[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk Repository.mk

[Jan Holesovsky]

 Repository.mk |   11 +++
 desktop/Executable_soffice.bin.mk |2 +-
 desktop/Executable_unopkg.bin.mk  |2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit ee24a236e1ebcc9585ed8e24cd73512e76a0303d
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jan 11 09:37:09 2012 +0100

Revert OS_FOR_BUILD is not right do decide Host module name

This reverts commit 39cfc4d8ad77700aefabaedde430693448a5f76f.

This OS_FOR_BUILD is to modify behavior in the cross-compilation case.

diff --git a/Repository.mk b/Repository.mk
index 0724e43..3cc7a38 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Helper_register_executables,OOO,\
-crashrep_com \
guiloader \
guistdio \
odbcconfig \
@@ -67,23 +66,27 @@ $(eval $(call gb_Helper_register_executables,OOO,\
sdraw \
simpress \
soffice \
-   soffice_bin \
smath \
sweb \
swriter \
unoinfo \
unopkg \
-unopkg_bin \
-unopkg_com \
unopkgio \
 ))
 
 else
 
+ifeq ($(OS_FOR_BUILD),WNT)
+$(eval $(call gb_Helper_register_executables,OOO,\
+   soffice_bin \
+unopkg_bin \
+))
+else
 $(eval $(call gb_Helper_register_executables,OOO,\
 soffice.bin \
 unopkg.bin \
 ))
+endif
 
 ifeq ($(OS),MACOSX)
 
diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index 8815432..456171d 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
 sofficebin := soffice_bin
 else
 sofficebin := soffice.bin
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index c635c2b..464824f 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
 unopkgbin := unopkg_bin
 else
 unopkgbin := unopkg.bin
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmlsecurity/source

[David Tardon]

 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f5113dbaf26b9f617ac346c915ce1734bdf317d5
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 11 07:47:38 2012 +0100

fix for gcc 4.7/C++11: this is not string literal operator

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx 
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index b5e4a13..2090235 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -298,7 +298,7 @@ bool nsscrypto_initialize( const css::uno::Reference 
css::lang::XMultiServiceFa
 deleteRootsModule();
 
 #if defined SYSTEM_MOZILLA
-OUString 
rootModule(RTL_CONSTASCII_USTRINGPARAM(libnssckbiSAL_DLLEXTENSION));
+OUString rootModule(RTL_CONSTASCII_USTRINGPARAM(libnssckbi 
SAL_DLLEXTENSION));
 #else
 OUString 
rootModule(RTL_CONSTASCII_USTRINGPARAM(${LO_LIB_DIR}/libnssckbi 
SAL_DLLEXTENSION));
 #endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source svx/inc svx/source

[Muthu Subramanian]

 oox/source/drawingml/customshapeproperties.cxx|2 +-
 oox/source/drawingml/shapecontext.cxx |6 ++
 oox/source/ppt/pptshapecontext.cxx|6 ++
 oox/source/token/properties.txt   |1 +
 oox/source/token/tokens.txt   |1 +
 svx/inc/svx/svdoashp.hxx  |2 +-
 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx |8 
 svx/source/svdraw/svdoashp.cxx|5 +++--
 8 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 5c4d1b05faa8a3d704fc74a186a173f8cc019cc1
Author: Muthu Subramanian sumu...@suse.com
Date:   Wed Jan 11 15:24:27 2012 +0530

n#734734: Text rotation fixes.

PPTX would need rotation of text _inside_ text/object
boundaries, rather than the rotation of the text/object itself.

diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 5da446a..a03e42c 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -154,7 +154,7 @@ void CustomShapeProperties::pushToPropSet( const 
::oox::core::FilterBase /* rFi
 
 aPropertyMap[ PROP_MirroredX ] = Any( mbMirroredX );
 aPropertyMap[ PROP_MirroredY ] = Any( mbMirroredY );
-aPropertyMap[ PROP_TextRotateAngle ] = Any( mnTextRotateAngle );
+aPropertyMap[ PROP_TextPreRotateAngle ] = Any( mnTextRotateAngle );
 Sequence PropertyValue  aSeq = 
aPropertyMap.makePropertyValueSequence();
 aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
 
diff --git a/oox/source/drawingml/shapecontext.cxx 
b/oox/source/drawingml/shapecontext.cxx
index f613e89..389bfac 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -119,6 +119,12 @@ Reference XFastContextHandler  
ShapeContext::createFastChildContext( sal_Int32
 xRet = new TextBodyContext( *this, *xTextBody );
 break;
 }
+case XML_txXfrm:
+{
+AttributeList aAttribs( xAttribs );
+mpShapePtr-getTextBody()-getTextProperties().moRotation = 
aAttribs.getInteger( XML_rot );
+break;
+}
 }
 
 if( !xRet.is() )
diff --git a/oox/source/ppt/pptshapecontext.cxx 
b/oox/source/ppt/pptshapecontext.cxx
index dce07b8..cc62b82 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -218,6 +218,12 @@ Reference XFastContextHandler  
PPTShapeContext::createFastChildContext( sal_In
 xRet = new oox::drawingml::TextBodyContext( *this, *xTextBody );
 break;
 }
+case PPT_TOKEN( txXfrm ):
+{
+AttributeList aAttribs( xAttribs );
+mpShapePtr-getTextBody()-getTextProperties().moRotation = 
aAttribs.getInteger( XML_rot );
+break;
+}
 }
 
 if( !xRet.is() )
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 65d2cb0..50c46bd 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -457,6 +457,7 @@ TextHorizontalAdjust
 TextLeftDistance
 TextLowerDistance
 TextOverlap
+TextPreRotateAngle
 TextRightDistance
 TextRotateAngle
 TextRotation
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 594468e..cec24b5 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5334,6 +5334,7 @@ txOverObj
 txPr
 txSp
 txStyles
+txXfrm
 txbxContent
 txtBox
 ty
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 3d91549..013e150 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -149,7 +149,7 @@ public:
 void SetMirroredY( const sal_Bool bMirroredY );
 
 double GetObjectRotation() const;
-double GetExtraTextRotation() const;
+double GetExtraTextRotation( const bool bPreRotation = false ) const;
 
 TYPEINFO();
 SdrObjCustomShape();
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx 
b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 2e63da2..85628ca 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -160,6 +160,14 @@ namespace sdr
 // #i101684# get the text range unrotated and absolute to 
the object range
 const basegfx::B2DRange 
aTextRange(getCorrectedTextBoundRect());
 
+// Rotation before scaling
+
if(!basegfx::fTools::equalZero(GetCustomShapeObj().GetExtraTextRotation(true)))
+{
+basegfx::B2DVector aTranslation(0.5, 0.5);
+aTextBoxMatrix.translate( -aTranslation.getX(), 
-aTranslation.getY() );
+aTextBoxMatrix.rotate((360.0 - 
GetCustomShapeObj().GetExtraTextRotation(true)) * 

[Libreoffice-commits] .: sc/inc sc/source

[Stephan Bergmann]

 sc/inc/global.hxx |1 
 sc/source/core/data/global.cxx|5 
 sc/source/core/data/table4.cxx|  232 --
 sc/source/ui/docshell/docfunc.cxx |4 
 sc/source/ui/miscdlgs/scuiautofmt.cxx |4 
 sc/source/ui/unoobj/afmtuno.cxx   |   88 +---
 sc/source/ui/unoobj/cellsuno.cxx  |4 
 sc/source/ui/view/cellsh3.cxx |4 
 8 files changed, 162 insertions(+), 180 deletions(-)

New commits:
commit 0e4b36269097f8865bdbc1b9d299a2776ae0cc06
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 11 10:26:41 2012 +0100

ScGlobal::GetAutoFormat not always required to create fresh instance.

...at least in ~ScAutoFormatObj it appears unnecessary and can lead to
crashes during Desktop::DeregisterServices (when ScGlobal::ppRscString
is already null and ScAutoFormat ctor calls ScGlobal::GetRscString).

Therefore split GetAutoFormat in two, GetOrCreateAutoFormat for cases
that probably need a non-null return and GetAutoFormat for those that
are OK with a null return.

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index a810400..ac10094 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -562,6 +562,7 @@ public:
 SC_DLLPUBLIC static const SvxSearchItemGetSearchItem();
 SC_DLLPUBLIC static voidSetSearchItem( const 
SvxSearchItem rNew );
 SC_DLLPUBLIC static ScAutoFormat*   GetAutoFormat();
+SC_DLLPUBLIC static ScAutoFormat*   GetOrCreateAutoFormat();
 static void ClearAutoFormat(); //BugId 54209
 static FuncCollection*  GetFuncCollection();
 SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 6de3782..c43a853 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -299,6 +299,11 @@ void ScGlobal::ClearAutoFormat()
 
 ScAutoFormat* ScGlobal::GetAutoFormat()
 {
+return pAutoFormat;
+}
+
+ScAutoFormat* ScGlobal::GetOrCreateAutoFormat()
+{
 if ( !pAutoFormat )
 {
 pAutoFormat = new ScAutoFormat;
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 9b38214..bc99c5c 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1592,14 +1592,10 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow,
 const ScPatternAttr rAttr, sal_uInt16 
nFormatNo)
 {
-ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat();
-if (pAutoFormat)
+ScAutoFormatData* pData = (*ScGlobal::GetOrCreateAutoFormat())[nFormatNo];
+if (pData)
 {
-ScAutoFormatData* pData = (*pAutoFormat)[nFormatNo];
-if (pData)
-{
-ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr);
-}
+ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr);
 }
 }
 
@@ -1608,140 +1604,136 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SCROW
 {
 if (ValidColRow(nStartCol, nStartRow)  ValidColRow(nEndCol, nEndRow))
 {
-ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat();
-if (pAutoFormat)
+ScAutoFormatData* pData = 
(*ScGlobal::GetOrCreateAutoFormat())[nFormatNo];
+if (pData)
 {
-ScAutoFormatData* pData = (*pAutoFormat)[nFormatNo];
-if (pData)
+ScPatternAttr* pPatternAttrs[16];
+for (sal_uInt8 i = 0; i  16; ++i)
+{
+pPatternAttrs[i] = new ScPatternAttr(pDocument-GetPool());
+pData-FillToItemSet(i, pPatternAttrs[i]-GetItemSet(), 
*pDocument);
+}
+
+SCCOL nCol = nStartCol;
+SCROW nRow = nStartRow;
+sal_uInt16 nIndex = 0;
+// Linke obere Ecke
+AutoFormatArea(nCol, nRow, nCol, nRow, *pPatternAttrs[nIndex], 
nFormatNo);
+// Linke Spalte
+if (pData-IsEqualData(4, 8))
+AutoFormatArea(nStartCol, nStartRow + 1, nStartCol, nEndRow - 
1, *pPatternAttrs[4], nFormatNo);
+else
 {
-ScPatternAttr* pPatternAttrs[16];
-for (sal_uInt8 i = 0; i  16; ++i)
+nIndex = 4;
+for (nRow = nStartRow + 1; nRow  nEndRow; nRow++)
 {
-pPatternAttrs[i] = new ScPatternAttr(pDocument-GetPool());
-pData-FillToItemSet(i, pPatternAttrs[i]-GetItemSet(), 
*pDocument);
+AutoFormatArea(nCol, nRow, nCol, nRow, 
*pPatternAttrs[nIndex], nFormatNo);
+if (nIndex == 4)
+nIndex = 8;
+else
+nIndex = 4;
 }
-
-SCCOL nCol = 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source svx/inc svx/source

[Muthu Subramanian]

 oox/source/drawingml/customshapeproperties.cxx|2 +-
 oox/source/drawingml/shapecontext.cxx |6 ++
 oox/source/ppt/pptshapecontext.cxx|6 ++
 oox/source/token/properties.txt   |1 +
 oox/source/token/tokens.txt   |1 +
 svx/inc/svx/svdoashp.hxx  |2 +-
 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx |8 
 svx/source/svdraw/svdoashp.cxx|5 +++--
 8 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 0b63bb1d5f37ad673b0aadefe4bfe1e61ae667b9
Author: Muthu Subramanian sumu...@suse.com
Date:   Wed Jan 11 15:24:27 2012 +0530

n#734734: Text rotation fixes.

PPTX would need rotation of text _inside_ text/object
boundaries, rather than the rotation of the text/object itself.

cherrypick: 5c4d1b05faa8a3d704fc74a186a173f8cc019cc1

diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 5da446a..a03e42c 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -154,7 +154,7 @@ void CustomShapeProperties::pushToPropSet( const 
::oox::core::FilterBase /* rFi
 
 aPropertyMap[ PROP_MirroredX ] = Any( mbMirroredX );
 aPropertyMap[ PROP_MirroredY ] = Any( mbMirroredY );
-aPropertyMap[ PROP_TextRotateAngle ] = Any( mnTextRotateAngle );
+aPropertyMap[ PROP_TextPreRotateAngle ] = Any( mnTextRotateAngle );
 Sequence PropertyValue  aSeq = 
aPropertyMap.makePropertyValueSequence();
 aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
 
diff --git a/oox/source/drawingml/shapecontext.cxx 
b/oox/source/drawingml/shapecontext.cxx
index f613e89..389bfac 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -119,6 +119,12 @@ Reference XFastContextHandler  
ShapeContext::createFastChildContext( sal_Int32
 xRet = new TextBodyContext( *this, *xTextBody );
 break;
 }
+case XML_txXfrm:
+{
+AttributeList aAttribs( xAttribs );
+mpShapePtr-getTextBody()-getTextProperties().moRotation = 
aAttribs.getInteger( XML_rot );
+break;
+}
 }
 
 if( !xRet.is() )
diff --git a/oox/source/ppt/pptshapecontext.cxx 
b/oox/source/ppt/pptshapecontext.cxx
index dce07b8..cc62b82 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -218,6 +218,12 @@ Reference XFastContextHandler  
PPTShapeContext::createFastChildContext( sal_In
 xRet = new oox::drawingml::TextBodyContext( *this, *xTextBody );
 break;
 }
+case PPT_TOKEN( txXfrm ):
+{
+AttributeList aAttribs( xAttribs );
+mpShapePtr-getTextBody()-getTextProperties().moRotation = 
aAttribs.getInteger( XML_rot );
+break;
+}
 }
 
 if( !xRet.is() )
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 65d2cb0..50c46bd 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -457,6 +457,7 @@ TextHorizontalAdjust
 TextLeftDistance
 TextLowerDistance
 TextOverlap
+TextPreRotateAngle
 TextRightDistance
 TextRotateAngle
 TextRotation
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 594468e..cec24b5 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5334,6 +5334,7 @@ txOverObj
 txPr
 txSp
 txStyles
+txXfrm
 txbxContent
 txtBox
 ty
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 3d91549..013e150 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -149,7 +149,7 @@ public:
 void SetMirroredY( const sal_Bool bMirroredY );
 
 double GetObjectRotation() const;
-double GetExtraTextRotation() const;
+double GetExtraTextRotation( const bool bPreRotation = false ) const;
 
 TYPEINFO();
 SdrObjCustomShape();
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx 
b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 2e63da2..85628ca 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -160,6 +160,14 @@ namespace sdr
 // #i101684# get the text range unrotated and absolute to 
the object range
 const basegfx::B2DRange 
aTextRange(getCorrectedTextBoundRect());
 
+// Rotation before scaling
+
if(!basegfx::fTools::equalZero(GetCustomShapeObj().GetExtraTextRotation(true)))
+{
+basegfx::B2DVector aTranslation(0.5, 0.5);
+aTextBoxMatrix.translate( -aTranslation.getX(), 
-aTranslation.getY() );
+

[Libreoffice-commits] .: android/Bootstrap android/qa README.cross

[Tor Lillqvist]

 README.cross |   12 --
 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java |   22 +--
 android/qa/sc/Makefile   |4 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

New commits:
commit 11c9125c28738ce99e502991523829756ec95326
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Jan 11 13:46:35 2012 +0200

Work around http://code.google.com/p/android/issues/detail?id=23351

diff --git a/README.cross b/README.cross
index 709838b..45e1888 100644
--- a/README.cross
+++ b/README.cross
@@ -395,18 +395,6 @@ window, and you probably also want to have set the stdout 
and stderr
 of app processes to be redirected to logcat (adb shell stop; adb
 shell setprop log.redirect-stdio true; adb shell start).
 
-Unfortunately you might notice that the command line passed to adb
-shell am start is too long (actually, not command line as such, but
-the length of the so-called extra arguments passed to the action, or
-something like that, see Android bug
-http://code.google.com/p/android/issues/detail?id=23351 , so you need
-to shorten it somehow... for instance by creating a symlink to
-/data/data/org.libreoffice.android.qa.sc in /system: adb remount; adb
-shell ln -s /data/data/org.libreoffice.android.qa.sc /system/sc and
-then use that shorter path /system/sc snippet in all places instead of
-the longer /data/data/org.libreoffice.android.qa.sc on the adb shell
-am start command line.
-
 To debug, do manually what make run would do, adding args -e
 lo-main-delay 20 to the command line, and when the app has started,
 run ndk-gdb. Unfortunately the gdb in NDK r7 is broken, use the one in
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 91f965e..9cd9c3b 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -37,6 +37,9 @@ import android.util.Log;
 
 import fi.iki.tml.CommandLine;
 
+import java.io.File;
+import java.util.Scanner;
+
 // We override NativeActivity so that we can get at the intent of the
 // activity and its extra parameters, that we use to tell us what
 // actual LibreOffice program to run. I.e. something that on desktop
@@ -111,9 +114,22 @@ public class Bootstrap extends NativeActivity
 // Get command line to pass to the LO program
 String cmdLine = getIntent().getStringExtra(lo-main-cmdline);
 
-if (cmdLine == null)
-cmdLine = 
/data/data/org.libreoffice.android/lib/libqa_sal_types.so;
-
+if (cmdLine == null) {
+String indirectFile = 
getIntent().getStringExtra(lo-main-indirect-cmdline);
+
+if (indirectFile != null) {
+try {
+// Somewhat stupid but short way to read a file into a 
string
+cmdLine = new Scanner(new File(indirectFile), 
UTF-8).useDelimiter(\\A).next();
+}
+catch (java.io.FileNotFoundException e) {
+Log.i(TAG, String.format(Could not read %s: 
%s,indirectFile, e.toString()));
+}
+}
+
+if (cmdLine == null)
+cmdLine = 
/data/data/org.libreoffice.android/lib/libqa_sal_types.so;
+}
 // argv[0] will be replaced by android_main() in lo-bootstrap.c by the
 // pathname of the mainLibrary.
 cmdLine = dummy-program-name  + cmdLine;
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 450b7ed..c400c72 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -162,7 +162,9 @@ uninstall:
adb uninstall $(APP_PACKAGE)
 
 run:
-   adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library 
libcppunittester -e lo-main-cmdline $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so 
--headless --protector libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb  
file:///assets/ComponentTarget/framework/util/fwk.component 
file:///assets/ComponentTarget/i18npool/util/i18npool.component 
file:///assets/ComponentTarget/sfx2/util/sfx.component 
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component 
file:///assets/ComponentTarget/configmgr/source/configmgr.component 
file:///assets/xml/ucb1.component file:///assets/xml/ucpfile1.component' 
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib 
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib 
+   echo $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  

[Libreoffice-commits] .: sc/source

[Andras Timar]

 sc/source/ui/src/optdlg.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ca1557b85188b7708930468d77412f51356e34c
Author: Andras Timar ati...@suse.com
Date:   Wed Jan 11 12:00:26 2012 +0100

enlarge 'Reset' button for German translation

diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 93378d1..a8f82a5 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -280,7 +280,7 @@ TabPage RID_SCPAGE_FORMULA
 PushButton BTN_FORMULA_SEP_RESET
 {
 Pos = MAP_APPFONT ( 21, 113 );
-Size = MAP_APPFONT ( 40, 14 );
+Size = MAP_APPFONT ( 50, 14 );
 Text [ en-US ] = Rese~t;
 };
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/Bootstrap

[Tor Lillqvist]

 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3267d34fb9f57e8a4549b8fb9e8c362a64447cfc
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Jan 11 14:18:20 2012 +0200

Need to trim trailing newline from the indirect command line string

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 9cd9c3b..f8331ac 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -120,7 +120,7 @@ public class Bootstrap extends NativeActivity
 if (indirectFile != null) {
 try {
 // Somewhat stupid but short way to read a file into a 
string
-cmdLine = new Scanner(new File(indirectFile), 
UTF-8).useDelimiter(\\A).next();
+cmdLine = new Scanner(new File(indirectFile), 
UTF-8).useDelimiter(\\A).next().trim();
 }
 catch (java.io.FileNotFoundException e) {
 Log.i(TAG, String.format(Could not read %s: 
%s,indirectFile, e.toString()));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - bridges/source configure.in set_soenv.in

[François Tigeot]

 bridges/source/cpp_uno/shared/makefile.mk   |4 
 bridges/source/cpp_uno/shared/vtablefactory.cxx |8 
 configure.in|2 ++
 set_soenv.in|1 +
 4 files changed, 15 insertions(+)

New commits:
commit 2938ec5539b54e98e801ae14ccb2c163cd94a92a
Author: Robert Nagy robert.n...@gmail.com
Date:   Wed Dec 21 16:16:22 2011 +0100

only use posix_fallocate() if it's actually available

diff --git a/bridges/source/cpp_uno/shared/makefile.mk 
b/bridges/source/cpp_uno/shared/makefile.mk
index 4ce8122..c71ba6b 100644
--- a/bridges/source/cpp_uno/shared/makefile.mk
+++ b/bridges/source/cpp_uno/shared/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF $(HAVE_POSIX_FALLOCATE) == YES
+CDEFS += -DHAVE_POSIX_FALLOCATE
+.ENDIF
+
 SLOFILES = \
 $(SLO)$/bridge.obj \
 $(SLO)$/component.obj \
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 801b16c..4d7e867 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -264,10 +264,18 @@ bool VtableFactory::createBlock(Block block, sal_Int32 
slotCount) const
 }
 unlink(tmpfname);
 delete[] tmpfname;
+#if defined(HAVE_POSIX_FALLOCATE)
 int err = posix_fallocate(block.fd, 0, block.size);
+#else
+int err = ftruncate(block.fd, block.size);
+#endif
 if (err != 0)
 {
+#if defined(HAVE_POSIX_FALLOCATE)
 SAL_WARN(bridges, posix_fallocate failed with code   err);
+#else
+SAL_WARN(bridges, truncation of executable memory area failed 
with code   err);
+#endif
 close(block.fd);
 block.fd = -1;
 break;
diff --git a/configure.in b/configure.in
index 290b294..40b20eb 100644
--- a/configure.in
+++ b/configure.in
@@ -3843,6 +3843,8 @@ fi
 if test $with_alloc = internal -o -z $with_alloc; then
 AC_MSG_RESULT([internal])
 fi
+AC_CHECK_FUNCS(posix_fallocate, HAVE_POSIX_FALLOCATE=YES, 
[HAVE_POSIX_FALLOCATE=NO])
+AC_SUBST(HAVE_POSIX_FALLOCATE)
 AC_SUBST(ALLOC)
 
 dnl ===
diff --git a/set_soenv.in b/set_soenv.in
index 5347a84..afaac53 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1999,6 +1999,7 @@ ToFile( HUNSPELL_LIBS, @HUNSPELL_LIBS@,e );
 ToFile( SYSTEM_LPSOLVE,@SYSTEM_LPSOLVE@,   e );
 ToFile( HAVE_GETOPT,   @HAVE_GETOPT@,  e );
 ToFile( HAVE_READDIR_R,@HAVE_READDIR_R@,   e );
+ToFile( HAVE_POSIX_FALLOCATE,@HAVE_POSIX_FALLOCATE@,   e );
 ToFile( SYSTEM_LIBC,   @SYSTEM_LIBC@,  e );
 ToFile( SYSTEM_HYPH,   @SYSTEM_HYPH@,  e );
 ToFile( HYPHEN_LIB,@HYPHEN_LIB@,   e );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sysui/desktop

[Petr Mladek]

 sysui/desktop/icons/hicolor/256x256/apps/base.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/calc.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/draw.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/impress.png  
|binary
 sysui/desktop/icons/hicolor/256x256/apps/main.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/math.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/startcenter.png  
|binary
 sysui/desktop/icons/hicolor/256x256/apps/writer.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-formula.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-master-document.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-presentation-template.png 
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-presentation.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet-template.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text-template.png 
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-web-template.png  
|binary
 20 files changed

New commits:
commit 8ed9108aea7fa807fa9a6174df0235b0a3b1a09c
Author: Petr Mladek pmla...@suse.cz
Date:   Wed Jan 11 11:14:55 2012 +0100

Add 256x256 desktop and MIME type icons (fdo#39555, bnc#722644)

diff --git a/sysui/desktop/icons/hicolor/256x256/apps/base.png 
b/sysui/desktop/icons/hicolor/256x256/apps/base.png
new file mode 100644
index 000..729dbcd
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/base.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png 
b/sysui/desktop/icons/hicolor/256x256/apps/calc.png
new file mode 100644
index 000..3ce322a
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/calc.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/draw.png 
b/sysui/desktop/icons/hicolor/256x256/apps/draw.png
new file mode 100644
index 000..b3ee114
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/draw.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/impress.png 
b/sysui/desktop/icons/hicolor/256x256/apps/impress.png
new file mode 100644
index 000..5909f05
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/main.png 
b/sysui/desktop/icons/hicolor/256x256/apps/main.png
new file mode 100644
index 000..7e8e2a0
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/main.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/math.png 
b/sysui/desktop/icons/hicolor/256x256/apps/math.png
new file mode 100644
index 000..50b8dc8
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/math.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png 
b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png
new file mode 100644
index 000..7e8e2a0
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png 
b/sysui/desktop/icons/hicolor/256x256/apps/writer.png
new file mode 100644
index 000..80af4bd
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png
new file mode 100644
index 000..729dbcd
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png differ
diff --git 
a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png
new file mode 100644
index 000..4cda813
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png
new file mode 100644
index 000..b3ee114
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-formula.png 

[Libreoffice-commits] .: sysui/desktop

[Petr Mladek]

 sysui/desktop/icons/hicolor/256x256/apps/base.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/calc.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/draw.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/impress.png  
|binary
 sysui/desktop/icons/hicolor/256x256/apps/main.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/math.png 
|binary
 sysui/desktop/icons/hicolor/256x256/apps/startcenter.png  
|binary
 sysui/desktop/icons/hicolor/256x256/apps/writer.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-formula.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-master-document.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-presentation-template.png 
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-presentation.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet-template.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text-template.png 
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-web-template.png  
|binary
 20 files changed

New commits:
commit 25e0d64a6fccbc62d4cca4d8d7d312ea84f45c3a
Author: Petr Mladek pmla...@suse.cz
Date:   Wed Jan 11 11:14:55 2012 +0100

Add 256x256 desktop and MIME type icons (fdo#39555, bnc#722644)

diff --git a/sysui/desktop/icons/hicolor/256x256/apps/base.png 
b/sysui/desktop/icons/hicolor/256x256/apps/base.png
new file mode 100644
index 000..729dbcd
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/base.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png 
b/sysui/desktop/icons/hicolor/256x256/apps/calc.png
new file mode 100644
index 000..3ce322a
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/calc.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/draw.png 
b/sysui/desktop/icons/hicolor/256x256/apps/draw.png
new file mode 100644
index 000..b3ee114
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/draw.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/impress.png 
b/sysui/desktop/icons/hicolor/256x256/apps/impress.png
new file mode 100644
index 000..5909f05
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/main.png 
b/sysui/desktop/icons/hicolor/256x256/apps/main.png
new file mode 100644
index 000..7e8e2a0
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/main.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/math.png 
b/sysui/desktop/icons/hicolor/256x256/apps/math.png
new file mode 100644
index 000..50b8dc8
Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/math.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png 
b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png
new file mode 100644
index 000..7e8e2a0
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png 
b/sysui/desktop/icons/hicolor/256x256/apps/writer.png
new file mode 100644
index 000..80af4bd
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png
new file mode 100644
index 000..729dbcd
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png differ
diff --git 
a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png
new file mode 100644
index 000..4cda813
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png 
differ
diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png
new file mode 100644
index 000..b3ee114
Binary files /dev/null and 
b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-formula.png 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Kohei Yoshida]

 sc/source/core/data/drwlayer.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 9fae191ea8438777d5c1dd20b20506e131707454
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 08:59:49 2012 -0500

Avoid iterating beyond the last existing drawing page.

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 74c9d35..82fbf7b 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -481,6 +481,15 @@ void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, 
sal_uInt16 nNewPos, sal_Bool b
 
 void ScDrawLayer::ResetTab( SCTAB nStart, SCTAB nEnd )
 {
+SCTAB nPageSize = static_castSCTAB(GetPageCount());
+if (nPageSize  0)
+// No drawing pages exist.
+return;
+
+if (nEnd = nPageSize)
+// Avoid iterating beyond the last existing page.
+nEnd = nPageSize - 1;
+
 for (SCTAB i = nStart; i = nEnd; ++i)
 {
 SdrPage* pPage = GetPage(static_castsal_uInt16(i));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/drwlayer.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 98aadb63dd07c51bdc2a0a0857c6ded05d7316f8
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 08:59:49 2012 -0500

Avoid iterating beyond the last existing drawing page.

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 74c9d35..82fbf7b 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -481,6 +481,15 @@ void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, 
sal_uInt16 nNewPos, sal_Bool b
 
 void ScDrawLayer::ResetTab( SCTAB nStart, SCTAB nEnd )
 {
+SCTAB nPageSize = static_castSCTAB(GetPageCount());
+if (nPageSize  0)
+// No drawing pages exist.
+return;
+
+if (nEnd = nPageSize)
+// Avoid iterating beyond the last existing page.
+nEnd = nPageSize - 1;
+
 for (SCTAB i = nStart; i = nEnd; ++i)
 {
 SdrPage* pPage = GetPage(static_castsal_uInt16(i));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extras/source

[Caolán McNamara]

 extras/source/truetype/symbol/README |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 211e147ac64b2a22652d7390bcd9c8f7215a73b4
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jan 11 14:44:42 2012 +

add README to document how to bump the font version

diff --git a/extras/source/truetype/symbol/README 
b/extras/source/truetype/symbol/README
new file mode 100644
index 000..889dd36
--- /dev/null
+++ b/extras/source/truetype/symbol/README
@@ -0,0 +1,16 @@
+Modify the OpenSymbol.sfd and generate opens___.ttf from it with fontforge. The
+.sfd is the canonical source for the .ttf
+
+Every new version of the font should increase the font version. This is
+important so that when two versions of the font are installed, e.g.  one
+bundled inside the office installation, and one already installed on the system
+that the most recent font can be detected and favoured.
+
+Bumping the font version is easiest done manually by bumping the two places in
+the .sfd where the version is mentioned, e.g.
+
+-Version: 102.2
++Version: 102.3
+
+-LangName: 1033   Regular OpenSymbol  Version 102.2
++LangName: 1033   Regular OpenSymbol  Version 102.3
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk Repository.mk

[Jan Holesovsky]

 Repository.mk |   11 ---
 desktop/Executable_soffice.bin.mk |2 +-
 desktop/Executable_unopkg.bin.mk  |2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 42bd571e07378c5e74f279e373c1442b4d224590
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Tue Jan 10 22:28:24 2012 -0600

OS_FOR_BUILD is not right do decide Host module name

diff --git a/Repository.mk b/Repository.mk
index 3cc7a38..f76ae79 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Helper_register_executables,OOO,\
+   crashrep_com \
guiloader \
guistdio \
odbcconfig \
@@ -66,27 +67,23 @@ $(eval $(call gb_Helper_register_executables,OOO,\
sdraw \
simpress \
soffice \
+   soffice_bin \
smath \
sweb \
swriter \
unoinfo \
unopkg \
+   unopkg_bin \
+   unopkg_com \
unopkgio \
 ))
 
 else
 
-ifeq ($(OS_FOR_BUILD),WNT)
-$(eval $(call gb_Helper_register_executables,OOO,\
-   soffice_bin \
-unopkg_bin \
-))
-else
 $(eval $(call gb_Helper_register_executables,OOO,\
 soffice.bin \
 unopkg.bin \
 ))
-endif
 
 ifeq ($(OS),MACOSX)
 
diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index 456171d..8815432 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
+ifeq ($(OS),WNT)
 sofficebin := soffice_bin
 else
 sofficebin := soffice.bin
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 464824f..c635c2b 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
+ifeq ($(OS),WNT)
 unopkgbin := unopkg_bin
 else
 unopkgbin := unopkg.bin
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: avmedia/source

[Caolán McNamara]

 avmedia/source/win/framegrabber.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit eea8a6e2181ee805854d29184aab3317264dde94
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jan 11 15:04:18 2012 +

fix windows build error

diff --git a/avmedia/source/win/framegrabber.cxx 
b/avmedia/source/win/framegrabber.cxx
index 9743d12..fd7264c 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -84,11 +84,11 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const 
::rtl::OUString rURL ) const
 
 if( SUCCEEDED( CoCreateInstance( CLSID_MediaDet, NULL, 
CLSCTX_INPROC_SERVER, IID_IMediaDet, (void**) pDet ) ) )
 {
-String aLocalStr;
+rtl::OUString aLocalStr;
 
-if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr 
)  aLocalStr.Len() )
+if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr 
)  !aLocalStr.isEmpty() )
 {
-if( !SUCCEEDED( pDet-put_Filename( ::SysAllocString( 
reinterpret_castLPCOLESTR(aLocalStr.GetBuffer()) ) ) ) )
+if( !SUCCEEDED( pDet-put_Filename( ::SysAllocString( 
reinterpret_castLPCOLESTR(aLocalStr.getStr()) ) ) ) )
 {
 pDet-Release();
 pDet = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in desktop/scripts

[David Tardon]

 configure.in  |3 ++-
 desktop/scripts/soffice.sh.in |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f5b96148cb9e489b2100e6a2fd6805bff637e113
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 11 16:54:35 2012 +0100

we need a var. assignment here, not a value

diff --git a/configure.in b/configure.in
index 204065b..ab12cea 100644
--- a/configure.in
+++ b/configure.in
@@ -4313,8 +4313,9 @@ if test $_os = Linux  test $host_cpu = powerpc; 
then
 # IBMs JDK needs this...
 JITC_PROCESSOR_TYPE=6
 export JITC_PROCESSOR_TYPE
+JITC_PROCESSOR_TYPE_EXPORT=JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE
 fi
-AC_SUBST([JITC_PROCESSOR_TYPE])
+AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
 
 if test $_os = WINNT; then
 WITH_VC_REDIST=TRUE
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index defd7b2..2014ab9 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -45,7 +45,7 @@ export SAL_ENABLE_FILE_LOCKING
 # uncomment line below if you encounter problems starting soffice on your 
system
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
-@JITC_PROCESSOR_TYPE@
+@JITC_PROCESSOR_TYPE_EXPORT@
 
 # resolve installation directory
 sd_cwd=`pwd`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in desktop/Module_desktop.mk desktop/Package_scripts.mk desktop/Package_soffice_sh.mk desktop/scripts

[David Tardon]

 config_host.mk.in |1 
 configure.in  |7 -
 desktop/Module_desktop.mk |5 +
 desktop/Package_scripts.mk|2 
 desktop/Package_soffice_sh.mk |   38 +
 desktop/scripts/Makefile  |   35 
 desktop/scripts/soffice.sh|  177 ++
 desktop/scripts/soffice.sh.in |  177 --
 8 files changed, 260 insertions(+), 182 deletions(-)

New commits:
commit 7ad72045d7c3a99dbb67f817ad570097de383c3f
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 11 17:31:44 2012 +0100

avoid generating a file in the source tree

diff --git a/config_host.mk.in b/config_host.mk.in
index 236a58c..57125bd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -167,6 +167,7 @@ export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
 export INTRO_BIPMAP=@INTRO_BITMAP@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
+export JITC_PROCESSOR_TYPE_EXPORT=@JITC_PROCESSOR_TYPE_EXPORT@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
 export KDE4_CFLAGS=@KDE4_CFLAGS@
 export KDE4_LIBS=@KDE4_LIBS@
diff --git a/configure.in b/configure.in
index e44bf75..d3b3a7e 100644
--- a/configure.in
+++ b/configure.in
@@ -10422,12 +10422,9 @@ else
 echo  set_soenv.last
 fi
 
-AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list 
desktop/scripts/soffice.sh build_env])
+AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list build_env])
 AC_OUTPUT
 
-# make sure this is executable
-chmod +x desktop/scripts/soffice.sh
-
 # touch the config timestamp file set_soenv.stamp
 if test ! -f set_soenv.stamp; then
 echo  set_soenv.stamp
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index c14600f..267cc2c 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -68,6 +68,11 @@ $(eval $(call gb_Module_add_targets,desktop,\
 Pagein_impress \
 Pagein_writer \
 ))
+ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
+$(eval $(call gb_Module_add_targets,desktop,\
+Package_soffice_sh \
+))
+endif
 endif
 
 ifeq ($(OS),WNT)
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index d2afeda..7611765 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -47,10 +47,12 @@ $(eval $(call 
gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
 
 ifneq ($(OS),MACOSX)
+ifeq ($(JITC_PROCESSOR_TYPE_EXPORT),)
 
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
 
 endif
+endif
 
 endif
 
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
new file mode 100644
index 000..5cf1df3
--- /dev/null
+++ b/desktop/Package_soffice_sh.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call 
gb_Package_Package,desktop_soffice_sh,$(WORKDIR)/CustomTarget/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_soffice_sh,bin/soffice,soffice.sh))
+
+$(eval $(call gb_Package_add_customtarget,desktop_soffice_sh,desktop/scripts))
+
+$(eval $(call gb_CustomTarget_add_dependencies,desktop/scripts,\
+desktop/scripts/soffice.sh \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/desktop/scripts/Makefile b/desktop/scripts/Makefile
new file mode 100644
index 000..349c5dd
--- /dev/null
+++ b/desktop/scripts/Makefile
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - configure.in desktop/scripts

[David Tardon]

 configure.in  |3 ++-
 desktop/scripts/soffice.sh.in |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 23e6f8b208bce0412e8aa0cb46a29f0395eb8317
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 11 17:32:02 2012 +0100

bah, i forgot *export*

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/configure.in b/configure.in
index 016e468..824de63 100644
--- a/configure.in
+++ b/configure.in
@@ -3890,7 +3890,7 @@ if test $_os = Linux  test $host_cpu = powerpc; 
then
 # IBMs JDK needs this...
 JITC_PROCESSOR_TYPE=6
 export JITC_PROCESSOR_TYPE
-JITC_PROCESSOR_TYPE_EXPORT=JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE
+JITC_PROCESSOR_TYPE_EXPORT=export 
JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE
 fi
 AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
 
commit 38a32dfd832dcd47af2457567c18a6e357bb578a
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 11 16:54:35 2012 +0100

we need a var. assignment here, not a value

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/configure.in b/configure.in
index 40b20eb..016e468 100644
--- a/configure.in
+++ b/configure.in
@@ -3890,8 +3890,9 @@ if test $_os = Linux  test $host_cpu = powerpc; 
then
 # IBMs JDK needs this...
 JITC_PROCESSOR_TYPE=6
 export JITC_PROCESSOR_TYPE
+JITC_PROCESSOR_TYPE_EXPORT=JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE
 fi
-AC_SUBST([JITC_PROCESSOR_TYPE])
+AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
 
 if test $_os = WINNT; then
 WITH_VC_REDIST=TRUE
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index defd7b2..2014ab9 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -45,7 +45,7 @@ export SAL_ENABLE_FILE_LOCKING
 # uncomment line below if you encounter problems starting soffice on your 
system
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
-@JITC_PROCESSOR_TYPE@
+@JITC_PROCESSOR_TYPE_EXPORT@
 
 # resolve installation directory
 sd_cwd=`pwd`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/dpobject.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 34219bd53d4270e6741e2b8596b4210e1c47da1a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 11:50:26 2012 -0500

fdo#44661: No need to update the source range when it's a named range.

Otherwise deleting a sheet that shifts the position of the pivot table
would turn the named range into the raw range that the name references.

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 8cc76c7..51be02d 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -745,6 +745,11 @@ void ScDPObject::UpdateReference( UpdateRefMode 
eUpdateRefMode,
 
 if ( pSheetDesc )
 {
+const OUString rRangeName = pSheetDesc-GetRangeName();
+if (!rRangeName.isEmpty())
+// Source range is a named range.  No need to update.
+return;
+
 const ScRange rSrcRange = pSheetDesc-GetSourceRange();
 nCol1 = rSrcRange.aStart.Col();
 nRow1 = rSrcRange.aStart.Row();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svtools/source

[Lionel Elie Mamane]

 svtools/source/brwbox/brwbox1.cxx   |   22 +-
 svtools/source/brwbox/brwbox2.cxx   |   22 --
 svtools/source/brwbox/brwbox3.cxx   |2 +-
 svtools/source/brwbox/brwhead.cxx   |2 +-
 svtools/source/brwbox/datwin.cxx|2 +-
 svtools/source/brwbox/editbrowsebox.cxx |   12 +---
 6 files changed, 29 insertions(+), 33 deletions(-)

New commits:
commit a3261b16471995832f6791b5831c640c72948a95
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jan 11 18:55:14 2012 +0100

fdo#44283: finish 8a17792f2e5 (Handle/invalid column ID cleanup)

diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index cca40ce..5ddaa03 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -307,9 +307,9 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const 
XubString rText,
 
 if ( getDataWindow()-pHeaderBar )
 {
-// Handlecolumn nicht in der Headerbar
+// Handle column not in the header bar
 sal_uInt16 nHeaderPos = nPos;
-if (nHeaderPos != HEADERBAR_APPEND  !GetColumnId(0))
+if (nHeaderPos != HEADERBAR_APPEND  GetColumnId(0) == HandleColumnId 
)
 nHeaderPos--;
 getDataWindow()-pHeaderBar-InsertItem(
 nItemId, rText, nWidth, nBits, nHeaderPos );
@@ -347,7 +347,7 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool 
bFreeze )
 DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 
 // never unfreeze the handle-column
-if ( nItemId == 0  !bFreeze )
+if ( nItemId == HandleColumnId  !bFreeze )
 return;
 
 // get the position in the current array
@@ -424,12 +424,8 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool 
bFreeze )
 
 void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
 {
-// never set pos of the handle-column
-if ( nColumnId == 0 )
-return;
-
-// do not move handle column
-if (nPos == 0  !(*pCols)[ 0 ]-GetId())
+// never set pos of the handle column
+if ( nColumnId == HandleColumnId )
 return;
 
 // get the position in the current array
@@ -504,7 +500,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, 
sal_uInt16 nPos )
 if ( getDataWindow()-pHeaderBar )
 {
 sal_uInt16 nNewPos = nPos;
-if ( !GetColumnId(0) )
+if ( GetColumnId(0) == HandleColumnId )
 --nNewPos;
 getDataWindow()-pHeaderBar-MoveItem(nColumnId,nNewPos);
 }
@@ -550,7 +546,7 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const 
String rTitle )
 DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 
 // never set title of the handle-column
-if ( nItemId == 0 )
+if ( nItemId == HandleColumnId )
 return;
 
 // get the position in the current array
@@ -2383,8 +2379,8 @@ void BrowseBox::SetMode( BrowserMode nMode )
 if ( pDataWin )
 pDataWin-Invalidate();
 
-// kein Cursor auf Handle-Column
-if ( nCurColId == 0 )
+// no cursor on handle column
+if ( nCurColId == HandleColumnId )
 nCurColId = GetColumnId( 1 );
 
 m_nCurrentMode = nMode;
diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 92c29de..9a4a7b2 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -416,8 +416,8 @@ void BrowseBox::DrawCursor()
 else
 bReallyHide |= ( GetCursorHideCount()  0 );
 
-// keine Cursor auf Handle-Column
-if ( nCurColId == 0 )
+// no cursor on handle column
+if ( nCurColId == HandleColumnId )
 nCurColId = GetColumnId(1);
 
 // Cursor-Rechteck berechnen
@@ -1682,8 +1682,8 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent 
rEvt )
 // DataRow?
 if ( rEvt.GetRow() = 0 )
 {
-// Zeilenselektion?
-if ( rEvt.GetColumnId() == 0 || !bColumnCursor )
+// line selection?
+if ( rEvt.GetColumnId() == HandleColumnId || !bColumnCursor )
 {
 if ( bMultiSelection )
 {
@@ -1757,7 +1757,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent 
rEvt )
 }
 else
 {
-if ( bMultiSelection  rEvt.GetColumnId() == 0 )
+if ( bMultiSelection  rEvt.GetColumnId() == HandleColumnId )
 {
 // toggle all-selection
 if ( uRow.pSel-GetSelectCount()  ( GetRowCount() / 2 ) )
@@ -1990,7 +1990,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
 if ( bColumnCursor )
 {
 sal_uInt16 nNewId = GetColumnId(ColCount() -1);
-bDone = (nNewId != 0)  GoToColumnId( nNewId );
+bDone = nNewId != HandleColumnId  GoToColumnId( nNewId );
 break;

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svtools/source

[Lionel Elie Mamane]

 svtools/source/brwbox/brwbox2.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit de89f1694b4cb2a5bf8ade020bfdef33e7135d35
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jan 11 19:05:36 2012 +0100

fdo#44283: contination of 8a17792f2e5 (Handle/invalid column ID cleanup)

Thanks to Julien Nabet for pointer and first part of this patch

diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 92c29de..7fe378e 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -2001,11 +2001,13 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
 {
 sal_uInt16 nNewPos = GetColumnPos( GetCurColumnId() ) + 1;
 sal_uInt16 nNewId = GetColumnId( nNewPos );
-if (nNewId != 0)// Am Zeilenende ?
+if (nNewId != BROWSER_INVALIDID)// At end of row ?
 bDone = GoToColumnId( nNewId );
 else
 {
-sal_uInt16 nColId = ( GetColumnId(0) == 0 ) ? 
GetColumnId(1) : GetColumnId(0);
+sal_uInt16 nColId = GetColumnId(0);
+if ( nColId == BROWSER_INVALIDID || nColId == 
HandleColumnId )
+nColId = GetColumnId(1);
 if ( GetRowCount() )
 bDone = ( nCurRow  GetRowCount() - 1 )  
GoToRowColumnId( nCurRow + 1, nColId );
 else if ( ColCount() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dpobject.hxx  |8 ++-
 sc/source/core/data/dpobject.cxx |  100 +++
 2 files changed, 99 insertions(+), 9 deletions(-)

New commits:
commit 1e88cd643a5959271f28eaaab3d14488374df11f
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 15:24:52 2012 -0500

fdo#44661: Properly update range keys for pivot cache.

When the internal data source range gets modified, we should also
update the affected range keys that are used to look up pivot caches.

Otherwise we'll end up creating a brand new cache, without removing
the old one that's no longer referenced.

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index cc73fcb..db8ea92 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -259,12 +259,18 @@ public:
 class SheetCaches
 {
 friend class ScDPCollection;
-typedef ::boost::ptr_mapScRange, ScDPCache CachesType;
+typedef boost::ptr_mapsize_t, ScDPCache CachesType;
+typedef std::vectorScRange RangeIndexType;
 CachesType maCaches;
+RangeIndexType maRanges;
 ScDocument* mpDoc;
 public:
 SheetCaches(ScDocument* pDoc);
 const ScDPCache* getCache(const ScRange rRange);
+
+void updateReference(
+UpdateRefMode eMode, const ScRange r, SCsCOL nDx, SCsROW nDy, 
SCsTAB nDz);
+
 private:
 void removeCache(const ScRange rRange);
 };
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 51be02d..b0bbace 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2459,27 +2459,108 @@ uno::Referencesheet::XDimensionsSupplier 
ScDPObject::CreateSource( const ScDPS
 
 ScDPCollection::SheetCaches::SheetCaches(ScDocument* pDoc) : mpDoc(pDoc) {}
 
+namespace {
+
+struct FindInvalidRange : public std::unary_functionScRange, bool
+{
+bool operator() (const ScRange r) const
+{
+return !r.IsValid();
+}
+};
+
+}
+
 const ScDPCache* ScDPCollection::SheetCaches::getCache(const ScRange rRange)
 {
-CachesType::const_iterator itr = maCaches.find(rRange);
-if (itr != maCaches.end())
-// already cached.
-return itr-second;
+RangeIndexType::iterator it = std::find(maRanges.begin(), maRanges.end(), 
rRange);
+if (it != maRanges.end())
+{
+// Already cached.
+size_t nIndex = std::distance(maRanges.begin(), it);
+CachesType::iterator itCache = maCaches.find(nIndex);
+if (itCache == maCaches.end())
+// cache pool and index pool out-of-sync !!!
+return NULL;
 
+return itCache-second;
+}
+
+// Not cached.  Create a new cache.
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptrScDPCache pCache(new ScDPCache(mpDoc));
 SAL_WNODEPRECATED_DECLARATIONS_POP
 pCache-InitFromDoc(mpDoc, rRange);
+
+// Get the smallest available range index.
+it = std::find_if(maRanges.begin(), maRanges.end(), FindInvalidRange());
+
+size_t nIndex = maRanges.size();
+if (it == maRanges.end())
+{
+// All range indices are valid.  Append a new index.
+maRanges.push_back(rRange);
+}
+else
+{
+// Slot with invalid range.  Re-use this slot.
+*it = rRange;
+nIndex = std::distance(maRanges.begin(), it);
+}
+
 const ScDPCache* p = pCache.get();
-maCaches.insert(rRange, pCache);
+maCaches.insert(nIndex, pCache);
 return p;
 }
 
+void ScDPCollection::SheetCaches::updateReference(
+UpdateRefMode eMode, const ScRange r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz)
+{
+if (maRanges.empty())
+// No caches.
+return;
+
+RangeIndexType::iterator it = maRanges.begin(), itEnd = maRanges.end();
+for (; it != itEnd; ++it)
+{
+const ScRange rKeyRange = *it;
+SCCOL nCol1 = rKeyRange.aStart.Col();
+SCROW nRow1 = rKeyRange.aStart.Row();
+SCTAB nTab1 = rKeyRange.aStart.Tab();
+SCCOL nCol2 = rKeyRange.aEnd.Col();
+SCROW nRow2 = rKeyRange.aEnd.Row();
+SCTAB nTab2 = rKeyRange.aEnd.Tab();
+
+ScRefUpdateRes eRes = ScRefUpdate::Update(
+mpDoc, eMode,
+r.aStart.Col(), r.aStart.Row(), r.aStart.Tab(),
+r.aEnd.Col(), r.aEnd.Row(), r.aEnd.Tab(), nDx, nDy, nDz,
+nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
+
+if (eRes != UR_NOTHING)
+{
+// range updated.
+ScRange aNew(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
+*it = aNew;
+}
+}
+}
+
 void ScDPCollection::SheetCaches::removeCache(const ScRange rRange)
 {
-CachesType::iterator itr = maCaches.find(rRange);
-if (itr != maCaches.end())
-maCaches.erase(itr);
+RangeIndexType::iterator it = std::find(maRanges.begin(), maRanges.end(), 
rRange);
+if (it == maRanges.end())
+// Not cached.  Nothing to do.
+return;
+
+  

[Libreoffice-commits] .: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dpobject.hxx  |8 ++-
 sc/source/core/data/dpobject.cxx |  100 +++
 2 files changed, 99 insertions(+), 9 deletions(-)

New commits:
commit e33702442a22a72f96a093fbfdf8bfac217f416f
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 15:24:52 2012 -0500

fdo#44661: Properly update range keys for pivot cache.

When the internal data source range gets modified, we should also
update the affected range keys that are used to look up pivot caches.

Otherwise we'll end up creating a brand new cache, without removing
the old one that's no longer referenced.

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index cc73fcb..db8ea92 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -259,12 +259,18 @@ public:
 class SheetCaches
 {
 friend class ScDPCollection;
-typedef ::boost::ptr_mapScRange, ScDPCache CachesType;
+typedef boost::ptr_mapsize_t, ScDPCache CachesType;
+typedef std::vectorScRange RangeIndexType;
 CachesType maCaches;
+RangeIndexType maRanges;
 ScDocument* mpDoc;
 public:
 SheetCaches(ScDocument* pDoc);
 const ScDPCache* getCache(const ScRange rRange);
+
+void updateReference(
+UpdateRefMode eMode, const ScRange r, SCsCOL nDx, SCsROW nDy, 
SCsTAB nDz);
+
 private:
 void removeCache(const ScRange rRange);
 };
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 51be02d..b0bbace 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2459,27 +2459,108 @@ uno::Referencesheet::XDimensionsSupplier 
ScDPObject::CreateSource( const ScDPS
 
 ScDPCollection::SheetCaches::SheetCaches(ScDocument* pDoc) : mpDoc(pDoc) {}
 
+namespace {
+
+struct FindInvalidRange : public std::unary_functionScRange, bool
+{
+bool operator() (const ScRange r) const
+{
+return !r.IsValid();
+}
+};
+
+}
+
 const ScDPCache* ScDPCollection::SheetCaches::getCache(const ScRange rRange)
 {
-CachesType::const_iterator itr = maCaches.find(rRange);
-if (itr != maCaches.end())
-// already cached.
-return itr-second;
+RangeIndexType::iterator it = std::find(maRanges.begin(), maRanges.end(), 
rRange);
+if (it != maRanges.end())
+{
+// Already cached.
+size_t nIndex = std::distance(maRanges.begin(), it);
+CachesType::iterator itCache = maCaches.find(nIndex);
+if (itCache == maCaches.end())
+// cache pool and index pool out-of-sync !!!
+return NULL;
 
+return itCache-second;
+}
+
+// Not cached.  Create a new cache.
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptrScDPCache pCache(new ScDPCache(mpDoc));
 SAL_WNODEPRECATED_DECLARATIONS_POP
 pCache-InitFromDoc(mpDoc, rRange);
+
+// Get the smallest available range index.
+it = std::find_if(maRanges.begin(), maRanges.end(), FindInvalidRange());
+
+size_t nIndex = maRanges.size();
+if (it == maRanges.end())
+{
+// All range indices are valid.  Append a new index.
+maRanges.push_back(rRange);
+}
+else
+{
+// Slot with invalid range.  Re-use this slot.
+*it = rRange;
+nIndex = std::distance(maRanges.begin(), it);
+}
+
 const ScDPCache* p = pCache.get();
-maCaches.insert(rRange, pCache);
+maCaches.insert(nIndex, pCache);
 return p;
 }
 
+void ScDPCollection::SheetCaches::updateReference(
+UpdateRefMode eMode, const ScRange r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz)
+{
+if (maRanges.empty())
+// No caches.
+return;
+
+RangeIndexType::iterator it = maRanges.begin(), itEnd = maRanges.end();
+for (; it != itEnd; ++it)
+{
+const ScRange rKeyRange = *it;
+SCCOL nCol1 = rKeyRange.aStart.Col();
+SCROW nRow1 = rKeyRange.aStart.Row();
+SCTAB nTab1 = rKeyRange.aStart.Tab();
+SCCOL nCol2 = rKeyRange.aEnd.Col();
+SCROW nRow2 = rKeyRange.aEnd.Row();
+SCTAB nTab2 = rKeyRange.aEnd.Tab();
+
+ScRefUpdateRes eRes = ScRefUpdate::Update(
+mpDoc, eMode,
+r.aStart.Col(), r.aStart.Row(), r.aStart.Tab(),
+r.aEnd.Col(), r.aEnd.Row(), r.aEnd.Tab(), nDx, nDy, nDz,
+nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
+
+if (eRes != UR_NOTHING)
+{
+// range updated.
+ScRange aNew(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
+*it = aNew;
+}
+}
+}
+
 void ScDPCollection::SheetCaches::removeCache(const ScRange rRange)
 {
-CachesType::iterator itr = maCaches.find(rRange);
-if (itr != maCaches.end())
-maCaches.erase(itr);
+RangeIndexType::iterator it = std::find(maRanges.begin(), maRanges.end(), 
rRange);
+if (it == maRanges.end())
+// Not cached.  Nothing to do.
+return;
+
+  

[Libreoffice-commits] .: shell/source slideshow/source sot/source starmath/source

[Olivier Hallot]

 shell/source/cmdmail/cmdmailmsg.cxx   |   18 +-
 shell/source/cmdmail/cmdmailsuppl.cxx |8 ++--
 shell/source/unix/exec/shellexec.cxx  |4 +-
 shell/source/unix/sysshell/recently_used_file.cxx |2 -
 slideshow/source/engine/activities/activitiesfactory.cxx  |2 -
 slideshow/source/engine/animationnodes/animationaudionode.cxx |2 -
 slideshow/source/engine/shapes/shapeimporter.cxx  |2 -
 slideshow/source/engine/shapes/viewmediashape.cxx |4 +-
 slideshow/source/engine/slide/shapemanagerimpl.cxx|4 +-
 slideshow/source/engine/slideshowimpl.cxx |4 +-
 sot/source/sdstor/storage.cxx |2 -
 sot/source/sdstor/ucbstorage.cxx  |8 ++--
 sot/source/unoolestorage/xolesimplestorage.cxx|4 +-
 starmath/source/cfgitem.cxx   |4 +-
 starmath/source/dialog.cxx|2 -
 starmath/source/mathmlexport.cxx  |2 -
 starmath/source/mathmlimport.cxx  |   14 +++
 starmath/source/smdetect.cxx  |2 -
 starmath/source/unomodel.cxx  |2 -
 19 files changed, 45 insertions(+), 45 deletions(-)

New commits:
commit 806dce17d6631738c7388d8d68d8b5ac2e4c11a8
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Wed Jan 11 11:37:33 2012 -0200

Fix for fdo43460 Part XXXIV getLength() to isEmpty()

Part XXXIV
Modules
shell, slideshow, sot, starmath

diff --git a/shell/source/cmdmail/cmdmailmsg.cxx 
b/shell/source/cmdmail/cmdmailmsg.cxx
index 1a33afd..2a2bb8a 100644
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -167,10 +167,10 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString aName 
)
 {
 MutexGuard aGuard( m_aMutex );
 
-if( 0 == aName.compareToAscii( from )   m_aOriginator.getLength() )
+if( 0 == aName.compareToAscii( from )   !m_aOriginator.isEmpty() )
 return makeAny( m_aOriginator );
 
-else if( 0 == aName.compareToAscii( to )   m_aRecipient.getLength() )
+else if( 0 == aName.compareToAscii( to )   !m_aRecipient.isEmpty() )
 return makeAny( m_aRecipient );
 
 else if( 0 == aName.compareToAscii( cc )   m_CcRecipients.getLength() )
@@ -179,7 +179,7 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString aName )
 else if( 0 == aName.compareToAscii( bcc )   
m_BccRecipients.getLength() )
 return makeAny( m_BccRecipients );
 
-else if( 0 == aName.compareToAscii( subject )   m_aSubject.getLength() 
)
+else if( 0 == aName.compareToAscii( subject )   !m_aSubject.isEmpty() )
 return makeAny( m_aSubject );
 
 else if( 0 == aName.compareToAscii( attachment )   
m_Attachments.getLength() )
@@ -199,10 +199,10 @@ Sequence OUString  SAL_CALL 
CmdMailMsg::getElementNames(  )
 sal_Int32 nItems = 0;
 Sequence OUString  aRet( 6 );
 
-if( m_aOriginator.getLength() )
+if( !m_aOriginator.isEmpty() )
 aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM(from));
 
-if( m_aRecipient.getLength() )
+if( !m_aRecipient.isEmpty() )
 aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM(to));
 
 if( m_CcRecipients.getLength() )
@@ -211,7 +211,7 @@ Sequence OUString  SAL_CALL CmdMailMsg::getElementNames(  
)
 if( m_BccRecipients.getLength() )
 aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM(bcc));
 
-if( m_aSubject.getLength() )
+if( !m_aSubject.isEmpty() )
 aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM(subject));
 
 if( m_Attachments.getLength() )
@@ -228,10 +228,10 @@ Sequence OUString  SAL_CALL 
CmdMailMsg::getElementNames(  )
 {
 MutexGuard aGuard( m_aMutex );
 
-if( 0 == aName.compareToAscii( from )   m_aOriginator.getLength() )
+if( 0 == aName.compareToAscii( from )   !m_aOriginator.isEmpty() )
 return sal_True;
 
-else if( 0 == aName.compareToAscii( to )   m_aRecipient.getLength() )
+else if( 0 == aName.compareToAscii( to )   !m_aRecipient.isEmpty() )
 return sal_True;
 
 else if( 0 == aName.compareToAscii( cc )   m_CcRecipients.getLength() )
@@ -240,7 +240,7 @@ Sequence OUString  SAL_CALL CmdMailMsg::getElementNames(  
)
 else if( 0 == aName.compareToAscii( bcc )   
m_BccRecipients.getLength() )
 return sal_True;
 
-else if( 0 == aName.compareToAscii( subject )   m_aSubject.getLength() 
)
+else if( 0 == aName.compareToAscii( subject )   !m_aSubject.isEmpty() )
 return sal_True;
 
 else if( 0 == aName.compareToAscii( attachment )   
m_Attachments.getLength() )
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx 
b/shell/source/cmdmail/cmdmailsuppl.cxx
index 3af65c8..c0531e3 100644
--- 

[Libreoffice-commits] .: vcl/generic

[Caolán McNamara]

 vcl/generic/fontmanager/fontconfig.cxx |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 34d1c9f9b8618c3a58516c4fa4286f257c858430
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jan 11 20:47:54 2012 +

Resolves:fdo#44078 fix unfortunate name alias mixups with DejaVu fonts

diff --git a/vcl/generic/fontmanager/fontconfig.cxx 
b/vcl/generic/fontmanager/fontconfig.cxx
index daf4fee..90d59f1 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -124,7 +124,7 @@ public:
 boost::unordered_map rtl::OString, rtl::OString, rtl::OStringHash  
m_aFontNameToLocalized;
 boost::unordered_map rtl::OString, rtl::OString, rtl::OStringHash  
m_aLocalizedToCanonical;
 private:
-void cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 *bestfontname, 
const std::vector lang_and_element  lang_and_elements);
+void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 
*bestfontname, const std::vector lang_and_element  lang_and_elements);
 };
 
 FontCfgWrapper::FontCfgWrapper()
@@ -296,6 +296,7 @@ namespace
 
 std::vectorlang_and_element::const_iterator aEnd = elements.end();
 bool alreadyclosematch = false;
+bool found_fallback_englishname = false;
 for( std::vectorlang_and_element::const_iterator aIter = 
elements.begin(); aIter != aEnd; ++aIter )
 {
 const char *pLang = (const char*)aIter-first;
@@ -307,7 +308,8 @@ namespace
 }
 else if( alreadyclosematch )
 {
-// override candidate only if there is a perfect match
+// current candidate matches lang of lang-TERRITORY
+// override candidate only if there is a full match
 continue;
 }
 else if( rtl_str_compare( pLang, sLangMatch.getStr()) == 0)
@@ -316,10 +318,18 @@ namespace
 candidate = aIter-second;
 alreadyclosematch = true;
 }
+else if( found_fallback_englishname )
+{
+// already found an english fallback, don't override candidate
+// unless there is a better language match
+continue;
+}
 else if( rtl_str_compare( pLang, en) == 0)
 {
-// fallback to the english element name
+// select a fallback candidate of the first english element
+// name
 candidate = aIter-second;
+found_fallback_englishname = true;
 }
 }
 return candidate;
@@ -327,7 +337,8 @@ namespace
 }
 
 //Set up maps to quickly map between a fonts best UI name and all the rest of 
its names, and vice versa
-void FontCfgWrapper::cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 
*bestfontname, const std::vector lang_and_element  lang_and_elements)
+void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname, 
const FcChar8 *bestfontname,
+const std::vector lang_and_element  lang_and_elements)
 {
 std::vectorlang_and_element::const_iterator aEnd = 
lang_and_elements.end();
 for (std::vectorlang_and_element::const_iterator aIter = 
lang_and_elements.begin(); aIter != aEnd; ++aIter)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/generic

[Caolán McNamara]

 vcl/generic/fontmanager/fontconfig.cxx |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 25b90909a7a22f6900abbe9df12570a24e528c9a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jan 11 20:47:54 2012 +

Resolves:fdo#44078 fix unfortunate name alias mixups with DejaVu fonts

diff --git a/vcl/generic/fontmanager/fontconfig.cxx 
b/vcl/generic/fontmanager/fontconfig.cxx
index 4d02a76..a120fb7 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -124,7 +124,7 @@ public:
 boost::unordered_map rtl::OString, rtl::OString, rtl::OStringHash  
m_aFontNameToLocalized;
 boost::unordered_map rtl::OString, rtl::OString, rtl::OStringHash  
m_aLocalizedToCanonical;
 private:
-void cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 *bestfontname, 
const std::vector lang_and_element  lang_and_elements);
+void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 
*bestfontname, const std::vector lang_and_element  lang_and_elements);
 };
 
 FontCfgWrapper::FontCfgWrapper()
@@ -296,6 +296,7 @@ namespace
 
 std::vectorlang_and_element::const_iterator aEnd = elements.end();
 bool alreadyclosematch = false;
+bool found_fallback_englishname = false;
 for( std::vectorlang_and_element::const_iterator aIter = 
elements.begin(); aIter != aEnd; ++aIter )
 {
 const char *pLang = (const char*)aIter-first;
@@ -307,7 +308,8 @@ namespace
 }
 else if( alreadyclosematch )
 {
-// override candidate only if there is a perfect match
+// current candidate matches lang of lang-TERRITORY
+// override candidate only if there is a full match
 continue;
 }
 else if( rtl_str_compare( pLang, sLangMatch.getStr()) == 0)
@@ -316,10 +318,18 @@ namespace
 candidate = aIter-second;
 alreadyclosematch = true;
 }
+else if( found_fallback_englishname )
+{
+// already found an english fallback, don't override candidate
+// unless there is a better language match
+continue;
+}
 else if( rtl_str_compare( pLang, en) == 0)
 {
-// fallback to the english element name
+// select a fallback candidate of the first english element
+// name
 candidate = aIter-second;
+found_fallback_englishname = true;
 }
 }
 return candidate;
@@ -327,7 +337,8 @@ namespace
 }
 
 //Set up maps to quickly map between a fonts best UI name and all the rest of 
its names, and vice versa
-void FontCfgWrapper::cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 
*bestfontname, const std::vector lang_and_element  lang_and_elements)
+void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname, 
const FcChar8 *bestfontname,
+const std::vector lang_and_element  lang_and_elements)
 {
 std::vectorlang_and_element::const_iterator aEnd = 
lang_and_elements.end();
 for (std::vectorlang_and_element::const_iterator aIter = 
lang_and_elements.begin(); aIter != aEnd; ++aIter)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/ar_DZ.xml  |5 -
 i18npool/source/localedata/data/ar_EG.xml  |5 -
 i18npool/source/localedata/data/ja_JP.xml  |8 ++--
 i18npool/source/localedata/data/ko_KR.xml  |3 ++-
 i18npool/source/localedata/data/locale.dtd |3 +--
 i18npool/source/localedata/data/mk_MK.xml  |2 +-
 i18npool/source/localedata/data/zh_HK.xml  |4 ++--
 i18npool/source/localedata/data/zh_MO.xml  |8 ++--
 i18npool/source/localedata/data/zh_TW.xml  |4 ++--
 9 files changed, 28 insertions(+), 14 deletions(-)

New commits:
commit d2c865b887c6b771ca2d0c804bf4e358e605a571
Author: Eike Rathke er...@redhat.com
Date:   Wed Jan 11 22:14:23 2012 +0100

made formatindex=33 the ISO 8601 -MM-DD that it needs to be

diff --git a/i18npool/source/localedata/data/ar_DZ.xml 
b/i18npool/source/localedata/data/ar_DZ.xml
index 68cf3ed..a9feabe 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -130,7 +130,7 @@
   DefaultNameISO 8601/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey20 default=false type=medium 
usage=DATE formatindex=33
-  FormatCode[NatNum1]/MM/DD/FormatCode
+  FormatCode-MM-DD/FormatCode
   DefaultNameISO 8601/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey3 default=false type=medium 
usage=DATE formatindex=34
@@ -181,6 +181,9 @@
 FormatElement msgid=DateTimeFormatskey4 default=false type=medium 
usage=DATE_TIME formatindex=51
   FormatCode[NatNum1]AM/PMHH:MM /MM/D/FormatCode
 /FormatElement
+FormatElement msgid=DateFormatskey22 default=false type=medium 
usage=DATE formatindex=52
+  FormatCode[NatNum1]/MM/DD/FormatCode
+/FormatElement
   /LC_FORMAT
   LC_COLLATION ref=en_US /
   LC_SEARCH ref=en_US/
diff --git a/i18npool/source/localedata/data/ar_EG.xml 
b/i18npool/source/localedata/data/ar_EG.xml
index bc3341d..b99a02d 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -130,7 +130,7 @@
   DefaultNameISO 8601/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey20 default=false type=medium 
usage=DATE formatindex=33
-  FormatCode[NatNum1]/MM/DD/FormatCode
+  FormatCode-MM-DD/FormatCode
   DefaultNameISO 8601/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey3 default=false type=medium 
usage=DATE formatindex=34
@@ -181,6 +181,9 @@
 FormatElement msgid=DateTimeFormatskey4 default=false type=medium 
usage=DATE_TIME formatindex=51
   FormatCode[NatNum1]AM/PMHH:MM /MM/D/FormatCode
 /FormatElement
+FormatElement msgid=DateFormatskey22 default=false type=medium 
usage=DATE formatindex=52
+  FormatCode[NatNum1]/MM/DD/FormatCode
+/FormatElement
   /LC_FORMAT
   LC_COLLATION ref=en_US /
   LC_SEARCH ref=en_US/
diff --git a/i18npool/source/localedata/data/ja_JP.xml 
b/i18npool/source/localedata/data/ja_JP.xml
index d09dd53..54c42a2 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -129,7 +129,8 @@
   FormatCodeGE.M.D/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey16 default=false type=medium 
usage=DATE formatindex=33
-  FormatCodeGE.MM.DD/FormatCode
+  FormatCode-MM-DD/FormatCode
+  DefaultNameISO 8601/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey17 default=false type=medium 
usage=DATE formatindex=34
   FormatCodeYY/MM/FormatCode
@@ -170,7 +171,7 @@
 FormatElement msgid=TimeFormatskey8 default=false type=medium 
usage=TIME formatindex=52
   FormatCodeH時MM分/FormatCode
 /FormatElement
-FormatElement msgid=TimeFormatskey9 default=false type=long 
usage=TIME formatindex=54
+FormatElement msgid=TimeFormatskey9 default=false type=long 
usage=TIME formatindex=53
   FormatCodeH時MM分SS秒/FormatCode
 /FormatElement
 FormatElement msgid=DateTimeFormatskey1 default=false type=long 
usage=DATE_TIME formatindex=46
@@ -179,6 +180,9 @@
 FormatElement msgid=DateTimeFormatskey2 default=true type=long 
usage=DATE_TIME formatindex=47
   FormatCode/M/D H:MM/FormatCode
 /FormatElement
+FormatElement msgid=DateFormatskey22 default=false type=medium 
usage=DATE formatindex=54
+  FormatCodeGE.MM.DD/FormatCode
+/FormatElement
   /LC_FORMAT
   LC_COLLATION
 Collator default=true unoid=phonetic (alphanumeric first) /
diff --git a/i18npool/source/localedata/data/ko_KR.xml 
b/i18npool/source/localedata/data/ko_KR.xml
index 7762c6d..932bd91 100644
--- a/i18npool/source/localedata/data/ko_KR.xml
+++ b/i18npool/source/localedata/data/ko_KR.xml
@@ -129,7 +129,8 @@
   FormatCodeYY-M-D/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey16 default=false type=medium 
usage=DATE formatindex=33
-  FormatCodeYY년 M월/FormatCode
+  FormatCode-MM-DD/FormatCode
+ 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/qa

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx |   31 +++
 1 file changed, 31 insertions(+)

New commits:
commit ae5943c6e22295b21b9e62fb51910e250333
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 16:23:45 2012 -0500

Unit test for repositioning of cell-anchored line objects.

Preivously, before my fix, relocating a cell-anchored bottom-left to
top-right line object would get flipped when its position changed.
This is a test for that use case.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 18fb569..26df2e7 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -62,11 +62,13 @@
 
 #include formula/IFunctionDescription.hxx
 
+#include basegfx/polygon/b2dpolygon.hxx
 #include editeng/boxitem.hxx
 
 #include svx/svdograf.hxx
 #include svx/svdpage.hxx
 #include svx/svdocirc.hxx
+#include svx/svdopath.hxx
 
 #include sfx2/docfile.hxx
 
@@ -2504,6 +2506,35 @@ void Test::testGraphicsInGroup()
 CPPUNIT_ASSERT_MESSAGE(Failed to move back to its original 
position., aOrigRect == rNewRect);
 }
 
+{
+// Add a line.
+basegfx::B2DPolygon aTempPoly;
+Point aStartPos(10,300), aEndPos(110,200); // bottom-left to top-right.
+Rectangle aOrigRect(10,200,110,300); // 100 x 100
+aTempPoly.append(basegfx::B2DPoint(aStartPos.X(), aStartPos.Y()));
+aTempPoly.append(basegfx::B2DPoint(aEndPos.X(), aEndPos.Y()));
+SdrPathObj* pObj = new SdrPathObj(OBJ_LINE, 
basegfx::B2DPolyPolygon(aTempPoly));
+pObj-NbcSetLogicRect(aOrigRect);
+pPage-InsertObject(pObj);
+const Rectangle rNewRect = pObj-GetLogicRect();
+CPPUNIT_ASSERT_MESSAGE(Size differ., aOrigRect == rNewRect);
+
+ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0);
+CPPUNIT_ASSERT_MESSAGE(Size changed when cell-anchored. Not good.,
+   aOrigRect == rNewRect);
+
+// Insert 2 rows at the top and delete them immediately.
+m_pDoc-InsertRow(0, 0, MAXCOL, 0, 0, 2);
+m_pDoc-DeleteRow(0, 0, MAXCOL, 0, 0, 2);
+CPPUNIT_ASSERT_MESSAGE(Size of a line object changed after row 
insertion and removal.,
+   aOrigRect == rNewRect);
+
+sal_Int32 n = pObj-GetPointCount();
+CPPUNIT_ASSERT_MESSAGE(There should be exactly 2 points in a line 
object., n == 2);
+CPPUNIT_ASSERT_MESSAGE(Line shape has changed.,
+   aStartPos == pObj-GetPoint(0)  aEndPos == 
pObj-GetPoint(1));
+}
+
 m_pDoc-DeleteTab(0);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx |   31 +++
 1 file changed, 31 insertions(+)

New commits:
commit 75bc746b97b5d1e08cd26c7bb5afde348085f6bf
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 16:23:45 2012 -0500

Unit test for repositioning of cell-anchored line objects.

Preivously, before my fix, relocating a cell-anchored bottom-left to
top-right line object would get flipped when its position changed.
This is a test for that use case.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index d45ddb4..c843eb7 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -62,11 +62,13 @@
 
 #include formula/IFunctionDescription.hxx
 
+#include basegfx/polygon/b2dpolygon.hxx
 #include editeng/boxitem.hxx
 
 #include svx/svdograf.hxx
 #include svx/svdpage.hxx
 #include svx/svdocirc.hxx
+#include svx/svdopath.hxx
 
 #include sfx2/docfile.hxx
 
@@ -2504,6 +2506,35 @@ void Test::testGraphicsInGroup()
 CPPUNIT_ASSERT_MESSAGE(Failed to move back to its original 
position., aOrigRect == rNewRect);
 }
 
+{
+// Add a line.
+basegfx::B2DPolygon aTempPoly;
+Point aStartPos(10,300), aEndPos(110,200); // bottom-left to top-right.
+Rectangle aOrigRect(10,200,110,300); // 100 x 100
+aTempPoly.append(basegfx::B2DPoint(aStartPos.X(), aStartPos.Y()));
+aTempPoly.append(basegfx::B2DPoint(aEndPos.X(), aEndPos.Y()));
+SdrPathObj* pObj = new SdrPathObj(OBJ_LINE, 
basegfx::B2DPolyPolygon(aTempPoly));
+pObj-NbcSetLogicRect(aOrigRect);
+pPage-InsertObject(pObj);
+const Rectangle rNewRect = pObj-GetLogicRect();
+CPPUNIT_ASSERT_MESSAGE(Size differ., aOrigRect == rNewRect);
+
+ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0);
+CPPUNIT_ASSERT_MESSAGE(Size changed when cell-anchored. Not good.,
+   aOrigRect == rNewRect);
+
+// Insert 2 rows at the top and delete them immediately.
+m_pDoc-InsertRow(0, 0, MAXCOL, 0, 0, 2);
+m_pDoc-DeleteRow(0, 0, MAXCOL, 0, 0, 2);
+CPPUNIT_ASSERT_MESSAGE(Size of a line object changed after row 
insertion and removal.,
+   aOrigRect == rNewRect);
+
+sal_Int32 n = pObj-GetPointCount();
+CPPUNIT_ASSERT_MESSAGE(There should be exactly 2 points in a line 
object., n == 2);
+CPPUNIT_ASSERT_MESSAGE(Line shape has changed.,
+   aStartPos == pObj-GetPoint(0)  aEndPos == 
pObj-GetPoint(1));
+}
+
 m_pDoc-DeleteTab(0);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/ko_KR.xml |4 ++--
 i18npool/source/localedata/data/ne_NP.xml |2 +-
 i18npool/source/localedata/data/zh_HK.xml |2 +-
 i18npool/source/localedata/data/zh_TW.xml |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e6a32a0d45fe4f6ad748123c6129310b0ae471b4
Author: Eike Rathke er...@redhat.com
Date:   Thu Jan 12 00:07:45 2012 +0100

removed leading/trailing blank from FormatCode

diff --git a/i18npool/source/localedata/data/ko_KR.xml 
b/i18npool/source/localedata/data/ko_KR.xml
index 932bd91..5654b71 100644
--- a/i18npool/source/localedata/data/ko_KR.xml
+++ b/i18npool/source/localedata/data/ko_KR.xml
@@ -117,7 +117,7 @@
   FormatCode[~hanja]YY年 M月 D日 /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey12 default=false type=medium 
usage=DATE formatindex=29
-  FormatCode[~hanja]年 M月 D日  /FormatCode
+  FormatCode[~hanja]年 M月 D日 /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey13 default=false type=medium 
usage=DATE formatindex=30
   FormatCodeYY-M-D /FormatCode
@@ -181,7 +181,7 @@
   FormatCodeYY/M/D /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey34 default=true type=long 
usage=DATE formatindex=62
-  FormatCode/M/D  /FormatCode
+  FormatCode/M/D /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey35 default=false type=long 
usage=DATE formatindex=63
   FormatCodeYY/M/FormatCode
diff --git a/i18npool/source/localedata/data/ne_NP.xml 
b/i18npool/source/localedata/data/ne_NP.xml
index 5826e7c..b652369 100644
--- a/i18npool/source/localedata/data/ne_NP.xml
+++ b/i18npool/source/localedata/data/ne_NP.xml
@@ -78,7 +78,7 @@
   FormatCode[NatNum1][CURRENCY] #,##0.00;[RED]-[CURRENCY] 
#,##0.00/FormatCode
 /FormatElement
 FormatElement msgid=CurrencyFormatskey5 default=false type=medium 
usage=CURRENCY formatindex=16
-  FormatCode[NatNum1]CCC #,##0.00 /FormatCode
+  FormatCode[NatNum1]CCC #,##0.00/FormatCode
 /FormatElement
 FormatElement msgid=CurrencyFormatskey6 default=false type=medium 
usage=CURRENCY formatindex=17
   FormatCode[NatNum1][CURRENCY] #,##0.--;[RED]-[CURRENCY] 
#,##0.--/FormatCode
diff --git a/i18npool/source/localedata/data/zh_HK.xml 
b/i18npool/source/localedata/data/zh_HK.xml
index 4bed867..891e626 100644
--- a/i18npool/source/localedata/data/zh_HK.xml
+++ b/i18npool/source/localedata/data/zh_HK.xml
@@ -142,7 +142,7 @@
   FormatCodeAM/PM HH:MM/FormatCode
 /FormatElement
 FormatElement msgid=TimeFormatskey4 default=false type=medium 
usage=TIME  formatindex=42
-  FormatCode AM/PM HH:MM:SS/FormatCode
+  FormatCodeAM/PM HH:MM:SS/FormatCode
 /FormatElement
 FormatElement msgid=TimeFormatskey5 default=false type=medium 
usage=TIME  formatindex=43
   FormatCode[HH]:MM:SS/FormatCode
diff --git a/i18npool/source/localedata/data/zh_TW.xml 
b/i18npool/source/localedata/data/zh_TW.xml
index aa068e1..89ecdd9 100644
--- a/i18npool/source/localedata/data/zh_TW.xml
+++ b/i18npool/source/localedata/data/zh_TW.xml
@@ -163,7 +163,7 @@
   FormatCodeAM/PM HH:MM/FormatCode
 /FormatElement
 FormatElement msgid=TimeFormatskey4 default=false type=medium 
usage=TIME  formatindex=42
-  FormatCode AM/PM HH:MM:SS/FormatCode
+  FormatCodeAM/PM HH:MM:SS/FormatCode
 /FormatElement
 FormatElement msgid=TimeFormatskey5 default=false type=medium 
usage=TIME  formatindex=43
   FormatCode[HH]:MM:SS/FormatCode
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - cui/source svl/inc svl/source svx/inc svx/source

[August Sodora]

 cui/source/inc/autocdlg.hxx  |4 ---
 cui/source/tabpages/autocdlg.cxx |   25 ++-
 cui/source/tabpages/numfmt.cxx   |   11 +++-
 svl/inc/svl/svstdarr.hxx |5 ---
 svl/source/memtools/svarray.cxx  |   48 -
 svx/inc/svx/numfmtsh.hxx |4 +--
 svx/source/items/numfmtsh.cxx|   50 ---
 7 files changed, 37 insertions(+), 110 deletions(-)

New commits:
commit 9556b3847edb9223db7c65614b49e10d4566b712
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 18:01:02 2012 -0500

Remove SvStringISort

diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 1d1b6e8..1533e47 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -50,11 +50,6 @@ SV_DECL_PTRARR_DEL_VISIBILITY( SvStringsDtor, StringPtr, 1, 
1, SVL_DLLPUBLIC )
 #define _SVSTDARR_STRINGSDTOR_DECL
 #endif
 
-#ifndef _SVSTDARR_STRINGSISORT_DECL
-SV_DECL_PTRARR_SORT_VISIBILITY( SvStringsISort, StringPtr, 1, 1, SVL_DLLPUBLIC 
)
-#define _SVSTDARR_STRINGSISORT_DECL
-#endif
-
 #ifndef _SVSTDARR_STRINGSISORTDTOR_DECL
 SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, StringPtr, 1, 1, 
SVL_DLLPUBLIC )
 #define _SVSTDARR_STRINGSISORTDTOR_DECL
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 52f3f0c..a8bbb68 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -28,7 +28,6 @@
 
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_STRINGSISORT
 
 #include svl/svstdarr.hxx
 #include tools/debug.hxx
@@ -46,53 +45,6 @@ SV_IMPL_PTRARR( SvStringsDtor, StringPtr )
 //  strings -
 
 // Array with different Seek method
-_SV_IMPL_SORTAR_ALG( SvStringsISort, StringPtr )
-void SvStringsISort::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
-{
-if( nL )
-{
-DBG_ASSERT( nP  nA  nP + nL = nA, ERR_VAR_DEL );
-for( sal_uInt16 n=nP; n  nP + nL; n++ )
-delete *((StringPtr*)pData+n);
-SvPtrarr::Remove( nP, nL );
-}
-}
-sal_Bool SvStringsISort::Seek_Entry( const StringPtr aE, sal_uInt16* pP ) const
-{
-register sal_uInt16 nO  = SvStringsISort_SAR::Count(),
-nM,
-nU = 0;
-if( nO  0 )
-{
-nO--;
-while( nU = nO )
-{
-nM = nU + ( nO - nU ) / 2;
-StringCompare eCmp = (*((StringPtr*)pData + nM))-
-CompareIgnoreCaseToAscii( *(aE) );
-if( COMPARE_EQUAL == eCmp )
-{
-if( pP ) *pP = nM;
-return sal_True;
-}
-else if( COMPARE_LESS == eCmp )
-nU = nM + 1;
-else if( nM == 0 )
-{
-if( pP ) *pP = nU;
-return sal_False;
-}
-else
-nO = nM - 1;
-}
-}
-if( pP ) *pP = nU;
-return sal_False;
-}
-
-//  strings -
-
-// Array with different Seek method
 _SV_IMPL_SORTAR_ALG( SvStringsISortDtor, StringPtr )
 void SvStringsISortDtor::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
commit 4497c499d2b57095a2dbeb592dce3b5067f417c9
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 14:02:02 2012 -0500

SvStringsISort-std::set

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index a22d7b3..3043739 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -67,8 +67,6 @@ public:
 #include svtools/svtabbx.hxx
 #include svx/simptabl.hxx
 
-class SvStringsISortDtor;
-
 // class OfaACorrCheckListBox --
 
 class OfaACorrCheckListBox : public SvxSimpleTable
@@ -240,7 +238,7 @@ private:
 String  sModify;
 String  sNew;
 
-SvStringsISortDtor* pFormatText;
+std::setrtl::OUString aFormatText;
 DoubleStringTable   aDoubleStringTable;
 CollatorWrapper*pCompareClass;
 CharClass*  pCharClass;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 48eb935..a0ce04b 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -960,7 +960,6 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* 
pParent,
 aDeleteReplacePB(this,CUI_RES(PB_DELETE_REPLACE )),
 sModify(CUI_RES(STR_MODIFY)),
 sNew(aNewReplacePB.GetText()),
-pFormatText(0),
 eLang(eLastDialogLanguage),
 bHasSelectionText(sal_False),
 bFirstSelect(sal_True),
@@ -995,7 +994,6 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* 
pParent,
 
 OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
 {
-delete pFormatText;
 lcl_ClearTable(aDoubleStringTable);
 delete pCompareClass;
 delete pCharClass;
@@ -1187,12 +1185,7 @@ void 

[Libreoffice-commits] .: svtools/source

[August Sodora]

 svtools/source/control/inettbc.cxx |  107 ++---
 1 file changed, 30 insertions(+), 77 deletions(-)

New commits:
commit 116d77f97329a064f67da99fd4c25260008c9ba4
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 20:46:25 2012 -0500

SvStringsDtor-std::vector

diff --git a/svtools/source/control/inettbc.cxx 
b/svtools/source/control/inettbc.cxx
index b9b526c..e33809b 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -68,8 +68,6 @@
 #include vector
 #include algorithm
 
-// ---
-
 using namespace ::rtl;
 using namespace ::ucbhelper;
 using namespace ::utl;
@@ -81,34 +79,30 @@ using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
 
-// ---
 class SvtURLBox_Impl
 {
 public:
-SvStringsDtor*  pURLs;
-SvStringsDtor*  pCompletions;
+std::vectorrtl::OUString  aURLs;
+std::vectorrtl::OUString  aCompletions;
 const IUrlFilter*   pUrlFilter;
 ::std::vector WildCardm_aFilters;
 
 static sal_Bool TildeParsing( String aText, String aBaseUrl );
 
 inline SvtURLBox_Impl( )
-:pURLs( NULL )
-,pCompletions( NULL )
-,pUrlFilter( NULL )
+:pUrlFilter( NULL )
 {
 FilterMatch::createWildCardFilterList(String(),m_aFilters);
 }
 };
 
-// ---
 class SvtMatchContext_Impl : public ::osl::Thread
 {
 static ::osl::Mutex*pDirMutex;
 
-SvStringsDtor   aPickList;
-SvStringsDtor*  pCompletions;
-SvStringsDtor*  pURLs;
+std::vectorrtl::OUString  aPickList;
+std::vectorrtl::OUString  aCompletions;
+std::vectorrtl::OUString  aURLs;
 svtools::AsynchronLink  aLink;
 String  aBaseURL;
 String  aText;
@@ -124,7 +118,7 @@ class SvtMatchContext_Impl : public ::osl::Thread
 virtual void SAL_CALL   Cancel();
 voidInsert( const String rCompletion, const 
String rURL, sal_Bool bForce = sal_False);
 voidReadFolder( const String rURL, const 
String rMatch, sal_Bool bSmart );
-voidFillPicklist( SvStringsDtor rPickList );
+voidFillPicklist(std::vectorrtl::OUString 
rPickList);
 
 public:
 static ::osl::Mutex*   GetMutex();
@@ -144,7 +138,6 @@ public:
 return pDirMutex;
 }
 
-//-
 SvtMatchContext_Impl::SvtMatchContext_Impl(
 SvtURLBox* pBoxP, const String rText )
 : aLink( STATIC_LINK( this, SvtMatchContext_Impl, Select_Impl ) )
@@ -155,9 +148,6 @@ SvtMatchContext_Impl::SvtMatchContext_Impl(
 , bOnlyDirectories( pBoxP-bOnlyDirectories )
 , bNoSelection( pBoxP-bNoSelection )
 {
-pURLs = new SvStringsDtor;
-pCompletions = new SvStringsDtor;
-
 aLink.CreateMutex();
 
 FillPicklist( aPickList );
@@ -165,16 +155,12 @@ SvtMatchContext_Impl::SvtMatchContext_Impl(
 create();
 }
 
-//-
 SvtMatchContext_Impl::~SvtMatchContext_Impl()
 {
 aLink.ClearPendingCall();
-delete pURLs;
-delete pCompletions;
 }
 
-//-
-void SvtMatchContext_Impl::FillPicklist( SvStringsDtor rPickList )
+void SvtMatchContext_Impl::FillPicklist(std::vectorrtl::OUString rPickList)
 {
 // Einlesung der Historypickliste
 Sequence Sequence PropertyValue   seqPicklist = 
SvtHistoryOptions().GetList( eHISTORY );
@@ -195,22 +181,19 @@ void SvtMatchContext_Impl::FillPicklist( SvStringsDtor 
rPickList )
 {
 seqPropertySet[nProperty].Value = sTitle;
 aURL.SetURL( sTitle );
-const StringPtr pStr = new String( aURL.GetMainURL( 
INetURLObject::DECODE_WITH_CHARSET ) );
-rPickList.Insert( pStr, (sal_uInt16) nItem );
+rPickList.insert(rPickList.begin() + nItem, 
aURL.GetMainURL(INetURLObject::DECODE_WITH_CHARSET));
 break;
 }
 }
 }
 }
 
-//-
 void SAL_CALL SvtMatchContext_Impl::Cancel()
 {
 // Cancel button pressed
 terminate();
 }
 
-//-
 void SvtMatchContext_Impl::Stop()
 {
 bStop = sal_True;
@@ -219,7 +202,6 @@ void SvtMatchContext_Impl::Stop()
 terminate();
 }
 
-//-
 void 

[Libreoffice-commits] .: editeng/source

[August Sodora]

 editeng/source/misc/svxacorr.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0204bbffbc273782ca3148c7ba6768af4f5a77f9
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 20:49:52 2012 -0500

Remove an unused SvStringsDtor

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b7df997..169c403 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2155,7 +2155,6 @@ SvxAutocorrWordList* 
SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
 else
 pAutocorr_List = new SvxAutocorrWordList( 16, 16 );
 
-SvStringsDtor aRemoveArr;
 try
 {
 uno::Reference  embed::XStorage  xStg = 
comphelper::OStorageHelper::GetStorageFromURL( sShareAutoCorrFile, 
embed::ElementModes::READ );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/dpobject.hxx  |1 
 sc/qa/unit/ucalc.cxx |  133 +++
 sc/source/core/data/dpobject.cxx |6 +
 3 files changed, 127 insertions(+), 13 deletions(-)

New commits:
commit 10a5404fd0fc2da42ba5b293363704af081ae308
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 21:10:14 2012 -0500

New test for pivot tables with named source ranges.

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index db8ea92..48e43eb 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -286,6 +286,7 @@ public:
 ScDocument* mpDoc;
 public:
 NameCaches(ScDocument* pDoc);
+const ScDPCache* getCache(const rtl::OUString rName) const;
 const ScDPCache* getCache(const ::rtl::OUString rName, const ScRange 
rRange);
 private:
 void removeCache(const ::rtl::OUString rName);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 26df2e7..ebb368a 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -133,6 +133,12 @@ public:
  * Test for pivot table's filtering functionality by page fields.
  */
 void testDataPilotFilters();
+
+/**
+ * Test for pivot table's named source range.
+ */
+void testDataPilotNamedSource();
+
 void testSheetCopy();
 void testSheetMove();
 void testExternalRef();
@@ -185,6 +191,7 @@ public:
 CPPUNIT_TEST(testDataPilot);
 CPPUNIT_TEST(testDataPilotLabels);
 CPPUNIT_TEST(testDataPilotFilters);
+CPPUNIT_TEST(testDataPilotNamedSource);
 CPPUNIT_TEST(testSheetCopy);
 CPPUNIT_TEST(testSheetMove);
 CPPUNIT_TEST(testExternalRef);
@@ -1152,17 +1159,12 @@ bool checkDPTableOutput(ScDocument* pDoc, const 
ScRange aOutRange, const char*
 return true;
 }
 
-ScDPObject* createDPFromRange(
-ScDocument* pDoc, const ScRange rRange, DPFieldDef aFields[], size_t 
nFieldCount,
+ScDPObject* createDPFromSourceDesc(
+ScDocument* pDoc, const ScSheetSourceDesc rDesc, DPFieldDef aFields[], 
size_t nFieldCount,
 bool bFilterButton)
 {
-SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
-SCCOL nCol1 = rRange.aStart.Col();
-
-ScSheetSourceDesc aSheetDesc(pDoc);
-aSheetDesc.SetSourceRange(rRange);
 ScDPObject* pDPObj = new ScDPObject(pDoc);
-pDPObj-SetSheetDesc(aSheetDesc);
+pDPObj-SetSheetDesc(rDesc);
 pDPObj-SetOutRange(ScAddress(0, 0, 1));
 ScPivotParam aParam;
 pDPObj-FillOldParam(aParam);
@@ -1182,16 +1184,16 @@ ScDPObject* createDPFromRange(
 aSaveData.SetDrillDown(true);
 
 // Check the sanity of the source range.
-const ScRange rSrcRange = aSheetDesc.GetSourceRange();
-nCol1 = rSrcRange.aStart.Col();
-nRow1 = rSrcRange.aStart.Row();
-nRow2 = rSrcRange.aEnd.Row();
+const ScRange rSrcRange = rDesc.GetSourceRange();
+SCCOL nCol1 = rSrcRange.aStart.Col();
+SCROW nRow1 = rSrcRange.aStart.Row();
+SCROW nRow2 = rSrcRange.aEnd.Row();
 CPPUNIT_ASSERT_MESSAGE(source range contains no data!, nRow2 - nRow1  
1);
 
 // Set the dimension information.
 for (size_t i = 0; i  nFieldCount; ++i)
 {
-OUString aDimName = pDoc-GetString(nCol1+i, nRow1, 
rRange.aStart.Tab());
+OUString aDimName = pDoc-GetString(nCol1+i, nRow1, 
rSrcRange.aStart.Tab());
 ScDPSaveDimension* pDim = aSaveData.GetDimensionByName(aDimName);
 pDim-SetOrientation(static_castsal_uInt16(aFields[i].eOrient));
 pDim-SetUsedHierarchy(0);
@@ -1247,6 +1249,15 @@ ScDPObject* createDPFromRange(
 return pDPObj;
 }
 
+ScDPObject* createDPFromRange(
+ScDocument* pDoc, const ScRange rRange, DPFieldDef aFields[], size_t 
nFieldCount,
+bool bFilterButton)
+{
+ScSheetSourceDesc aSheetDesc(pDoc);
+aSheetDesc.SetSourceRange(rRange);
+return createDPFromSourceDesc(pDoc, aSheetDesc, aFields, nFieldCount, 
bFilterButton);
+}
+
 }
 
 void Test::testDataPilot()
@@ -1573,6 +1584,102 @@ void Test::testDataPilotFilters()
 m_pDoc-DeleteTab(0);
 }
 
+void Test::testDataPilotNamedSource()
+{
+m_pDoc-InsertTab(0, OUString(RTL_CONSTASCII_USTRINGPARAM(Data)));
+m_pDoc-InsertTab(1, OUString(RTL_CONSTASCII_USTRINGPARAM(Table)));
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ Name,  sheet::DataPilotFieldOrientation_ROW },
+{ Group, sheet::DataPilotFieldOrientation_COLUMN },
+{ Score, sheet::DataPilotFieldOrientation_DATA }
+};
+
+// Raw data
+const char* aData[][3] = {
+{ Andy,A, 30 },
+{ Bruce,   A, 20 },
+{ Charlie, B, 45 },
+{ David,   B, 12 },
+{ Edward,  C,  8 },
+{ Frank,   C, 15 },
+};
+
+size_t nFieldCount = SAL_N_ELEMENTS(aFields);
+size_t nDataCount = SAL_N_ELEMENTS(aData);
+
+// Insert the raw data.
+ScRange aSrcRange = insertDPSourceData(m_pDoc, aFields, nFieldCount, 
aData, nDataCount);
+rtl::OUString aRangeStr;
+aSrcRange.Format(aRangeStr, SCR_ABS_3D, 

[Libreoffice-commits] .: sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/dpobject.hxx  |1 
 sc/qa/unit/ucalc.cxx |  133 +++
 sc/source/core/data/dpobject.cxx |6 +
 3 files changed, 127 insertions(+), 13 deletions(-)

New commits:
commit 6a14a5826b9c041d9e3e0878c4a0ecfb46ce
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 21:10:14 2012 -0500

New test for pivot tables with named source ranges.

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index db8ea92..48e43eb 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -286,6 +286,7 @@ public:
 ScDocument* mpDoc;
 public:
 NameCaches(ScDocument* pDoc);
+const ScDPCache* getCache(const rtl::OUString rName) const;
 const ScDPCache* getCache(const ::rtl::OUString rName, const ScRange 
rRange);
 private:
 void removeCache(const ::rtl::OUString rName);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index c843eb7..ac683a0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -133,6 +133,12 @@ public:
  * Test for pivot table's filtering functionality by page fields.
  */
 void testDataPilotFilters();
+
+/**
+ * Test for pivot table's named source range.
+ */
+void testDataPilotNamedSource();
+
 void testSheetCopy();
 void testSheetMove();
 void testExternalRef();
@@ -185,6 +191,7 @@ public:
 CPPUNIT_TEST(testDataPilot);
 CPPUNIT_TEST(testDataPilotLabels);
 CPPUNIT_TEST(testDataPilotFilters);
+CPPUNIT_TEST(testDataPilotNamedSource);
 CPPUNIT_TEST(testSheetCopy);
 CPPUNIT_TEST(testSheetMove);
 CPPUNIT_TEST(testExternalRef);
@@ -1152,17 +1159,12 @@ bool checkDPTableOutput(ScDocument* pDoc, const 
ScRange aOutRange, const char*
 return true;
 }
 
-ScDPObject* createDPFromRange(
-ScDocument* pDoc, const ScRange rRange, DPFieldDef aFields[], size_t 
nFieldCount,
+ScDPObject* createDPFromSourceDesc(
+ScDocument* pDoc, const ScSheetSourceDesc rDesc, DPFieldDef aFields[], 
size_t nFieldCount,
 bool bFilterButton)
 {
-SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
-SCCOL nCol1 = rRange.aStart.Col();
-
-ScSheetSourceDesc aSheetDesc(pDoc);
-aSheetDesc.SetSourceRange(rRange);
 ScDPObject* pDPObj = new ScDPObject(pDoc);
-pDPObj-SetSheetDesc(aSheetDesc);
+pDPObj-SetSheetDesc(rDesc);
 pDPObj-SetOutRange(ScAddress(0, 0, 1));
 ScPivotParam aParam;
 pDPObj-FillOldParam(aParam);
@@ -1182,16 +1184,16 @@ ScDPObject* createDPFromRange(
 aSaveData.SetDrillDown(true);
 
 // Check the sanity of the source range.
-const ScRange rSrcRange = aSheetDesc.GetSourceRange();
-nCol1 = rSrcRange.aStart.Col();
-nRow1 = rSrcRange.aStart.Row();
-nRow2 = rSrcRange.aEnd.Row();
+const ScRange rSrcRange = rDesc.GetSourceRange();
+SCCOL nCol1 = rSrcRange.aStart.Col();
+SCROW nRow1 = rSrcRange.aStart.Row();
+SCROW nRow2 = rSrcRange.aEnd.Row();
 CPPUNIT_ASSERT_MESSAGE(source range contains no data!, nRow2 - nRow1  
1);
 
 // Set the dimension information.
 for (size_t i = 0; i  nFieldCount; ++i)
 {
-OUString aDimName = pDoc-GetString(nCol1+i, nRow1, 
rRange.aStart.Tab());
+OUString aDimName = pDoc-GetString(nCol1+i, nRow1, 
rSrcRange.aStart.Tab());
 ScDPSaveDimension* pDim = aSaveData.GetDimensionByName(aDimName);
 pDim-SetOrientation(static_castsal_uInt16(aFields[i].eOrient));
 pDim-SetUsedHierarchy(0);
@@ -1247,6 +1249,15 @@ ScDPObject* createDPFromRange(
 return pDPObj;
 }
 
+ScDPObject* createDPFromRange(
+ScDocument* pDoc, const ScRange rRange, DPFieldDef aFields[], size_t 
nFieldCount,
+bool bFilterButton)
+{
+ScSheetSourceDesc aSheetDesc(pDoc);
+aSheetDesc.SetSourceRange(rRange);
+return createDPFromSourceDesc(pDoc, aSheetDesc, aFields, nFieldCount, 
bFilterButton);
+}
+
 }
 
 void Test::testDataPilot()
@@ -1573,6 +1584,102 @@ void Test::testDataPilotFilters()
 m_pDoc-DeleteTab(0);
 }
 
+void Test::testDataPilotNamedSource()
+{
+m_pDoc-InsertTab(0, OUString(RTL_CONSTASCII_USTRINGPARAM(Data)));
+m_pDoc-InsertTab(1, OUString(RTL_CONSTASCII_USTRINGPARAM(Table)));
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ Name,  sheet::DataPilotFieldOrientation_ROW },
+{ Group, sheet::DataPilotFieldOrientation_COLUMN },
+{ Score, sheet::DataPilotFieldOrientation_DATA }
+};
+
+// Raw data
+const char* aData[][3] = {
+{ Andy,A, 30 },
+{ Bruce,   A, 20 },
+{ Charlie, B, 45 },
+{ David,   B, 12 },
+{ Edward,  C,  8 },
+{ Frank,   C, 15 },
+};
+
+size_t nFieldCount = SAL_N_ELEMENTS(aFields);
+size_t nDataCount = SAL_N_ELEMENTS(aData);
+
+// Insert the raw data.
+ScRange aSrcRange = insertDPSourceData(m_pDoc, aFields, nFieldCount, 
aData, nDataCount);
+rtl::OUString aRangeStr;
+aSrcRange.Format(aRangeStr, SCR_ABS_3D, 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/dpobject.hxx  |3 ++-
 sc/qa/unit/ucalc.cxx |   12 +++-
 sc/source/core/data/dpobject.cxx |   17 ++---
 3 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit c99e8165043041d1989c7d9ad47e89b40af00a56
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 22:00:50 2012 -0500

Test code for sheet source data cache relocation.

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 48e43eb..dc20944 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -266,6 +266,7 @@ public:
 ScDocument* mpDoc;
 public:
 SheetCaches(ScDocument* pDoc);
+bool hasCache(const ScRange rRange) const;
 const ScDPCache* getCache(const ScRange rRange);
 
 void updateReference(
@@ -286,7 +287,7 @@ public:
 ScDocument* mpDoc;
 public:
 NameCaches(ScDocument* pDoc);
-const ScDPCache* getCache(const rtl::OUString rName) const;
+bool hasCache(const rtl::OUString rName) const;
 const ScDPCache* getCache(const ::rtl::OUString rName, const ScRange 
rRange);
 private:
 void removeCache(const ::rtl::OUString rName);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ebb368a..419ce63 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1386,6 +1386,16 @@ void Test::testDataPilot()
 CPPUNIT_ASSERT_MESSAGE(Table output check failed, bSuccess);
 }
 
+CPPUNIT_ASSERT_MESSAGE(Cache should be here., 
pDPs-GetSheetCaches().hasCache(aSrcRange));
+
+// Swap the two sheets.
+m_pDoc-MoveTab(1, 0);
+CPPUNIT_ASSERT_MESSAGE(Cache should have moved., 
!pDPs-GetSheetCaches().hasCache(aSrcRange));
+aSrcRange.aStart.SetTab(1);
+aSrcRange.aEnd.SetTab(1);
+CPPUNIT_ASSERT_MESSAGE(Cache should be here., 
pDPs-GetSheetCaches().hasCache(aSrcRange));
+
+
 pDPs-FreeTable(pDPObj2);
 CPPUNIT_ASSERT_MESSAGE(There shouldn't be any data pilot table stored 
with the document.,
pDPs-GetCount() == 0);
@@ -1671,7 +1681,7 @@ void Test::testDataPilotNamedSource()
 CPPUNIT_ASSERT_MESSAGE(Named source range has been altered unexpectedly!,
pDesc-GetRangeName().equals(aRangeName));
 
-CPPUNIT_ASSERT_MESSAGE(Cache should exist., 
pDPs-GetNameCaches().getCache(aRangeName) != NULL);
+CPPUNIT_ASSERT_MESSAGE(Cache should exist., 
pDPs-GetNameCaches().hasCache(aRangeName));
 pDPs-FreeTable(pDPObj);
 CPPUNIT_ASSERT_MESSAGE(There should be no more tables., pDPs-GetCount() 
== 0);
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index d384cd9..063c02a 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2471,6 +2471,18 @@ struct FindInvalidRange : public 
std::unary_functionScRange, bool
 
 }
 
+bool ScDPCollection::SheetCaches::hasCache(const ScRange rRange) const
+{
+RangeIndexType::const_iterator it = std::find(maRanges.begin(), 
maRanges.end(), rRange);
+if (it == maRanges.end())
+return false;
+
+// Already cached.
+size_t nIndex = std::distance(maRanges.begin(), it);
+CachesType::const_iterator itCache = maCaches.find(nIndex);
+return itCache != maCaches.end();
+}
+
 const ScDPCache* ScDPCollection::SheetCaches::getCache(const ScRange rRange)
 {
 RangeIndexType::iterator it = std::find(maRanges.begin(), maRanges.end(), 
rRange);
@@ -2565,10 +2577,9 @@ void ScDPCollection::SheetCaches::removeCache(const 
ScRange rRange)
 
 ScDPCollection::NameCaches::NameCaches(ScDocument* pDoc) : mpDoc(pDoc) {}
 
-const ScDPCache* ScDPCollection::NameCaches::getCache(const OUString rName) 
const
+bool ScDPCollection::NameCaches::hasCache(const OUString rName) const
 {
-CachesType::const_iterator itr = maCaches.find(rName);
-return itr != maCaches.end() ? itr-second : NULL;
+return maCaches.count(rName) != 0;
 }
 
 const ScDPCache* ScDPCollection::NameCaches::getCache(const OUString rName, 
const ScRange rRange)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/dpobject.hxx  |3 ++-
 sc/qa/unit/ucalc.cxx |   12 +++-
 sc/source/core/data/dpobject.cxx |   17 ++---
 3 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit ca73d85cc813a2a95fbbba35be6de6dc5ff2967f
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 11 22:00:50 2012 -0500

Test code for sheet source data cache relocation.

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 48e43eb..dc20944 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -266,6 +266,7 @@ public:
 ScDocument* mpDoc;
 public:
 SheetCaches(ScDocument* pDoc);
+bool hasCache(const ScRange rRange) const;
 const ScDPCache* getCache(const ScRange rRange);
 
 void updateReference(
@@ -286,7 +287,7 @@ public:
 ScDocument* mpDoc;
 public:
 NameCaches(ScDocument* pDoc);
-const ScDPCache* getCache(const rtl::OUString rName) const;
+bool hasCache(const rtl::OUString rName) const;
 const ScDPCache* getCache(const ::rtl::OUString rName, const ScRange 
rRange);
 private:
 void removeCache(const ::rtl::OUString rName);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ac683a0..b9e3013 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1386,6 +1386,16 @@ void Test::testDataPilot()
 CPPUNIT_ASSERT_MESSAGE(Table output check failed, bSuccess);
 }
 
+CPPUNIT_ASSERT_MESSAGE(Cache should be here., 
pDPs-GetSheetCaches().hasCache(aSrcRange));
+
+// Swap the two sheets.
+m_pDoc-MoveTab(1, 0);
+CPPUNIT_ASSERT_MESSAGE(Cache should have moved., 
!pDPs-GetSheetCaches().hasCache(aSrcRange));
+aSrcRange.aStart.SetTab(1);
+aSrcRange.aEnd.SetTab(1);
+CPPUNIT_ASSERT_MESSAGE(Cache should be here., 
pDPs-GetSheetCaches().hasCache(aSrcRange));
+
+
 pDPs-FreeTable(pDPObj2);
 CPPUNIT_ASSERT_MESSAGE(There shouldn't be any data pilot table stored 
with the document.,
pDPs-GetCount() == 0);
@@ -1671,7 +1681,7 @@ void Test::testDataPilotNamedSource()
 CPPUNIT_ASSERT_MESSAGE(Named source range has been altered unexpectedly!,
pDesc-GetRangeName().equals(aRangeName));
 
-CPPUNIT_ASSERT_MESSAGE(Cache should exist., 
pDPs-GetNameCaches().getCache(aRangeName) != NULL);
+CPPUNIT_ASSERT_MESSAGE(Cache should exist., 
pDPs-GetNameCaches().hasCache(aRangeName));
 pDPs-FreeTable(pDPObj);
 CPPUNIT_ASSERT_MESSAGE(There should be no more tables., pDPs-GetCount() 
== 0);
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index d384cd9..063c02a 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2471,6 +2471,18 @@ struct FindInvalidRange : public 
std::unary_functionScRange, bool
 
 }
 
+bool ScDPCollection::SheetCaches::hasCache(const ScRange rRange) const
+{
+RangeIndexType::const_iterator it = std::find(maRanges.begin(), 
maRanges.end(), rRange);
+if (it == maRanges.end())
+return false;
+
+// Already cached.
+size_t nIndex = std::distance(maRanges.begin(), it);
+CachesType::const_iterator itCache = maCaches.find(nIndex);
+return itCache != maCaches.end();
+}
+
 const ScDPCache* ScDPCollection::SheetCaches::getCache(const ScRange rRange)
 {
 RangeIndexType::iterator it = std::find(maRanges.begin(), maRanges.end(), 
rRange);
@@ -2565,10 +2577,9 @@ void ScDPCollection::SheetCaches::removeCache(const 
ScRange rRange)
 
 ScDPCollection::NameCaches::NameCaches(ScDocument* pDoc) : mpDoc(pDoc) {}
 
-const ScDPCache* ScDPCollection::NameCaches::getCache(const OUString rName) 
const
+bool ScDPCollection::NameCaches::hasCache(const OUString rName) const
 {
-CachesType::const_iterator itr = maCaches.find(rName);
-return itr != maCaches.end() ? itr-second : NULL;
+return maCaches.count(rName) != 0;
 }
 
 const ScDPCache* ScDPCollection::NameCaches::getCache(const OUString rName, 
const ScRange rRange)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - sfx2/inc sfx2/source svx/inc svx/source

[August Sodora]

 sfx2/inc/sfx2/docfile.hxx|5 ---
 sfx2/inc/sfx2/docinsert.hxx  |   15 -
 sfx2/source/doc/docinsert.cxx|   39 ++--
 svx/inc/svx/numfmtsh.hxx |8 -
 svx/inc/svx/srchdlg.hxx  |4 +-
 svx/source/dialog/srchdlg.cxx|   52 +---
 svx/source/items/clipfmtitem.cxx |   62 +--
 7 files changed, 62 insertions(+), 123 deletions(-)

New commits:
commit 8be35fc8c1f24a05deb6ba850ad42ca17352350e
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 22:18:58 2012 -0500

SvStringsDtor-std::vector

diff --git a/sfx2/inc/sfx2/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx
index 292b396..6ec9627 100644
--- a/sfx2/inc/sfx2/docinsert.hxx
+++ b/sfx2/inc/sfx2/docinsert.hxx
@@ -39,20 +39,11 @@
 namespace sfx2 { class FileDialogHelper; }
 class SfxMedium;
 class SfxItemSet;
-class SvStringsDtor;
 
 typedef ::std::vector SfxMedium*  SfxMediumList;
 
-// 
-
 namespace sfx2 {
 
-// 
-
-// 
-// DocumentInserter
-// 
-
 class SFX2_DLLPUBLIC DocumentInserter
 {
 private:
@@ -65,7 +56,7 @@ private:
 
 sfx2::FileDialogHelper* m_pFileDlg;
 SfxItemSet* m_pItemSet;
-SvStringsDtor*  m_pURLList;
+std::vectorrtl::OUString m_pURLList;
 
 DECL_LINK(  DialogClosedHdl, sfx2::FileDialogHelper* );
 
@@ -82,12 +73,8 @@ public:
 inline String   GetFilter() const { return m_sFilter; }
 };
 
-// 
-
 } // namespace sfx2
 
-// 
-
 #endif // _SFX_DOCINSERT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index c103116..d40f65a 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -57,16 +57,8 @@ using namespace ::com::sun::star::uno;
 // implemented in 'sfx2/source/appl/appopen.cxx'
 extern sal_uInt32 CheckPasswd_Impl( SfxObjectShell* pDoc, SfxItemPool rPool, 
SfxMedium* pFile );
 
-// ===
-
 namespace sfx2 {
 
-// ===
-
-// ===
-// DocumentInserter
-// ===
-
 DocumentInserter::DocumentInserter(
 const String rFactory, bool const bEnableMultiSelection) :
 
@@ -77,8 +69,6 @@ DocumentInserter::DocumentInserter(
 , m_nError  ( ERRCODE_NONE )
 , m_pFileDlg( NULL )
 , m_pItemSet( NULL )
-, m_pURLList( NULL )
-
 {
 }
 
@@ -91,7 +81,6 @@ void DocumentInserter::StartExecuteModal( const Link 
_rDialogClosedLink )
 {
 m_aDialogClosedLink = _rDialogClosedLink;
 m_nError = ERRCODE_NONE;
-DELETEZ( m_pURLList );
 if ( !m_pFileDlg )
 {
 m_pFileDlg = new FileDialogHelper(
@@ -104,10 +93,10 @@ void DocumentInserter::StartExecuteModal( const Link 
_rDialogClosedLink )
 SfxMedium* DocumentInserter::CreateMedium()
 {
 SfxMedium* pMedium = NULL;
-if ( !m_nError  m_pItemSet  m_pURLList  m_pURLList-Count()  0 )
+if (!m_nError  m_pItemSet  !m_pURLList.empty())
 {
-DBG_ASSERT( m_pURLList-Count() == 1, 
DocumentInserter::CreateMedium(): invalid URL list count );
-String sURL = *( m_pURLList-GetObject(0) );
+DBG_ASSERT( m_pURLList.size() == 1, DocumentInserter::CreateMedium(): 
invalid URL list count );
+String sURL(m_pURLList[0]);
 pMedium = new SfxMedium(
 sURL, SFX_STREAM_READONLY, sal_False,
 SFX_APP()-GetFilterMatcher().GetFilter4FilterName( m_sFilter 
), m_pItemSet );
@@ -137,15 +126,12 @@ SfxMedium* DocumentInserter::CreateMedium()
 SfxMediumList* DocumentInserter::CreateMediumList()
 {
 SfxMediumList* pMediumList = new SfxMediumList;
-if ( !m_nError  m_pItemSet  m_pURLList  m_pURLList-Count()  0 )
+if (!m_nError  m_pItemSet  !m_pURLList.empty())
 {
-sal_Int32 i = 0;
-sal_Int32 nCount = m_pURLList-Count();
-for ( ; i  nCount; ++i )
+for(std::vectorrtl::OUString::const_iterator i = m_pURLList.begin(); 
i != m_pURLList.end(); ++i)
 {
-String sURL = *( m_pURLList-GetObject( static_cast sal_uInt16 
(i) ) );
 SfxMedium* pMedium = new SfxMedium(
-sURL, SFX_STREAM_READONLY, sal_False,
+*i, SFX_STREAM_READONLY, sal_False,
 

[Libreoffice-commits] .: svx/source

[August Sodora]

 svx/source/items/clipfmtitem.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59cc5f6e39b7e81e4af245473f09c7446f6facfd
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 23:02:11 2012 -0500

Fix build on MacOSX

diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index d8f7f64..24f550c 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -34,7 +34,7 @@
 
 struct SvxClipboardFmtItem_Impl
 {
-boost::ptr_vectorboost::nullableString aFmtNms;
+boost::ptr_vector boost::nullableString  aFmtNms;
 std::vectorsal_uIntPtr aFmtIds;
 static String sEmptyStr;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - sfx2/inc sfx2/source

[August Sodora]

 sfx2/inc/sfx2/filedlghelper.hxx  |   11 +--
 sfx2/inc/sfx2/macropg.hxx|6 ---
 sfx2/inc/sfx2/viewsh.hxx |1 
 sfx2/source/appl/appopen.cxx |   15 -
 sfx2/source/appl/linkmgr2.cxx|3 -
 sfx2/source/dialog/filedlghelper.cxx |   54 +++
 sfx2/source/dialog/filedlgimpl.hxx   |4 +-
 sfx2/source/dialog/templdlg.cxx  |   24 +++
 8 files changed, 40 insertions(+), 78 deletions(-)

New commits:
commit 5c445208a184fb88d8de0855be279e98d54dfad1
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 23:54:28 2012 -0500

SvStringsDtor-std::vector

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 4e60a86..1c51c40 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1320,7 +1320,7 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 
 SfxStyleSheetBase *pStyle = pStyleSheetPool-First();
 SvLBoxEntry* pEntry = aFmtLb.First();
-SvStringsDtor aStrings;
+std::vectorrtl::OUString aStrings;
 
 comphelper::string::NaturalStringSorter aSorter(
 ::comphelper::getProcessComponentContext(),
@@ -1329,21 +1329,19 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 while( pStyle )
 {
 //Bubblesort
-sal_uInt16 nPos;
-for( nPos = aStrings.Count() ; nPos 
-aSorter.compare(*(aStrings[nPos-1]), pStyle-GetName())  
0 ; nPos--)
+size_t nPos;
+for(nPos = aStrings.size(); nPos  
aSorter.compare(aStrings[nPos-1], pStyle-GetName())  0; --nPos)
 {};
-aStrings.Insert( new String( pStyle-GetName() ), nPos );
+aStrings.insert(aStrings.begin() + nPos, pStyle-GetName());
 pStyle = pStyleSheetPool-Next();
 }
 
-
-sal_uInt16 nCount = aStrings.Count();
-sal_uInt16 nPos = 0;
-while( nPos  nCount  pEntry 
-   *aStrings[ nPos ] == aFmtLb.GetEntryText( pEntry ) )
+size_t nCount = aStrings.size();
+size_t nPos = 0;
+while(nPos  nCount  pEntry 
+  aStrings[nPos] == rtl::OUString(aFmtLb.GetEntryText(pEntry)))
 {
-nPos++;
+++nPos;
 pEntry = aFmtLb.Next( pEntry );
 }
 
@@ -1353,8 +1351,8 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 aFmtLb.SetUpdateMode(sal_False);
 aFmtLb.Clear();
 
-for(nPos = 0 ;  nPos  nCount ; ++nPos )
-aFmtLb.InsertEntry( *aStrings.GetObject( nPos ), 0, 
sal_False, nPos);
+for(nPos = 0; nPos  nCount; ++nPos)
+aFmtLb.InsertEntry(aStrings[nPos], 0, sal_False, nPos);
 
 aFmtLb.SetUpdateMode(true);
 }
commit 17964c4f5a3aa25099b62db0e7652905cdf051a1
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 23:48:30 2012 -0500

Remove unused locals

diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index b7c5f2a..b7a4970 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -300,9 +300,6 @@ void LinkManager::UpdateAllLinks(
 sal_Bool bUpdateGrfLinks,
 Window* pParentWin )
 {
-SvStringsDtor aApps, aTopics, aItems;
-String sApp, sTopic, sItem;
-
 // First make a copy of the array in order to update links
 // links in ... no contact between them!
 SvPtrarr aTmpArr( 255, 50 );
commit 5cf36e9739a46ce20c4a3588962a04c6c4d1a72d
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 23:46:52 2012 -0500

Remove unnecessary forward declaration

diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 07cbdec..869de36 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -65,7 +65,6 @@ class SfxFrameSetDescriptor;
 class Printer;
 class SfxPrinter;
 class SfxProgress;
-class SvStringsDtor;
 class SfxFrameItem;
 class Dialog;
 class Menu;
commit 3ea8ee202832294adc09c0b1fd1c26cb87ca7cbf
Author: August Sodora aug...@gmail.com
Date:   Wed Jan 11 23:44:05 2012 -0500

SvStringsDtor-std::vector

diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index 3b3835b..faf2040 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -68,11 +68,8 @@ namespace com
 }
 
 class SfxItemSet;
-class SvStringsDtor;
 class Window;
 
-//-
-
 // the SFXWB constants are for the nFlags parameter of the constructor
 #define SFXWB_INSERT0x0400L // turn Open into Insert dialog
 #define SFXWB_EXPORT0x4000L // turn Save into Export dialog
@@ -85,8 +82,6 

[Libreoffice-commits] .: 2 commits - l10ntools/scripts

[David Tardon]

 l10ntools/scripts/fast_merge.pl |   29 -
 1 file changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 196885980bbb51562264cb5aad9a3e01133d1d7d
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 11 14:04:54 2012 +0100

fix writing of strings from the first module

diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index 5dc63cf..cc632e4 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -89,11 +89,10 @@ while( hasLines() )
 }
 write_lines();
 }
-if( $#current+1 ne 0 )
+# write content of the last localize.sdf file
+if( $#buffer ge 0 )
 {
-( $path , $localize_file ) = make_paths();
-add_to_buffer();
-write_buffer( $path , $localize_file );
+write_buffer( $last_path , $last_localize_file );
 }
 release_lock();
 exit( 0 );
@@ -248,15 +247,14 @@ sub make_paths
 
 return ( $path , $localizeFile );
 }
+
 sub write_lines
 {
 if( $first_run ){
-add_to_buffer();
 my( $path , $localize_file ) = make_paths();
 $last_path = $path;
 $last_localize_file = $localize_file;
-mkpath $path;
-write_buffer( $path , $localize_file );
+add_to_buffer();
 $first_run = '';
 }
 else
@@ -269,7 +267,6 @@ sub write_lines
 }
 else
 {
-mkpath $path;
 write_buffer( $last_path , $last_localize_file );
 add_to_buffer();
 $last_path = $path;
@@ -277,6 +274,11 @@ sub write_lines
 }
 }
 }
+
+# Adds all lines that contain strings from one source file from every input 
file.
+# TODO: Would it not be better to add lines for all files from a directory 
(i.e., replace
+# $afile eq $elem-file by $adir eq $elem-dir)? We could get rid of the 
delayed
+# writing then. But maybe there is a reason for doing it this way...
 sub add_to_buffer
 {
 my $plainline;
@@ -293,12 +295,15 @@ sub add_to_buffer
 } while ( !$elem-endoffile  $amodule eq $elem-module  $afile eq 
$elem-file );
 }
 }
+
+# Writes the buffer to currently selected localize.sdf file.
 sub write_buffer
 {
 my $path= shift;
 my $localize_file   = shift;
 my $cnt = $#buffer+1;
 print Write to $path $cnt lines\n;
+mkpath $path;
 open FILE , $localize_file or die Can't open file '$localize_file'\n;
 foreach ( @buffer )
 {
commit 4ce9896c6ac42d450d2056ee8d700b9f6dce8e2d
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 11 11:42:09 2012 +0100

Revert fast_merge: fix mis-merge of first module's strings

This is not enough, because the file is still wrong.

This reverts commit 47a8454f5f76030203ce6458cf63d4348bdacffe.

diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index 73b824e..5dc63cf 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -91,7 +91,7 @@ while( hasLines() )
 }
 if( $#current+1 ne 0 )
 {
-( $path , $localize_file ) = make_paths($current[ 0 ]-module);
+( $path , $localize_file ) = make_paths();
 add_to_buffer();
 write_buffer( $path , $localize_file );
 }
@@ -240,8 +240,7 @@ sub hasLines
 
 sub make_paths
 {
-my $module = shift ;
-my $localizeFile = $merge_dir.\\.$module.\\.$current[ 0 ]-file;
+my $localizeFile = $merge_dir.\\.$current[ 0 ]-module.\\.$current[ 0 
]-file;
 my $path = getDir( $localizeFile );
 $path =~ s/\\/\//g;
 
@@ -252,9 +251,8 @@ sub make_paths
 sub write_lines
 {
 if( $first_run ){
-my $module = $current[ 0 ]-module;
 add_to_buffer();
-my( $path , $localize_file ) = make_paths($module);
+my( $path , $localize_file ) = make_paths();
 $last_path = $path;
 $last_localize_file = $localize_file;
 mkpath $path;
@@ -264,7 +262,7 @@ sub write_lines
 else
 {
 return , if ( $#current+1 eq 0 );
-my( $path , $localize_file ) = make_paths($current[ 0 ]-module);
+my( $path , $localize_file ) = make_paths();
 if( $path eq $last_path )
 {
 add_to_buffer();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/scripts

[David Tardon]

 l10ntools/scripts/fast_merge.pl |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0df9d7c05d6fd31824fd76710c3c6c5e723dbdec
Author: David Tardon dtar...@redhat.com
Date:   Thu Jan 12 06:15:23 2012 +0100

close opened file

diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index cc632e4..7074bea 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -309,6 +309,7 @@ sub write_buffer
 {
 print FILE $_.\n;
 }
+close ( FILE );
 @buffer = ();
 }
 sub parse_options
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

[Markus Mohrhard]

 sc/qa/unit/data/contentCSV/rangeExp_Sheet2.csv |1 +
 sc/qa/unit/data/ods/named-ranges-global.ods|binary
 sc/qa/unit/data/xls/named-ranges-global.xls|binary
 sc/qa/unit/data/xlsx/named-ranges-global.xlsx  |binary
 4 files changed, 1 insertion(+)

New commits:
commit c82de8f8eb39d72394c82b1a29c8566f42302867
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jan 12 04:28:55 2012 +0100

add test for range name import, related fdo#42624

this adds range names referencing range names that are loaded after the
referencing range name

diff --git a/sc/qa/unit/data/contentCSV/rangeExp_Sheet2.csv 
b/sc/qa/unit/data/contentCSV/rangeExp_Sheet2.csv
index 24778a9..f6d5971 100644
--- a/sc/qa/unit/data/contentCSV/rangeExp_Sheet2.csv
+++ b/sc/qa/unit/data/contentCSV/rangeExp_Sheet2.csv
@@ -3,3 +3,4 @@
 0
 1, 2, 3
 4, 5, 6
+5
diff --git a/sc/qa/unit/data/ods/named-ranges-global.ods 
b/sc/qa/unit/data/ods/named-ranges-global.ods
index 8a8bbe2..84f79ac 100644
Binary files a/sc/qa/unit/data/ods/named-ranges-global.ods and 
b/sc/qa/unit/data/ods/named-ranges-global.ods differ
diff --git a/sc/qa/unit/data/xls/named-ranges-global.xls 
b/sc/qa/unit/data/xls/named-ranges-global.xls
index 993c8af..7ab1b7b 100644
Binary files a/sc/qa/unit/data/xls/named-ranges-global.xls and 
b/sc/qa/unit/data/xls/named-ranges-global.xls differ
diff --git a/sc/qa/unit/data/xlsx/named-ranges-global.xlsx 
b/sc/qa/unit/data/xlsx/named-ranges-global.xlsx
index e3fa9fb..3bb0cbc 100644
Binary files a/sc/qa/unit/data/xlsx/named-ranges-global.xlsx and 
b/sc/qa/unit/data/xlsx/named-ranges-global.xlsx differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryExternal.mk

[Matus Kukan]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b951e82748eb25aeb3976043c530b8f5debc0a3
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 12 08:23:06 2012 +0100

trying to fix windows build: include proper npapi.h

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 514a5b7..f37cc10 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -909,8 +909,8 @@ ifeq ($(SYSTEM_MOZILLA_HEADERS),YES)
 
 define gb_LinkTarget__use_mozilla_headers
 $(eval $(call gb_LinkTarget_set_include,$(1),\
-   $$(INCLUDE) \
$(MOZILLA_HEADERS_CFLAGS)
+   $$(INCLUDE) \
 ))
 endef
 
@@ -918,8 +918,8 @@ else #!SYSTEM_MOZILLA_HEADERS
 
 define gb_LinkTarget__use_mozilla_headers
 $(eval $(call gb_LinkTarget_set_include,$(1),\
-   $$(INCLUDE) \
-I$(OUTDIR)/inc/npsdk \
+   $$(INCLUDE) \
 ))
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryExternal.mk

[Matus Kukan]

 RepositoryExternal.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 66458f367ac045c5e263271b58ed4b0068644ac9
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 12 08:53:20 2012 +0100

typo: missing \

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f37cc10..c2efb60 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -909,9 +909,10 @@ ifeq ($(SYSTEM_MOZILLA_HEADERS),YES)
 
 define gb_LinkTarget__use_mozilla_headers
 $(eval $(call gb_LinkTarget_set_include,$(1),\
-   $(MOZILLA_HEADERS_CFLAGS)
+   $(MOZILLA_HEADERS_CFLAGS) \
$$(INCLUDE) \
 ))
+
 endef
 
 else #!SYSTEM_MOZILLA_HEADERS
@@ -921,6 +922,7 @@ $(eval $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/npsdk \
$$(INCLUDE) \
 ))
+
 endef
 
 endif #SYSTEM_MOZILLA_HEADERS
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

--- Comment #84 from sasha.libreoff...@gmail.com 2012-01-11 01:24:24 PST ---
Please, verify Bug 44664 - Calc PRINTING: printer prints Landscape page
orientation as Portrait
it my be regression if confirmed

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] npshell build / functionality [was: Re: Tinderbox failure, last success: 2011-12-05 19:05:50]

[Rene Engelhard]

Hi,

On Wed, Jan 11, 2012 at 10:25:12AM +0100, Michael Stahl wrote:
 On 10/01/12 23:53, Matúš Kukan wrote:
  On 10 January 2012 22:41, Michael Stahl mst...@redhat.com wrote:
  argh, there is a SYSTEM_MOZILLA_HEADERS?  completely forgot about that,
  but i guess in that case changing the header isn't such a good idea
  after all :(
  
  Hmm, but does anybody use --with-system-mozilla-headers ?

Yes. And actually I think *any* distro should.

 I can't see any advantage over internal headers. (But I can't see many 
 things.)

The advantage is that you use from system what belongs to the system. Not
LibreOffice itself.

  I'd say, let's just remove SYSTEM_MOZILLA_HEADERS and change the internal 
  ones.
 
 hmmm that is also an option... actually it looks like there are both
 headers and source files in np_sdk, and if SYSTEM_MOZILLA_HEADERS is

and the headers were always and still are a bug imho.

 set, source files are still compiled, but not against the headers in
 np_sdk, but against the system headers.

This is *exactly the point* of the option.
You say you want SYSTEM_MOZILLA_HEADERS, so they get used.

What exactly is your problem?

 this doesn't seem to make all that much sense to me, so i'll change my
 opinion again: let's remove SYSTEM_MOZILLA_HEADERS option.

NO. Why on earth do people always want to remove options to make the build
sane and instead rely on copies headers from system stuff? (Which the npapi
headers are, no matter what you argue)

Stop this nonsense, please.

[ But yes, I needed 
http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=blob;f=patches/getMIMEDescription-mismatch.diff;h=9924877e8501d0f0e2175f6c521c0bf88a1301ba;hb=refs/heads/debian-experimental-3.5
 with recent headers ]

Yes, I use --with-system-mozilla-headers. Like I use *any* system-lib
or -header possible (also for sane, x11, etc.)

Regards,

Rene
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [Libreoffice-ux-advise] Complete removal of the Windows/Linux quickstarter, was: Re: Removing LibO on Windows ...

[Stefan Knorr (Astron)]

Hi Michael,

        Is this a 4.0 feature we can add to the 4.0 plan ?

Done that. Albeit, probably didn't get the technical background right.
So, let's close this discussion for now.


Astron.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Communicating between a .doc and a hosted database

[Cor Nouws]

Mi Michael,

Michael Meeks wrote (11-01-12 10:35)


This is a developers list; it seems like you want to post your
questions to the user's list instead:

Unfortunately the users lists is rather difficult to use; there

[... pulling a dead horse ]



We know (or should have noticed) your preference about mail lists.
(I've seen many hours discussion pass by, more then many people do spend 
on actually helping with user questions :-( )


IMO it is easier, friendlier, more inviting to simply point to 
http://www.libreoffice.org/get-help/


HTH

--
 - Cor
 - http://nl.libreoffice.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] npshell build / functionality [was: Re: Tinderbox failure, last success: 2011-12-05 19:05:50]

[Michael Stahl]

On 11/01/12 10:44, Rene Engelhard wrote:
 Hi,
 
 On Wed, Jan 11, 2012 at 10:25:12AM +0100, Michael Stahl wrote:
 On 10/01/12 23:53, Matúš Kukan wrote:
 On 10 January 2012 22:41, Michael Stahl mst...@redhat.com wrote:
 argh, there is a SYSTEM_MOZILLA_HEADERS?  completely forgot about that,
 but i guess in that case changing the header isn't such a good idea
 after all :(

 Hmm, but does anybody use --with-system-mozilla-headers ?
 
 Yes. And actually I think *any* distro should.
 
 I can't see any advantage over internal headers. (But I can't see many 
 things.)
 
 The advantage is that you use from system what belongs to the system. Not
 LibreOffice itself.
 
 I'd say, let's just remove SYSTEM_MOZILLA_HEADERS and change the internal 
 ones.

 hmmm that is also an option... actually it looks like there are both
 headers and source files in np_sdk, and if SYSTEM_MOZILLA_HEADERS is
 
 and the headers were always and still are a bug imho.

so how would you build the plugin on windows?

 set, source files are still compiled, but not against the headers in
 np_sdk, but against the system headers.
 
 This is *exactly the point* of the option.
 You say you want SYSTEM_MOZILLA_HEADERS, so they get used.

well, almost all SYSTEM_FOO options enable taking both the headers and
the actual code from the system, so this one is weird.

 What exactly is your problem?

hmmm... thinking about it a bit more, it now looks like
SYSTEM_MOZILLA_HEADERS isn't a problem after all, because it is not used
on Windows, where the missing __declspec(dllexport) bites us; at least
on Linux GCC does not complain about the inconsistency (and on ELF based
platforms there is no equivalent of __declspec(dllimport) anyway).

so let's do the following:
- add SAL_DLLPUBLIC_EXPORT to the internal np_sdk headers
- add a check to configure.in to disable SYSTEM_MOZILLA_HEADERS if the
host platform is windows (just to be safe)

any objections?

 this doesn't seem to make all that much sense to me, so i'll change my
 opinion again: let's remove SYSTEM_MOZILLA_HEADERS option.
 
 NO. Why on earth do people always want to remove options to make the build
 sane and instead rely on copies headers from system stuff? (Which the npapi
 headers are, no matter what you argue)
 
 Stop this nonsense, please.
 
 [ But yes, I needed 
 http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=blob;f=patches/getMIMEDescription-mismatch.diff;h=9924877e8501d0f0e2175f6c521c0bf88a1301ba;hb=refs/heads/debian-experimental-3.5
  with recent headers ]

hmm... i've got a /usr/include/xulrunner-sdk-2/npapi.h here that also
looks like it would need this change.  can you commit it on master (and
adapt np_sdk/inc/npapi.h to match)?

 Yes, I use --with-system-mozilla-headers. Like I use *any* system-lib
 or -header possible (also for sane, x11, etc.)
 
 Regards,
 
 Rene

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] UNO Object Life Cycle question

[Tomas Hlavaty]

Hi Paul,

 My own experience with this protocol is with a Delphi client [snip]
 I've notice that an unreleased objet persist after disconnection,
 [snip] AFAIK all the objects should be just droped down on
 disconnection, but they're not.

interesting, do you have any measurements of how much memory leaks on
disconnection?

Thank you,

Tomas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] [PUSHED] msvc doesn't allow dll interface in both class and functions

[Korrawit Pruegsanusak]

Hello Stephan,

On Mon, Jan 9, 2012 at 17:12, Stephan Bergmann sberg...@redhat.com wrote:
 Fixed in a third way now,
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=2fa19ed7e407188d6af028aad19a2598454959a8,
 reducing the set of exported symbols to just what is needed by
 extensions/qa/update/test_update.cxx.

Thanks! :-)

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] If there's no java, don't do the java stuff

[Korrawit Pruegsanusak]

H

On Mon, Jan 9, 2012 at 19:04, Christophe Strobbe
christophe.stro...@esat.kuleuven.be wrote:
 I noticed on the mailing list that David Tardon has already pushed your
 patch, but I'm still curious to know: did you have the Java Access Bridge
 [1] installed when you tested this patch (I assume you didn't have it
 because the build broke)?

No, I don't have Java Access Bridge, nor have heard of it. :-)

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PUSHED-3-5] [PATCH] proposed fix for fdo#44533

[Korrawit Pruegsanusak]

Hello Thorsten, Julien,

On Tue, Jan 10, 2012 at 19:22, Thorsten Behrens
t...@documentfoundation.org wrote:
 Will cherry-pick tomorrow. :)

 Done.

Shall we close the bug now?
https://bugs.freedesktop.org/show_bug.cgi?id=44533

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] UNO Object Life Cycle question

[Execute SARL]

Hi,

As a Delphi developper I do not have Office in debug mode, I have to 
find some time to setup all this :)


Paul
Le 11/01/2012 15:30, Tomas Hlavaty a écrit :

Hi Paul,


My own experience with this protocol is with a Delphi client [snip]
I've notice that an unreleased objet persist after disconnection,
[snip] AFAIK all the objects should be just droped down on
disconnection, but they're not.

interesting, do you have any measurements of how much memory leaks on
disconnection?

Thank you,

Tomas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] UNO Object Life Cycle question

[Tomas Hlavaty]

Hi Stephan

Stephan Bergmann sberg...@redhat.com writes:
 No, the sending side increments its ref count multiple times for a
 given tuple it sends, unless it earlier received that tuple from the
 other side (i.e., it is bridged in at this side), in which case it
 does not increment the ref count at all.

great explanation, thank you!

 Is there a mechanism that when a link between the server and client
 bridge breaks, the server releases the resources properly, or do we
 get/expect memory leaks?

 In some sense this is a QoI issue.

What is a QoI issue?  Quality of Information?  You mean that the
server must be able to detect disconnection, which works with sockets
but wouldn't work for example with named pipes?

 But existing URP endpoints (binary and Java) do note if a connection
 is broken and locally release the objects they have bridged out across
 that connection.  [snip] (With the above said, just lowering a
 connection without releasing references before should actually also
 happen to work, even if it is not good style to defer release messages
 unduly.)

OK, this is what I was after.

My use case is as follows:

1) connect to LO via unix domain socket

2) load and traverse (via uno) a large word document (about 1200 pages
   of plain text)

3) close the connection

And repeat many times with long running LO process.

During one iteration, i get LO memory usage increase of about 70MB and
on closing the connection it drops back to about the same level no
matter if I use reference counting (release) or not (this confirms what
you said above).

However, in both cases, the memory usage gradually grows a bit with the
number of iterations.  It looks to me as there is a memory leak in LO
not cleaning after the disconnected client properly.

Memory usage without reference counting:

|| virt | res | shr |
|+--+-+-|
|  1 |  123 |  43 |  28 |
|  2 |  268 | 141 |  52 |
|  3 |  288 | 161 |  52 |
|  4 |  275 | 148 |  52 |
|  5 |  326 | 198 |  52 |
|  6 |  274 | 147 |  52 |
|  7 |  272 | 145 |  52 |
|  8 |  287 | 159 |  52 |
|  9 |  285 | 158 |  52 |
| 10 |  273 | 146 |  52 |
| 11 |  278 | 151 |  52 |
| 12 |  339 | 212 |  52 |
| 13 |  281 | 154 |  52 |
| 23 |  327 | 199 |  52 |
| 24 |  324 | 196 |  52 |
| 25 |  323 | 196 |  52 |
| 26 |  323 | 196 |  52 |
| 36 |  327 | 199 |  52 |
| 37 |  325 | 197 |  52 |
| 38 |  325 | 197 |  52 |
| 48 |  328 | 200 |  52 |
| 49 |  328 | 200 |  52 |
| 59 |  330 | 187 |  36 |
| 60 |  327 | 184 |  36 |
| 61 |  328 | 185 |  36 |
| 62 |  326 | 183 |  36 |
| 63 |  328 | 185 |  36 |

Memory usage with reference counting:

|  | virt | res | shr |
|--+--+-+-|
|1 |  123 |  43 |  28 |
|2 |  269 | 141 |  52 |
|3 |  286 | 158 |  52 |
|4 |  293 | 165 |  52 |
|5 |  300 | 172 |  52 |
|6 |  295 | 168 |  52 |
|7 |  302 | 174 |  52 |
|8 |  317 | 189 |  52 |
|9 |  334 | 206 |  52 |
|   10 |  332 | 204 |  52 |
|   11 |  323 | 195 |  52 |
|   12 |  322 | 194 |  52 |
|   13 |  302 | 174 |  52 |
|   14 |  299 | 171 |  52 |
|   15 |  306 | 179 |  52 |
|   16 |  300 | 172 |  52 |
|  736 |  372 | 184 | 6.4 |
|  737 |  372 | 204 |  16 |
|  738 |  372 | 204 |  16 |
|  739 |  372 | 203 |  16 |
|  740 |  371 | 203 |  16 |
|  741 |  372 | 203 |  16 |
|  742 |  372 | 203 |  16 |
|  752 |  372 | 205 |  16 |
|  753 |  372 | 204 |  16 |
|  754 |  372 | 204 |  16 |
|  764 |  371 | 204 |  16 |
|  774 |  373 | 207 |  16 |
|  784 |  372 | 206 |  16 |
|  785 |  373 | 206 |  16 |
|  795 |  373 | 207 |  16 |
|  805 |  372 | 206 |  16 |
|  955 |  374 | 171 | 1.1 |
|  965 |  375 | 201 |  16 |
|  975 |  375 | 201 |  16 |
|  985 |  375 | 202 |  16 |
|  995 |  375 | 200 |  16 |
| 1015 |  376 | 196 |  16 |
| 1035 |  376 | 187 |  16 |
| 1055 |  377 | 188 |  16 |
| 1155 |  377 | 147 | 0.6 |
| 1165 |  376 | 175 |  16 |

The memory usage keeps growing, slightly but persistently.  Is it a
leak, or a feature of the custom LO allocator, or would it stabilise
eventually?

Also, according to what you said above, it should not matter whether the
client implements reference counting at all.  The leak seems smaller
with reference counting in place.  However, it does not disappear.

Thank you,

Tomas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Win-x86_6-fast Tinderbox not show status

[Korrawit Pruegsanusak]

Hello Jan,

As I get some mails from tinderbox Win-x86_6-fast saying the build
failed, I assume that it is running.
But could you please check why it does not show its status in
http://tinderbox.libreoffice.org/MASTER/status.html ?

It seems to show status as it should in
http://tinderbox.libreoffice.org/libreoffice-3-5/status.html

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] npshell build / functionality [was: Re: Tinderbox failure, last success: 2011-12-05 19:05:50]

[Rene Engelhard]

Hi,

On Wed, Jan 11, 2012 at 11:45:38AM +0100, Michael Stahl wrote:
  and the headers were always and still are a bug imho.
 
 so how would you build the plugin on windows?

Windows is - as always - the exception.

  set, source files are still compiled, but not against the headers in
  np_sdk, but against the system headers.
  
  This is *exactly the point* of the option.
  You say you want SYSTEM_MOZILLA_HEADERS, so they get used.
 
 well, almost all SYSTEM_FOO options enable taking both the headers and
 the actual code from the system, so this one is weird.

There is actual code from the system? You seem to imply the cxx'es are Mozilla
code? If that was the case, yes, it should be linked to that, too. Another 
reason
to properly resurrect --with-system-mozilla.

Regards,

Rene
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 43532, which changed state.

Bug 43532 Summary: Renaming and deleting of inserted template categories 
broken, inserted templates land in wrong category (indexing issue in code)
https://bugs.freedesktop.org/show_bug.cgi?id=43532

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] Scrollbar in Calc is broken for RTL interface (help needed)

[Lior Kaplan]

Hi,

It seems that the scrollbar in Calc (and some other places) is broken (in
different ways on Linux and Windows).

Any help with https://bugs.freedesktop.org/show_bug.cgi?id=44657 will be
welcomed.

Thanks,

Kaplan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Issue with git

[Olivier Hallot]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi
Yesterday I commited some patches in git, but strangely the patch

http://cgit.freedesktop.org/libreoffice/core/commit/?id=f19d269ab4286b2e2e9f579bc4705daf4f6756ab

shown a repository error...

How can I fix it or can someone please take care of it?

Many thanks in advance.
- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPDZLVAAoJEJp3R7nH3vLxupQIAJPm4PzEJZtMd9mnS4CyEYYI
fhCod54vuVMDO4DrNI7lZxpD7eQ/NA4CFpWeLGDxwVWJvj2vSp7FNMauz+A8dGIn
ZENGdQMfnxkxOsdeDA6ZiNxgD+CkUrx51uzcqymGwzzhWPrBT+VZcP7Td/ogty2W
uvMtt4HesIOP9G0++oRGDMyQwg6XayK75reE406MVHq3M1+NtijFD+kqBAqSjXkr
lNFE5KhyQpE3eL9s/ccqN4ir4MhFbpsqcbjXpUU+irnb0uzGXldlELiSDgNuLvsX
TzIpMrZ5MxRCmz8S1u+hkall1XDVssqZnaAywCj0WIYYAlqI2h4q2GXrOuj+5Jw=
=GmuP
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] UNO Object Life Cycle question

[Stephan Bergmann]

On 01/11/2012 12:51 PM, Tomas Hlavaty wrote:

Is there a mechanism that when a link between the server and client
bridge breaks, the server releases the resources properly, or do we
get/expect memory leaks?


In some sense this is a QoI issue.


What is a QoI issue?  Quality of Information?  You mean that the
server must be able to detect disconnection, which works with sockets
but wouldn't work for example with named pipes?


Quality of Implementation, sorry.  As I wrote the other day, UNO largely 
tries to pretend that interprocess communication is no different from 
intraprocess communication.  So questions of how to react to a lost 
connection are somewhat outside the scope of the UNO specification.



My use case is as follows:

1) connect to LO via unix domain socket

2) load and traverse (via uno) a large word document (about 1200 pages
of plain text)

3) close the connection

And repeat many times with long running LO process.

[...]

The memory usage keeps growing, slightly but persistently.  Is it a
leak, or a feature of the custom LO allocator, or would it stabilise
eventually?


Setting G_SLICE=always-malloc environment variable should help rule out 
the LO memory allocator.


I can easily imagine that there is a leak somewhere.  Why the numbers 
are different with different release strategies is hard to tell.  In 
principle, it could be that releasing a remotely held UNO object early 
releases more additional data structures than if it is only released 
later, if the indirectly referenced data structures change in the 
meantime (e.g., mass release during connection loss might hypothetically 
lead to unreclaimable ring references).


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] .: sc/qa sc/source

[Kohei Yoshida]

Hi Michael,

On Wed, 2012-01-11 at 13:51 +0100, Michael Stahl wrote:
 hi Kohei,
 
 i get an assertion in the smoketest because of this commit:
 
  #0  sal_detail_logFormat(level = SAL_DETAIL_LOG_LEVEL_WARN, area = 
  0x7f75465b5032 legacy.tools, where = 0x7f75465b57e0 
  /data/lo/core_master/svx/source/svdraw/svdmodel.cxx:1977: , format = 
  0x7f75465b5770 SdrModel::GetPage: Access out of range (!)) at 
  /data/lo/core_master/sal/osl/all/log.cxx:178
  #1  SdrModel::GetPage(this = 0x30788a0, nPgNum = 1) at 
  /data/lo/core_master/svx/source/svdraw/svdmodel.cxx:1977
  #2  ScDrawLayer::ResetTab(this = 0x30788a0, nStart = 0, nEnd = 2) at 
  /data/lo/core_master/sc/source/core/data/drwlayer.cxx:486
  #3  ScDrawLayer::ScAddPage(this = 0x30788a0, nTab = 0) at 
  /data/lo/core_master/sc/source/core/data/drwlayer.cxx:393
  #4  ScDocument::InitDrawLayer(this = 0x31b5698, pDocShell = 0x31b5620) at 
  /data/lo/core_master/sc/source/core/data/documen9.cxx:157
  #5  ScDocShell::MakeDrawLayer(this = 0x31b5620) at 
  /data/lo/core_master/sc/source/ui/docshell/docsh2.cxx:221
  #6  ScTabView::MakeDrawLayer(this = 0x3036120) at 
  /data/lo/core_master/sc/source/ui/view/tabview2.cxx:1348
  #7  ScTabViewShell::ScTabViewShell(this = 0x30360a0, pViewFrame = 
  0x304fd30, pOldSh = 0x0) at 
  /data/lo/core_master/sc/source/ui/view/tabvwsh4.cxx:1759
  #8  ScTabViewShell::CreateInstance(pFrame = 0x304fd30, pOldView = 0x0) at 
  /data/lo/core_master/sc/source/ui/view/tabvwsh.cxx:97
 
 reverting the change to drwlayer.cxx ScDrawLayer::ScAddPage i don't get
 the smoketest assertion, but then the new unit test fails.

