Re: Regd ECCN Code for LibreOffice
There are no licenses its free to download. On Fri, Jul 19, 2013 at 7:11 PM, Jain, Pulkit X pulkit.j...@verizon.comwrote: Hi, ** ** Can you let us know the ECCN Code for thisLibreOffice*. We need to purchase a few licenses for the same.* ** ** ** ** Thanks, Pulkit Jain vBuild || VDSI || Chennai NPES Mobile Dev Team Phone: 91-813-987-8055- Extn-109993 *pulkit.j...@one.verizon.com* ** ** ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Send Feedback...and BSA ideas
I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. On Fri, Jul 19, 2013 at 11:51 PM, Rob Snelders libreoff...@ertai.nl wrote: Hi All, My little contribution. I think we are going the wrong way totally. When the dev-list found gerrit it wasn't quite what they wanted. But they took it, tweaked it and are now using it, with great success (afaik). And here we are trying to create something new that stands between what we have as bugzilla and the ask-site. Why are we trying to take this hughe detour to get what we want? I think we need _really need_ our own bugzilla so we can tweak that install that it suits us better. Then we can make the bugs less complex and use usefull subcomponents. But then we can also install plugins we think are usefull. Tweaking bugzilla then so it comes really close with what we need is better then. Yes this is a road that needs time invested. But that is also needed for the other road. Just my €0,02 -- Greetings, Rob Snelders On 16-07-13 00:33, Bjoern Michaelsen wrote: Hi, On Mon, Jul 15, 2013 at 05:59:37PM -0400, Robinson Tryon wrote: I did that and I was told to stop. One big problem with Ask admins reporting a bug for a user is that the reporter isthe Ask admin. Do you run OSX 10.7? Do you run Windows Vista? I don't, so when a dev comes back and asks me for repro steps, I have to shrug and say Go talk to user XYZ on the Ask site and as you said, the devs don't use the Ask site! Yeah, its probably best to suggest users to file a bug and offer to help them along on #libreoffice-qa once the bug is triaged roughly. I dont think we need to bother with bugs as long as those are obviously not welltriaged. Another problem is that if they haven't provided enough information, we can't tag the question as NEEDINFO and let the Ask system pester them for more information (although this would be a *great* improvement that I'd like to see!) THB, I did something similar with a question recently: Asked a long idle incomplete question if there is an update on the missing info and then closed it as outdated a few days later as there was no reply. Many/most new users on the Ask site do not read old questions. Of the small number that do, most of them either know how to file a bug or learn very quickly. So I don't think that me filing bugs for people will have much value in leading by example (but I could be wrong...). Only file bugs for others when you can reproduce the bug. Otherwise guide them through filing their bug themselves. This also makes the motivation for a reproduction scenario clear to the other guy. So: Give the people a smooth migration path towards bugzilla and allow them to test the waters on askbot, instead of a migration scenario that requires a sleep all-in learning curve, which will make a lot of them just turn away. It's a novel idea, having people start on Askbot and then having them learn how to use the bugtracker later, and it's not something I'm entirely opposed to, but it's a very drastic change to how we've been using FDO and the Ask site up until now. Note that experienced users will should be encouraged to stay with fdo (and will likely do so all by themselves). So: If you now what bugzilla is, go with it, otherwise better stay with askbot. If you have (experienced users: bugzilla) behind on the feedback page, you can hopefully divide the stream at that point already successfull as those saying oh, I know bugzilla will go for it and those who do not will evade (experienced users: UNKNOWN_THING). Best, Bjoern -- -- Greetings, Rob Snelders __**_ LibreOffice mailing list LibreOffice@lists.freedesktop.**org LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - 2 commits - cui/source
cui/source/options/optaboutconfig.cxx | 24
cui/source/options/optaboutconfig.hxx | 11 +--
2 files changed, 17 insertions(+), 18 deletions(-)
New commits:
commit daeccfaf65a0b312e1a19901de8b223cb3204724
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date: Sun Jul 21 22:05:28 2013 +0300
InsertEntry method implemented
This is used for the adding new items to the list box.
Change-Id: I6c531141c9dd4df1e050bfec610735c917bf5403
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index a130753..e6ec794 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -9,6 +9,8 @@
#include optaboutconfig.hxx
#include optHeaderTabListbox.hxx
+#include svtools/svlbitm.hxx
+#include svtools/treelistentry.hxx
using namespace svx;
@@ -57,4 +59,16 @@ SfxTabPage* CuiAboutConfigTabPage::Create( Window* pParent,
const SfxItemSet rI
{
return ( new CuiAboutConfigTabPage( pParent, rItemSet) );
}
+
+void CuiAboutConfigTabPage::InsertEntry( OUString rProp, OUString rStatus,
OUString rType, OUString rValue)
+{
+SvTreeListEntry* pEntry = new SvTreeListEntry;
+
+pEntry-AddItem( new SvLBoxString( pEntry, 0, rProp));
+pEntry-AddItem( new SvLBoxString( pEntry, 0, rStatus));
+pEntry-AddItem( new SvLBoxString( pEntry, 0, rType));
+pEntry-AddItem( new SvLBoxString( pEntry, 0, rValue));
+
+pPrefBox-Insert( pEntry );
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 6848a8f..cdfb1d5 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -28,12 +28,13 @@ private:
PushButton* m_pEditBtn;
::svx::OptHeaderTabListBox* pPrefBox;
+CuiAboutConfigTabPage( Window* pParent, const SfxItemSet rItemSet );
+~CuiAboutConfigTabPage();
public:
- CuiAboutConfigTabPage( Window* pParent, const SfxItemSet rItemSet );
- ~CuiAboutConfigTabPage();
-
static SfxTabPage* Create( Window* pParent, const SfxItemSet rItemset );
+ void InsertEntry(OUString rProp, OUString rStatus, OUString rType,
OUString rValue);
+
};
#endif
commit e81a396053526f9a7c09aefed805b189ecd4e0b9
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date: Sun Jul 21 18:36:58 2013 +0300
Revert starting to initial implementation
This reverts commit 5a3b21b5fb579bcf86eff172862b1c23c499b361.
Will implement it a different way.
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 864c681..a130753 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -9,7 +9,6 @@
#include optaboutconfig.hxx
#include optHeaderTabListbox.hxx
-#include svtools/accessibilityoption.hxx
using namespace svx;
@@ -18,17 +17,8 @@ using namespace svx;
#define ITEMID_STATUS 3
#define ITEMID_VALUE4
-struct CuiAboutConfigTabPage_Impl
-{
-SvtAccessibilityOptions m_aAccConfig;
-CuiAccessibilityOptionsTabPage_Impl()
-: m_aAccConfig(){}
-//FIXME use this struct for all options possible.
-}
-
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet rItemSet )
-:SfxTabPage( pParent, AboutConfig, cui/ui/aboutconfigdialog.ui,
rItemSet),
-m_pImpl(new CuiAboutConfigTabPage_Impl)
+:SfxTabPage( pParent, AboutConfig, cui/ui/aboutconfigdialog.ui,
rItemSet)
{
get(m_pDefaultBtn,default);
get(m_pEditBtn, edit);
@@ -67,8 +57,4 @@ SfxTabPage* CuiAboutConfigTabPage::Create( Window* pParent,
const SfxItemSet rI
{
return ( new CuiAboutConfigTabPage( pParent, rItemSet) );
}
-
-sal_Bool CuiAboutConfigTabPage::FillItemSet()
-{
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index a924877..6848a8f 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -18,7 +18,7 @@ namespace svx
{
class OptHeaderTabListBox;
}
-struct CuiAboutConfigTabPage_Impl;
+class CuiAboutConfigTabPage;
class CuiAboutConfigTabPage : public SfxTabPage
{
@@ -28,8 +28,6 @@ private:
PushButton* m_pEditBtn;
::svx::OptHeaderTabListBox* pPrefBox;
-
-CuiAboutConfigTabPage_Impl* m_pImpl;
public:
CuiAboutConfigTabPage( Window* pParent, const SfxItemSet rItemSet );
~CuiAboutConfigTabPage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit e77b0fe093ed0bc94c7d03d45838e590fb8219b2 Author: Tor Lillqvist t...@iki.fi Date: Mon Jul 22 09:40:21 2013 +0300 Use pkg-config --modversion to set FIREBIRD_VERSION if no fb_config Change-Id: I8ece7b989c330123a5df73f763a4b5fefefcf0cc diff --git a/configure.ac b/configure.ac index 95fc300..bcc9b4b 100644 --- a/configure.ac +++ b/configure.ac @@ -8125,6 +8125,7 @@ if test x$enable_firebird_sdbc = xyes; then if test -z $FIREBIRDCONFIG; then AC_MSG_NOTICE([No fb_config -- using pkg-config]) PKG_CHECK_MODULES(FIREBIRD, fbembed) +FIREBIRD_VERSION=`pkg-config --modversion fbembed` else AC_MSG_NOTICE([fb_config found]) FIREBIRD_VERSION=`$FIREBIRDCONFIG --version` ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: Regd ECCN Code for LibreOffice
Hi Jonathan, There should be an ECCN for the product, which is to be considered when the same software is used in some other country. My organization would not use LibreOffice unless it has an ECCN. Can you lemme know the same? Link - https://www.bis.doc.gov/index.php/licensing/commerce-control-list-classification/export-control-classification-number-eccn Thanks, Pulkit Jain vBuild || VDSI || Chennai NPES Mobile Dev Team Phone: 91-813-987-8055- Extn-109993 pulkit.j...@one.verizon.commailto:pulkit.j...@one.verizon.com From: Jonathan Aquilina [mailto:eagles051...@gmail.com] Sent: Monday, July 22, 2013 11:37 AM To: Jain, Pulkit X Cc: libreoffice@lists.freedesktop.org; michael.me...@novell.com Subject: Re: Regd ECCN Code for LibreOffice There are no licenses its free to download. On Fri, Jul 19, 2013 at 7:11 PM, Jain, Pulkit X pulkit.j...@verizon.commailto:pulkit.j...@verizon.com wrote: Hi, Can you let us know the ECCN Code for thisLibreOffice. We need to purchase a few licenses for the same. Thanks, Pulkit Jain vBuild || VDSI || Chennai NPES Mobile Dev Team Phone: 91-813-987-8055tel:813-987-8055- Extn-109993 pulkit.j...@one.verizon.commailto:pulkit.j...@one.verizon.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.orgmailto:LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 9f7676033585ab3bf352d5dc2ef43a3a9d8d5c46
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jul 22 09:10:15 2013 +0200
writerfilter: make sure the redline stack always has at least one element
One element is pushed to that stack in the constructor, so calling top()
on it always OK, as long as we check during pop() that the stack won't
be empty.
Change-Id: I010bd77897ab2a3684e7d9c5c0450e7bda626fc0
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index cc1dfba..fb7b8fc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1635,6 +1635,11 @@ void DomainMapper_Impl::PopFootOrEndnote()
if (!m_aTextAppendStack.empty())
m_aTextAppendStack.pop();
+if (m_aRedlines.size() == 1)
+{
+SAL_WARN(writerfilter, PopFootOrEndnote() is called without
PushFootOrEndnote()?);
+return;
+}
m_aRedlines.pop();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Can I put back OxygenOffice product ti instset_native?
Hi Kami, On Mon, Jul 22, 2013 at 07:08:05AM +0200, KAMI911 KAMI911 kami...@gmail.com wrote: Can I put back OxygenOffice product ti instset_native that was removed here? http://cgit.freedesktop.org/libreoffice/core/commit/instsetoo_native/util/openoffice.lst.in?id=33b05d5de716707e54ae09afe88a7e02c63e388d Yes, sure -- I guess it was removed as everyone thought OxygenOffice is MIA. Best, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Link error problem - Code Completition in BASIC IDE
On 2013-07-19 20:31, Gergő Mocsi wrote: Hi all, this day I've started to implement the cache fo Code Completition in Basic IDE. I've created a file codecompletecache.hxx in include/basic, and the implementation is placed in basic/source/classes/codecompletecache.cxx. The problem is teh following: I use a function called CodeCompleteDataCache GetCodeCompleteDataFromParse();, defined in file include/basic/sbmod.hxx (it's a public member of SbModule), and it's used to extract the data out from parsing. GetCodeCompleteDataFromParse() is being called from file basctl/source/basicide/baside2b.cxx. When I type make basic, that works, but when I compile the basctl module, it give me link error on CodeCompleteDataCache class's function. My working progress ca be found here:http://cgit.freedesktop.org/libreoffice/core/log/?h=feature/gsoc-basic-ide-completion-and-other-bits . Can anybody tell me a solution to this problem? In the file called tree/basctl/Library_basctl.mk after the line | $(eval $(call gb_Library_use_libraries,basctl,\ try adding a line basic \ | Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Regd ECCN Code for LibreOffice
On 2013-07-19 19:12, Jain, Pulkit X wrote: Can you let us know the ECCN Code for thisLibreOffice*. We need to purchase a few licenses for the same.* LibreOffice is an open-source project, so you do not need to buy licenses. If want you want is commercial support, there are various companies that offer that, see here: http://www.libreoffice.org/get-help/ Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Math: Fix memory leak with SmDocShell
On Mon, Jul 22, 2013 at 03:16:33AM +, Fridrich Strba (via Code Review) ger...@gerrit.libreoffice.org wrote: Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5017 This breaks JunitTest_starmath_unoapi here. Are you sure mpDocShell owns that pointer? signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - android/experimental
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
| 150 +-
1 file changed, 147 insertions(+), 3 deletions(-)
New commits:
commit 24773530143c995820417fd004d227ff9472e51f
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jul 15 18:01:02 2013 +0200
LibreOffice4Android: render in a bit better quality
Change-Id: I65984af5e28c8a0250105b34c4bc7b1abf9ce3c7
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index df09708..d67d6e6 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -574,6 +574,7 @@ public class DocumentLoader
static final String TAG = PAGE_VIEWER;
int width ;
int height;
+double zoomFactor;
class PageLoadTask
extends AsyncTaskInteger, Void, Integer
@@ -588,13 +589,19 @@ public class DocumentLoader
state = PageState.LOADING;
currentPageNumber = number;
-ByteBuffer bb = renderPage(currentPageNumber , params[1] ,
params[2]);//
-bm = Bitmap.createBitmap( width, height,
Bitmap.Config.ARGB_);
+ByteBuffer bb = renderPage(currentPageNumber,
getZoomed(params[1]), getZoomed(params[2]));//
+bm = Bitmap.createBitmap(getZoomed(width), getZoomed(height),
Bitmap.Config.ARGB_);
bm.copyPixelsFromBuffer(bb);
return currentPageNumber;
}
+int getZoomed(int in)
+{
+double zoomed = in * zoomFactor;
+return (int)zoomed;
+}
+
protected void onPostExecute(Integer result)
{
Log.i(PageViewer.TAG, onPostExecute: + result);
@@ -651,6 +658,8 @@ public class DocumentLoader
return;
this.width = width ;
this.height = height;
+// Render in a bit better quality, so it makes sense to zoom.
+zoomFactor = Math.sqrt(2);
waitView = new TextView(DocumentLoader.this);
waitView.setTextSize(24);
waitView.setGravity(Gravity.CENTER);
commit 847fa448107574011745a530864ffd76b7531378
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jul 15 17:36:11 2013 +0200
LibreOffice4Android: support pinch zoom and dragging around while in zoom
Change-Id: Ic8e4cb30acff734e6860dfc9bb31e836d2ecd32d
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index 1373f37..df09708 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -32,6 +32,7 @@ package org.libreoffice.android;
import org.libreoffice.R;
import android.app.Activity;
+import android.graphics.PointF;
import android.graphics.Bitmap;
import android.graphics.Matrix;
import android.graphics.Color;
@@ -41,10 +42,12 @@ import android.graphics.Canvas;
import android.graphics.Paint;
import android.os.AsyncTask;
import android.os.Bundle;
+import android.util.FloatMath;
import android.util.Log;
import android.view.GestureDetector;
import android.view.Gravity;
import android.view.MotionEvent;
+import android.view.View.OnTouchListener;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationSet;
@@ -52,6 +55,7 @@ import android.view.animation.TranslateAnimation;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import android.widget.ImageView.ScaleType;
import android.widget.ViewFlipper;
import android.widget.ViewSwitcher;
import android.view.MenuItem;
@@ -129,6 +133,7 @@ public class DocumentLoader
XRenderable renderable;
GestureDetector gestureDetector;
+ScaleListener scaleDetector;
ViewGroup.LayoutParams matchParent;
@@ -149,15 +154,19 @@ public class DocumentLoader
float velocityY)
{
Log.i(TAG, onFling: + event1 + + event2);
+if (scaleDetector.inZoom())
+return false;
ViewFlipper flipper = documentViewer.getFlipper();
if (event1.getX() - event2.getX() 120) {
if (((PageViewer)flipper.getCurrentView()).currentPageNumber
== pageCount-1)
return false;
+scaleDetector.reset();
documentViewer.nextPage();
return true;
} else if (event2.getX() - event1.getX() 120) {
Re: LibreOffice Works on XStream/illumos! - questions about packaging
On Fri, Jul 19, 2013 at 04:46:32PM +0200, Gabriele Bulfon gabriele.bul...@sonicle.com wrote: Should I just place everything in /usr/lib/libreoffice as in prototype, or also provide links in /usr/bin to run common executables? (soffice,swriter and so on). Linux distros do that, also you probably want to symlink a few more things: - .desktop files - icons - mime config - manpages signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - connectivity/Library_firebird_sdbc.mk connectivity/source
connectivity/Library_firebird_sdbc.mk |1
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx | 296 +---
connectivity/source/drivers/firebird/FResultSetMetaData.cxx | 87 ---
connectivity/source/drivers/firebird/Util.cxx | 151 ++
connectivity/source/drivers/firebird/Util.hxx | 35 +
5 files changed, 430 insertions(+), 140 deletions(-)
New commits:
commit 074ef06c908af1e5c6922a0c8ff9ccc9a9d54063
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Mon Jul 22 10:49:37 2013 +0200
Implement getColumns() (firebird-sdbc).
Change-Id: I07e9af5e049d58dc794cad4481a2f4e2b1fe547d
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index 38f61a1..c6e33c9 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -35,10 +35,12 @@
#include FDatabaseMetaData.hxx
#include FDatabaseMetaDataResultSet.hxx
+#include Util.hxx
#include ibase.h
#include rtl/ustrbuf.hxx
+#include com/sun/star/sdbc/ColumnValue.hpp
#include com/sun/star/sdbc/DataType.hpp
#include com/sun/star/sdbc/ResultSetType.hpp
#include com/sun/star/sdbc/ResultSetConcurrency.hpp
@@ -849,18 +851,193 @@ uno::Reference XResultSet SAL_CALL
ODatabaseMetaData::getColumnPrivileges(
(void) columnNamePattern;
return NULL;
}
-// -
+
uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getColumns(
-const Any catalog, const OUString schemaPattern, const OUString
tableNamePattern,
-const OUString columnNamePattern ) throw(SQLException, RuntimeException)
+const Any catalog,
+const OUString schemaPattern,
+const OUString tableNamePattern,
+const OUString columnNamePattern)
+throw(SQLException, RuntimeException)
{
-(void) catalog;
-(void) schemaPattern;
-(void) tableNamePattern;
-(void) columnNamePattern;
-return NULL;
+(void) catalog; // Unsupported in firebird
+(void) schemaPattern; // Unsupported in firebird
+SAL_INFO(connectivity.firebird, getColumns() with
+ TableNamePattern: tableNamePattern
+ ColumnNamePattern: columnNamePattern);
+
+OUStringBuffer queryBuf(SELECT
+relfields.RDB$RELATION_NAME, // 1
+relfields.RDB$FIELD_NAME, // 2
+relfields.RDB$DESCRIPTION,// 3
+relfields.RDB$DEFAULT_VALUE, // 4
+relfields.RDB$FIELD_POSITION, // 5
+fields.RDB$FIELD_TYPE,// 6
+fields.RDB$FIELD_LENGTH, // 7
+fields.RDB$FIELD_PRECISION, // 8
+fields.RDB$NULL_FLAG // 9
+FROM RDB$RELATION_FIELDS relfields
+JOIN RDB$FIELDS fields
+on (relfields.RDB$FIELD_NAME = fields.RDB$FIELD_NAME) );
+
+if (!tableNamePattern.isEmpty())
+{
+OUString sAppend;
+if (tableNamePattern.match(%))
+sAppend = AND RDB$RELATION_NAME LIKE '%' ;
+else
+sAppend = AND RDB$RELATION_NAME = '%' ;
+
+queryBuf.append(sAppend.replaceAll(%, tableNamePattern));
+}
+
+if (!columnNamePattern.isEmpty())
+{
+OUString sAppend;
+if (columnNamePattern.match(%))
+sAppend = AND RDB$FIELD_NAME LIKE '%' ;
+else
+sAppend = AND RDB$FIELD_NAME = '%' ;
+
+queryBuf.append(sAppend.replaceAll(%, columnNamePattern));
+}
+
+OUString query = queryBuf.makeStringAndClear();
+
+uno::Reference XStatement statement = m_pConnection-createStatement();
+uno::Reference XResultSet rs = statement-executeQuery(query.getStr());
+uno::Reference XRow xRow( rs, UNO_QUERY_THROW );
+
+ODatabaseMetaDataResultSet::ORows aResults;
+
+while( rs-next() )
+{
+ODatabaseMetaDataResultSet::ORow aCurrentRow(16);
+
+// 1. TABLE_CAT (catalog) may be null -- thus we omit it.
+// 2. TABLE_SCHEM (schema) may be null -- thus we omit it.
+// 3. TABLE_NAME
+{
+OUString aTableName = xRow-getString(1);
+aCurrentRow.push_back(new ORowSetValueDecorator(aTableName));
+}
+// 4. Column Name
+{
+OUString aColumnName = xRow-getString(2);
+aCurrentRow.push_back(new ORowSetValueDecorator(aColumnName));
+}
+
+// 5. Datatype
+short aType = getFBTypeFromBlrType(xRow-getShort(6));
+aCurrentRow.push_back(new
ORowSetValueDecorator(getColumnTypeFromFBType(aType)));
+// 6. Typename (SQL_*)
+aCurrentRow.push_back(new
ORowSetValueDecorator(getColumnTypeNameFromFBType(aType)));
+
+// 7. Column Sizes
+{
+sal_Int32 aColumnSize = 0;
+switch (aType)
+{
+case SQL_TEXT:
+case SQL_VARYING:
+
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/ElementsDockingWindow.hxx|1 -
starmath/source/ElementsDockingWindow.cxx |5 -
2 files changed, 6 deletions(-)
New commits:
commit f9e981ba0e2da6ce122e3ef30aef057c439c8fb8
Author: Fridrich Strba fridr...@documentfoundation.org
Date: Mon Jul 22 09:22:31 2013 +
Revert Math: Fix memory leak with SmDocShell
It breaks make check
This reverts commit d3cf684146162a1528046ab2bcd7d9fa94443c69
Change-Id: Iae8ef2a49a395e885aa8ab3658244836c9ce71c5
Reviewed-on: https://gerrit.libreoffice.org/5021
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/starmath/inc/ElementsDockingWindow.hxx
b/starmath/inc/ElementsDockingWindow.hxx
index 9a98cf9..c46cf79 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -100,7 +100,6 @@ class SmElementsControl : public Control
public:
SmElementsControl(Window *pParent, const ResId rResId);
-~SmElementsControl();
void setElementSetId(sal_uInt16 aSetId);
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index d7656f5..8f71602 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -178,11 +178,6 @@ SmElementsControl::SmElementsControl(Window *pParent,
const ResId rResId) :
maFormat.SetBaseSize(PixelToLogic(Size(0, 24)));
}
-SmElementsControl::~SmElementsControl()
-{
-delete mpDocShell;
-}
-
void SmElementsControl::setVerticalMode(bool bVerticalMode)
{
mbVerticalMode = bVerticalMode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - include/vcl svtools/source vcl/source
include/vcl/bitmap.hxx | 29 -
include/vcl/bitmapex.hxx| 32 +
svtools/source/control/ctrlbox.cxx | 14 +-
svtools/source/control/valueset.cxx | 14 +-
vcl/source/control/ilstbox.cxx | 32 ++---
vcl/source/gdi/bitmap4.cxx | 194
vcl/source/gdi/bitmapex.cxx | 149 +++
vcl/source/gdi/outdev2.cxx |9 +
8 files changed, 214 insertions(+), 259 deletions(-)
New commits:
commit ba6478560792e0eec161142c8cfbc0e08cd7a4f5
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Jul 21 13:01:47 2013 -0500
Resolves: #i122418# Added workaround to not use GetBitmap on windows
(cherry picked from commit 136976efb17b8617a83c7f26601cd04031b51e7f)
Change-Id: I2500a13a80c6be7b038187ea87fdf179da25ebe5
Reviewed-on: https://gerrit.libreoffice.org/5012
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 85aead9..b6c00c2 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -821,35 +821,6 @@ public:
const Link* pProgress = NULL );
public:
-/** Draw a blend frame to the Bitmap
-
-@param nAlpha
-The blend value defines how strong the frame will be blended with the
-existing content, 255 == full coverage, 0 == no frame will be drawn
-
-@param aColorTopLeft, aColorBottomRight, aColorTopRight,
aColorBottomLeft
-The colors defining the frame. If the version without aColorTopRight
and
-aColorBottomLeft is used, these colors are linearly interpolated from
-aColorTopLeft and aColorBottomRight using the width and height of the
area
-
-@param rTopLeft
-The start point of the frame in pixels
-
-@param rSize
-The size of the frame in pixels
- */
-void DrawBlendFrame(
-sal_uInt8 nAlpha = 128,
-Color aColorTopLeft = Color(COL_WHITE),
-Color aColorBottomRight = Color(COL_BLACK));
-void DrawBlendFrame(
-const Point rTopLeft,
-const Size rSize,
-sal_uInt8 nAlpha = 128,
-Color aColorTopLeft = Color(COL_WHITE),
-Color aColorTopRight = Color(COL_GRAY),
-Color aColorBottomRight = Color(COL_BLACK),
-Color aColorBottomLeft = Color(COL_GRAY));
BitmapReadAccess* AcquireReadAccess();
BitmapWriteAccess* AcquireWriteAccess();
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index ce1b2ae..00a3c4e 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -395,6 +395,38 @@ public:
const Size rSize );
};
+// --
+/** Create a blend frame as BitmapEx
+
+@param nAlpha
+The blend value defines how strong the frame will be blended with the
+existing content, 255 == full coverage, 0 == no frame will be drawn
+
+@param aColorTopLeft, aColorBottomRight, aColorTopRight, aColorBottomLeft
+The colors defining the frame. If the version without aColorTopRight and
+aColorBottomLeft is used, these colors are linearly interpolated from
+aColorTopLeft and aColorBottomRight using the width and height of the area
+
+@param rSize
+The size of the frame in pixels
+*/
+
+BitmapEx VCL_DLLPUBLIC createBlendFrame(
+const Size rSize,
+sal_uInt8 nAlpha,
+Color aColorTopLeft,
+Color aColorBottomRight);
+
+BitmapEx VCL_DLLPUBLIC createBlendFrame(
+const Size rSize,
+sal_uInt8 nAlpha,
+Color aColorTopLeft,
+Color aColorTopRight,
+Color aColorBottomRight,
+Color aColorBottomLeft);
+
+// --
+
#endif // _SV_BITMAPEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 37cf887..b839b89 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -307,16 +307,14 @@ void ColorListBox::UserDraw( const UserDrawEvent rUDEvt )
if(nEdgeBlendingPercent)
{
-Bitmap aBitmap(rUDEvt.GetDevice()-GetBitmap(aRect.TopLeft(),
aRect.GetSize()));
+const Color
rTopLeft(rStyleSettings.GetEdgeBlendingTopLeftColor());
+const Color
rBottomRight(rStyleSettings.GetEdgeBlendingBottomRightColor());
+const sal_uInt8 nAlpha((nEdgeBlendingPercent * 255) / 100);
+const BitmapEx aBlendFrame(createBlendFrame(aRect.GetSize(),
nAlpha, rTopLeft, rBottomRight));
-if(!aBitmap.IsEmpty())
+if(!aBlendFrame.IsEmpty())
{
-const Color
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - dictionaries sd/source
dictionaries |2 +-
sd/source/ui/view/drviews1.cxx |4 ++--
sd/source/ui/view/outlnvsh.cxx |1 +
sd/source/ui/view/viewshel.cxx |3 +--
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit e5726f0578223cdd2b706c73be931364c57d477c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 18 14:27:15 2013 +0100
Resolves: fdo#66924 switching to master view is broken
It seems 0143805a565418d2a114c16b7eeba3b784176d9e wanted to not call
SfxShell::Activate from ViewShell::Activate and removed that call and added
an
explicit SfxShell::BroadcastContextForActivation(true) (which is the body of
SfxShell::Activate) to OutlineViewShell::Activate for the case where it was
apparently wanted.
Then DrawViewShell::Deactivate had the call to ViewShell::Deactivate removed
persumably to avoid calling SfxShell::Deactivate via ViewShell::Deactivate
But with ViewShell::Deactivate omitted switching to master view is broken,
it
does quite a lot more than call just SfxShell::Deactivate
Restore the call of ViewShell::Deactivate from DrawViewShell::Deactivate and
remove the call of SfxShell::Deactivate from ViewShell::Deactivate and put
its
equivalent of SfxShell::BroadcastContextForActivation(false) into
OutlineViewShell::Deactivate to balance OutlineViewShell::Activate
regression since 0143805a565418d2a114c16b7eeba3b784176d9e
(cherry picked from commit 4a578dc9c7b9c5697f624807790565c99ccb919d)
Reviewed-on: https://gerrit.libreoffice.org/4974
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Change-Id: I5175378af6a6527a8be4d5011f13029d028b4304
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/dictionaries b/dictionaries
index 9c0209d..60f4c3b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 9c0209d831365ff1a10d686a6519d42434ec8e8a
+Subproject commit 60f4c3b0227f18061387155c9831d761c659ce01
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 26ad764..e6ea485 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -114,9 +114,9 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli )
}
-void DrawViewShell::Deactivate(sal_Bool /*bIsMDIActivate*/)
+void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate)
{
-// Do not forward to ViewShell::Deactivate() to prevent a context change.
+ViewShell::Deactivate(bIsMDIActivate);
}
namespace
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 80f8b3d..446c31f 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -383,6 +383,7 @@ void OutlineViewShell::Deactivate( sal_Bool bIsMDIActivate )
// Links must be kept also on deactivated viewshell, to allow drag'n'drop
// to function properly
ViewShell::Deactivate( bIsMDIActivate );
+SfxShell::BroadcastContextForActivation(false);
}
/**
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 19ab220..2117370 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -403,8 +403,7 @@ void ViewShell::Deactivate(sal_Bool bIsMDIActivate)
mpHorizontalRuler-SetActive(sal_False);
if (mpVerticalRuler.get() != NULL)
mpVerticalRuler-SetActive(sal_False);
-
-SfxShell::Deactivate(bIsMDIActivate);
+// Do not forward to SfxShell::Deactivate()
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4326872e510941595f0682b6b6330d480d3e6150 Author: Miklos Vajna vmik...@suse.cz Date: Mon Jul 22 11:38:08 2013 +0200 Partially revert Resolves: fdo#66924 switching to master view is broken This partially reverts commit e5726f0578223cdd2b706c73be931364c57d477c. The dictionaries hunk wasn't intentional. diff --git a/dictionaries b/dictionaries index 60f4c3b..9c0209d 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 60f4c3b0227f18061387155c9831d761c659ce01 +Subproject commit 9c0209d831365ff1a10d686a6519d42434ec8e8a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo65632.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13 ++
writerfilter/source/dmapper/DomainMapper.cxx |6 ++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 28 +++---
writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 -
writerfilter/source/ooxml/model.xml |4 ++-
writerfilter/source/rtftok/rtfdocumentimpl.cxx| 21 +++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx|1
8 files changed, 56 insertions(+), 19 deletions(-)
New commits:
commit fe5e35009f23b025ac58fcb5abc892a90c6a264c
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jul 17 15:32:03 2013 +0200
fdo#65632 RTF import: send NS_ooxml::LN_trackchange only once for one range
The problem was that in case we had
{\deleted foo\b bar}
then both foo and bar triggered a trackchange, but } only ended
one, resulting in overlapping redline ranges. This was cought by core,
but caused a performance problem.
For the first bugdoc, before:
real3m57.803s
after:
real0m3.072s
(cherry picked from commits 7c0a1557406bb8145f8035ce86d31e927667,
ed187fcbd457d01be6ac382d61b493039a5af7d5 and
54518a209d0ffe00f8e391472da92e398c474392 and
9f7676033585ab3bf352d5dc2ef43a3a9d8d5c46)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
writerfilter/source/rtftok/rtfdocumentimpl.hxx
Change-Id: Ibf6f2db30109f0b9a2571d2e4fb3cc76294f68d1
Reviewed-on: https://gerrit.libreoffice.org/4964
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/qa/extras/ooxmlimport/data/fdo65632.docx
b/sw/qa/extras/ooxmlimport/data/fdo65632.docx
new file mode 100755
index 000..8c336c2
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo65632.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 26ecdf3..1db7829 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -124,6 +124,7 @@ public:
void testN820504();
void testFdo43641();
void testFdo46361();
+void testFdo65632();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -213,6 +214,7 @@ void Test::run()
{n820504.docx, Test::testN820504},
{fdo43641.docx, Test::testFdo43641},
{fdo46361.docx, Test::testFdo46361},
+{fdo65632.docx, Test::testFdo65632},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1511,6 +1513,17 @@ void Test::testFdo46361()
CPPUNIT_ASSERT_EQUAL(OUString(text\ntext\n),
uno::Referencetext::XTextRange(xGroupShape-getByIndex(2),
uno::UNO_QUERY)-getString());
}
+void Test::testFdo65632()
+{
+// The problem was that the footnote text had fake redline: only the body
+// text has redline in fact.
+uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
+uno::Referencetext::XText xText(xFootnotes-getByIndex(0),
uno::UNO_QUERY);
+//uno::Referencetext::XTextRange xParagraph = getParagraphOfText(1,
xText);
+CPPUNIT_ASSERT_EQUAL(OUString(Text),
getPropertyOUString(getRun(getParagraphOfText(1, xText), 1),
TextPortionType));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 91d5d94..fb4786e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1402,9 +1402,6 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
case NS_ooxml::LN_CT_Color_themeShade:
//unsupported
break;
-case NS_ooxml::LN_endtrackchange:
-m_pImpl-RemoveCurrentRedline( );
-break;
case NS_ooxml::LN_CT_DocGrid_linePitch:
{
//see SwWW8ImplReader::SetDocumentGrid
@@ -3276,6 +3273,9 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
m_pImpl-EndParaChange( );
}
break;
+case NS_ooxml::LN_endtrackchange:
+m_pImpl-RemoveCurrentRedline( );
+break;
case NS_ooxml::LN_CT_RPrChange_rPr:
break;
case NS_ooxml::LN_object:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e2b2ea5..c437471 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -208,6 +208,8 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bUsingEnhancedFields = lcl_IsUsingEnhancedFields( m_xComponentContext );
m_pSdtHelper = new SdtHelper(*this);
+
+
[Libreoffice-commits] core.git: sd/Library_sd.mk
sd/Library_sd.mk | 22 +- 1 file changed, 17 insertions(+), 5 deletions(-) New commits: commit 1b1037767adf96c23848a7ac195023e277086e54 Author: Tor Lillqvist t...@iki.fi Date: Mon Jul 22 12:59:31 2013 +0300 Fix remote control server side build problems The non-Bluetooth (TCP) code should not be inside Bluetooth conditionals. You can't put a flag like -Wno-error in a list of objects. (And besides, why would we want to disable -Werror like that, instead we should not introduce warnings in what is after all freshly written code;) This should fix the Android tinderbox build. Change-Id: Ia698031a9815bf938c5c2a29bf68dee68cae07fe diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 1586ba0..15b720d 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -530,17 +530,31 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/Transmitter \ )) +ifneq ($(OS),MACOSX) + +$(eval $(call gb_Library_add_exception_objects,sd,\ +sd/source/ui/remotecontrol/DiscoveryService \ +)) + +else + +$(eval $(call gb_Library_add_objcxxobjects,sd,\ +sd/source/ui/remotecontrol/DiscoveryService \ +sd/source/ui/remotecontrol/OSXNetworkService, \ +)) + +endif + $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE \ )) ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) -ifeq (,$(filter IOS MACOSX,$(OS))) +ifneq ($(OS),MACOSX)) $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ -sd/source/ui/remotecontrol/DiscoveryService \ )) else @@ -548,9 +562,6 @@ else $(eval $(call gb_Library_add_objcxxobjects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ sd/source/ui/remotecontrol/OSXBluetooth\ -sd/source/ui/remotecontrol/DiscoveryService \ -sd/source/ui/remotecontrol/OSXNetworkService, \ --Wno-error \ )) $(eval $(call gb_Library_add_libs,sd,\ @@ -567,6 +578,7 @@ endif $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) + endif endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to know the current viewed page and line in writer
thanks! still, this gives the page of the cursor, not the page of the viewer, which when scrolling, can be different from what i could see XViewDataSupplier does not have this data we want this data to implement a location indicator similar to that on iOS browsers, on the iOS app, using iOS UI controls. Is it possible to extract this data from the libreoffice VCL scrollbar elements using UNO, instead of calculating it ourselves? On Wed, Jul 17, 2013 at 10:18 AM, Miklos Vajna vmik...@suse.cz wrote: Hi, On Tue, Jul 16, 2013 at 07:59:43PM +0300, Ptyl Dragon p...@cloudon.com wrote: 1. Which line the writer GUI is currently showing (which may be different from the line the caret / cursor is on - such as when scrolling, for example) The GUI is typically showing an area of the document, which is more a rectangle than a given set of lines. You can use document::XViewDataSupplier to read/write that data: http://api.libreoffice.org/docs/common/ref/com/sun/star/document/XViewDataSupplier.html 2. How many lines there are in total, in the writer document Isn't that available as part of the document stats? Additionally, as a fallback, we would like to simply to know which page writer is showing, and how many pages there are in total. See http://opengrok.libreoffice.org/xref/core/sw/qa/extras/inc/swmodeltestbase.hxx#getPages on how to get the number of pages using UNO. Miklos -- [image: appicon.png] *Ptyl Dragon* Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://site.cloudon.com/blog ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: g
g |8
1 file changed, 8 insertions(+)
New commits:
commit 27925032cd5aec8805185679e01c687c40bbd617
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jul 22 11:55:49 2013 +0200
g: ignore submodule changes
Change-Id: I6125dd018615bc7aa18bacc838ea602ccb0fabc1
diff --git a/g b/g
index e273171..4c0184c 100755
--- a/g
+++ b/g
@@ -90,6 +90,14 @@ local hook
for repo in ${SUBMODULES_ALL?} ; do
refresh_submodule_hooks $repo
done
+# In our workflow, it's always gerrit that does the submodule updates, so
+# better ignoring them to avoid accidentally including those changes in our
+# commits.
+# 'git submodule status' can be still used to see if a submodule has such
+# changes.
+for repo in ${SUBMODULES_CONFIGURED?} ; do
+git config submodule.$repo.ignore all
+done
popd /dev/null
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/gdi/salmisc.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit ec3d48418f1cbad40153b3e4fdc2497ebf0e7d59
Author: Herbert Dürr h...@apache.org
Date: Mon Jul 22 09:50:08 2013 +
#i122796# fix half-pixel offset in StretchAndConvert() image scaling
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 817aa90..7b93189 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -429,12 +429,12 @@ BitmapBuffer* StretchAndConvert(
}
// horizontal mapping table
-if( nDstDX != nSrcDX )
+if( (nDstDX != nSrcDX) (nDstDX != 0) )
{
-const double fFactorX = ( nDstDX 1 ) ? (double) ( nSrcDX - 1 ) / (
nDstDX - 1 ) : 0.0;
+const double fFactorX = (double)nSrcDX / nDstDX;
for( i = 0L; i nDstDX; i++ )
-pMapX[ i ] = nSrcX + FRound( i * fFactorX );
+pMapX[ i ] = nSrcX + static_castint( i * fFactorX );
}
else
{
@@ -443,12 +443,12 @@ BitmapBuffer* StretchAndConvert(
}
// vertical mapping table
-if( nDstDY != nSrcDY )
+if( (nDstDY != nSrcDY) (nDstDY != 0) )
{
-const double fFactorY = ( nDstDY 1 ) ? (double) ( nSrcDY - 1 ) / (
nDstDY - 1 ) : 0.0;
+const double fFactorY = (double)nSrcDY / nDstDY;
for( i = 0L; i nDstDY; i++ )
-pMapY[ i ] = nSrcY + FRound( i * fFactorY );
+pMapY[ i ] = nSrcY + static_castint( i * fFactorY );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/CustomTarget_deb.mk
sysui/CustomTarget_deb.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6f4e3a2e272e1ed269efe3ba11915378ffb41a77 Author: Petr Mladek pmla...@suse.cz Date: Mon Jul 22 12:07:01 2013 +0200 avoid file conflict in debian-menus package (fdo#67031) Use versioned file name for Debian specific /usr/lib/menu/libreoffice. All the other files have been versioned for years when we did this for RPMs. Heh, nobody noticed this with DEBs because people were used to that conflict and did not complain ;-) Change-Id: I1195279ff4825ed9154cf497ff3cc702f7309b6a diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk index b1186d6..82acd32 100644 --- a/sysui/CustomTarget_deb.mk +++ b/sysui/CustomTarget_deb.mk @@ -51,7 +51,7 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge -e 's/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ -e 's/%PREFIX/$(UNIXFILENAME.$*)/' \ -e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \ -$(deb_WORKDIR)/$*/usr/lib/menu/$* +$(deb_WORKDIR)/$*/usr/lib/menu/$*$(PKGVERSIONSHORT) echo Package: $*$(PKGVERSIONSHORT)-debian-menus $@ cat $ | tr -d \015 | \ sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sysui/desktop
sysui/desktop/debian/control |3 --- 1 file changed, 3 deletions(-) New commits: commit 754586bb7148ffd9f8e7fd34a6f1700b74e4286f Author: Petr Mladek pmla...@suse.cz Date: Thu Jul 18 11:40:17 2013 +0200 debian-menus packages should not conflict with older versions (fdo#67031) All the files and menu entries have been versioned since LO 3.4. There are not real conflicts with older versions or native Debian packages any longer. Change-Id: Ie3afb8b506cb23767b52a5f9cf1c721521e60ec3 Reviewed-on: https://gerrit.libreoffice.org/4965 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-on: https://gerrit.libreoffice.org/5019 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control index da25ee4..cfcd707 100755 --- a/sysui/desktop/debian/control +++ b/sysui/desktop/debian/control @@ -1,6 +1,3 @@ Description: %productname desktop integration Maintainer: LibreOffice Architecture: all -Provides: libreoffice-desktop-integration, libreoffice-unbundled -Conflicts: libreoffice-desktop-integration, libreoffice-debian-menus, libreoffice-bundled -Replaces: libreoffice-desktop-integration, libreoffice-debian-menus ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/view.hxx|4 ++--
starmath/source/view.cxx |9 ++---
2 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit ca16c526497ef5a5d1522db74204eed9a0309355
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Sat Jul 20 19:53:02 2013 -0300
Change function to void, nobody checks the returned data
Change-Id: I9ef7eb7a9c32153f0a886479f65678907969adc5
Reviewed-on: https://gerrit.libreoffice.org/5000
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index ca81b0e..e307137 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -260,8 +260,8 @@ protected:
virtual sal_uInt16 SetPrinter(SfxPrinter *pNewPrinter,
sal_uInt16 nDiffFlags = SFX_PRINTER_ALL,
bool bIsAPI=false);
-boolInsert( SfxMedium rMedium );
-boolInsertFrom(SfxMedium rMedium);
+void Insert( SfxMedium rMedium );
+void InsertFrom(SfxMedium rMedium);
virtual bool HasPrintOptionsPage() const;
virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent,
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a59ccde..9a291a9 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1451,7 +1451,7 @@ void SmViewShell::PrevError()
}
-bool SmViewShell::Insert( SfxMedium rMedium )
+void SmViewShell::Insert( SfxMedium rMedium )
{
SAL_INFO( starmath, starmath: SmViewShell::Insert );
@@ -1489,11 +1489,9 @@ bool SmViewShell::Insert( SfxMedium rMedium )
rBnd.Invalidate(SID_GAPHIC_SM);
rBnd.Invalidate(SID_TEXT);
}
-return bRet;
}
-
-bool SmViewShell::InsertFrom(SfxMedium rMedium)
+void SmViewShell::InsertFrom(SfxMedium rMedium)
{
SAL_INFO( starmath, starmath: SmViewShell::InsertFrom );
@@ -1528,11 +1526,8 @@ bool SmViewShell::InsertFrom(SfxMedium rMedium)
rBnd.Invalidate(SID_GAPHIC_SM);
rBnd.Invalidate(SID_TEXT);
}
-
-return bSuccess;
}
-
void SmViewShell::Execute(SfxRequest rReq)
{
SAL_INFO( starmath, starmath: SmViewShell::Execute );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sysui/CustomTarget_deb.mk
sysui/CustomTarget_deb.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a6ae1cc0a2c5fd9f9bc0a834038b73e79b78fc6d Author: Petr Mladek pmla...@suse.cz Date: Mon Jul 22 12:07:01 2013 +0200 avoid file conflict in debian-menus package (fdo#67031) Use versioned file name for Debian specific /usr/lib/menu/libreoffice. All the other files have been versioned for years when we did this for RPMs. Heh, nobody noticed this with DEBs because people were used to that conflict and did not complain ;-) Change-Id: I1195279ff4825ed9154cf497ff3cc702f7309b6a Reviewed-on: https://gerrit.libreoffice.org/5025 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk index b1186d6..82acd32 100644 --- a/sysui/CustomTarget_deb.mk +++ b/sysui/CustomTarget_deb.mk @@ -51,7 +51,7 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge -e 's/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ -e 's/%PREFIX/$(UNIXFILENAME.$*)/' \ -e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \ -$(deb_WORKDIR)/$*/usr/lib/menu/$* +$(deb_WORKDIR)/$*/usr/lib/menu/$*$(PKGVERSIONSHORT) echo Package: $*$(PKGVERSIONSHORT)-debian-menus $@ cat $ | tr -d \015 | \ sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/win32 framework/source scp2/source vcl/inc vcl/Library_vcl.mk vcl/win
desktop/win32/source/applauncher/launcher.cxx | 39
framework/source/helper/titlebarupdate.cxx| 32 +++-
scp2/source/base/registryitem_base.scp|2 -
scp2/source/calc/registryitem_calc.scp|8 ++--
scp2/source/draw/registryitem_draw.scp|8 ++--
scp2/source/impress/registryitem_impress.scp |8 ++--
scp2/source/math/registryitem_math.scp|4 +-
scp2/source/writer/registryitem_writer.scp| 14 +++
vcl/Library_vcl.mk|1
vcl/inc/win/salframe.h|7 ++-
vcl/win/source/window/salframe.cxx| 49 +-
11 files changed, 105 insertions(+), 67 deletions(-)
New commits:
commit f7d410edfa0866bd7759b2b977800d5744d8b544
Author: Jesús Corrius jcorr...@gmail.com
Date: Sat Jul 20 17:10:43 2013 +0200
fdo#35785 LibreOffice's support of recent documents in Windows 7 broken
Change-Id: I916ba1335b0a0420f568ab9340632f273e3c9516
Reviewed-on: https://gerrit.libreoffice.org/4997
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 19f3d9310caef84fe2815eb89af448a81937bddd)
Shell32.dll is already loaded
Since the vcllo.dll links already the shell32.dll because of its symbol
SHAddToRecentDocs, no need to increase reference of that library. Just
get the module handle.
Moreover, a mere presence of the symbol SHGetPropertyStoreForWindow in
shell32.dll indicates that we are running at least on Windows 7 or Windows
Server 2008 R2. There is thus no need to check for the library version.
Change-Id: I9ddfb8407fd805faf588779ac5fa8c10a0ae8898
Reviewed-on: https://gerrit.libreoffice.org/5016
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 50d330c3d238b7b6182787959b30a6d665eab078)
Reviewed-on: https://gerrit.libreoffice.org/5024
Reviewed-by: Jesús Corrius jcorr...@gmail.com
Reviewed-by: Tor Lillqvist t...@iki.fi
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/desktop/win32/source/applauncher/launcher.cxx
b/desktop/win32/source/applauncher/launcher.cxx
index c6a40d3..b0f031a 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -34,51 +34,12 @@
#include stdlib.h
#include malloc.h
-#define PACKVERSION(major,minor) MAKELONG(minor,major)
-#define APPUSERMODELID LTheDocumentFoundation.LibreOffice
-
-
#ifdef __MINGW32__
extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
#else
extern C int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
#endif
{
-// Set an explicit Application User Model ID for the process
-
-WCHAR szShell32[MAX_PATH];
-GetSystemDirectoryW(szShell32, MAX_PATH);
-wcscat(szShell32, L\\Shell32.dll);
-
-HINSTANCE hinstDll = LoadLibraryW(szShell32);
-
-if(hinstDll)
-{
-DLLVERSIONINFO dvi;
-ZeroMemory(dvi, sizeof(dvi));
-dvi.cbSize = sizeof(dvi);
-
-DLLGETVERSIONPROC pDllGetVersion;
-pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll,
DllGetVersion);
-HRESULT hr = (*pDllGetVersion)(dvi);
-
-if(SUCCEEDED(hr))
-{
-DWORD dwVersion = PACKVERSION(dvi.dwMajorVersion,
dvi.dwMinorVersion);
-if(dwVersion = PACKVERSION(6,1)) // Shell32 version in Windows 7
-{
-typedef HRESULT (WINAPI
*SETCURRENTPROCESSEXPLICITAPPUSERMODELID)(PCWSTR);
-SETCURRENTPROCESSEXPLICITAPPUSERMODELID
pSetCurrentProcessExplicitAppUserModelID;
-pSetCurrentProcessExplicitAppUserModelID =
-
(SETCURRENTPROCESSEXPLICITAPPUSERMODELID)GetProcAddress(hinstDll,
SetCurrentProcessExplicitAppUserModelID);
-
-if(pSetCurrentProcessExplicitAppUserModelID)
-(*pSetCurrentProcessExplicitAppUserModelID)
(APPUSERMODELID);
-}
-}
-}
-FreeLibrary(hinstDll);
-
// Retreive startup info
STARTUPINFO aStartupInfo;
diff --git a/framework/source/helper/titlebarupdate.cxx
b/framework/source/helper/titlebarupdate.cxx
index ddf55b7..9b81249 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -172,7 +172,7 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference css::fr
OUString aModuleId = xModuleManager-identify(xFrame);
OUString sDesktopName;
-
+#if defined(UNX) !defined(MACOSX)
if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.TextDocument))
||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.GlobalDocument))
||
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sysui/CustomTarget_deb.mk
sysui/CustomTarget_deb.mk |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9544ab3c41048939b58fd4898a7532c53f37d056
Author: Petr Mladek pmla...@suse.cz
Date: Thu Jul 18 15:32:09 2013 +0200
use correct package name in libreofficeX.Y-debian-menus package (fdo#67041)
Add back the missing -debian-menus suffix. It was lost during
gbuildisation.
Also add the X.Y version. The files and menu entries have been versioned
since LO 4.1 but we did not versioned the package name ;-)
Finally, fix typo in the package version definition and mention the
release number again.
Change-Id: I26e1664349c326db199905e6c5b1efb5d2d1723c
Reviewed-on: https://gerrit.libreoffice.org/4970
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
Reviewed-on: https://gerrit.libreoffice.org/5020
Reviewed-by: David Tardon dtar...@redhat.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 81afdd9..b1186d6 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -52,11 +52,11 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control
$(call gb_CustomTarget_ge
-e 's/%PREFIX/$(UNIXFILENAME.$*)/' \
-e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \
$(deb_WORKDIR)/$*/usr/lib/menu/$*
- echo Package: $* $@
+ echo Package: $*$(PKGVERSIONSHORT)-debian-menus $@
cat $ | tr -d \015 | \
sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
$@
- echo Version: $(PKGVERSION)-$(LIBV_VERSION_PATCH) $@
+ echo Version: $(PKGVERSION)-$(LIBO_VERSION_PATCH) $@
du -k -s $(deb_WORKDIR)/$* | awk -F ' ' '{ printf Installed-Size:
%s\n, $$1 ; }' $@
$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb:
$(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst
$(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control $(call
gb_Library_get_target,getuid)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source writerfilter/source
sw/source/core/tox/tox.cxx|8 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 102 +-
2 files changed, 69 insertions(+), 41 deletions(-)
New commits:
commit fb7b24dc5affb4f29f61a8716c97370951ccba80
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jul 18 16:38:39 2013 +0200
n#825976: Table of Illustration has hyperlinks by default like TOC
...and that fixes the formatting of hyperlinks in docx Tableoof
Illustrations.
(cherry picked from commit c1fac43432891bf9f396ff1ec7a1c2ed042bce54)
(cherry picked from commit 49d077b80c15ec9d069435da08bbfe38cdd57c5a)
Change-Id: I990f31a8c9d0d56f58b7b87e368010576d8c8c0d
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 677d84f..8b98989 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -310,11 +310,15 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
}
SwFormTokens aTokens;
-if (TOX_CONTENT == eType)
+if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType )
{
SwFormToken aLinkStt (TOKEN_LINK_START);
aLinkStt.sCharStyleName = String(SW_RES(STR_POOLCHR_TOXJUMP));
aTokens.push_back(aLinkStt);
+}
+
+if (TOX_CONTENT == eType)
+{
aTokens.push_back(SwFormToken(TOKEN_ENTRY_NO));
aTokens.push_back(SwFormToken(TOKEN_ENTRY_TEXT));
}
@@ -334,7 +338,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
aTokens.push_back(SwFormToken(TOKEN_PAGE_NUMS));
}
-if (TOX_CONTENT == eType)
+if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType)
aTokens.push_back(SwFormToken(TOKEN_LINK_END));
SetTemplate( 0, SW_RESSTR( nPoolId++ ));
commit f494d9dfd1c0c40eae7aa69a86c3aa4c45971a29
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jul 18 15:04:00 2013 +0200
n#825976: handle TOC \h field for illustrations tables in writerfilter
Change-Id: I9ebc91d5f0e706dc1e316e0aa8494af7aec4da4e
(cherry picked from commit 43f7bc96c0117a77610bfa5e1edfa870123f56f1)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fb7b8fc..7086c75 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2573,6 +2573,53 @@ void DomainMapper_Impl::handleAuthor
#undef SET_DATE
}
+uno::Sequence beans::PropertyValues lcl_createTOXLevelHyperlinks( bool
bHyperlinks, OUString sChapterNoSeparator,
+ uno::Sequence beans::PropertyValues
aLevel,
+ PropertyNameSupplier rPropNameSupplier )
+{
+//create a copy of the level and add two new entries - hyperlink start and
end
+bool bChapterNoSeparator = !sChapterNoSeparator.isEmpty();
+sal_Int32 nAdd = (bHyperlinks bChapterNoSeparator) ? 4 : 2;
+uno::Sequence beans::PropertyValues aNewLevel( aLevel.getLength() +
nAdd);
+beans::PropertyValues* pNewLevel = aNewLevel.getArray();
+if( bHyperlinks )
+{
+beans::PropertyValues aHyperlink(1);
+aHyperlink[0].Name = rPropNameSupplier.GetName( PROP_TOKEN_TYPE );
+aHyperlink[0].Value = rPropNameSupplier.GetName(
PROP_TOKEN_HYPERLINK_START );
+pNewLevel[0] = aHyperlink;
+aHyperlink[0].Value = rPropNameSupplier.GetName(
PROP_TOKEN_HYPERLINK_END );
+pNewLevel[aNewLevel.getLength() -1] = aHyperlink;
+}
+if( bChapterNoSeparator )
+{
+beans::PropertyValues aChapterNo(2);
+aChapterNo[0].Name = rPropNameSupplier.GetName( PROP_TOKEN_TYPE );
+aChapterNo[0].Value = rPropNameSupplier.GetName(
PROP_TOKEN_CHAPTER_INFO );
+aChapterNo[1].Name = rPropNameSupplier.GetName( PROP_CHAPTER_FORMAT );
+//todo: is ChapterFormat::Number correct?
+aChapterNo[1].Value = (sal_Int16)text::ChapterFormat::NUMBER;
+pNewLevel[aNewLevel.getLength() - (bHyperlinks ? 4 : 2) ] = aChapterNo;
+
+beans::PropertyValues aChapterSeparator(2);
+aChapterSeparator[0].Name = rPropNameSupplier.GetName( PROP_TOKEN_TYPE
);
+aChapterSeparator[0].Value = rPropNameSupplier.GetName(
PROP_TOKEN_TEXT );
+aChapterSeparator[1].Name = rPropNameSupplier.GetName( PROP_TEXT );
+aChapterSeparator[1].Value = sChapterNoSeparator;
+pNewLevel[aNewLevel.getLength() - (bHyperlinks ? 3 : 1)] =
aChapterSeparator;
+}
+//copy the 'old' entries except the last (page no)
+for( sal_Int32 nToken = 0; nToken aLevel.getLength() - 1; ++nToken)
+{
+pNewLevel[nToken + 1] = aLevel[nToken];
+}
+//copy page no entry (last or last but one depending on bHyperlinks
+sal_Int32 nPageNo = aNewLevel.getLength() - (bHyperlinks ? 2 : 3);
+pNewLevel[nPageNo] = aLevel[aLevel.getLength() - 1];
+
+return aNewLevel;
+}
+
void DomainMapper_Impl::handleToc
(FieldContextPtr pContext,
RE: How to know the current viewed page and line in writer
Hi Ptyl, Bug fdo#40465 may give you (some) information you seek. There appears to be a problem in correctly calculating/getting the page in the viewer. HTH, Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Impress Remote and Bonjour
Hi All, Siqi, the current implementation works fine with Android and commenting things or removing them is actually breaking existing clients. It would be great if you’ll do all protocol-related changes via Gerrit and always CC me and Michael. These changes shouldn’t be silent because there are thousands of active Android users using remote client. If you have any questions about the Android implementation — poke me and I’ll give you my opinion, it is highly welcome. The second thing is about the protocol itself — it would be great if you‘ll write down all known bugs and desired features to the wiki page so I can fix them or implement them. It is great that you post things to the mailing list but I just can forget to read some thread and then bug or feature will be missed, that’s why there is a wiki page for that (and Bugzilla as well). I hope that my words are reasonable and I’m sorry if they sound harsh — I didn’t mean that. Andrzej, can you post the timeout bug to Bugzilla and CC me? I’ll try to test it on the NG version. Thanks for mentioning firewall issues — I saw a related comment at the Google Play page, I’m adding it to my TODO list. And let me be the most pessimistic guy in the room about Zeroconf — it becomes a tradition, huh ;-) Well, the Zeroconf conception is great. It worked perfectly since the first versions of OS X and it always was an example for me about how things should work in real world for people who doesn’t know what IP addresses are and what to do to connect to computers and share files. You don’t need that — just patch a cable or connect to WiFi and you are already set. So I’m not against it at all. The point is that world is not ideal. I don’t really know how to make Bonjour work on Windows but I think it is tricky at least. What I know is Avahi sometimes is not installed on Linux stations — and if it is that doesn’t mean Avahi actually work because it just could be not active as a daemon. I’m not sure that an additional dependency for just discovering via remote clients for a very small (I think so and have no statistics) percentage of users is a great idea as well. The network service discovery support is available only starting Android 4.1 [1] which is not acceptable because there are a lot of users using older Android versions [2]. There is an external library [3] but is seems not updated for a while. Also I don’t know is it a great idea to put an external dependency for the client — we had a talk with Michael about that already ;-) Does that make sense? Regards, Artur. [1]: https://developer.android.com/reference/android/net/nsd/package-summary.html [2]: http://developer.android.com/about/dashboards/index.html [3]: http://jmdns.sourceforge.net/___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: animations/source basic/source chart2/source comphelper/source xmlscript/source xmlsecurity/source
animations/source/animcore/animcore.cxx |2 +-
basic/source/comp/sbcomp.cxx |6 +++---
basic/source/sbx/sbxvar.cxx |2 +-
chart2/source/tools/ConfigColorScheme.cxx|2 +-
chart2/source/tools/ErrorBar.cxx |2 +-
comphelper/source/misc/docpasswordhelper.cxx |4 ++--
xmlscript/source/misc/unoservices.cxx|2 +-
xmlsecurity/source/xmlsec/nss/secerror.cxx |2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit bddd4d45989067e58589519c497e03ff443094e9
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Jul 22 20:57:11 2013 +0900
Mark as const
Change-Id: I2746b92b1360c3c181879a81f653c44ef609f351
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index 5b83bc0..90b5062 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -646,7 +646,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType )
throw()
mpId[nNodeType] = new Sequence sal_Int8 ( 16 );
rtl_createUuid( (sal_uInt8 *)mpId[nNodeType]-getArray(), 0, sal_True
);
-static sal_Int32 type_numbers[] =
+static const sal_Int32 type_numbers[] =
{
7, // CUSTOM
9, // PAR
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 20d5262..32cdabc 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -245,11 +245,11 @@ static void lcl_lineOut( const char* pStr, const char*
pPreStr = NULL, const cha
const char* lcl_getSpaces( int nSpaceCount )
{
-static sal_Char Spaces[] =
+static const sal_Char Spaces[] =
;
-static int nAvailableSpaceCount = strlen( Spaces );
-static sal_Char* pSpacesEnd = Spaces + nAvailableSpaceCount;
+static const int nAvailableSpaceCount = strlen( Spaces );
+static const sal_Char* pSpacesEnd = Spaces + nAvailableSpaceCount;
if( nSpaceCount nAvailableSpaceCount )
nSpaceCount = nAvailableSpaceCount;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index b692720..6c4c09b 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -244,7 +244,7 @@ void SbxVariable::SetName( const OUString rName )
const OUString SbxVariable::GetName( SbxNameType t ) const
{
-static char cSuffixes[] = %!#@ $;
+static const char cSuffixes[] = %!#@ $;
if( t == SbxNAME_NONE )
{
return maName;
diff --git a/chart2/source/tools/ConfigColorScheme.cxx
b/chart2/source/tools/ConfigColorScheme.cxx
index d1425e9..5774392 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -157,7 +157,7 @@ void ConfigColorScheme::retrieveConfigColors()
return static_cast sal_Int32 ( m_aColorSequence[ nIndex %
m_nNumberOfColors ] );
// fall-back: hard-coded standard colors
-static sal_Int32 nDefaultColors[] = {
+static const sal_Int32 nDefaultColors[] = {
0xff, 0x993366, 0xcc,
0xcc, 0x660066, 0xff8080,
0x0066cc, 0xff, 0x80,
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 932efbc..14c88fb 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -53,7 +53,7 @@ bool lcl_isInternalData( const uno::Reference
chart2::data::XLabeledDataSequenc
const SfxItemPropertySet* GetErrorBarPropertySet()
{
-static SfxItemPropertyMapEntry aErrorBarPropertyMap_Impl[] =
+static const SfxItemPropertyMapEntry aErrorBarPropertyMap_Impl[] =
{
{MAP_CHAR_LEN(ShowPositiveError),0,getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(ShowNegativeError),1,getBooleanCppuType(), 0, 0},
diff --git a/comphelper/source/misc/docpasswordhelper.cxx
b/comphelper/source/misc/docpasswordhelper.cxx
index b941cbd..1cf9775 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -135,7 +135,7 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const
OUString aPassword,
sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32(
const OUString aUString )
{
-static sal_uInt16 pInitialCode[] = {
+static const sal_uInt16 pInitialCode[] = {
0xE1F0, // 1
0x1D0F, // 2
0xCC9C, // 3
@@ -153,7 +153,7 @@ sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32(
0x4EC3 // 15
};
-static sal_uInt16 pEncryptionMatrix[15][7] = {
+static
[Libreoffice-commits] core.git: postprocess/Rdb_services.mk
postprocess/Rdb_services.mk |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 8b3a03a43f24ca6d072bc016d415a5339d516c32 Author: Tor Lillqvist t...@iki.fi Date: Mon Jul 22 12:14:52 2013 +0300 Probably no reason to filter out these for iOS any more Change-Id: Ifab498ca7fe41aae19cc235a0ab8998827422b6c diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 10ce2d4..12a327d 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -115,11 +115,9 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_LPSOLVE), \ sccomp/source/solver/solver \ ) \ - $(if $(filter-out IOS,$(OS)), \ - writerfilter/util/writerfilter \ - writerperfect/util/wpftwriter \ - writerperfect/util/wpftdraw \ - ) \ + writerfilter/util/writerfilter \ + writerperfect/util/wpftwriter \ + writerperfect/util/wpftdraw \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter-out X86_64,$(CPUNAME)), \ avmedia/source/quicktime/avmediaQuickTime \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Impress Remote and Bonjour
2013/7/22 Artur Dryomov artur.dryo...@gmail.com Hi All, Siqi, the current implementation works fine with Android and commenting things or removing them is actually breaking existing clients. It would be great if you’ll do all protocol-related changes via Gerrit and always CC me and Michael. These changes shouldn’t be silent because there are thousands of active Android users using remote client. If you have any questions about the Android implementation — poke me and I’ll give you my opinion, it is highly welcome. The second thing is about the protocol itself — it would be great if you‘ll write down all known bugs and desired features to the wiki page so I can fix them or implement them. It is great that you post things to the mailing list but I just can forget to read some thread and then bug or feature will be missed, that’s why there is a wiki page for that (and Bugzilla as well). I hope that my words are reasonable and I’m sorry if they sound harsh — I didn’t mean that. Hi Artur, I've already restored the old implementation a couple of days ago so it should work as before now. Sorry that I've commented that out since it seemed like it doesn't work on my device. You can pull the master branch and it should be working with the android app. However, as I said earlier, the current implementation is still less reliable than the Bonjour/Avahi service, but if that is too complicated to use on the android then it's fine to stick to the old implementation, that's up to you. I will try to remember to put what bugs that I've found on the wiki page so that you can find them easily. Just didn't have the time to organize them. Maybe you can create a filter (if you use gmail) which put all mails from Micheal, Andrzej and me together so that you don't miss them ^^ That's what I've done, maybe it can comes handy to you as well. There is absolutely no problem to stay direct with me :-P I mean we are all gsoc students so we both have a lot to learn. ^^ Andrzej, can you post the timeout bug to Bugzilla and CC me? I’ll try to test it on the NG version. Thanks for mentioning firewall issues — I saw a related comment at the Google Play page, I’m adding it to my TODO list. And let me be the most pessimistic guy in the room about Zeroconf — it becomes a tradition, huh ;-) Well, the Zeroconf conception is great. It worked perfectly since the first versions of OS X and it always was an example for me about how things should work in real world for people who doesn’t know what IP addresses are and what to do to connect to computers and share files. You don’t need that — just patch a cable or connect to WiFi and you are already set. So I’m not against it at all. The point is that world is not ideal. I don’t really know how to make Bonjour work on Windows but I think it is tricky at least. What I know is Avahi sometimes is not installed on Linux stations — and if it is that doesn’t mean Avahi actually work because it just could be not active as a daemon. I’m not sure that an additional dependency for just discovering via remote clients for a very small (I think so and have no statistics) percentage of users is a great idea as well. Actually Avahi comes with most of the modern Linux distro and Bonjour comes with Mac OSX. But yes, on Windows it can be tricky but it seems that a lot of widely used software needs that service as well, so we can probably find a way to handle that as well. For now, I've implemented the Mac OSX with bonjour and Avahi on Linux just needs some modifications to be able to build with some CFLAGS. I'm working on that. The network service discovery support is available only starting Android 4.1 [1] which is not acceptable because there are a lot of users using older Android versions [2]. There is an external library [3] but is seems not updated for a while. Also I don’t know is it a great idea to put an external dependency for the client — we had a talk with Michael about that already ;-) Yep, on Android there is always a problem of fragmentation and maybe at least you can make it conditional on the android app? If (version4.1) Bonjour resolution else ... Otherwise I suppose the IP resolution should be really easy as it's just several lines of code on iOS. Does that make sense? Regards, Artur. [1]: https://developer.android.com/reference/android/net/nsd/package-summary.html [2]: http://developer.android.com/about/dashboards/index.html [3]: http://jmdns.sourceforge.net/ Happy coding! -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/sdi basctl/source basctl/uiconfig basic/source include/basic include/sfx2 officecfg/registry sfx2/sdi
basctl/sdi/baside.sdi |6 ++
basctl/source/basicide/baside2.cxx|5 ++
basctl/source/basicide/baside2b.cxx |7 +-
basctl/uiconfig/basicide/menubar/menubar.xml |1
basic/source/classes/codecompletecache.cxx|7 ++
basic/source/classes/sbxmod.cxx |2
include/basic/codecompletecache.hxx |4 -
include/sfx2/sfxsids.hrc |1
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |5 ++
sfx2/sdi/sfx.sdi | 24
++
10 files changed, 53 insertions(+), 9 deletions(-)
New commits:
commit 29325bddce79943d956194009aa82ca1e5849f42
Author: Gergo Mocsi gmocs...@gmail.com
Date: Mon Jul 22 14:32:00 2013 +0200
GSOC work menu entry + code fix
Fixed the definition of GLOB_KEY, NOT_FOUND from const to static const.
Added a new menu entry for code completition under View-Enable Code
Completition.
Change-Id: If8ac25ee43a7ba780ccdee2e5e909777115a1f27
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 5582c1d..7dfe68a 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -138,6 +138,12 @@ shell basctl_Shell
StateMethod = GetState;
]
+SID_BASICIDE_CODECOMPLETITION
+[
+ExecMethod = ExecuteCurrent;
+StateMethod = GetState;
+]
+
SID_BASICIDE_LIBSELECTED
[
ExecMethod = ExecuteGlobal;
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 962658f..4fc6674 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1009,6 +1009,11 @@ void ModulWindow::ExecuteCommand (SfxRequest rReq)
rLayout.BasicRemoveWatch();
}
break;
+case SID_BASICIDE_CODECOMPLETITION:
+{
+std::cerr code completition enabled std::endl;
+}
+break;
case SID_CUT:
{
if ( !IsReadOnly() )
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index bfa8285..0dddf7f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -519,8 +519,8 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
aVect.push_back( aLine.copy(r.nBegin, r.nEnd - r.nBegin) );
}
OUString sBaseName = aVect[0];//variable name
-OUString sVarType = aCodeCompleteCache.GetVariableType(sBaseName,
aCodeCompleteCache.GLOB_KEY);
-if( sVarType == aCodeCompleteCache.NOT_FOUND )
+OUString sVarType = aCodeCompleteCache.GetVariableType(sBaseName,
CodeCompleteDataCache::GLOB_KEY);
+if( sVarType == CodeCompleteDataCache::NOT_FOUND )
sVarType = aCodeCompleteCache.GetVariableType(sBaseName, sActSub);
Reference lang::XMultiServiceFactory xFactory(
comphelper::getProcessServiceFactory(), UNO_SET_THROW );
@@ -569,7 +569,6 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
}
}
}
-
}
if ( !bDone ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify()
) )
{
@@ -878,7 +877,7 @@ OUString EditorWindow::GetActualSubName( sal_uLong nLine )
}
}
}
-return aCodeCompleteCache.GLOB_KEY;
+return CodeCompleteDataCache::GLOB_KEY;
}
void EditorWindow::SetScrollBarRanges()
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 2c12262..2e16130 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -61,6 +61,7 @@
menu:menuitem menu:id=.uno:StatusBarVisible/
menu:menuitem menu:id=.uno:ShowImeStatusWindow/
menu:menuitem menu:id=.uno:ShowLines/
+menu:menuitem menu:id=.uno:BasicCodeCompletition/
menu:menuitem menu:id=.uno:GotoLine/
menu:menuseparator/
menu:menuitem menu:id=.uno:FullScreen/
diff --git a/basic/source/classes/codecompletecache.cxx
b/basic/source/classes/codecompletecache.cxx
index e45e20a..fc23e7a 100644
--- a/basic/source/classes/codecompletecache.cxx
+++ b/basic/source/classes/codecompletecache.cxx
@@ -19,6 +19,9 @@
#include basic/codecompletecache.hxx
+const OUString CodeCompleteDataCache::GLOB_KEY = OUString(global key);
+const OUString CodeCompleteDataCache::NOT_FOUND = OUString(not found);
+
std::ostream operator (std::ostream aStream, const CodeCompleteDataCache
aCache)
{
for( CodeCompleteVarScopes::const_iterator aIt =
aCache.aVarScopes.begin(); aIt != aCache.aVarScopes.end(); ++aIt )
@@ -52,12 +55,12 @@ OUString CodeCompleteDataCache::GetVariableType(
[Libreoffice-commits] core.git: boost/boost.wuninitialized.patch boost/UnpackedTarball_boost.mk
boost/UnpackedTarball_boost.mk |1 +
boost/boost.wuninitialized.patch | 10 ++
2 files changed, 11 insertions(+)
New commits:
commit 2cf07709dc23daf23ddfdfdd1091dc047cba886b
Author: Tor Lillqvist t...@iki.fi
Date: Mon Jul 22 16:26:27 2013 +0300
WaE: may be used uninitialized
For some reason, GCC 4.7 targeting X86 in the Android NDK 8e complained
about
the fields in the btrd struct in the union in binomial_distribution
(boost/random/binomial_distribution.hpp) maybe being uninitialized in a call
to its copy constructor. So make sure these fields are initialized in all
cases.
Change-Id: Iebae5e130cd6ca6ef5c476c6b0366d57c0303c88
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 3f78005..a353b03 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -46,6 +46,7 @@ boost_patches += boost.wunused.patch
boost_patches += boost.wshadow.patch
boost_patches += boost.wconstexpr-not-const.patch.0
boost_patches += boost.wdeprecated-register.patch.0
+boost_patches += boost.wuninitialized.patch
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/boost/boost.wuninitialized.patch b/boost/boost.wuninitialized.patch
new file mode 100644
index 000..1b6384e
--- /dev/null
+++ b/boost/boost.wuninitialized.patch
@@ -0,0 +1,10 @@
+--- foo/foo/foo/boost/random/binomial_distribution.hpp
foo/foo/foo/boost/random/binomial_distribution.hpp
+@@ -278,6 +278,7 @@
+ m = static_castIntType((t_lcl+1)*p_lcl);
+
+ if(use_inversion()) {
++btrd.r = btrd.nr = btrd.npq = btrd.b = btrd.a = btrd.c =
btrd.alpha = btrd.v_r = btrd.u_rv_r = 0;
+ q_n = pow((1 - p_lcl), static_castRealType(t_lcl));
+ } else {
+ btrd.r = p_lcl/(1-p_lcl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Translations submodule takes forever to pull
Olivier Hallot wrote: Is there a way to improve that? (Should I beg NSA to let translations go through?) There is always the weekly bundle tarballs: http://dev-www.libreoffice.org/bundles/ , though of course in times of huge translation updates, you might still need to pull a chunk of updates. Or maybe freedesktop.org is faster for you? You can configure different push and pull urls for git. HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 34 ++
cui/source/options/optaboutconfig.hxx |3 +++
2 files changed, 37 insertions(+)
New commits:
commit f41b3971e2ee6a371e1afaa327dd5b3d107e0518
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date: Mon Jul 22 16:22:49 2013 +0300
Configuration Access method implemented.
This method is used for getting access to configurations.
Change-Id: Ia4aa82a3f2df02e26f750133f7a7d2c85a75710c
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index e6ec794..09805c0 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -11,8 +11,15 @@
#include optHeaderTabListbox.hxx
#include svtools/svlbitm.hxx
#include svtools/treelistentry.hxx
+#include comphelper/processfactory.hxx
+#include com/sun/star/configuration/theDefaultProvider.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/container/XNameAccess.hpp
+#include com/sun/star/beans/NamedValue.hpp
+
using namespace svx;
+using namespace ::com::sun::star;
#define ITEMID_PREF 1
#define ITEMID_TYPE 2
@@ -71,4 +78,31 @@ void CuiAboutConfigTabPage::InsertEntry( OUString rProp,
OUString rStatus, OU
pPrefBox-Insert( pEntry );
}
+
+sal_Bool CuiAboutConfigTabPage::FillItems()
+{
+return sal_False;
+}
+
+uno::Reference container::XNameAccess
CuiAboutConfigTabPage::getConfigAccess()
+{
+uno::Reference uno::XComponentContext xContext(
::comphelper::getProcessComponentContext() );
+
+uno::Reference lang::XMultiServiceFactory xConfigProvider(
+com::sun::star::configuration::theDefaultProvider::get(
xContext ) );
+
+beans::NamedValue aProperty;
+aProperty.Name = nodepath;
+aProperty.Value = uno::makeAny( OUString(org.openoffice) );
+
+uno::Sequence uno::Any aArgumentList( 1 );
+aArgumentList[0] = uno::makeAny( aProperty );
+
+uno::Reference container::XNameAccess xNameAccess(
+xConfigProvider-createInstanceWithArguments(
+com.sun.star.configuration.ConfigurationAccess,
aArgumentList ),
+uno::UNO_QUERY_THROW );
+
+return xNameAccess;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index cdfb1d5..eb446dc 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -13,6 +13,7 @@
#include sfx2/tabdlg.hxx
#include svx/simptabl.hxx
#include optHeaderTabListbox.hxx
+#include com/sun/star/container/XNameAccess.hpp
namespace svx
{
@@ -34,6 +35,8 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet rItemset );
void InsertEntry(OUString rProp, OUString rStatus, OUString rType,
OUString rValue);
+ sal_Bool FillItems();
+ com::sun::star::uno::Reference com::sun::star::container::XNameAccess
getConfigAccess();
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basic/source
basic/source/classes/codecompletecache.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit c2a327bb7a4f4dcd559c1134d77c3f898f58d160 Author: Noel Power noel.po...@suse.com Date: Mon Jul 22 14:44:56 2013 +0100 fix compile error, cerr not defined Change-Id: Id33342491dd9bad0ee2f1a7bc648ed669a2b92b9 diff --git a/basic/source/classes/codecompletecache.cxx b/basic/source/classes/codecompletecache.cxx index fc23e7a..6281133 100644 --- a/basic/source/classes/codecompletecache.cxx +++ b/basic/source/classes/codecompletecache.cxx @@ -18,6 +18,7 @@ */ #include basic/codecompletecache.hxx +#include iostream const OUString CodeCompleteDataCache::GLOB_KEY = OUString(global key); const OUString CodeCompleteDataCache::NOT_FOUND = OUString(not found); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sd/source
sd/source/ui/view/drtxtob1.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 24135caf7f8ac668023bb4473fd0a463d027c96c
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Fri Jun 28 10:54:55 2013 +0200
fix crash when use increase font on table in impress
Change-Id: Id6c8cac4543d97657cb66b979f5dc4b5f903473a
Reviewed-on: https://gerrit.libreoffice.org/4797
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-on: https://gerrit.libreoffice.org/5030
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 572fbed..6ad4cf1 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -328,15 +328,17 @@ void TextObjectBar::Execute( SfxRequest rReq )
if( pFontList )
{
FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV,
pFontList, mpView );
+if( pOLV )
+{
+SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
+SfxItemSet aNewAttrs
(pOLV-GetEditView().GetEmptyItemSet() );
-SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
-SfxItemSet aNewAttrs (pOLV-GetEditView().GetEmptyItemSet() );
-
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
-mpView-SetAttributes( aNewAttrs );
+mpView-SetAttributes( aNewAttrs );
+}
Invalidate();
// to refresh preview (in outline mode), slot has to be
invalidated:
mpViewShell-GetViewFrame()-GetBindings().Invalidate(
SID_PREVIEW_STATE, sal_True, sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 64957, which changed state. Bug 64957 Summary: EDITING: letters move around during editing/typing https://bugs.freedesktop.org/show_bug.cgi?id=64957 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Send Feedback...and BSA ideas
Other projects use something like that. I think it wont have any privacy issues if all you collect is system specifications. On Mon, Jul 22, 2013 at 4:37 PM, Joel Madero jmadero@gmail.com wrote: On 07/21/2013 11:22 PM, Jonathan Aquilina wrote: I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. This has been discussed a bit and from my understanding it's a) quite a bit of work b) might have some legal issues in terms of privacy if we're collecting data automatically. Best, Joel -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - postprocess/CustomTarget_registry.mk
postprocess/CustomTarget_registry.mk | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit 7d61c222ff1fded3524351bf6b16e34736ac17fa Author: David Ostrovsky da...@ostrovsky.org Date: Thu Jul 18 20:53:59 2013 +0200 fdo#65761 yet another gbuildification bug Change-Id: I88bdd3f0e1cc49b21579043ceaf42616fe2f2493 Reviewed-on: https://gerrit.libreoffice.org/4973 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-on: https://gerrit.libreoffice.org/5033 Reviewed-by: Thorsten Behrens tbehr...@suse.com Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 38758b2..27825f3 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -60,15 +60,6 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) postprocess_FILES_calc += \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-calc.xcu postprocess_DRIVERS += calc -ifeq (WNT,$(OS)) -ifeq ($(WITH_MOZAB4WIN),YES) -postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu -postprocess_DRIVERS += mozab -endif -else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE))) -postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu -postprocess_DRIVERS += mork -endif endif postprocess_DEPS_cjk := main @@ -291,6 +282,15 @@ postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu postprocess_DRIVERS += dbase flat mysql odbc +ifeq (WNT,$(OS)) +ifeq ($(WITH_MOZAB4WIN),YES) +postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu +postprocess_DRIVERS += mozab +endif +else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE))) +postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu +postprocess_DRIVERS += mork +endif endif ifeq (MACOSX,$(OS)) postprocess_FILES_main += \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Send Feedback from LibreOffice application
That name is misleading shouldnt that be submit a bug report or something? On Mon, Jul 22, 2013 at 4:45 PM, Rob Snelders libreoff...@ertai.nl wrote: Hi All, There was some work in progress for that. LibreOffice gives that information already to the BSA. But the BSA doesn't pick it up yet. So that will need to be implemented. The option can be found on Help-Send Feedback. When you open it you can see the info of your LibreOffice in the URL. -- Greetings, Rob Snelders On 22-07-13 16:40, Jonathan Aquilina wrote: Other projects use something like that. I think it wont have any privacy issues if all you collect is system specifications. On Mon, Jul 22, 2013 at 4:37 PM, Joel Madero jmadero@gmail.com mailto:jmadero@gmail.com** wrote: On 07/21/2013 11:22 PM, Jonathan Aquilina wrote: I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. This has been discussed a bit and from my understanding it's a) quite a bit of work b) might have some legal issues in terms of privacy if we're collecting data automatically. Best, Joel -- Jonathan Aquilina -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - cui/source
cui/source/options/fontsubs.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 4573e9aab652bbb2078459a0056f3fda91342764
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 16 09:38:48 2013 +0100
option dialog isn't fully layout aware yet, so always calculate
otherwise the font subst opt page has overlapping entries
(cherry picked from commit 84e5cdce3ed58c663109bb557b75cd6e45bb2dbc)
Change-Id: Ifed85cf8c1c2da70eae2d18b9ef32b61ce278c4a
Reviewed-on: https://gerrit.libreoffice.org/4936
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
Reviewed-on: https://gerrit.libreoffice.org/5032
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index ad6cac1..91ecf40 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -410,8 +410,7 @@ void SvxFontSubstCheckListBox::setColSizes()
void SvxFontSubstCheckListBox::Resize()
{
SvxSimpleTable::Resize();
-if (isInitialLayout(this))
-setColSizes();
+setColSizes();
}
void SvxFontSubstCheckListBox::SetTabs()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Send Feedback from LibreOffice application
On 07/22/2013 07:46 AM, Jonathan Aquilina wrote: That name is misleading shouldnt that be submit a bug report or something? We are changing it so it's not misleading - it's going to get to a landing page - that's what this whole thread is about ;) So it will be for feedback (in a general sense). We want to avoid negative words like bugs in our main GUI. Best, Joel On Mon, Jul 22, 2013 at 4:45 PM, Rob Snelders libreoff...@ertai.nl mailto:libreoff...@ertai.nl wrote: Hi All, There was some work in progress for that. LibreOffice gives that information already to the BSA. But the BSA doesn't pick it up yet. So that will need to be implemented. The option can be found on Help-Send Feedback. When you open it you can see the info of your LibreOffice in the URL. -- Greetings, Rob Snelders On 22-07-13 16:40, Jonathan Aquilina wrote: Other projects use something like that. I think it wont have any privacy issues if all you collect is system specifications. On Mon, Jul 22, 2013 at 4:37 PM, Joel Madero jmadero@gmail.com mailto:jmadero@gmail.com mailto:jmadero@gmail.com mailto:jmadero@gmail.com wrote: On 07/21/2013 11:22 PM, Jonathan Aquilina wrote: I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. This has been discussed a bit and from my understanding it's a) quite a bit of work b) might have some legal issues in terms of privacy if we're collecting data automatically. Best, Joel -- Jonathan Aquilina -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Send Feedback from LibreOffice application
Bug might be negative but submit a bug report in a way is positive in the sense that an issue has been found and reported. On Mon, Jul 22, 2013 at 4:57 PM, Joel Madero jmadero@gmail.com wrote: On 07/22/2013 07:46 AM, Jonathan Aquilina wrote: That name is misleading shouldnt that be submit a bug report or something? We are changing it so it's not misleading - it's going to get to a landing page - that's what this whole thread is about ;) So it will be for feedback (in a general sense). We want to avoid negative words like bugs in our main GUI. Best, Joel On Mon, Jul 22, 2013 at 4:45 PM, Rob Snelders libreoff...@ertai.nlwrote: Hi All, There was some work in progress for that. LibreOffice gives that information already to the BSA. But the BSA doesn't pick it up yet. So that will need to be implemented. The option can be found on Help-Send Feedback. When you open it you can see the info of your LibreOffice in the URL. -- Greetings, Rob Snelders On 22-07-13 16:40, Jonathan Aquilina wrote: Other projects use something like that. I think it wont have any privacy issues if all you collect is system specifications. On Mon, Jul 22, 2013 at 4:37 PM, Joel Madero jmadero@gmail.com mailto:jmadero@gmail.com wrote: On 07/21/2013 11:22 PM, Jonathan Aquilina wrote: I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. This has been discussed a bit and from my understanding it's a) quite a bit of work b) might have some legal issues in terms of privacy if we're collecting data automatically. Best, Joel -- Jonathan Aquilina -- Jonathan Aquilina -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to know the current viewed page and line in writer
Hi I looked into fdo#40465, but could not find any code snippets or something similar i could integrate in my code. Moreover, using XRays, i saw that getViewData returns the location and size of the window, with respect to the desktop, and not the relative location of the viewer, with respect to the document. The view data remains as is, no matter which portion of the document i view. Moreover, the ZoomFactor shows incorrect values, a fact which may be related with fro#40465. Still, it is a fact, LibreOffice knows which portions of the document to show. So what component holds this data, and is it reachable via UNO? If it is not reachable through UNO, what is the closest component which is reachable through UNO, so that we could extend its UNO support, so to provide us this data? On Mon, Jul 22, 2013 at 2:33 PM, Winfried Donkers w.donk...@dci-electronics.nl wrote: Hi Ptyl, ** ** Bug fdo#40465 may give you (some) information you seek. There appears to be a problem in correctly calculating/getting the page in the viewer. ** ** HTH, ** ** ** ** Winfried ** ** -- [image: appicon.png] *Ptyl Dragon* Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://site.cloudon.com/blog ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 7 commits - connectivity/source
connectivity/source/drivers/firebird/FConnection.cxx| 19
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx | 64 +-
connectivity/source/drivers/firebird/FPreparedStatement.cxx | 261 +++-
connectivity/source/drivers/firebird/FPreparedStatement.hxx | 19
connectivity/source/drivers/firebird/FResultSetMetaData.cxx |2
connectivity/source/drivers/firebird/FStatement.cxx | 93
connectivity/source/drivers/firebird/FStatement.hxx |6
connectivity/source/drivers/firebird/Util.cxx | 69 +++
connectivity/source/drivers/firebird/Util.hxx |6
9 files changed, 320 insertions(+), 219 deletions(-)
New commits:
commit 86ec35f71d28061a21c00b12c23c41351002a701
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Mon Jul 22 18:05:08 2013 +0200
Fix implicit conversion error (firebird-sdbc).
Change-Id: I67ecd01655bdde73a279926c65f81555e550b7ca
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index c2dde74..35fa88e 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -705,11 +705,17 @@ sal_Int32 SAL_CALL
ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLExceptio
{
return 31;
}
-// -
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType
) throw(SQLException, RuntimeException)
+
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType)
+throw(SQLException, RuntimeException)
{
-(void) setType;
-return sal_False;
+switch (setType)
+{
+case ResultSetType::FORWARD_ONLY:
+return sal_True;
+default:
+return sal_False;
+}
}
// -
sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32
setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException)
@@ -1038,11 +1044,11 @@ uno::Reference XResultSet SAL_CALL
ODatabaseMetaData::getColumns(
// 18. Is nullable
if (xRow-getShort(9))
{
-aCurrentRow.push_back(new ORowSetValueDecorator(NO));
+aCurrentRow.push_back(new ORowSetValueDecorator(OUString(NO)));
}
else
{
-aCurrentRow.push_back(new ORowSetValueDecorator(YES));
+aCurrentRow.push_back(new ORowSetValueDecorator(OUString(YES)));
}
aResults.push_back(aCurrentRow);
commit 7ae8da726747ce661dcd223b864d819f8b207819
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Mon Jul 22 17:47:38 2013 +0200
Further minor fixes (firebird-sdbc).
Change-Id: I1ed77e7910bd59aa0534ff7fb32d96e3432b58d3
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index bad5ad6..c2dde74 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -245,7 +245,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( )
throw(SQLException,
// -
sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( )
throw(SQLException, RuntimeException)
{
-return sal_False;
+return sal_True;
}
// -
OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString( )
throw(SQLException, RuntimeException)
@@ -921,10 +921,12 @@ uno::Reference XResultSet SAL_CALL
ODatabaseMetaData::getColumns(
while( rs-next() )
{
-ODatabaseMetaDataResultSet::ORow aCurrentRow(16);
+ODatabaseMetaDataResultSet::ORow aCurrentRow(18);
-// 1. TABLE_CAT (catalog) may be null -- thus we omit it.
-// 2. TABLE_SCHEM (schema) may be null -- thus we omit it.
+// 1. TABLE_CAT (catalog) may be null
+aCurrentRow.push_back(new ORowSetValueDecorator());
+// 2. TABLE_SCHEM (schema) may be null
+aCurrentRow.push_back(new ORowSetValueDecorator());
// 3. TABLE_NAME
{
OUString aTableName = xRow-getString(1);
@@ -989,23 +991,25 @@ uno::Reference XResultSet SAL_CALL
ODatabaseMetaData::getColumns(
}
// 12. Comments -- may be omitted
{
+OUString aDescription;
uno::Reference XBlob xDescriptionBlob = xRow-getBlob(3);
if (xDescriptionBlob.is())
{
sal_Int32 aBlobLength = (sal_Int32) xDescriptionBlob-length();
-OUString aDescription = OUString((char*)
xDescriptionBlob-getBytes(0, aBlobLength).getArray(),
+aDescription = OUString((char*)
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/qa sc/source
sc/inc/refdata.hxx | 12 +--
sc/inc/tokenarray.hxx | 11 +++
sc/qa/unit/ucalc_formula.cxx|4 -
sc/source/core/data/formulacell.cxx | 40 +++-
sc/source/core/tool/refdata.cxx | 30 +
sc/source/core/tool/token.cxx | 114
6 files changed, 161 insertions(+), 50 deletions(-)
New commits:
commit 437342e62a313be1bc9f8d4c732790cafa8824eb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Jul 22 11:56:20 2013 -0400
Handle reference adjustment in response to sheet deletion.
Change-Id: Ia6039d8a38a73d8d461743f128f01c347a2c51ad
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 77d03e6d..92bf5b9 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -64,12 +64,12 @@ struct SC_DLLPUBLIC ScSingleRefData
inline void SetTabRel( bool bVal ) { Flags.bTabRel = (bVal ? true : false
); }
inline bool IsTabRel() const { return Flags.bTabRel; }
-inline void SetColDeleted( bool bVal ) { Flags.bColDeleted = (bVal ? true
: false ); }
-inline bool IsColDeleted() const { return Flags.bColDeleted; }
-inline void SetRowDeleted( bool bVal ) { Flags.bRowDeleted = (bVal ? true
: false ); }
-inline bool IsRowDeleted() const { return Flags.bRowDeleted; }
-inline void SetTabDeleted( bool bVal ) { Flags.bTabDeleted = (bVal ? true
: false ); }
-inline bool IsTabDeleted() const { return Flags.bTabDeleted; }
+void SetColDeleted( bool bVal );
+bool IsColDeleted() const;
+void SetRowDeleted( bool bVal );
+bool IsRowDeleted() const;
+void SetTabDeleted( bool bVal );
+bool IsTabDeleted() const;
bool IsDeleted() const;
inline void SetFlag3D( bool bVal ) { Flags.bFlag3D = (bVal ? true : false
); }
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index fe6204c..5ff7da0 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -129,6 +129,17 @@ public:
*/
sc::RefUpdateResult AdjustReferenceOnShift( const sc::RefUpdateContext
rCxt, const ScAddress rOldPos );
+/**
+ * Adjust all references on sheet deletion.
+ *
+ * @param nDelPos position of sheet being deleted.
+ * @param nSheets number of sheets to delete.
+ * @param rOldPos position of formula cell prior to the deletion.
+ *
+ * @return true if at least one reference has changed its sheet reference.
+ */
+bool AdjustReferenceOnDeletedTab( SCTAB nDelPos, SCTAB nSheets, const
ScAddress rOldPos );
+
#if DEBUG_FORMULA_COMPILER
void Dump() const;
#endif
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 4181ec9..c400ae5 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -807,13 +807,13 @@ void Test::testFormulaRefUpdateSheets()
m_pDoc-DeleteTab(0);
m_pDoc-GetName(0, aName);
CPPUNIT_ASSERT_EQUAL(OUString(Sheet2), aName);
-
+#if 0 // TODO: I'll look into this later.
if (!checkFormula(*m_pDoc, ScAddress(1,1,0), SUM(#REF!.B2:C3)))
CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
if (!checkFormula(*m_pDoc, ScAddress(1,2,0), SUM(#REF!.$B$2:$C$3)))
CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
-
+#endif
m_pDoc-DeleteTab(0);
}
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 773c474..e57d5dd 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2644,44 +2644,24 @@ void ScFormulaCell::UpdateInsertTab(SCTAB nTable, SCTAB
nNewSheets)
aPos.IncTab();
}
-bool ScFormulaCell::UpdateDeleteTab(SCTAB nTable, bool bIsMove, SCTAB nSheets)
+bool ScFormulaCell::UpdateDeleteTab(SCTAB nTable, bool /*bIsMove*/, SCTAB
nSheets)
{
-bool bRefChanged = false;
bool bPosChanged = ( aPos.Tab() = nTable + nSheets ? true : false );
pCode-Reset();
-if( pCode-GetNextReferenceRPN() !pDocument-IsClipOrUndo() )
+if (pDocument-IsClipOrUndo() || !pCode-GetNextReferenceRPN())
{
-EndListeningTo( pDocument );
-// IncTab _after_ EndListeningTo und _before_ Compiler UpdateDeleteTab!
-if ( bPosChanged )
+if (bPosChanged)
aPos.IncTab(-1*nSheets);
-ScRangeData* pRangeData;
-ScCompiler aComp(pDocument, aPos, *pCode);
-aComp.SetGrammar(pDocument-GetGrammar());
-pRangeData = aComp.UpdateDeleteTab(nTable, bIsMove, false,
bRefChanged, nSheets);
-if (pRangeData) // Exchange Shared Formula with real Formula
-{
-pDocument-RemoveFromFormulaTree( this ); // update formula count
-delete pCode;
-pCode = pRangeData-GetCode()-Clone();
-ScCompiler aComp2(pDocument, aPos, *pCode);
-aComp2.SetGrammar(pDocument-GetGrammar());
-aComp2.CompileTokenArray();
-aComp2.MoveRelWrap(pRangeData-GetMaxCol(),
pRangeData-GetMaxRow());
-
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - sd/source sd/xml test/user-template
sd/source/core/sdpage.cxx | 46
+-
sd/xml/layoutlist.xml | 32
+-
test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml | 32
+-
3 files changed, 79 insertions(+), 31 deletions(-)
New commits:
commit e283e81165914c337815227bb3f91e2e9bc11ef4
Author: Vishv Brahmbhatt vishvbrahmbhat...@gmail.com
Date: Mon Jul 22 20:01:24 2013 +0530
Solved the identation problem related to layoutlist.xml.
Have added a 'if' conditional statement to know whether layout's child is a
empty 'text' node or 'presobj' node.And proceed with rest of the
things ,if it is a 'presobj' node.Also the xml files are indented.
Change-Id: I676e710b86b1f50dbd861f2cb180bf9be839b867
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 051cadc..ecd481f 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1261,30 +1261,34 @@ void readLayoutPropFromFile(const ReferenceXElement
root, const rtl::OUString
ReferenceXNodeList layoutchildrens =
layoutnode-getChildNodes();
presobjsize = layoutchildrens-getLength(); //get the
length of that of the layout(number of pres objects)
for( long j=0; j presobjsize ; j++)
-{
+{ rtl::OUString nodename;
ReferenceXNode presobj = layoutchildrens-item(j);
//get the j'th presobj for that layout
-ReferenceXNamedNodeMap presObjAttributes =
presobj-getAttributes();
-ReferenceXNode presObjKindAttr =
presObjAttributes-getNamedItem(kind);
-sPresObjKindAttName = presObjKindAttr-getNodeValue();
//get the value of it's presobj kind
-if(sPresObjKindAttName==sPresObjKind)
+nodename=presobj-getNodeName();
+if(nodename==presobj)//check whether children is blank
'text-node' or 'presobj' node
{
-ReferenceXNode presObjPosX =
presObjAttributes-getNamedItem(layout-pos-x);
-rtl::OUString sValue = presObjPosX-getNodeValue();
-propvalue[0] = sValue.toDouble();
-ReferenceXNode presObjPosY =
presObjAttributes-getNamedItem(layout-pos-y);
-sValue = presObjPosY-getNodeValue();
-propvalue[1] = sValue.toDouble();
-ReferenceXNode presObjSizeHeight =
presObjAttributes-getNamedItem(layout-size-height);
-sValue = presObjSizeHeight-getNodeValue();
-propvalue[2] = sValue.toDouble();
-ReferenceXNode presObjSizeWidth =
presObjAttributes-getNamedItem(layout-size-width);
-sValue = presObjSizeWidth-getNodeValue();
-propvalue[3] = sValue.toDouble();
-bnoprop=false;
-break;
+ReferenceXNamedNodeMap presObjAttributes =
presobj-getAttributes();
+ReferenceXNode presObjKindAttr =
presObjAttributes-getNamedItem(kind);
+sPresObjKindAttName = presObjKindAttr-getNodeValue();
//get the value of it's presobj kind
+if(sPresObjKindAttName==sPresObjKind)
+{
+ReferenceXNode presObjPosX =
presObjAttributes-getNamedItem(layout-pos-x);
+rtl::OUString sValue = presObjPosX-getNodeValue();
+propvalue[0] = sValue.toDouble();
+ReferenceXNode presObjPosY =
presObjAttributes-getNamedItem(layout-pos-y);
+sValue = presObjPosY-getNodeValue();
+propvalue[1] = sValue.toDouble();
+ReferenceXNode presObjSizeHeight =
presObjAttributes-getNamedItem(layout-size-height);
+sValue = presObjSizeHeight-getNodeValue();
+propvalue[2] = sValue.toDouble();
+ReferenceXNode presObjSizeWidth =
presObjAttributes-getNamedItem(layout-size-width);
+sValue = presObjSizeWidth-getNodeValue();
+propvalue[3] = sValue.toDouble();
+bnoprop=false;
+break;
+}
+else
+continue;
}
-else
-continue;
}
}
else
diff --git a/sd/xml/layoutlist.xml b/sd/xml/layoutlist.xml
index 6695c53..cfe1f1e 100644
--- a/sd/xml/layoutlist.xml
+++ b/sd/xml/layoutlist.xml
@@ -2,9 +2,31 @@
!-- At present I am not sure about corect XML namespace,so once I am aware of
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - sw/source writerfilter/source
sw/source/core/tox/tox.cxx|8 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 102 +-
2 files changed, 69 insertions(+), 41 deletions(-)
New commits:
commit 3b8d2fe1382618ab247db89a6c508f537e416098
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jul 18 16:38:39 2013 +0200
n#825976: Table of Illustration has hyperlinks by default like TOC
...and that fixes the formatting of hyperlinks in docx Tableoof
Illustrations.
(cherry picked from commit c1fac43432891bf9f396ff1ec7a1c2ed042bce54)
(cherry picked from commit 49d077b80c15ec9d069435da08bbfe38cdd57c5a)
Change-Id: I990f31a8c9d0d56f58b7b87e368010576d8c8c0d
(cherry picked from commit fb7b24dc5affb4f29f61a8716c97370951ccba80)
Reviewed-on: https://gerrit.libreoffice.org/5028
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 677d84f..8b98989 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -310,11 +310,15 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
}
SwFormTokens aTokens;
-if (TOX_CONTENT == eType)
+if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType )
{
SwFormToken aLinkStt (TOKEN_LINK_START);
aLinkStt.sCharStyleName = String(SW_RES(STR_POOLCHR_TOXJUMP));
aTokens.push_back(aLinkStt);
+}
+
+if (TOX_CONTENT == eType)
+{
aTokens.push_back(SwFormToken(TOKEN_ENTRY_NO));
aTokens.push_back(SwFormToken(TOKEN_ENTRY_TEXT));
}
@@ -334,7 +338,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
aTokens.push_back(SwFormToken(TOKEN_PAGE_NUMS));
}
-if (TOX_CONTENT == eType)
+if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType)
aTokens.push_back(SwFormToken(TOKEN_LINK_END));
SetTemplate( 0, SW_RESSTR( nPoolId++ ));
commit fdb5bd8e1af6796ab3436aba4fa903c0fdb6c221
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jul 18 15:04:00 2013 +0200
n#825976: handle TOC \h field for illustrations tables in writerfilter
Change-Id: I9ebc91d5f0e706dc1e316e0aa8494af7aec4da4e
(cherry picked from commit 43f7bc96c0117a77610bfa5e1edfa870123f56f1)
(cherry picked from commit f494d9dfd1c0c40eae7aa69a86c3aa4c45971a29)
Reviewed-on: https://gerrit.libreoffice.org/5027
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c437471..a1a4d66 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2540,6 +2540,53 @@ void DomainMapper_Impl::handleAuthor
#undef SET_DATE
}
+uno::Sequence beans::PropertyValues lcl_createTOXLevelHyperlinks( bool
bHyperlinks, OUString sChapterNoSeparator,
+ uno::Sequence beans::PropertyValues
aLevel,
+ PropertyNameSupplier rPropNameSupplier )
+{
+//create a copy of the level and add two new entries - hyperlink start and
end
+bool bChapterNoSeparator = !sChapterNoSeparator.isEmpty();
+sal_Int32 nAdd = (bHyperlinks bChapterNoSeparator) ? 4 : 2;
+uno::Sequence beans::PropertyValues aNewLevel( aLevel.getLength() +
nAdd);
+beans::PropertyValues* pNewLevel = aNewLevel.getArray();
+if( bHyperlinks )
+{
+beans::PropertyValues aHyperlink(1);
+aHyperlink[0].Name = rPropNameSupplier.GetName( PROP_TOKEN_TYPE );
+aHyperlink[0].Value = rPropNameSupplier.GetName(
PROP_TOKEN_HYPERLINK_START );
+pNewLevel[0] = aHyperlink;
+aHyperlink[0].Value = rPropNameSupplier.GetName(
PROP_TOKEN_HYPERLINK_END );
+pNewLevel[aNewLevel.getLength() -1] = aHyperlink;
+}
+if( bChapterNoSeparator )
+{
+beans::PropertyValues aChapterNo(2);
+aChapterNo[0].Name = rPropNameSupplier.GetName( PROP_TOKEN_TYPE );
+aChapterNo[0].Value = rPropNameSupplier.GetName(
PROP_TOKEN_CHAPTER_INFO );
+aChapterNo[1].Name = rPropNameSupplier.GetName( PROP_CHAPTER_FORMAT );
+//todo: is ChapterFormat::Number correct?
+aChapterNo[1].Value = (sal_Int16)text::ChapterFormat::NUMBER;
+pNewLevel[aNewLevel.getLength() - (bHyperlinks ? 4 : 2) ] = aChapterNo;
+
+beans::PropertyValues aChapterSeparator(2);
+aChapterSeparator[0].Name = rPropNameSupplier.GetName( PROP_TOKEN_TYPE
);
+aChapterSeparator[0].Value = rPropNameSupplier.GetName(
PROP_TOKEN_TEXT );
+aChapterSeparator[1].Name = rPropNameSupplier.GetName( PROP_TEXT );
+aChapterSeparator[1].Value = sChapterNoSeparator;
+pNewLevel[aNewLevel.getLength() - (bHyperlinks ? 3 : 1)] =
aChapterSeparator;
+}
+
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 28a6e1cf1bb9d6e8865736432dd32c12f0002cf9
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Jul 22 16:34:56 2013 +0200
Disambiguate ctor calls, fix windows build.
Fixup for 074ef06c908af1e5c6922a0c8ff9ccc9a9d54063
Change-Id: I5ceb153cda6112c4e8751ee0b63c19f442ccf18a
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index c6e33c9..2efde9b 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -965,9 +965,9 @@ uno::Reference XResultSet SAL_CALL
ODatabaseMetaData::getColumns(
aCurrentRow.push_back(new ORowSetValueDecorator());
// 9. Decimal Digits
// TODO: implement
-aCurrentRow.push_back(new ORowSetValueDecorator(0));
+aCurrentRow.push_back(new ORowSetValueDecorator(sal_Int32(0)));
// 10. Radix
-aCurrentRow.push_back(new ORowSetValueDecorator(10));
+aCurrentRow.push_back(new ORowSetValueDecorator(sal_Int32(10)));
// 11. Nullable
if (xRow-getShort(9))
{
@@ -1008,11 +1008,11 @@ uno::Reference XResultSet SAL_CALL
ODatabaseMetaData::getColumns(
}
else if (aType == SQL_VARYING)
{
-aCurrentRow.push_back(new ORowSetValueDecorator(32767));
+aCurrentRow.push_back(new ORowSetValueDecorator(sal_Int32(32767)));
}
else
{
-aCurrentRow.push_back(new ORowSetValueDecorator(0));
+aCurrentRow.push_back(new ORowSetValueDecorator(sal_Int32(0)));
}
// 17. Index in column
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/vcl svtools/source vcl/source
include/vcl/bitmap.hxx | 29 -
include/vcl/bitmapex.hxx| 32 +
svtools/source/control/ctrlbox.cxx | 14 +-
svtools/source/control/valueset.cxx | 14 +-
vcl/source/control/ilstbox.cxx | 32 ++---
vcl/source/gdi/bitmap4.cxx | 194
vcl/source/gdi/bitmapex.cxx | 149 +++
vcl/source/gdi/outdev2.cxx |9 +
8 files changed, 214 insertions(+), 259 deletions(-)
New commits:
commit 3712d96a3988ff05a3d3ea842bccf6bba8b38085
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Jul 21 12:53:16 2013 -0500
Resolves: #i122418# Added workaround to not use GetBitmap on windows
(cherry picked from commit 136976efb17b8617a83c7f26601cd04031b51e7f)
Change-Id: I9c3aeae76c155c9050404f67adeb91106502c3f1
Reviewed-on: https://gerrit.libreoffice.org/5011
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 85aead9..b6c00c2 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -821,35 +821,6 @@ public:
const Link* pProgress = NULL );
public:
-/** Draw a blend frame to the Bitmap
-
-@param nAlpha
-The blend value defines how strong the frame will be blended with the
-existing content, 255 == full coverage, 0 == no frame will be drawn
-
-@param aColorTopLeft, aColorBottomRight, aColorTopRight,
aColorBottomLeft
-The colors defining the frame. If the version without aColorTopRight
and
-aColorBottomLeft is used, these colors are linearly interpolated from
-aColorTopLeft and aColorBottomRight using the width and height of the
area
-
-@param rTopLeft
-The start point of the frame in pixels
-
-@param rSize
-The size of the frame in pixels
- */
-void DrawBlendFrame(
-sal_uInt8 nAlpha = 128,
-Color aColorTopLeft = Color(COL_WHITE),
-Color aColorBottomRight = Color(COL_BLACK));
-void DrawBlendFrame(
-const Point rTopLeft,
-const Size rSize,
-sal_uInt8 nAlpha = 128,
-Color aColorTopLeft = Color(COL_WHITE),
-Color aColorTopRight = Color(COL_GRAY),
-Color aColorBottomRight = Color(COL_BLACK),
-Color aColorBottomLeft = Color(COL_GRAY));
BitmapReadAccess* AcquireReadAccess();
BitmapWriteAccess* AcquireWriteAccess();
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index ce1b2ae..00a3c4e 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -395,6 +395,38 @@ public:
const Size rSize );
};
+// --
+/** Create a blend frame as BitmapEx
+
+@param nAlpha
+The blend value defines how strong the frame will be blended with the
+existing content, 255 == full coverage, 0 == no frame will be drawn
+
+@param aColorTopLeft, aColorBottomRight, aColorTopRight, aColorBottomLeft
+The colors defining the frame. If the version without aColorTopRight and
+aColorBottomLeft is used, these colors are linearly interpolated from
+aColorTopLeft and aColorBottomRight using the width and height of the area
+
+@param rSize
+The size of the frame in pixels
+*/
+
+BitmapEx VCL_DLLPUBLIC createBlendFrame(
+const Size rSize,
+sal_uInt8 nAlpha,
+Color aColorTopLeft,
+Color aColorBottomRight);
+
+BitmapEx VCL_DLLPUBLIC createBlendFrame(
+const Size rSize,
+sal_uInt8 nAlpha,
+Color aColorTopLeft,
+Color aColorTopRight,
+Color aColorBottomRight,
+Color aColorBottomLeft);
+
+// --
+
#endif // _SV_BITMAPEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 37cf887..b839b89 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -307,16 +307,14 @@ void ColorListBox::UserDraw( const UserDrawEvent rUDEvt )
if(nEdgeBlendingPercent)
{
-Bitmap aBitmap(rUDEvt.GetDevice()-GetBitmap(aRect.TopLeft(),
aRect.GetSize()));
+const Color
rTopLeft(rStyleSettings.GetEdgeBlendingTopLeftColor());
+const Color
rBottomRight(rStyleSettings.GetEdgeBlendingBottomRightColor());
+const sal_uInt8 nAlpha((nEdgeBlendingPercent * 255) / 100);
+const BitmapEx aBlendFrame(createBlendFrame(aRect.GetSize(),
nAlpha, rTopLeft, rBottomRight));
-if(!aBitmap.IsEmpty())
+if(!aBlendFrame.IsEmpty())
{
-const Color
rTopLeft(rStyleSettings.GetEdgeBlendingTopLeftColor());
-
Re: Gui or ux libraries used
Hello Christian, Thanks for your detailed explanation but i am looking for libraries like gtk which are used for graphics. Can you enlist them? -- Warm Regards From Abhimanyu Shegokar www.abhimanyushegokar.co.cc Set out to correct the world's wrongs and you will almost certainly wind up adding to them. Sent from Samsung Galaxy Note N7000. On Jul 22, 2013 3:41 AM, Christian Lohmaier lohmaier+libreoff...@googlemail.com wrote: Hi Abhhimanyu, *, On Sun, Jul 21, 2013 at 1:54 PM, abhimanyu shegokar abhimanyu.shego...@gmail.com wrote: Can someone help me listing gui and/or ux libraries used to build/install libreoffice? Not sure what you mean with gui/ux libraries here. You can build libreoffice without much system-dependencies, so the installation is more or less self-contained and doesn't have external dependencies. To build libreoffice, you can install dependencies to any prefix you like, provided that you then add the path with the pkg-info data to the corresponding environment variable (PKG_CONFIG_PATH or pass the flags manually to override/skip pkg-config detection so configure can find them As for gui libraries, libreoffice can integrate with gtk and/or kde-theming and file-dialogs, but that is optional. If they are not available, LO will default to its own colors/its own look/use its own dialogs. But I'd consider gtk or kde devel packages general dependencies that your mentor could install, so maybe I'm missing your point. I want to have all the install dependencies related to ux in /home folder since i don't have sudo permission at my college. Other general dependencies can be resolved by asking my mentor to install them. Again not sure what you mean with ux related dependencies. Maybe you mean glade to edit the UI files? That is not needed to build, only if you want to modify the dialogs, but the above notice applies as well - just build glade with --prefix=/your/home/some/dir. HTH ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - offapi/com offapi/UnoApi_offapi.mk svtools/source
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl | 38 --
svtools/source/uno/treecontrolpeer.cxx| 10 ++--
3 files changed, 6 insertions(+), 43 deletions(-)
New commits:
commit e1244d57bd8329ccc4177399d159923d76b1e2ce
Author: Noel Power noel.po...@suse.com
Date: Fri Jul 12 14:22:30 2013 +0100
fix fdo#66586 Revert fdo#46808, create IDL fortree::DefaultTreeDataModel
This reverts commit fcd01fba69db6de6cfc983fae65b6ba6764de0d6.
Service DefaultTreeDataModel actually doens't exist ( and we can't find
when/where it used to :-( ) The treecontrolpeer.cxx change to
use the new service also had the undesired effect of throwing an exception
when the UnoTreeControl model is inserted ( previously this failed silently
)
The net effect is the dialog control is malformed and not initialised
correctly
(cherry picked from commit df9f26c22a59ae2309201d2709ea5f8a0ecbf247)
also partial revert of f50553593613cbefb7f197fed66498bb6556a39a on
DefaultTreeDataModel.idl so the revert above would apply
Change-Id: Id76cc12a5360f6435bd39ca86020655feba20c9f
Reviewed-on: https://gerrit.libreoffice.org/4865
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/5031
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 678b0ed..50e68bc 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -70,7 +70,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\
UnoControlTabPageModel \
))
$(eval $(call
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
- DefaultTreeDataModel \
MutableTreeDataModel \
MutableTreeNode \
TreeControl \
diff --git a/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl
b/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl
deleted file mode 100644
index f8ad7b6..000
--- a/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/**
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_awt_tree_DefaultTreeDataModel_idl__
-#define __com_sun_star_awt_tree_DefaultTreeDataModel_idl__
-
-#include com/sun/star/awt/tree/XTreeDataModel.idl
-
-
-module com { module sun { module star { module awt { module tree {
-
-
-/**
-@since LibreOffice 4.1
- */
-service DefaultTreeDataModel : XTreeDataModel;
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/treecontrolpeer.cxx
b/svtools/source/uno/treecontrolpeer.cxx
index a403e31..e4976a6 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -22,8 +22,6 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/lang/DisposedException.hpp
#include com/sun/star/view/SelectionType.hpp
-#include com/sun/star/awt/tree/DefaultTreeDataModel.hpp
-
#include toolkit/helper/property.hxx
#include toolkit/helper/vclunohelper.hxx
@@ -1230,8 +1228,12 @@ void TreeControlPeer::onChangeDataModel(
UnoTreeListBoxImpl rTree, const Refere
if( !xDataModel.is() )
{
-Reference XComponentContext xORB(
::comphelper::getProcessComponentContext() );
-mxDataModel.query( DefaultTreeDataModel::create(xORB));
+static const OUString aSN( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.awt.tree.DefaultTreeDataModel ) );
+Reference XMultiServiceFactory xORB(
::comphelper::getProcessServiceFactory() );
+if( xORB.is() )
+{
+mxDataModel.query( xORB-createInstance( aSN ) );
+}
}
mxDataModel = xDataModel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/qa sc/source
sc/inc/refdata.hxx |9 ++
sc/qa/unit/ucalc_formula.cxx|4 +--
sc/source/core/tool/refdata.cxx | 53 +---
sc/source/core/tool/token.cxx | 29 +
4 files changed, 63 insertions(+), 32 deletions(-)
New commits:
commit 263d7d0802e9970868404b0d75ecc135e5addc11
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Jul 22 13:08:31 2013 -0400
Don't mark all of column, row, and sheet indices to be invalid in toAbs().
When only one of them is invalid. This messes up the displaying of an
invalid reference.
Change-Id: I2b5a614434417160d605dd889ca4d3b54fcaffc2
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 92bf5b9..259b63f 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -23,6 +23,7 @@
#include global.hxx
#include address.hxx
#include scdllapi.h
+#include calcmacros.hxx
/// Single reference (one address) into the sheet
struct SC_DLLPUBLIC ScSingleRefData
@@ -91,6 +92,10 @@ struct SC_DLLPUBLIC ScSingleRefData
void CalcAbsIfRel( const ScAddress rPos );
bool operator==( const ScSingleRefData ) const;
bool operator!=( const ScSingleRefData ) const;
+
+#if DEBUG_FORMULA_COMPILER
+void Dump() const;
+#endif
};
inline void ScSingleRefData::InitAddress( SCCOL nColP, SCROW nRowP, SCTAB
nTabP )
@@ -178,6 +183,10 @@ struct ScComplexRefData
relative references. */
ScComplexRefData Extend( const ScSingleRefData rRef, const ScAddress
rPos );
ScComplexRefData Extend( const ScComplexRefData rRef, const ScAddress
rPos );
+
+#if DEBUG_FORMULA_COMPILER
+void Dump() const;
+#endif
};
inline bool ScComplexRefData::ValidExternal() const
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index c400ae5..4181ec9 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -807,13 +807,13 @@ void Test::testFormulaRefUpdateSheets()
m_pDoc-DeleteTab(0);
m_pDoc-GetName(0, aName);
CPPUNIT_ASSERT_EQUAL(OUString(Sheet2), aName);
-#if 0 // TODO: I'll look into this later.
+
if (!checkFormula(*m_pDoc, ScAddress(1,1,0), SUM(#REF!.B2:C3)))
CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
if (!checkFormula(*m_pDoc, ScAddress(1,2,0), SUM(#REF!.$B$2:$C$3)))
CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
-#endif
+
m_pDoc-DeleteTab(0);
}
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 053f2a5..239fd6b 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -67,10 +67,18 @@ ScAddress ScSingleRefData::toAbs( const ScAddress rPos )
const
SCROW nRetRow = Flags.bRowRel ? nRelRow + rPos.Row() : nRow;
SCTAB nRetTab = Flags.bTabRel ? nRelTab + rPos.Tab() : nTab;
-if (!ValidCol(nRetCol) || !ValidRow(nRetRow) || !ValidTab(nRetTab))
-return ScAddress(ScAddress::INITIALIZE_INVALID);
+ScAddress aAbs(ScAddress::INITIALIZE_INVALID);
-return ScAddress(nRetCol, nRetRow, nRetTab);
+if (ValidCol(nRetCol))
+aAbs.SetCol(nRetCol);
+
+if (ValidRow(nRetRow))
+aAbs.SetRow(nRetRow);
+
+if (ValidTab(nRetTab))
+aAbs.SetTab(nRetTab);
+
+return aAbs;
}
void ScSingleRefData::SetAddress( const ScAddress rAddr, const ScAddress
rPos )
@@ -149,6 +157,20 @@ bool ScSingleRefData::operator!=( const ScSingleRefData r
) const
return !operator==(r);
}
+#if DEBUG_FORMULA_COMPILER
+void ScSingleRefData::Dump() const
+{
+coutaddress type column: (IsColRel()?relative:absolute)
+ row : (IsRowRel()?relative:absolute)sheet:
+ (IsTabRel()?relative:absolute) endl;
+coutdeleted column: (IsColDeleted()?yes:no)
+ row : (IsRowDeleted()?yes:no)sheet:
+ (IsTabDeleted()?yes:no) endl;
+coutabsolute pos column: nColrow: nRow
sheet: nTab endl;
+coutrelative pos column: nRelColrow: nRelRow
sheet: nRelTab endl;
+}
+#endif
+
static void lcl_putInOrder( ScSingleRefData rRef1, ScSingleRefData rRef2 )
{
SCCOL nCol1, nCol2;
@@ -330,4 +352,29 @@ void ScComplexRefData::SetRange( const ScRange rRange,
const ScAddress rPos )
Ref2.SetAddress(rRange.aEnd, rPos);
}
+#if DEBUG_FORMULA_COMPILER
+void ScComplexRefData::Dump() const
+{
+coutref 1 endl;
+cout address type column:
(Ref1.IsColRel()?relative:absolute)
+ row: (Ref1.IsRowRel()?relative:absolute)
+ sheet: (Ref1.IsTabRel()?relative:absolute) endl;
+cout deleted column: (Ref1.IsColDeleted()?yes:no)
+ row: (Ref1.IsRowDeleted()?yes:no)
+ sheet: (Ref1.IsTabDeleted()?yes:no) endl;
+cout absolute pos column: Ref1.nColrow: Ref1.nRow
sheet: Ref1.nTab endl;
+cout relative pos column: Ref1.nRelColrow:
Ref1.nRelRowsheet: Ref1.nRelTab endl;
+
+coutref
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sysui/CustomTarget_deb.mk
sysui/CustomTarget_deb.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff2139ccf7dc950503d10f953f2afd4b3e93417d Author: Petr Mladek pmla...@suse.cz Date: Mon Jul 22 12:07:01 2013 +0200 avoid file conflict in debian-menus package (fdo#67031) Use versioned file name for Debian specific /usr/lib/menu/libreoffice. All the other files have been versioned for years when we did this for RPMs. Heh, nobody noticed this with DEBs because people were used to that conflict and did not complain ;-) Change-Id: I1195279ff4825ed9154cf497ff3cc702f7309b6a Reviewed-on: https://gerrit.libreoffice.org/5026 Reviewed-by: Michael Meeks michael.me...@suse.com Reviewed-by: Thorsten Behrens tbehr...@suse.com Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk index b1186d6..82acd32 100644 --- a/sysui/CustomTarget_deb.mk +++ b/sysui/CustomTarget_deb.mk @@ -51,7 +51,7 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge -e 's/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ -e 's/%PREFIX/$(UNIXFILENAME.$*)/' \ -e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \ -$(deb_WORKDIR)/$*/usr/lib/menu/$* +$(deb_WORKDIR)/$*/usr/lib/menu/$*$(PKGVERSIONSHORT) echo Package: $*$(PKGVERSIONSHORT)-debian-menus $@ cat $ | tr -d \015 | \ sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] update ids for consolidate dialog .ui conversion
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5035 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/35/5035/1 update ids for consolidate dialog .ui conversion Change-Id: I92b434dde9361c669d8c6a5cccd9bc74e56aa5cf --- M helpers/help_hid.lst M source/text/scalc/01/1207.xhp M source/text/scalc/01/12070100.xhp M source/text/shared/00/0001.xhp 4 files changed, 23 insertions(+), 37 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 7cf7da2..cc6dc8e 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6287,9 +6287,6 @@ sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND1,2568520705, sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND2,2568520715, sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND3,2568520725, -sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_BYCOL,2567521332, -sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_BYROW,2567521331, -sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_REFS,2567521341, sc_CheckBox_RID_SCDLG_DBNAMES_BTN_FORMAT,2567324695, sc_CheckBox_RID_SCDLG_DBNAMES_BTN_HEADER,2567324693, sc_CheckBox_RID_SCDLG_DBNAMES_BTN_SIZE,2567324694, @@ -6360,8 +6357,6 @@ sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND2_2,2568521745, sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND3_1,2568521752, sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND3_2,2568521755, -sc_Edit_RID_SCDLG_CONSOLIDATE_ED_DATA_AREA,2567522337, -sc_Edit_RID_SCDLG_CONSOLIDATE_ED_DEST_AREA,2567522347, sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973, sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977, sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971, @@ -6400,8 +6395,6 @@ sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_2,2568531474, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_1,2568531481, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_2,2568531484, -sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DATA_AREA,2567532066, -sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DEST_AREA,2567532076, sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438, sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689, @@ -6424,9 +6417,6 @@ sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_1,2568523286, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_2,2568523287, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_TEMPLATE,2568523294, -sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_DATA_AREA,2567523872, -sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_DEST_AREA,2567523882, -sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_FUNC,2567523852, sc_ListBox_RID_SCDLG_DAPIDATA_LB_DATABASE,1495354899, sc_ListBox_RID_SCDLG_DAPIDATA_LB_OBJTYPE,1495354903, sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505, @@ -6472,7 +6462,6 @@ sc_ModalDialog_RID_SCDLG_STRINPUT,1493467136, sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816, sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576, -sc_MoreButton_RID_SCDLG_CONSOLIDATE_BTN_MORE,2567533060, sc_MoreButton_RID_SCDLG_DBNAMES_BTN_MORE,2567336481, sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868, sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465, @@ -6481,7 +6470,6 @@ sc_MultiLineEdit_TP_VALIDATION_ERROR_EDT_ERROR,548309529, sc_MultiLineEdit_TP_VALIDATION_INPUTHELP_EDT_INPUTHELP,548293135, sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765, -sc_MultiListBox_RID_SCDLG_CONSOLIDATE_LB_CONSAREAS,2567523350, sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137, sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657, sc_MultiListBox_RID_SCDLG_SHOW_TAB_LB_ENTRYLIST,1494993931, @@ -6500,8 +6488,6 @@ sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284, -sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_ADD,2567524869, -sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_REMOVE,2567524870, sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259, sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260, sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197, diff --git a/source/text/scalc/01/1207.xhp b/source/text/scalc/01/1207.xhp index f02c208..a52a17d 100644 --- a/source/text/scalc/01/1207.xhp +++ b/source/text/scalc/01/1207.xhp @@ -35,27 +35,27 @@ section id=howtoget embed href=text/scalc/00/0412.xhp#dnksd/ /section -bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_FUNC id=bm_id3149958 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/consolidatedialog/func id=bm_id3149958 localize=false/ paragraph role=heading id=hd_id3150010 xml-lang=en-US level=2 l10n=U oldref=8Function/paragraph -paragraph role=paragraph id=par_id3149377 xml-lang=en-US l10n=U oldref=9ahelp hid=SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_FUNCSelect the function that you want to use to consolidate the data./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sc:MultiListBox:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS id=bm_id3144764 localize=false/ +paragraph role=paragraph id=par_id3149377 xml-lang=en-US l10n=U
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/filters/Rich_Text_Format.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cb99d8238502fad55aa62c5cadb0c188cc61d067 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Jul 21 00:40:54 2013 +0200 fdo#66274: Saving document as RTF result in text 'Use Rich Text Format Format' Change-Id: Id617816c8530b7536238b5aa4a471c57a2a0b82e Reviewed-on: https://gerrit.libreoffice.org/4999 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/filter/source/config/fragments/filters/Rich_Text_Format.xcu b/filter/source/config/fragments/filters/Rich_Text_Format.xcu index 4bb6a82..602ca42 100644 --- a/filter/source/config/fragments/filters/Rich_Text_Format.xcu +++ b/filter/source/config/fragments/filters/Rich_Text_Format.xcu @@ -21,7 +21,7 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.RtfFilter/value/prop prop oor:name=UserDatavalueRTF/value/prop prop oor:name=UIName -value xml:lang=x-defaultRich Text Format/value +value xml:lang=x-defaultRich Text/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluewriter_Rich_Text_Format/value/prop ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bab6ca9f04f69d450be0cb8bda3f747cf3bfdac Author: pje335_NL meulentho...@gmail.com Date: Fri Jul 19 20:04:56 2013 +0200 Updated core Project: dictionaries a32a341efdbb9e53a7b832262a41f6fb6454bedf Downgraded the Dutch spellchecker to version 2.00 ( fdo#63033 fdo#65994 ) After some problems with the upgrade to version 2.10g on Linux and Windows downgrading is better. I think downgrading is better because I had the old working files still saved and that was working. Maybe in the furture I will try again to make the upgrade after some more testing. Change-Id: I2e21a40f03b44a336355500bb617865ca2704125 Reviewed-on: https://gerrit.libreoffice.org/4987 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/dictionaries b/dictionaries index 60f4c3b..a32a341 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 60f4c3b0227f18061387155c9831d761c659ce01 +Subproject commit a32a341efdbb9e53a7b832262a41f6fb6454bedf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Downgraded the Dutch spellchecker to version 2.00 ( fdo#6303...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4987 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4987 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e21a40f03b44a336355500bb617865ca2704125 Gerrit-PatchSet: 4 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Thomas van der meulen meulentho...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 7 commits - cui/source icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/oxygen include/drawinglayer officecfg/registry sw/inc
cui/source/tabpages/border.cxx |4
dev/null|binary
include/drawinglayer/primitive2d/borderlineprimitive2d.hxx |4
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 -
sw/Library_swui.mk |1
sw/inc/cmdid.h |1
sw/inc/dialog.hrc |1
sw/inc/swabstdlg.hxx|1
sw/sdi/_basesh.sdi |5
sw/sdi/swriter.sdi | 25 ---
sw/source/core/inc/swfont.hxx |3
sw/source/core/layout/paintfrm.cxx | 16 +-
sw/source/ui/dialog/swdlgfact.cxx | 20 --
sw/source/ui/dialog/swdlgfact.hxx |5
sw/source/ui/envelp/envfmt.cxx |1
sw/source/ui/frmdlg/frmui.src |4
sw/source/ui/frmdlg/uiborder.cxx| 65
-
sw/source/ui/inc/frmui.hrc |1
sw/source/ui/inc/uiborder.hxx | 42
--
sw/source/ui/shells/basesh.cxx | 67
--
sw/source/ui/shells/textsh1.cxx | 19 +-
21 files changed, 22 insertions(+), 271 deletions(-)
New commits:
commit ea79b364499d7d9df06fb0cd048f53a38b95077b
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Tue Jul 9 12:41:33 2013 +0200
Decrease scope of some variable
Change-Id: I23319e09bf6c4c0e33b86edc225cdfaa0433b7c6
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index b19da71..6d99fd3 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4673,9 +4673,6 @@ static void lcl_PaintLeftRightLine( const bool
_bLeft,
{
pLeftRightBorder = bR2L ? rBox.GetLeft() : rBox.GetRight();
}
-// OD 06.05.2003 #107169# - init boolean indicating printer output device.
-const bool bPrtOutputDev =
-( OUTDEV_PRINTER == pGlobalShell-GetOut()-GetOutDevType() );
if ( !pLeftRightBorder )
{
@@ -4694,9 +4691,7 @@ static void lcl_PaintLeftRightLine( const bool
_bLeft,
(aRect.*_rRectFn-fnGetWidth)() );
}
-const sal_Bool bCnt = _rFrm.IsCntntFrm();
-
-if ( bCnt )
+if ( _rFrm.IsCntntFrm() )
{
::lcl_ExtendLeftAndRight( aRect, _rFrm, _rAttrs, _rRectFn );
@@ -4707,6 +4702,10 @@ static void lcl_PaintLeftRightLine( const bool
_bLeft,
if ( !pLeftRightBorder-GetInWidth() )
{
+// OD 06.05.2003 #107169# - init boolean indicating printer output
device.
+const bool bPrtOutputDev =
+( OUTDEV_PRINTER == pGlobalShell-GetOut()-GetOutDevType() );
+
// OD 06.05.2003 #107169# - add 6th parameter
::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn,
bPrtOutputDev );
}
@@ -4730,8 +4729,7 @@ static void lcl_PaintTopBottomLine( const bool
_bTop,
{
const SvxBoxItem rBox = _rAttrs.GetBox();
const SvxBorderLine* pTopBottomBorder = 0;
-const SvxBorderLine* pLeftBorder = rBox.GetLeft();
-const SvxBorderLine* pRightBorder = rBox.GetRight();
+
if ( _bTop )
{
pTopBottomBorder = rBox.GetTop();
@@ -4761,7 +4759,7 @@ static void lcl_PaintTopBottomLine( const bool
_bTop,
if ( lcl_GetLineWidth( pTopBottomBorder ) 0 )
{
lcl_MakeBorderLine(
-aRect, false, _bTop, *pTopBottomBorder, pLeftBorder, pRightBorder);
+aRect, false, _bTop, *pTopBottomBorder, rBox.GetLeft(),
rBox.GetRight());
}
}
commit 3b7030d99580aa70dad884b1ac74924d9a179b3e
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sun Jul 7 21:13:55 2013 +0200
Update comment
Change-Id: I26dd6b741b538da1c372534b55870c22ebd3d046
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index d03e749..c0f225e 100644
--- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -37,9 +37,9 @@ namespace drawinglayer
/** BorderLinePrimitive2D class
This is the basic primitive to build frames around objects, e.g.
tables.
-It defines a single or double line from Start to nd using the
LeftWidth,
+It defines a single or double line from Start to End using the
LeftWidth,
Distance and RightWidth
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f653884f96b90d5da5a85487234a7e7182df3fa Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Mon Jul 22 20:22:27 2013 +0200 Hopefully the last ambiguous conversion fix (firebird-sdbc). Change-Id: If290239444f4849e3f5355a3c0a64416fc5c691d diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx index 35fa88e..3545970 100644 --- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx @@ -1039,7 +1039,7 @@ uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getColumns( short aColumnNumber = xRow-getShort(5); // Firebird stores column numbers beginning with 0 internally // SDBC expects column numbering to begin with 1. -aCurrentRow.push_back(new ORowSetValueDecorator(aColumnNumber + 1)); +aCurrentRow.push_back(new ORowSetValueDecorator(sal_Int32(aColumnNumber + 1))); } // 18. Is nullable if (xRow-getShort(9)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#67093 Change traduction of Title for some more languages
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5038 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/translations refs/changes/38/5038/1 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 --- M source/as/sw/source/ui/utlui.po M source/bg/sw/source/ui/utlui.po M source/br/sw/source/ui/utlui.po M source/gl/sw/source/ui/utlui.po M source/lt/sw/source/ui/utlui.po M source/pt-BR/sw/source/ui/utlui.po M source/pt/sw/source/ui/utlui.po M source/ru/sw/source/ui/utlui.po M source/sv/sw/source/ui/utlui.po M source/te/sw/source/ui/utlui.po M source/uk/sw/source/ui/utlui.po M source/zh-CN/sw/source/ui/utlui.po M source/zh-TW/sw/source/ui/utlui.po 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/as/sw/source/ui/utlui.po b/source/as/sw/source/ui/utlui.po index e863fd5..5623812 100644 --- a/source/as/sw/source/ui/utlui.po +++ b/source/as/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr শিৰোনাম +msgstr শীৰ্ষক #: poolfmt.src msgctxt diff --git a/source/bg/sw/source/ui/utlui.po b/source/bg/sw/source/ui/utlui.po index 2628690..2e1e2ea 100644 --- a/source/bg/sw/source/ui/utlui.po +++ b/source/bg/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Заглавие +msgstr Заглавие на документ #: poolfmt.src msgctxt diff --git a/source/br/sw/source/ui/utlui.po b/source/br/sw/source/ui/utlui.po index 0f723b2..f37d526 100644 --- a/source/br/sw/source/ui/utlui.po +++ b/source/br/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Titl +msgstr Titl pennañ #: poolfmt.src msgctxt diff --git a/source/gl/sw/source/ui/utlui.po b/source/gl/sw/source/ui/utlui.po index 85dd133..cdbdc8b 100644 --- a/source/gl/sw/source/ui/utlui.po +++ b/source/gl/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Título +msgstr Título de documento #: poolfmt.src msgctxt diff --git a/source/lt/sw/source/ui/utlui.po b/source/lt/sw/source/ui/utlui.po index cb70517..d8627d6 100644 --- a/source/lt/sw/source/ui/utlui.po +++ b/source/lt/sw/source/ui/utlui.po @@ -3142,7 +3142,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Antraštė +msgstr Dokumento antraštė #: poolfmt.src msgctxt diff --git a/source/pt-BR/sw/source/ui/utlui.po b/source/pt-BR/sw/source/ui/utlui.po index 02906b2..87e7004 100644 --- a/source/pt-BR/sw/source/ui/utlui.po +++ b/source/pt-BR/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Título +msgstr Título principal #: poolfmt.src msgctxt diff --git a/source/pt/sw/source/ui/utlui.po b/source/pt/sw/source/ui/utlui.po index 73c1a98..41b8a07 100644 --- a/source/pt/sw/source/ui/utlui.po +++ b/source/pt/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Título +msgstr Título principal #: poolfmt.src msgctxt diff --git a/source/ru/sw/source/ui/utlui.po b/source/ru/sw/source/ui/utlui.po index 06e319e..ccc0004 100644 --- a/source/ru/sw/source/ui/utlui.po +++ b/source/ru/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Заголовок +msgstr Заглавие #: poolfmt.src msgctxt diff --git a/source/sv/sw/source/ui/utlui.po b/source/sv/sw/source/ui/utlui.po index f3daaf5..819944c 100644 --- a/source/sv/sw/source/ui/utlui.po +++ b/source/sv/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Rubrik +msgstr Titel #: poolfmt.src msgctxt diff --git a/source/te/sw/source/ui/utlui.po b/source/te/sw/source/ui/utlui.po index 7a7b170..dc1ddab 100644 --- a/source/te/sw/source/ui/utlui.po +++ b/source/te/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr శీర్షిక +msgstr పత్ర శీర్షిక #: poolfmt.src msgctxt diff --git a/source/uk/sw/source/ui/utlui.po b/source/uk/sw/source/ui/utlui.po index e441d1f..b413a45 100644 --- a/source/uk/sw/source/ui/utlui.po +++ b/source/uk/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Заголовок +msgstr Назва #: poolfmt.src msgctxt diff --git a/source/zh-CN/sw/source/ui/utlui.po b/source/zh-CN/sw/source/ui/utlui.po index c3ff05d..6bf682b 100644 --- a/source/zh-CN/sw/source/ui/utlui.po +++ b/source/zh-CN/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr 标题 +msgstr 大标题 #: poolfmt.src msgctxt diff --git a/source/zh-TW/sw/source/ui/utlui.po b/source/zh-TW/sw/source/ui/utlui.po
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac8d4805ebb388d78abb5a6dead12099f86267d6 Author: Arnaud Versini arnaud.vers...@gmail.com Date: Sat Jul 20 15:16:51 2013 +0200 Updated core Project: translations 4ad59c5fbe4386773ed4e8c33a0550a6385caf6b fdo#67093 Change traduction of Title in french to avoid conflict with Heading Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Reviewed-on: https://gerrit.libreoffice.org/4996 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/translations b/translations index abf9df6..4ad59c5 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit abf9df6fa0748b60511662c8c62e99d3e052307d +Subproject commit 4ad59c5fbe4386773ed4e8c33a0550a6385caf6b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1-0' - source/fr
source/fr/sw/source/ui/utlui.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4ad59c5fbe4386773ed4e8c33a0550a6385caf6b Author: Arnaud Versini arnaud.vers...@gmail.com Date: Sat Jul 20 15:16:51 2013 +0200 fdo#67093 Change traduction of Title in french to avoid conflict with Heading Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Reviewed-on: https://gerrit.libreoffice.org/4996 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/source/fr/sw/source/ui/utlui.po b/source/fr/sw/source/ui/utlui.po index 07f591c..f697c52 100644 --- a/source/fr/sw/source/ui/utlui.po +++ b/source/fr/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Titre +msgstr Titre principal #: poolfmt.src msgctxt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-1-0] fdo#67093 Change traduction of Title in french to avoid conf...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4996 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved Fridrich Strba: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/4996 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Gerrit-PatchSet: 3 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1-0 Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: 2 commits - src/lib
src/lib/VSDContentCollector.cpp |2
src/lib/VSDContentCollector.h |2
src/lib/VSDXTheme.cpp | 179 +++-
src/lib/VSDXTheme.h | 10 ++
4 files changed, 186 insertions(+), 7 deletions(-)
New commits:
commit 746fdbc6e6a6f41238dd19f8e20ed48192e86aad
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jul 22 22:17:35 2013 +0200
Some more parsing of theme information
diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp
index a0388f0..97be35d 100644
--- a/src/lib/VSDXTheme.cpp
+++ b/src/lib/VSDXTheme.cpp
@@ -39,6 +39,12 @@ libvisio::VSDXTheme::~VSDXTheme()
{
}
+
+int libvisio::VSDXTheme::getElementToken(xmlTextReaderPtr reader)
+{
+ return VSDXMLTokenMap::getTokenId(xmlTextReaderConstName(reader));
+}
+
bool libvisio::VSDXTheme::parse(WPXInputStream *input)
{
if (!input)
@@ -53,8 +59,7 @@ bool libvisio::VSDXTheme::parse(WPXInputStream *input)
int ret = xmlTextReaderRead(reader);
while (1 == ret)
{
- int tokenId = VSDXMLTokenMap::getTokenId(xmlTextReaderConstName(reader));
- int tokenType = xmlTextReaderNodeType(reader);
+ int tokenId = getElementToken(reader);
switch (tokenId)
{
@@ -79,7 +84,7 @@ bool libvisio::VSDXTheme::parse(WPXInputStream *input)
boost::optionallibvisio::Colour
libvisio::VSDXTheme::readSrgbClr(xmlTextReaderPtr reader)
{
boost::optionallibvisio::Colour retVal;
- if (XML_A_SRGBCLR ==
VSDXMLTokenMap::getTokenId(xmlTextReaderConstName(reader)))
+ if (XML_A_SRGBCLR == getElementToken(reader))
{
xmlChar *val = xmlTextReaderGetAttribute(reader, BAD_CAST(val));
if (val)
@@ -100,7 +105,7 @@ boost::optionallibvisio::Colour
libvisio::VSDXTheme::readSrgbClr(xmlTextReader
boost::optionallibvisio::Colour
libvisio::VSDXTheme::readSysClr(xmlTextReaderPtr reader)
{
boost::optionallibvisio::Colour retVal;
- if (XML_A_SYSCLR ==
VSDXMLTokenMap::getTokenId(xmlTextReaderConstName(reader)))
+ if (XML_A_SYSCLR == getElementToken(reader))
{
xmlChar *lastClr = xmlTextReaderGetAttribute(reader, BAD_CAST(lastClr));
if (lastClr)
@@ -120,6 +125,172 @@ boost::optionallibvisio::Colour
libvisio::VSDXTheme::readSysClr(xmlTextReaderP
void libvisio::VSDXTheme::readClrScheme(xmlTextReaderPtr reader)
{
+ int ret = 1;
+ int tokenId = XML_TOKEN_INVALID;
+ int tokenType = -1;
+ m_clrScheme.m_variationClrSchemeLst.clear();
+ do
+ {
+ret = xmlTextReaderRead(reader);
+tokenId = getElementToken(reader);
+if (XML_TOKEN_INVALID == tokenId)
+{
+ VSD_DEBUG_MSG((VSDXTheme::readClrScheme: unknown token %s\n,
xmlTextReaderConstName(reader)));
+}
+tokenType = xmlTextReaderNodeType(reader);
+switch (tokenId)
+{
+case XML_A_SRGBCLR:
+ readThemeColour(reader, tokenId, m_clrScheme.m_dk1);
+ break;
+case XML_A_DK2:
+ readThemeColour(reader, tokenId, m_clrScheme.m_dk2);
+ break;
+case XML_A_LT1:
+ readThemeColour(reader, tokenId, m_clrScheme.m_lt1);
+ break;
+case XML_A_LT2:
+ readThemeColour(reader, tokenId, m_clrScheme.m_lt2);
+ break;
+case XML_A_ACCENT1:
+ readThemeColour(reader, tokenId, m_clrScheme.m_accent1);
+ break;
+case XML_A_ACCENT2:
+ readThemeColour(reader, tokenId, m_clrScheme.m_accent2);
+ break;
+case XML_A_ACCENT3:
+ readThemeColour(reader, tokenId, m_clrScheme.m_accent3);
+ break;
+case XML_A_ACCENT4:
+ readThemeColour(reader, tokenId, m_clrScheme.m_accent4);
+ break;
+case XML_A_ACCENT5:
+ readThemeColour(reader, tokenId, m_clrScheme.m_accent5);
+ break;
+case XML_A_ACCENT6:
+ readThemeColour(reader, tokenId, m_clrScheme.m_accent6);
+ break;
+case XML_A_HLINK:
+ readThemeColour(reader, tokenId, m_clrScheme.m_hlink);
+ break;
+case XML_A_FOLHLINK:
+ readThemeColour(reader, tokenId, m_clrScheme.m_folHlink);
+ break;
+case XML_VT_VARIATIONCLRSCHEMELST:
+ readVariationClrSchemeLst(reader);
+ break;
+default:
+ break;
+}
+ }
+ while ((XML_A_CLRSCHEME != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) 1 == ret);
+}
+
+void libvisio::VSDXTheme::readThemeColour(xmlTextReaderPtr reader, int
idToken, Colour clr)
+{
+ int ret = 1;
+ int tokenId = XML_TOKEN_INVALID;
+ int tokenType = -1;
+ boost::optionallibvisio::Colour colour;
+ do
+ {
+ret = xmlTextReaderRead(reader);
+tokenId = getElementToken(reader);
+if (XML_TOKEN_INVALID == tokenId)
+{
+ VSD_DEBUG_MSG((VSDXTheme::readThemeColour: unknown token %s\n,
xmlTextReaderConstName(reader)));
+}
+tokenType = xmlTextReaderNodeType(reader);
+switch (tokenId)
+{
+case XML_A_SRGBCLR:
+ colour = readSrgbClr(reader);
+ break;
+case XML_A_SYSCLR:
+ colour = readSysClr(reader);
+ break;
+default:
+ break;
+}
+ }
+ while ((idToken != tokenId || XML_READER_TYPE_END_ELEMENT !=
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - filter/source
filter/source/config/fragments/filters/Rich_Text_Format.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fb479f1b707478708b8ab8b09af994bd4e1759dc Author: Julien Nabet serval2...@yahoo.fr Date: Sun Jul 21 00:40:54 2013 +0200 fdo#66274: Saving document as RTF result in text 'Use Rich Text Format Format' Change-Id: Id617816c8530b7536238b5aa4a471c57a2a0b82e Reviewed-on: https://gerrit.libreoffice.org/4999 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-on: https://gerrit.libreoffice.org/5036 diff --git a/filter/source/config/fragments/filters/Rich_Text_Format.xcu b/filter/source/config/fragments/filters/Rich_Text_Format.xcu index 4bb6a82..602ca42 100644 --- a/filter/source/config/fragments/filters/Rich_Text_Format.xcu +++ b/filter/source/config/fragments/filters/Rich_Text_Format.xcu @@ -21,7 +21,7 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.RtfFilter/value/prop prop oor:name=UserDatavalueRTF/value/prop prop oor:name=UIName -value xml:lang=x-defaultRich Text Format/value +value xml:lang=x-defaultRich Text/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluewriter_Rich_Text_Format/value/prop ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - filter/source
filter/source/config/fragments/filters/Rich_Text_Format.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f3f0fd9dc42cc5767ba5512581203df5406f45a8 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Jul 21 00:40:54 2013 +0200 fdo#66274: Saving document as RTF result in text 'Use Rich Text Format Format' Change-Id: Id617816c8530b7536238b5aa4a471c57a2a0b82e Reviewed-on: https://gerrit.libreoffice.org/4999 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-on: https://gerrit.libreoffice.org/5037 diff --git a/filter/source/config/fragments/filters/Rich_Text_Format.xcu b/filter/source/config/fragments/filters/Rich_Text_Format.xcu index 4bb6a82..602ca42 100644 --- a/filter/source/config/fragments/filters/Rich_Text_Format.xcu +++ b/filter/source/config/fragments/filters/Rich_Text_Format.xcu @@ -21,7 +21,7 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.RtfFilter/value/prop prop oor:name=UserDatavalueRTF/value/prop prop oor:name=UIName -value xml:lang=x-defaultRich Text Format/value +value xml:lang=x-defaultRich Text/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluewriter_Rich_Text_Format/value/prop ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: source/as source/bg source/br source/gl source/lt source/pt source/pt-BR source/ru source/sv source/te source/uk source/zh-CN source/zh-TW
source/as/sw/source/ui/utlui.po|2 +- source/bg/sw/source/ui/utlui.po|2 +- source/br/sw/source/ui/utlui.po|2 +- source/gl/sw/source/ui/utlui.po|2 +- source/lt/sw/source/ui/utlui.po|2 +- source/pt-BR/sw/source/ui/utlui.po |2 +- source/pt/sw/source/ui/utlui.po|2 +- source/ru/sw/source/ui/utlui.po|2 +- source/sv/sw/source/ui/utlui.po|2 +- source/te/sw/source/ui/utlui.po|2 +- source/uk/sw/source/ui/utlui.po|2 +- source/zh-CN/sw/source/ui/utlui.po |2 +- source/zh-TW/sw/source/ui/utlui.po |2 +- 13 files changed, 13 insertions(+), 13 deletions(-) New commits: commit 8fe00a5faf3c817a8ec89a2cfc68114c456281bc Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Jul 22 21:24:05 2013 +0200 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/source/as/sw/source/ui/utlui.po b/source/as/sw/source/ui/utlui.po index e863fd5..5623812 100644 --- a/source/as/sw/source/ui/utlui.po +++ b/source/as/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr শিৰà§à¦¨à¦¾à¦® +msgstr শà§à§°à§à¦·à¦ #: poolfmt.src msgctxt diff --git a/source/bg/sw/source/ui/utlui.po b/source/bg/sw/source/ui/utlui.po index 2628690..2e1e2ea 100644 --- a/source/bg/sw/source/ui/utlui.po +++ b/source/bg/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Ðаглавие +msgstr Ðаглавие на докÑÐ¼ÐµÐ½Ñ #: poolfmt.src msgctxt diff --git a/source/br/sw/source/ui/utlui.po b/source/br/sw/source/ui/utlui.po index 0f723b2..f37d526 100644 --- a/source/br/sw/source/ui/utlui.po +++ b/source/br/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Titl +msgstr Titl pennañ #: poolfmt.src msgctxt diff --git a/source/gl/sw/source/ui/utlui.po b/source/gl/sw/source/ui/utlui.po index 85dd133..cdbdc8b 100644 --- a/source/gl/sw/source/ui/utlui.po +++ b/source/gl/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr TÃtulo +msgstr TÃtulo de documento #: poolfmt.src msgctxt diff --git a/source/lt/sw/source/ui/utlui.po b/source/lt/sw/source/ui/utlui.po index cb70517..d8627d6 100644 --- a/source/lt/sw/source/ui/utlui.po +++ b/source/lt/sw/source/ui/utlui.po @@ -3142,7 +3142,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr AntraÅ¡tÄ +msgstr Dokumento antraÅ¡tÄ #: poolfmt.src msgctxt diff --git a/source/pt-BR/sw/source/ui/utlui.po b/source/pt-BR/sw/source/ui/utlui.po index 02906b2..87e7004 100644 --- a/source/pt-BR/sw/source/ui/utlui.po +++ b/source/pt-BR/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr TÃtulo +msgstr TÃtulo principal #: poolfmt.src msgctxt diff --git a/source/pt/sw/source/ui/utlui.po b/source/pt/sw/source/ui/utlui.po index 73c1a98..41b8a07 100644 --- a/source/pt/sw/source/ui/utlui.po +++ b/source/pt/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr TÃtulo +msgstr TÃtulo principal #: poolfmt.src msgctxt diff --git a/source/ru/sw/source/ui/utlui.po b/source/ru/sw/source/ui/utlui.po index 06e319e..ccc0004 100644 --- a/source/ru/sw/source/ui/utlui.po +++ b/source/ru/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Ðаголовок +msgstr Ðаглавие #: poolfmt.src msgctxt diff --git a/source/sv/sw/source/ui/utlui.po b/source/sv/sw/source/ui/utlui.po index f3daaf5..819944c 100644 --- a/source/sv/sw/source/ui/utlui.po +++ b/source/sv/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr Rubrik +msgstr Titel #: poolfmt.src msgctxt diff --git a/source/te/sw/source/ui/utlui.po b/source/te/sw/source/ui/utlui.po index 7a7b170..dc1ddab 100644 --- a/source/te/sw/source/ui/utlui.po +++ b/source/te/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt STR_POOLCOLL_DOC_TITEL\n string.text msgid Title -msgstr à°¶à±à°°à±à°·à°¿à° +msgstr పతà±à°° à°¶à±à°°à±à°·à°¿à° #: poolfmt.src msgctxt diff --git a/source/uk/sw/source/ui/utlui.po b/source/uk/sw/source/ui/utlui.po index e441d1f..b413a45 100644 --- a/source/uk/sw/source/ui/utlui.po +++ b/source/uk/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4546b72702dbe30505594a8307dd402e81a0303 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Jul 22 21:24:05 2013 +0200 Updated core Project: translations 8fe00a5faf3c817a8ec89a2cfc68114c456281bc fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/translations b/translations index d3cf882..8fe00a5 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit d3cf882e3bc074447bbe708b914b1566d0e8b0d1 +Subproject commit 8fe00a5faf3c817a8ec89a2cfc68114c456281bc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 53 ++
cui/source/options/optaboutconfig.hxx |6 +--
2 files changed, 51 insertions(+), 8 deletions(-)
New commits:
commit 69892393f2588767e1d380ad0fc9d8e812a9713f
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date: Mon Jul 22 23:09:28 2013 +0300
Draft for FillItems
Change-Id: Iefd8a21d1cb27496c87502755834c31b1a35ba44
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 09805c0..6bc02bf 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -16,10 +16,14 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/container/XNameAccess.hpp
#include com/sun/star/beans/NamedValue.hpp
+#include com/sun/star/container/XNameAccess.hpp
+#include com/sun/star/container/XHierarchicalNameAccess.hpp
using namespace svx;
using namespace ::com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::container;
#define ITEMID_PREF 1
#define ITEMID_TYPE 2
@@ -79,12 +83,44 @@ void CuiAboutConfigTabPage::InsertEntry( OUString rProp,
OUString rStatus, OU
pPrefBox-Insert( pEntry );
}
-sal_Bool CuiAboutConfigTabPage::FillItems()
+
+void CuiAboutConfigTabPage::FillItems( Reference XNameAccess xNameAccess,
+Reference XHierarchicalNameAccess xHierarchicalNameAccess, OUString
sPath)
{
-return sal_False;
+sal_Bool bIsLeafNode;
+//Reference XNameAccess xNameAccess = getConfigAccess();
+//Reference XHierarchicalNameAccess xNextHierarchicalNameAccess;
+
+uno::Sequence OUString seqItems = xNameAccess-getElementNames();
+for( sal_Int16 i = 0; i seqItems.getLength(); ++i )
+{
+xHierarchicalNextNameAccess =
xHierarchicalNameAccess-getByHierarchicalName( seqItems[i] );
+
+//getConfigAccess for nextNameAccess ? with
xHierarchicalNextName.getName()
+
+bIsLeafNode = sal_True;
+
+try
+{
+uno::Sequence OUString seqNext =
xNextNameAccess-getElementNames();
+FillItems( xHierarchicalNextAccess, sPath + OUString(/) +
seqItems[i] );
+bIsLeafNode = sal_False;
+
+}
+catch( uno::Exception )
+{
+}
+
+if( bIsLeafNode )
+{
+InsertEntry( sPath, , , );
+}
+}
}
-uno::Reference container::XNameAccess
CuiAboutConfigTabPage::getConfigAccess()
+//uno::Reference XNameAccess CuiAboutConfigTabPage::getConfigAccess(
sal_Bool isHierarchical )
+void CuiAboutConfigTabPage::getConfigAccess( Reference XNameAccess
xNameAccess,
+Reference XHierarchicalNameAccess xHierarchicalNameAccess )
{
uno::Reference uno::XComponentContext xContext(
::comphelper::getProcessComponentContext() );
@@ -98,11 +134,18 @@ uno::Reference container::XNameAccess
CuiAboutConfigTabPage::getConfigAccess(
uno::Sequence uno::Any aArgumentList( 1 );
aArgumentList[0] = uno::makeAny( aProperty );
-uno::Reference container::XNameAccess xNameAccess(
+uno::Reference container::XNameAccess xNameAcc(
xConfigProvider-createInstanceWithArguments(
com.sun.star.configuration.ConfigurationAccess,
aArgumentList ),
uno::UNO_QUERY_THROW );
-return xNameAccess;
+Reference XHierarchicalNameAccess xHierarchicalNameAcc(
+xConfigProvider-createInstanceWithArguments(
+com.sun.star.configuration.ConfigurationAccess,
aArgumentList ),
+uno::UNO_QUERY_THROW );
+
+xNameAccess = xNameAcc;
+xHierarchicalNameAccess = xHierarchicalNameAcc;
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index eb446dc..947009e 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -13,7 +13,7 @@
#include sfx2/tabdlg.hxx
#include svx/simptabl.hxx
#include optHeaderTabListbox.hxx
-#include com/sun/star/container/XNameAccess.hpp
+#include com/sun/star/container/XHierarchicalNameAccess.hpp
namespace svx
{
@@ -35,8 +35,8 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet rItemset );
void InsertEntry(OUString rProp, OUString rStatus, OUString rType,
OUString rValue);
- sal_Bool FillItems();
- com::sun::star::uno::Reference com::sun::star::container::XNameAccess
getConfigAccess();
+ void FillItems( com::sun::star::uno::Reference
com::sun::star::container::XHierarchicalNameAccess xNameAccess, OUString
sPath);
+ com::sun::star::uno::Reference
com::sun::star::container::XHierarchicalNameAccess getConfigAccess();
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#67093 Change traduction of Title for some more languages
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5038 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5038 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Gerrit-PatchSet: 2 Gerrit-Project: translations Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier lohmaier+libreoff...@googlemail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo66145.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/core/doc/docdesc.cxx | 10 +-
sw/source/filter/ww8/docxattributeoutput.cxx |4 +++-
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
writerfilter/source/dmapper/PropertyMap.cxx |5 +
7 files changed, 28 insertions(+), 2 deletions(-)
New commits:
commit 2d5978b22b402dea9dee5b468d2044ccc1208a15
Author: Adam Co rattles2...@gmail.com
Date: Sun Jul 21 16:27:45 2013 +0300
fdo#66145: fix for FirstIsShared flag
Change-Id: Id8cc3829ccd5806295b0f240a570dc1d66ed0c87
Reviewed-on: https://gerrit.libreoffice.org/5002
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/qa/extras/ooxmlexport/data/fdo66145.docx
b/sw/qa/extras/ooxmlexport/data/fdo66145.docx
new file mode 100644
index 000..62ffdbe
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo66145.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ea46058..afaa061 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -96,6 +96,7 @@ public:
void testFdo58577();
void testBnc581614();
void testFdo66929();
+void testFdo66145();
void testPageBorderSpacingExportCase2();
CPPUNIT_TEST_SUITE(Test);
@@ -162,6 +163,7 @@ void Test::run()
{fdo43093.docx, Test::testFdo43093},
{fdo64238_a.docx, Test::testFdo64238_a},
{fdo64238_b.docx, Test::testFdo64238_b},
+{fdo66145.docx, Test::testFdo66145},
{fdo56679.docx, Test::testFdo56679},
{fdo65400.docx, Test::testFdo65400},
{fdo66543.docx, Test::testFdo66543},
@@ -1003,6 +1005,13 @@ void Test::testPageBorderSpacingExportCase2()
assertXPath(pXmlDoc, /w:document/w:body/w:sectPr/w:pgBorders/w:right,
space, 24);
}
+void Test::testFdo66145()
+{
+// The Writer ignored the 'First Is Shared' flag
+uno::Referencebeans::XPropertySet
xPropertySet(getStyles(PageStyles)-getByName(First Page), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, bool(getPropertysal_Bool(xPropertySet,
FirstIsShared)));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 920853f..67f2d18 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -189,7 +189,15 @@ void SwDoc::CopyMasterHeader(const SwPageDesc rChged,
const SwFmtHeader rHead,
const SwFrmFmt *pRight = rHead.GetHeaderFmt();
const SwFmtCntnt aRCnt = pRight-GetCntnt();
const SwFmtCntnt aCnt = rFmtHead.GetHeaderFmt()-GetCntnt();
-if( !aCnt.GetCntntIdx() )
+
+// In case PROP_FIRST_IS_SHARED (writefilter) is set and
headerFmt has 'cntnt' node,
+// Already anchored node is original fmt.
+// But at this part, change startnode(below create new pSttNd).
+// Because of this,
fdo45183.rtf(sw/qa/extras/rtfimport/data/fdo45183.rtf) cannot draw picture.
+// Compare module is sw/source/core/layout/frmtool.cxx :
AppendObjs() function.
+// In this function, because selected node index and anchored node
index aren't equal, don't draw object.
+// So, If (aCnt.GetCntntIdx() !bLeft) - use the original
headerFmt.
+if( !aCnt.GetCntntIdx() || !bLeft )
{
const SwFrmFmt rChgedFrmFmt = (bLeft ? rChged.GetLeft() :
rChged.GetFirst());
rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetHeader() );
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1f01d7b..f4a5608 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -422,7 +422,9 @@ void DocxAttributeOutput::StartParagraphProperties( const
SwTxtNode rNode )
if ( aNextIndex.GetNode().IsTxtNode() )
{
const SwTxtNode* pTxtNode = static_cast SwTxtNode* (
aNextIndex.GetNode() );
-m_rExport.OutputSectionBreaks( pTxtNode-GetpSwAttrSet(), *pTxtNode );
+// If next node has no string - it is an empty node, so no need to
output the section break
+if (!pTxtNode-GetTxt().isEmpty())
+m_rExport.OutputSectionBreaks( pTxtNode-GetpSwAttrSet(),
*pTxtNode );
}
else if ( aNextIndex.GetNode().IsTableNode() )
{
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 5cbd552..f71ed96 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -327,6 +327,7 @@ const OUString PropertyNameSupplier::GetName( PropertyIds
eId ) const
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/source
sc/source/filter/excel/xeroot.cxx |2
sc/source/filter/excel/xestyle.cxx | 92 ++---
sc/source/filter/inc/xestyle.hxx | 14 +++--
3 files changed, 96 insertions(+), 12 deletions(-)
New commits:
commit 1f78fb99c4b36b5cc437b7008cc2e0c99bb5d28c
Author: Akash Shetye shetyeak...@gmail.com
Date: Tue Jul 23 01:55:56 2013 +0530
Completed the export of table formatting data to excel.
The patch has not yet been tested nicely, improvements will come soon. The
basics are all in place though. Will be doing the export of DB Ranges as well.
Change-Id: I237b0311ed2247f8fd884545e9a5741c60ea9242
diff --git a/sc/source/filter/excel/xeroot.cxx
b/sc/source/filter/excel/xeroot.cxx
index 9df6afe..31ad08b 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -212,7 +212,7 @@ void XclExpRoot::InitializeGlobals()
// BIFF8: only one link manager for all sheets
mrExpData.mxLocLinkMgr = mrExpData.mxGlobLinkMgr;
mrExpData.mxDxfs.reset( new XclExpDxfs( GetRoot() ) );
-mrExpData.mxTableStyles.reset( new XclExpTableStyles( GetRoot() ) );
+mrExpData.mxTableStyles.reset( new XclExpTableStyles( GetRoot(),
GetDxfs() ) );
}
if( GetOutput() == EXC_OUTPUT_XML_2007 )
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 9b52289..11c3faf 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3133,8 +3133,8 @@ void XclExpDxf::SaveXml( XclExpXmlStream rStrm )
XclExpTableStyleElement::XclExpTableStyleElement( const XclExpRoot rRoot,
OUString rType, int iSize, int iDxfId )
:XclExpRoot( rRoot),
maType( rType ),
-maDxfId( iDxfId ),
-maSize( iSize )
+miSize( iSize ),
+miDxfId( iDxfId )
{
}
@@ -3142,16 +3142,54 @@ XclExpTableStyleElement::~XclExpTableStyleElement()
{
}
-void XclExpTableStyleElement::SaveXml( XclExpStream rStrm )
+void XclExpTableStyleElement::SaveXml( XclExpXmlStream rStrm )
{
+sax_fastparser::FSHelperPtr rStyleSheet = rStrm.GetCurrentStream();
+rStyleSheet-singleElement( XML_tableStyleElement,
+XML_type, OUStringToOString(maType, RTL_TEXTENCODING_UTF8
).getStr(),
+XML_size, OString::number(miSize).getStr(),
+XML_dxfId, OString::number(miDxfId).getStr(),
+FSEND );
}
//
-XclExpTableStyle::XclExpTableStyle( const XclExpRoot rRoot, OUString
rTableStyleName )
+XclExpTableStyle::XclExpTableStyle( const XclExpRoot rRoot,
ScDBDataFormatting rTableStyle, XclExpDxfs rDxfs )
:XclExpRoot( rRoot ),
-maTableStyleName( rTableStyleName )
+maTableStyle( rTableStyle )
{
+//Get the table style name
+maTableStyleName = maTableStyle.GetTableStyleName();
+//Keep adding table style elements
+OUString aStyleString;
+OUString aElementType;
+int aiDxfId;
+if( !(aStyleString = maTableStyle.GetFirstRowStripeStyle()).isEmpty() )
+{
+//Resolve this string style sheet name to a dxf id
+aiDxfId = rDxfs.GetDxfId( aStyleString );
+aElementType = firstRowStripe;
+maStyleElementContainer.push_back( new XclExpTableStyleElement( rRoot,
aElementType, 1, aiDxfId ) );
+}
+if( !(aStyleString = maTableStyle.GetSecondRowStripeStyle()).isEmpty() )
+{
+aiDxfId = rDxfs.GetDxfId( aStyleString );
+aElementType = secondRowStripe;
+maStyleElementContainer.push_back( new XclExpTableStyleElement( rRoot,
aElementType, 1, aiDxfId ) );
+}
+if( !(aStyleString = maTableStyle.GetFirstColStripeStyle()).isEmpty() )
+{
+aiDxfId = rDxfs.GetDxfId( aStyleString );
+aElementType = firstColumnStripe;
+maStyleElementContainer.push_back( new XclExpTableStyleElement( rRoot,
aElementType, 1, aiDxfId ) );
+}
+if( !(aStyleString = maTableStyle.GetSecondColStripeStyle()).isEmpty() )
+{
+aiDxfId = rDxfs.GetDxfId( aStyleString );
+aElementType = secondColumnStripe;
+maStyleElementContainer.push_back( new XclExpTableStyleElement( rRoot,
aElementType, 1, aiDxfId ) );
+}
+miCount = maStyleElementContainer.size();
}
XclExpTableStyle::~XclExpTableStyle()
@@ -3160,13 +3198,47 @@ XclExpTableStyle::~XclExpTableStyle()
void XclExpTableStyle::SaveXml( XclExpXmlStream rStrm )
{
+sax_fastparser::FSHelperPtr rStyleSheet = rStrm.GetCurrentStream();
+rStyleSheet-startElement( XML_tableStyle, XML_name,
OUStringToOString(maTableStyleName, RTL_TEXTENCODING_UTF8 ).getStr(),
XML_count, OString::number(miCount).getStr(), FSEND );
+for ( StyleElementContainer::iterator itr =
maStyleElementContainer.begin(); itr != maStyleElementContainer.end(); ++itr )
+{
+itr-SaveXml( rStrm );
+}
+rStyleSheet-endElement( XML_tableStyle );
}
//
[GSOC] about:config utility - Weekly Report #5
Hi, After getting a lot of distractions and misunderstandings started coding again. I was implementing the code with completely different and ineffective way. After a quick hangout session with Thorsten all the pieces of puzzle are falling into place. Implementation goes on UNO api. Which will allow me to implement the feature more generic as wanted. I am currently implementing two methods for accessing configuration data and adding it to the listbox. This weeks plan is: -Mainly End with a functioning tab page. -Finish current methods (Probably will end tomorrow) -Implement handlers. 3 or 4 handler don't think they take too much time. (Doubleclick, Reset, Edit etc.) Best, -- Efe Gürkan YALAMAN http://about.me/efegurkan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: formula/source
formula/source/ui/resource/ModuleHelper.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit b32a9e9ccb685b663941a1f4aa945a70ef784446 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jul 22 23:16:06 2013 +0200 fdo#46037: no more comphelper/configurationhelper.hxx in formula module Change-Id: I6ed4af811d96cb0ddbb2093d6627d4d39836a033 diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index 7544bd1..ec6f68b 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include ModuleHelper.hxx -#include comphelper/configurationhelper.hxx #include comphelper/processfactory.hxx #include osl/thread.h #include com/sun/star/util/XMacroExpander.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/core/resource/core_resource.cxx |1 - reportdesign/source/core/sdr/ModuleHelper.cxx |1 - 2 files changed, 2 deletions(-) New commits: commit a4148011836a8be7d23f3f798ee276488f54d31e Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jul 22 23:19:48 2013 +0200 fdo#46037: no more comphelper/configurationhelper.hxx in reportdesign Change-Id: I37b885ab3e8976d3e7ee71ee3e723bd2d5f6b973 diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index dab1457..c10b129 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -22,7 +22,6 @@ // needed as long as we have no contexts for components --- #include vcl/svapp.hxx //--- -#include comphelper/configurationhelper.hxx #include osl/thread.h #include com/sun/star/util/XMacroExpander.hpp #include com/sun/star/beans/XPropertySet.hpp diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index 375722d..7b16502 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include ModuleHelper.hxx -#include comphelper/configurationhelper.hxx #include comphelper/processfactory.hxx #include osl/thread.h #include com/sun/star/util/XMacroExpander.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/OSXNetworkService.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 572fc4a1937399f9e3dca19968e906cfd362554e
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jul 23 00:39:10 2013 +0200
Blind fix for Mac Tinderbox
Change-Id: I4c429afb285446a9839f8039a906c37b4e7b3de1
diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.mm
b/sd/source/ui/remotecontrol/OSXNetworkService.mm
index 0cbfb3e..8e81def 100644
--- a/sd/source/ui/remotecontrol/OSXNetworkService.mm
+++ b/sd/source/ui/remotecontrol/OSXNetworkService.mm
@@ -29,7 +29,7 @@
-(void)netService:(NSNetService *)aNetService
didNotPublish:(NSDictionary *)dict {
-NSLog(@Service did not publish: %@, dict);
+NSLog(@Service %p did not publish: %@, aNetService, dict);
}
- (void)dealloc {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/refupdatecontext.hxx |2 +-
sc/source/core/data/formulacell.cxx |5 +++--
sc/source/core/data/refupdatecontext.cxx |4 ++--
sc/source/core/tool/token.cxx| 12 +---
4 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 0c5aed287731f2546fbc73e00786dff9c87a3fb1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Jul 22 19:55:09 2013 -0400
Flag cell state modified when a reference points to a different position.
This fixes testStreamValid() test failure.
Change-Id: Ife406957a723930efb419ba8c566485f4b089d97
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index 8067c3b..af47851 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -51,7 +51,7 @@ struct RefUpdateContext
struct RefUpdateResult
{
bool mbValueChanged;
-bool mbRangeSizeModified;
+bool mbReferenceModified;
RefUpdateResult();
RefUpdateResult(const RefUpdateResult r);
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index e57d5dd..a99041d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2274,11 +2274,12 @@ bool ScFormulaCell::UpdateReferenceOnShift(
{
// Update cell or range references.
sc::RefUpdateResult aRes = pCode-AdjustReferenceOnShift(rCxt,
aOldPos);
-bRangeModified = aRes.mbRangeSizeModified;
+bRangeModified = aRes.mbReferenceModified;
bValChanged = aRes.mbValueChanged;
}
-bCellStateChanged |= bValChanged;
+if (bValChanged || bRangeModified)
+bCellStateChanged = true;
if (bOnRefMove)
// Cell may reference itself, e.g. ocColumn, ocRow without parameter
diff --git a/sc/source/core/data/refupdatecontext.cxx
b/sc/source/core/data/refupdatecontext.cxx
index f1ad64c..67e1242 100644
--- a/sc/source/core/data/refupdatecontext.cxx
+++ b/sc/source/core/data/refupdatecontext.cxx
@@ -24,9 +24,9 @@ bool RefUpdateContext::isDeleted() const
return (meMode == URM_INSDEL) (mnColDelta 0 || mnRowDelta 0 ||
mnTabDelta 0);
}
-RefUpdateResult::RefUpdateResult() : mbValueChanged(false),
mbRangeSizeModified(false) {}
+RefUpdateResult::RefUpdateResult() : mbValueChanged(false),
mbReferenceModified(false) {}
RefUpdateResult::RefUpdateResult(const RefUpdateResult r) :
-mbValueChanged(r.mbValueChanged),
mbRangeSizeModified(r.mbRangeSizeModified) {}
+mbValueChanged(r.mbValueChanged),
mbReferenceModified(r.mbReferenceModified) {}
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 4c8e595..64beedf 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2392,7 +2392,10 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
}
if (rCxt.maRange.In(aAbs))
+{
aAbs.Move(rCxt.mnColDelta, rCxt.mnRowDelta,
rCxt.mnTabDelta);
+aRes.mbReferenceModified = true;
+}
rRef.SetAddress(aAbs, aNewPos);
}
@@ -2419,7 +2422,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift(
const sc::RefUpdateCon
// The reference range has been shrunk.
rRef.SetRange(aAbs, aNewPos);
aRes.mbValueChanged = true;
-aRes.mbRangeSizeModified = true;
+aRes.mbReferenceModified = true;
break;
}
}
@@ -2432,7 +2435,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift(
const sc::RefUpdateCon
// The reference range has been expanded.
rRef.SetRange(aAbs, aNewPos);
aRes.mbValueChanged = true;
-aRes.mbRangeSizeModified = true;
+aRes.mbReferenceModified = true;
break;
}
@@ -2441,13 +2444,16 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
// The reference range has been expanded on the edge.
rRef.SetRange(aAbs, aNewPos);
aRes.mbValueChanged = true;
-aRes.mbRangeSizeModified = true;
+aRes.mbReferenceModified = true;
break;
}
}
if (rCxt.maRange.In(aAbs))
+{
aAbs.Move(rCxt.mnColDelta, rCxt.mnRowDelta,
rCxt.mnTabDelta);
+aRes.mbReferenceModified = true;
+}
else if (rCxt.maRange.Intersects(aAbs))
{
// Part of the referenced range is being shifted. This
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/formulacell.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 268d00ef10f0abbd2c40f2b5ecdf2c0aa1f37251
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Jul 22 20:30:29 2013 -0400
Modified reference shouldn't make the cell dirty.
The 'value changed' flag is there for that purpose. Modified reference
alone doesn't change the value of the cell.
Change-Id: I9d7b4c7005603cd7bed8d90901f1fab0e0d49008
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index a99041d..63d2c9b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2267,18 +2267,18 @@ bool ScFormulaCell::UpdateReferenceOnShift(
pOldCode.reset(pCode-Clone());
bool bValChanged = false;
-bool bRangeModified = false;// any range, not only shared formula
+bool bRefModified = false;
bool bRefSizeChanged = false;
if (bHasRefs)
{
// Update cell or range references.
sc::RefUpdateResult aRes = pCode-AdjustReferenceOnShift(rCxt,
aOldPos);
-bRangeModified = aRes.mbReferenceModified;
+bRefModified = aRes.mbReferenceModified;
bValChanged = aRes.mbValueChanged;
}
-if (bValChanged || bRangeModified)
+if (bValChanged || bRefModified)
bCellStateChanged = true;
if (bOnRefMove)
@@ -2304,7 +2304,7 @@ bool ScFormulaCell::UpdateReferenceOnShift(
bHasRelName = HasRelNameReference();
// Reference changed and new listening needed?
// Except in Insert/Delete without specialties.
-bNewListening = (bRangeModified || bColRowNameCompile
+bNewListening = (bRefModified || bColRowNameCompile
|| (bValChanged (bInDeleteUndo || bRefSizeChanged)) ||
bHasRelName);
if ( bNewListening )
@@ -2312,12 +2312,12 @@ bool ScFormulaCell::UpdateReferenceOnShift(
}
// NeedDirty for changes except for Copy and Move/Insert without RelNames
-bool bNeedDirty = (bRangeModified || bValChanged || bColRowNameCompile ||
bOnRefMove);
+bool bNeedDirty = (bValChanged || bColRowNameCompile || bOnRefMove);
if (pUndoDoc (bValChanged || bOnRefMove))
setOldCodeToUndo(pUndoDoc, aUndoPos, pOldCode.get(), eTempGrammar,
cMatrixFlag);
-if ( ( bCompile = (bCompile || bRangeModified || bColRowNameCompile) ) !=
0 )
+if ( (bCompile = (bCompile || bColRowNameCompile)) != 0 )
{
CompileTokenArray( bNewListening ); // no Listening
bNeedDirty = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 suokunl...@gmail.com changed: What|Removed |Added Depends on||62729 --- Comment #52 from suokunl...@gmail.com --- I added Bug 62729: Cell (range) name lost after FILESAVE after other sheet has been deleted. It courses data loss. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] WikiHelp update
Hi, For your information, I uploaded LibreOffice 4.1 help pages to http://help.libreoffice.org today (including localizations). Best regards, Andras ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Windows builds
El 19/07/13 7:51, Florian Reisinger [via Document Foundation Mail Archive] escribió: Hi, What is the preffered way? I got: -Find a different for master builds -Keep the current master as debug and download all .pdb files in subfolders Am I right? Liebe Grüße, / Yours, Florian Reisinger ... Hi Florian, Sounds good the second option, but .pdb seems to have 3,3 GB or at least 900MB, I think it could be acceptable if was possible download all only once and updated in the next downloads. Regards. * Inglés - detectado * Inglés * Español * Gallego * Italiano * Inglés * Español * Gallego * Italiano javascript:void(0); # -- View this message in context: http://nabble.documentfoundation.org/Windows-builds-tp4065919p4066280.html Sent from the QA mailing list archive at Nabble.com.___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Send Feedback...and BSA ideas
I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. On Fri, Jul 19, 2013 at 11:51 PM, Rob Snelders libreoff...@ertai.nl wrote: Hi All, My little contribution. I think we are going the wrong way totally. When the dev-list found gerrit it wasn't quite what they wanted. But they took it, tweaked it and are now using it, with great success (afaik). And here we are trying to create something new that stands between what we have as bugzilla and the ask-site. Why are we trying to take this hughe detour to get what we want? I think we need _really need_ our own bugzilla so we can tweak that install that it suits us better. Then we can make the bugs less complex and use usefull subcomponents. But then we can also install plugins we think are usefull. Tweaking bugzilla then so it comes really close with what we need is better then. Yes this is a road that needs time invested. But that is also needed for the other road. Just my €0,02 -- Greetings, Rob Snelders On 16-07-13 00:33, Bjoern Michaelsen wrote: Hi, On Mon, Jul 15, 2013 at 05:59:37PM -0400, Robinson Tryon wrote: I did that and I was told to stop. One big problem with Ask admins reporting a bug for a user is that the reporter isthe Ask admin. Do you run OSX 10.7? Do you run Windows Vista? I don't, so when a dev comes back and asks me for repro steps, I have to shrug and say Go talk to user XYZ on the Ask site and as you said, the devs don't use the Ask site! Yeah, its probably best to suggest users to file a bug and offer to help them along on #libreoffice-qa once the bug is triaged roughly. I dont think we need to bother with bugs as long as those are obviously not welltriaged. Another problem is that if they haven't provided enough information, we can't tag the question as NEEDINFO and let the Ask system pester them for more information (although this would be a *great* improvement that I'd like to see!) THB, I did something similar with a question recently: Asked a long idle incomplete question if there is an update on the missing info and then closed it as outdated a few days later as there was no reply. Many/most new users on the Ask site do not read old questions. Of the small number that do, most of them either know how to file a bug or learn very quickly. So I don't think that me filing bugs for people will have much value in leading by example (but I could be wrong...). Only file bugs for others when you can reproduce the bug. Otherwise guide them through filing their bug themselves. This also makes the motivation for a reproduction scenario clear to the other guy. So: Give the people a smooth migration path towards bugzilla and allow them to test the waters on askbot, instead of a migration scenario that requires a sleep all-in learning curve, which will make a lot of them just turn away. It's a novel idea, having people start on Askbot and then having them learn how to use the bugtracker later, and it's not something I'm entirely opposed to, but it's a very drastic change to how we've been using FDO and the Ask site up until now. Note that experienced users will should be encouraged to stay with fdo (and will likely do so all by themselves). So: If you now what bugzilla is, go with it, otherwise better stay with askbot. If you have (experienced users: bugzilla) behind on the feedback page, you can hopefully divide the stream at that point already successfull as those saying oh, I know bugzilla will go for it and those who do not will evade (experienced users: UNKNOWN_THING). Best, Bjoern -- -- Greetings, Rob Snelders __**_ LibreOffice mailing list LibreOffice@lists.freedesktop.**org libreoff...@lists.freedesktop.org http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Send Feedback from LibreOffice application
That name is misleading shouldnt that be submit a bug report or something? On Mon, Jul 22, 2013 at 4:45 PM, Rob Snelders libreoff...@ertai.nl wrote: Hi All, There was some work in progress for that. LibreOffice gives that information already to the BSA. But the BSA doesn't pick it up yet. So that will need to be implemented. The option can be found on Help-Send Feedback. When you open it you can see the info of your LibreOffice in the URL. -- Greetings, Rob Snelders On 22-07-13 16:40, Jonathan Aquilina wrote: Other projects use something like that. I think it wont have any privacy issues if all you collect is system specifications. On Mon, Jul 22, 2013 at 4:37 PM, Joel Madero jmadero@gmail.com mailto:jmadero@gmail.com** wrote: On 07/21/2013 11:22 PM, Jonathan Aquilina wrote: I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. This has been discussed a bit and from my understanding it's a) quite a bit of work b) might have some legal issues in terms of privacy if we're collecting data automatically. Best, Joel -- Jonathan Aquilina -- Jonathan Aquilina ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Send Feedback from LibreOffice application
Bug might be negative but submit a bug report in a way is positive in the sense that an issue has been found and reported. On Mon, Jul 22, 2013 at 4:57 PM, Joel Madero jmadero@gmail.com wrote: On 07/22/2013 07:46 AM, Jonathan Aquilina wrote: That name is misleading shouldnt that be submit a bug report or something? We are changing it so it's not misleading - it's going to get to a landing page - that's what this whole thread is about ;) So it will be for feedback (in a general sense). We want to avoid negative words like bugs in our main GUI. Best, Joel On Mon, Jul 22, 2013 at 4:45 PM, Rob Snelders libreoff...@ertai.nlwrote: Hi All, There was some work in progress for that. LibreOffice gives that information already to the BSA. But the BSA doesn't pick it up yet. So that will need to be implemented. The option can be found on Help-Send Feedback. When you open it you can see the info of your LibreOffice in the URL. -- Greetings, Rob Snelders On 22-07-13 16:40, Jonathan Aquilina wrote: Other projects use something like that. I think it wont have any privacy issues if all you collect is system specifications. On Mon, Jul 22, 2013 at 4:37 PM, Joel Madero jmadero@gmail.com mailto:jmadero@gmail.com wrote: On 07/21/2013 11:22 PM, Jonathan Aquilina wrote: I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. This has been discussed a bit and from my understanding it's a) quite a bit of work b) might have some legal issues in terms of privacy if we're collecting data automatically. Best, Joel -- Jonathan Aquilina -- Jonathan Aquilina -- Jonathan Aquilina ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Send Feedback from LibreOffice application
Hi All, There was some work in progress for that. LibreOffice gives that information already to the BSA. But the BSA doesn't pick it up yet. So that will need to be implemented. The option can be found on Help-Send Feedback. When you open it you can see the info of your LibreOffice in the URL. -- Greetings, Rob Snelders On 22-07-13 16:40, Jonathan Aquilina wrote: Other projects use something like that. I think it wont have any privacy issues if all you collect is system specifications. On Mon, Jul 22, 2013 at 4:37 PM, Joel Madero jmadero@gmail.com mailto:jmadero@gmail.com wrote: On 07/21/2013 11:22 PM, Jonathan Aquilina wrote: I am not trying to hijack this thread. I was thinking also in conjunction with an online version of the BSA is there something we can code into LO which integrates with the BSA that way if people go to help and submit a but a window pops up with version os etc and a text box to type in the issue. This has been discussed a bit and from my understanding it's a) quite a bit of work b) might have some legal issues in terms of privacy if we're collecting data automatically. Best, Joel -- Jonathan Aquilina ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Send Feedback...and BSA ideas
(Apologies if I'm a couple of days late to the party...catching up on emails here) On Fri, Jul 19, 2013 at 5:48 PM, Rob Snelders r...@ertai.nl wrote: I think we need _really need_ our own bugzilla so we can tweak that install that it suits us better. Yes, many of us agree. But we've punted on that in the past for a variety of reasons. Perhaps it's time to revisit the question and see if now is a good time to move to our own Bugzilla. On Sat, Jul 20, 2013 at 12:34 PM, Joel Madero jmadero@gmail.com wrote: When they sign up they sign up for both FDO Ask in one go so then they'll never have to worry about this again. Two accounts...same password, or? Also giving them two accounts at the same time might be a bit confusing (but there are two sites, so there might not be a good way around that). What about using OpenID for both sites? (esp. if we ran our own OpenID server for all of this, or otherwise gave them a single identity for their LibreOffice logins) --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 47677] New Toolbar that has Record Changes (Track Changes) options
https://bugs.freedesktop.org/show_bug.cgi?id=47677 Joel Madero jmadero@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |jmadero@gmail.com |desktop.org | --- Comment #7 from Joel Madero jmadero@gmail.com --- I'll see what I can do - no promises ;) If I don't make progress in the next 1-2 weeks I'll drop it so someone else can take it over -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67070] Password protected file does not open/save
https://bugs.freedesktop.org/show_bug.cgi?id=67070 --- Comment #3 from Bojan bojan...@gmail.com --- Sorry my ignorance, but I can not find the way to reset the bug to unconfirmed.. On 21 July 2013 14:20, bugzilla-dae...@freedesktop.org wrote: James spa...@gmx.net changed bug 67070https://bugs.freedesktop.org/show_bug.cgi?id=67070 What Removed Added Status UNCONFIRMED NEEDINFO Ever confirmed 1 *Comment # 1 https://bugs.freedesktop.org/show_bug.cgi?id=67070#c1 on bug 67070 https://bugs.freedesktop.org/show_bug.cgi?id=67070 from Jamesspa...@gmx.net * Bojan could you please provide an example file to test against and name the PW in the file description. After providing that, please re-set this bug to UNCONFIRMED. -- You are receiving this mail because: - You are on the CC list for the bug. - You reported the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65736] Libre Office hangs on using document converter
https://bugs.freedesktop.org/show_bug.cgi?id=65736 --- Comment #7 from Julien Nabet serval2...@yahoo.fr --- nickmdowson: i've been using it since several years and breaks are quite rare with testing (don't forget there's sid/unstable before). Now i don't use a lot of things, I suppose it depends on your use. About partition, I just wonder if the encrypted may be the root cause. - could you give more precision about encryption (which type for example)? - for the test, could you create some directories on your boot partition with appropriate 777 rights and put your files to convert + destination files there (each kind in a separate subdirectory of course)? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59524] Allow FILESAVE with password for xlsx and other not LibreOffice XML-based formats
https://bugs.freedesktop.org/show_bug.cgi?id=59524 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=64753 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 64753] FILESAVE: Sheet Protection removed from XLSX after saving reopening file
https://bugs.freedesktop.org/show_bug.cgi?id=64753 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=59524 Summary|FILESAVE: Document |FILESAVE: Sheet Protection |Protection removed from |removed from XLSX after |XLSX after saving |saving reopening file |reopening file | --- Comment #10 from ign_christian ign_christ...@yahoo.com --- I change summary a bit since Bug 59524 has been reported against document protection. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65229] superscript element in formula shifts formula baseline
https://bugs.freedesktop.org/show_bug.cgi?id=65229
--- Comment #6 from Yury yury.tarasiev...@gmail.com ---
Created attachment 82807
-- https://bugs.freedesktop.org/attachment.cgi?id=82807action=edit
more clear example
This demonstrates the formula's baseline shifting, quite to the loss of the
output quality.
The formulas are, respectively,
α=1 , ... , g_i
β=1, ... , g_k {}^{}
The {}^{} is added to the 2nd formula because of
https://bugs.freedesktop.org/show_bug.cgi?id=62355
--
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65229] superscript element in formula shifts formula baseline
https://bugs.freedesktop.org/show_bug.cgi?id=65229 Yury yury.tarasiev...@gmail.com changed: What|Removed |Added Version|3.6.5.2 release |3.6.7.2 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46707] Crashes when right clicked to call context menu while a mixture of alphabets and Japanese texts are selected
https://bugs.freedesktop.org/show_bug.cgi?id=46707 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|NEW |NEEDINFO CC||serval2...@yahoo.fr --- Comment #6 from Julien Nabet serval2...@yahoo.fr --- On pc Debian testing x86-64 with LO 4.0.3, I don't reproduce this. AH: would you have some time to give a try with a newer LO version? (last 4.0 version is 4.0.4) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60781] ASKLIBREOFFICE: Add a list to a profile with questions which commented or answered by a registered person
https://bugs.freedesktop.org/show_bug.cgi?id=60781 --- Comment #4 from bugquestcon...@online.de --- The Follow button needs to clicked always manually and can be forgotten, thus an automatism would be better. Whenever I commented or answered to a question this question should be in a list associate to my profile. I can access this list via my profile. As soon as an answer (not necessarily my answer) is flagged as correct/solution the question should automatically disappear from this list. This would enable me to follow up all questions to which I once wrote a comment or answer, until the questioner has flagged an answer as solved/solution. The follow up would be consistent although I cannot be in the forum everyday. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