Yes, that can make some drawing objects not saved to disk.  Pretty bad.
We can't afford to revert it.

Fixing the assertion should be easy.  Just calling GetPageCount() and
using it to avoid accessing non-existing page.  I'll take care of it
this morning.

Best,

Kohei

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Win-x86_6-fast Tinderbox not show status

[Korrawit Pruegsanusak]

Hello Jan,

On Wed, Jan 11, 2012 at 19:57, Jan Holesovsky ke...@suse.cz wrote:
 Hi Korrawit,

 On 2012-01-11 at 18:56 +0700, Korrawit Pruegsanusak wrote:

 As I get some mails from tinderbox Win-x86_6-fast saying the build
 failed, I assume that it is running.
 But could you please check why it does not show its status in
 http://tinderbox.libreoffice.org/MASTER/status.html ?

 It seems to show status as it should in
 http://tinderbox.libreoffice.org/libreoffice-3-5/status.html

 It is deliberately running on the -3-5 branch only, so that we get the 4
 hours builds there.   Doing both master and -3-5 would prolong the run
 to 8 hours, which is not what we want during the beta phase :-)

 I've helped to revive the Voreppe box, a build there is at about 7.5
 hours each which is still better than running the @6-fast both branches;
 I hope this is good enough for now, but of course, volunteers that would
 be able to setup another (faster) Windows tinderbox are highly welcome!

 Later in the -3-5 release cycle when the amount of changes decreases,
 I'll switch the @6-fast to master, and Voreppe to -3-5.

 All the best,
 Kendy


Thanks :-) and sorry for the noise.

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Issue with git

[Miklos Vajna]

On Wed, Jan 11, 2012 at 11:47:01AM -0200, Olivier Hallot 
olivier.hal...@documentfoundation.org wrote:
 Yesterday I commited some patches in git, but strangely the patch
 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=f19d269ab4286b2e2e9f579bc4705daf4f6756ab
 
 shown a repository error...
 
 How can I fix it or can someone please take care of it?

Maybe you ran 'git pull -r' before pushing? Such a rebase operation
changes the ID's of the commits. Try to re-run git log locally and see
what are the commit ID's and check again cgit with the new ones.


pgpxARKhKP8m2.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

--- Comment #86 from Clemmitt Sigler cmsigler.onl...@gmail.com 2012-01-11 
06:47:42 PST ---
(In reply to comment #84)
 Please, verify Bug 44664 - Calc PRINTING: printer prints Landscape page
 orientation as Portrait
 it my be regression if confirmed

Please see prior Bug 38962 as it may be the same or a closely related bug.  In
Bug 38962 Comment 3, freedesktop isolates the problem he is seeing to the
Printer Language Type being set to PDF.  Note that this may be affecting
primarily Brother brand printers(???).  Also note that this may be an issue for
3.4 as well as 3.5.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] minutes of ESC call ...

[Thorsten Behrens]

Michael Meeks wrote:
 AA:   + qa list incomplete, or updating slowly on gmane (Thorsten to 
 poke Florian)

Seems setup is no different than for the other lists, additionally,
for the last handful of days, I see no missing mails. Could you
point out concrete examples?

Cheers,

-- Thorsten


pgpuydIhsYjdx.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Do we have native SVG support in 3.5 ?

[Fernand Vanrie]

Do we now have native SVG support in 3.5 ?

When testing 3.5 dev if found that inserting SVG files is totaly 
different from 3.4.


The pictures shown  more correct and are stored in the document as 
SVG and no longer as SVM


Greetz

Fernand
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Memory tweaking Graphics Cache tot avoid crash after deleting a graphic

[Fernand Vanrie]

Can a developer  explain how the Memory tweaking for the Graphics Cache 
is working.


I found that LO 3.4 can crash after deleting a Graphic in a document who 
contains  many or  a few Big pictures.
We  replace LowResolution Graphics with HighResolutions just before 
final printing . When the document is Loaded with HighResolution 
graphics, then LO can crash when deleting a Graphic.

This do not happens with OO 3.3 !
I supose it happens when i delete a graphic on a page where the size of 
the graphic if bigger than the setting of the Memory per Object in the 
UI Graphic Cache settings.
PLaying with the Cache size and the size per Object can avoid the crash, 
but there is no clear line why and when it happens.


so:
whats the meaning of Use for LO (who is max 256 MB)
whats the meaning of Memory per Object (who is also max 256 MB)

There are already many Issues posted for related Graphic 
deleting-disapearing problems


Greetz
Fernand
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Memory tweaking Graphics Cache tot avoid crash after deleting a graphic

[Thorsten Behrens]

Fernand Vanrie wrote:
 Can a developer  explain how the Memory tweaking for the Graphics
 Cache is working.
 
Erm - well, I can tell you how it's _supposed_ to work at least. ;)

 whats the meaning of Use for LO (who is max 256 MB)

entire size of in-memory cached graphics.

 whats the meaning of Memory per Object (who is also max 256 MB)
 
graphics that are bigger than this number are not cached in-memory.

 I found that LO 3.4 can crash after deleting a Graphic in a document
 who contains  many or  a few Big pictures.
 We  replace LowResolution Graphics with HighResolutions just before
 final printing . When the document is Loaded with HighResolution
 graphics, then LO can crash when deleting a Graphic.
 This do not happens with OO 3.3 !
 I supose it happens when i delete a graphic on a page where the size
 of the graphic if bigger than the setting of the Memory per Object
 in the UI Graphic Cache settings.
 PLaying with the Cache size and the size per Object can avoid the
 crash, but there is no clear line why and when it happens.
 
Can you somehow get debug symbols for your installation  get us a
backtrace of such a crash?
 
 
http://wiki.documentfoundation.org/BugReport#How_to_get_backtrace_.28on_Linux.29

With that, please file a bug.

Cheers,

-- Thorsten


pgpoCWg0HyDfD.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] minutes of ESC call ...

[Jesús Corrius]

2012/1/11 Jesús Corrius je...@softcatala.org:
        + Windows 8 - public beta for Feburary
                + Win 8 doesn't install in VMWare
                        - until it does debugging is hard.
                + crash-on-load bug #43648 - fun.
                + Jesus reports it working well though ...

 I confirm the bug with LibO 3.5 beta 2.
 Windows 8 works perfectly well in VirtualBox :)

OK. It's a duplicate of this bug:

https://bugs.freedesktop.org/show_bug.cgi?id=43989

Sorry for the noise :)

-- 
Jesús Corrius je...@softcatala.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] proposed fix for fdo#44283

[Caolán McNamara]

On Tue, 2012-01-10 at 13:38 -0800, julien2412 wrote:
 I replaced 0 by BROWSER_INVALIDID, it compiles and seems to work.
 
 I propose this patch : 
 http://nabble.documentfoundation.org/file/n3648948/patch.txt patch.txt 

Reading your patch and also
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f7ed67f2cf79fd067c1634e8f7c3f8a17792f2e5

GetColumnId: return BROWSER_INVALIDID, not 0 (== id of handle column)
for an invalid column; adapt code calling GetColumnId to this change.

It looks like you're right at this was a missed adaption of the
GetColumnId change.

 Is it ok for you ? If yes I can commit and push on master (3.5 too ?)

Looks good to me on the surface anyway. Go for it I say for master and
3.5. Lionel ? are we right here ?

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Licence statement

[Tzvetelina Tzeneva]

The code I wrote for Libre Office as part of the Google Summer Of Code 2009
program is under  MPL1.1+ / GPLv3+ / LGPLv3+ .


Tzvetelina Tzeneva
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] minutes of ESC call ...

[Michael Meeks]

On Wed, 2012-01-11 at 16:47 +0100, Jesús Corrius wrote:
  I confirm the bug with LibO 3.5 beta 2.
  Windows 8 works perfectly well in VirtualBox :)
 
 OK. It's a duplicate of this bug:
 
 https://bugs.freedesktop.org/show_bug.cgi?id=43989

Be great to get a trace and work out what exit code is popping out from
there, and why :-) [ so we're not re-starting correctly ].

Thanks,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [REVIEW-3-5] progressbar for rtf import

[Miklos Vajna]

Hi,

I've implemented a progressbar for rtf import yesterday:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=92c7b6733e55a6ab62bc231ecf0ffd5c0da7c8d2

There are two bugreports requesting this: fdo#38057 and fdo#44157. The
second calls this a 3.4 - 3.5 regression, which is true.

What is better - should I cherry-pick this to -3-5, introducing a new
string to be localized or respect string freeze and ignore this being a
regression? (It's unfortune that till now I was not aware so far that
this is a regression, sure.)

Thanks.


pgpIPvm6tO4el.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=35673

Kohei Yoshida kohei.yosh...@gmail.com changed:

   What|Removed |Added

 Depends on|42339   |

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] [Bug 35673] LibreOffice 3.4 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=35673

Kohei Yoshida kohei.yosh...@gmail.com changed:

   What|Removed |Added

 Depends on|42684   |

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] [Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 44078, which changed state.

Bug 44078 Summary: [he] UI is displayed with squares instead of translation due 
to bad font selection
https://bugs.freedesktop.org/show_bug.cgi?id=44078

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] [REVIEW][3-4] fdo#44078 boxes shown for glyph fallback with DejaVu Sans ExtraLight (he/ar)

[Caolán McNamara]

https://bugs.freedesktop.org/show_bug.cgi?id=44078

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=25b90909a7a22f6900abbe9df12570a24e528c9a

I've done a bit more work to fix more of the root problem in master, but
the above is a minimal and should-be-safe workaround to fix the
practical problem where a font like DejaVu Sans ExtraLight has two
aliases (fc-list -v DejaVu Sans Light) of DejaVu Sans and DejaVu Sans
Light and our efforts to present a localized name to users and
canonical name to fontconfig ends in tears as DejaVu Sans gets mapped
to DejaVu Sans Light under some circumstances so if DejaVu Sans is
suggested as a font suitable for glyph fallback then DejaVu Sans Light
gets used, and it has less glyphs than DejaVu Sans, hence the boxes.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] A Bounty on LibreOffice Emerges!

[Rich Jones]

Hey, LibreOffice folks!

I don't know if it was you guys who posted this, but a new bounty for
LibreOffice just came across our system and I thought you guys might be
interested:

http://gun.io/open/25/better-windows-7-taskbar-integration-for-libreoff

Check it out!

-- 
Rich Jones
Director, Gun.io
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] A Bounty on LibreOffice Emerges!

[Jesús Corrius]

Hi,

 I don't know if it was you guys who posted this, but a new bounty for
 LibreOffice just came across our system and I thought you guys might be
 interested:

 http://gun.io/open/25/better-windows-7-taskbar-integration-for-libreoff

If you do the job, how do you know that you will be paid for it?

-- 
Jesús Corrius je...@softcatala.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Issue with git

[Olivier Hallot]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Miklos

Thank you for your attention. I think the issue is more with the web
interface than the repo itself: Here is my log

commit f19d269ab4286b2e2e9f579bc4705daf4f6756ab
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Mon Jan 9 11:57:52 2012 -0200

Fix for fdo43460 Part XXXII getLength() to isEmpty()

Part XXXII
Modules
sdext

Regards

Olivier


Em 11-01-2012 12:01, Miklos Vajna escreveu:
 On Wed, Jan 11, 2012 at 11:47:01AM -0200, Olivier Hallot 
 olivier.hal...@documentfoundation.org wrote:
 Yesterday I commited some patches in git, but strangely the patch

 http://cgit.freedesktop.org/libreoffice/core/commit/?id=f19d269ab4286b2e2e9f579bc4705daf4f6756ab

 shown a repository error...

 How can I fix it or can someone please take care of it?
 
 Maybe you ran 'git pull -r' before pushing? Such a rebase operation
 changes the ID's of the commits. Try to re-run git log locally and see
 what are the commit ID's and check again cgit with the new ones.
 
 
 
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice

- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPDgwgAAoJEJp3R7nH3vLxoxIH/i+Dk9H5vrzLi7hr4DGYt8/Y
FKd6qcvry73Ecx71wHniZuzoPzEymsy5agu3GvcFCrXtGyeGadZXjc98s9Y0xJbU
+HHdkIhJY2i7luEhMrBATxu/KgJL8EWgxEGdI0petxismNUTyk0uSPVgsSS2uHQ6
ckLKMvsqIuBUH1qBKTQmfQwIN1p6gs4JXjAs6FIkjuh9jfIumn9HeCgXflguRBZS
TKXOtDp6L15/JtKsmAfPVAw86733OgjAGdEmwNmr1VPmt/xhVeGw+Nq69UfwWouC
gLkoQfe8xlDiwguiLzgYcKKwyURNVsi7bF0vJT91ueBnieeFNTewUTG9cGHCG/I=
=vSm0
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Issue with git

[Miklos Vajna]

On Wed, Jan 11, 2012 at 08:24:32PM -0200, Olivier Hallot 
olivier.hal...@documentfoundation.org wrote:
 Thank you for your attention. I think the issue is more with the web
 interface than the repo itself: Here is my log
 
 commit f19d269ab4286b2e2e9f579bc4705daf4f6756ab

Strange indeed. The short has works, though:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=f19d269

Maybe some cache issue, not sure.


pgpE4V0Eo0Or1.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] libvisio: how can I help?

[Bruno Girin]

On 11/01/12 09:44, Fridrich Strba wrote:


Now, I just pushed a fix for some diagrams not having borders in 
shapes where the borders should be. Like the sample Brainstm.vsd. 
When/if I have time, I will try to go through your bugs and try to fix 
what can be fixable.


I saw you had a look at all of the bugs I filed. Thanks for the 
feedback! I will have a go at progressing the arrowhead ones (#44551 and 
#44576) and the pattern one (#44552).


Having said this, it raises a newby question: I have a git clone of the 
LO code in one folder and a git clone of the libvisio code in another. 
What is the simplest way to build and run LO so that it uses the 
libvisio library I'm working on rather than the one that came with it so 
that I can test my fixes?






Any chance you can be on IRC during CET day?

I wish but no. The job that pays the bills keeps me busy during the day,
UK time, and doesn't let me use any software that's not part of the
organisation's standard build.


There is always this possibility http://webchat.freenode.net/ for 
people being behind firewalls and inflexible administrators :)


I will try but my admins also blacklist a number of web sites :-)




I'll try to find my way and will drop you a note if I struggle. Worst
case scenario, I hope I'll see you at FOSDEM in a few weeks so I may
take the opportunity to ask a few questions then.


Wonderful! I look forward to meeting you. I am intending to make a 
small hands-on presentation/workshop about import filters. I would 
like to use the upcomming Corel Draw library (or if I have time to 
start the MS Publisher library) to show how easy it is to start 
working on filters using writerperfect framework.


In preparation, I plan to write a serie of blog entries about some 
basics about LO import/export filters. Let us see whether the Lord 
gives me enough time for that.


Please, keep testing, it is invaluable


No worries, I've got lots of testing material!

Bruno

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] If there's no java, don't do the java stuff

[David Tardon]

On Mon, Jan 09, 2012 at 01:04:20PM +0100, Christophe Strobbe wrote:
 Hi Korrawit,
 
 At 18:24 8-1-2012, Korrawit Pruegsanusak wrote:
 Hello all,
 
 This attached patch fixes build on windows / cygwin.
 
 I'm building --without-java, and it breaks because not found
 java_uno_accessbridge, which seems java-related.
 
 I noticed on the mailing list that David Tardon has already pushed
 your patch, but I'm still curious to know: did you have the Java
 Access Bridge [1] installed when you tested this patch (I assume you
 didn't have it because the build broke)?
 
 [1] http://www.oracle.com/technetwork/java/javase/tech/index-jsp-136191.html

java_uno_accessbridge.jar is one of two jars we build in module
accessibility (only for Windows).

 
 So, I add a check whether we have SOLAR_JAVA before doing this thing.
 
 So java_uno_accessbridge is only added when SOLAR_JAVA is set to
 TRUE, which AFAICT is something that happens at compile time.

Yes, because when SOLAR_JAVA is not set, it might mean there is not any
Java compiler avaliable, so we can hardly build any jars :)

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-qa] Minutes - QA related - TSC call 2012-01-05

[Rainer Bielefeld]

Hi,

you can find a summery from my point of view concerning QA related 
discussion of the Engineering Steering Committee on

http://wiki.documentfoundation.org/RBd/TSC_Call_Minutes

Best regards

Rainer
___
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] 3.5.0 QA ... from BHS 1 to BHS 2

[Pedro]

Hi Michael, all


Michael Meeks-2 wrote
 
   Actually, there is an updated patch in bugzilla's bugzilla:
 
   https://bugzilla.mozilla.org/show_bug.cgi?id=294608
 
   Unclear how to help focus minds there though :-) please do watch that
 bug (requires a login ;-) and report back as/when it's merged.
 

Aaarghhh! Another Login! See what I mean? This is insane! :)

I will keep an eye on it. But given the negative feedback the patch
submitter got and that it has been neglected since November 17th by both
parts, I would say it's another dead duck :(

Regards,
Pedro

--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-3-5-0-QA-from-BHS-1-to-BHS-2-tp3643039p3650302.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/

[Libreoffice-bugs] [Bug 43220] UI: Strange Behavior According the Display of the Navigation Toolbar in Writer

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=43220

sasha.libreoff...@gmail.com changed:

   What|Removed |Added

   Platform|Other   |All
 CC||sasha.libreoff...@gmail.com

--- Comment #1 from sasha.libreoff...@gmail.com 2012-01-11 00:17:58 PST ---
reproduced on LibO 3.5.0 beta 1 on Fedora 64 bit
steps from 1 to 5b (including) looks as useful features, but my be not
documented
beginning from 5c - bugs:
1) Navigation appear and disappear randomly (one time opens additional window
and another time closes random existing window)
2) let we open document with several sections and several tables and open 2
window of Navigation. When press button Table on one window of Navigation and
Section on another. On both windows appear buttons To next section.
Therefore no use of 2 windows of Navigation.

I am not sure if it is bug or not fully implemented feature, therefore retain
status as is.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 43573] FILEOPEN: Writer crash when open docx file.

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=43573

sasha.libreoff...@gmail.com changed:

   What|Removed |Added

 CC||sasha.libreoff...@gmail.com

--- Comment #1 from sasha.libreoff...@gmail.com 2012-01-11 00:25:10 PST ---
not reproduced in LibO 3.5.0 beta 1 and LibO 3.3.4 both on Fedora 64 bit

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 43663] Crashes while opening .docx: /home/lo/stable/clone/filters/writerfilter/source/dmapper/GraphicImport.cxx:1505 failed. Message :GraphicCrop

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=43663

sasha.libreoff...@gmail.com changed:

   What|Removed |Added

 CC||sasha.libreoff...@gmail.com

--- Comment #2 from sasha.libreoff...@gmail.com 2012-01-11 00:31:02 PST ---
not reproduced crash on LibO 3.5.0 beta 1 and LibO 3.3.4 both on Fedora 64 bit
LibO 3.5.0 writes on console:
/home/lo/master/writerfilter/source/dmapper/GraphicImport.cxx:1505 failed.
Message :GraphicCrop
but all works correctly

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 44316] FILESAVE RTF files are saved corrupted

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=44316

Jean-Baptiste Faure jbf.fa...@orange.fr changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 CC||jbf.fa...@orange.fr
 Ever Confirmed|0   |1

--- Comment #3 from Jean-Baptiste Faure jbf.fa...@orange.fr 2012-01-11 
00:33:31 PST ---
Please, could you attach the original ODT file and the corresponding RTF
exported file?
Additional information needed: your OS.

Best regards. JBF

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 43028] FILEOPEN: Test case where opening docx causes General Error

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=43028

--- Comment #2 from Thomas fisc...@unix-ag.uni-kl.de 2012-01-11 00:42:25 PST 
---
Created attachment 55407
  -- https://bugs.freedesktop.org/attachment.cgi?id=55407
Test file as requested in comment #2

The file is still available. I guess you either missed the x of docx or due to
the line wrapping the whitespaces got messed up.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 43972] EDITING: Cross References Break when Moving Sections when Change Tracking is On

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=43972

--- Comment #1 from Graham White gwh...@uk.ibm.com 2012-01-11 00:45:01 PST ---
Hello?  Anybody there?

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 41402] Calc: Spreadsheet cannot be saved /saved as ... any more

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=41402

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 CC||c...@nouenoff.nl

--- Comment #2 from Cor Nouws c...@nouenoff.nl 2012-01-11 00:55:50 PST ---
Hello Helmut,

Can you please try again.
Might it be that the problem only occurs when a sheet is copied?
See zB: 41085 - fails save as when adding a new work sheet to front of sheets

thanks - Cor

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 41054] FILESAVE odf file corrupted - cannot save after inserting new sheet

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=41054

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |
 CC||c...@nouenoff.nl

--- Comment #8 from Cor Nouws c...@nouenoff.nl 2012-01-11 01:01:59 PST ---
Reopen - the attachment from the first comment
  https://bugs.freedesktop.org/attachment.cgi?id=51422
does show the bug in 3.4.5 rc2

(it's great that not all files / new files / all versions have the problem, but
this still is a bug - and a severe one)

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 39872] OUTER JOIN does not seem to work

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=39872

Pat Willener pwille...@gmail.com changed:

   What|Removed |Added

 AssignedTo|pwille...@gmail.com |libreoffice-b...@lists.free
   ||desktop.org

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 44644] VIEWING: Diacritics in fullscreen missing

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=44644

--- Comment #2 from novot...@gmail.com 2012-01-11 01:08:59 PST ---
(In reply to comment #1)
 I can't reproduce with Parallel Dev-Installation of  LibreOffice 3.5.0 Beta2-
 WIN7 Home Premium (64bit) German UI [Build-ID :
 8589e48-760cc4d-f39cf3d-1b2857e-60db978], no idea how to type those letters
 with my German keyboard.

Try type some germans Umlaut (I hope, that I use the rigth word for this)
e.g. ö, or others, where you need hit Umlaut first and letter second. In my
case, the result is the same as described above - o without Umlaut.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 41054] FILESAVE odf file corrupted - cannot save after inserting new sheet

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=41054

--- Comment #9 from Cor Nouws c...@nouenoff.nl 2012-01-11 01:09:38 PST ---
Created attachment 55410
  -- https://bugs.freedesktop.org/attachment.cgi?id=55410
ods to reproduce the problem

create attachment that I have to reproduce the problem:
LibreOffice 3.4.5 rc2

- right click on sheet 'leeg'
- choose Move / copy sheet
- choose Insert , before '2010'
- OK
- ctrl-s
   error with saving file ...
problem on writing
file cannot be saved

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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 41085] fails save as when adding a new work sheet to front of sheets

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=41085

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||DUPLICATE
 CC||c...@nouenoff.nl

--- Comment #2 from Cor Nouws c...@nouenoff.nl 2012-01-11 01:10:17 PST ---


*** This bug has been marked as a duplicate of bug 41054 ***

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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