date:20120224

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

2012-02-24 Thread Miklos Vajna

 oox/inc/oox/helper/propertymap.hxx |2 ++
 oox/source/helper/propertymap.cxx  |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 15af96ffec893cd2b1df734fd61e79feae5e2976
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Feb 24 10:08:04 2012 +0100

oox: guard dbgutil-only methods with ifdef

diff --git a/oox/inc/oox/helper/propertymap.hxx 
b/oox/inc/oox/helper/propertymap.hxx
index eda19e4..2696d49 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -100,8 +100,10 @@ public:
 makePropertySet() const;
 
 #if OSL_DEBUG_LEVEL  0
+#ifdef DBG_UTIL
   static void dump( ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet  rXPropSet);
   void dump();
+#endif
   static void dumpCode( ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet  rXPropSet);
   void dumpCode();
 #endif
diff --git a/oox/source/helper/propertymap.cxx 
b/oox/source/helper/propertymap.cxx
index 8923d9c..dcc3a83 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -431,6 +431,7 @@ static void lclDumpAnyValue( Any value)
   fprintf (stderr,???   unhandled type %s\n, 
USS(value.getValueTypeName()));
 }
 
+#ifdef DBG_UTIL
 void PropertyMap::dump( Reference XPropertySet  rXPropSet )
 {
 Reference XPropertySetInfo  info = rXPropSet-getPropertySetInfo ();
@@ -454,6 +455,7 @@ void PropertyMap::dump()
 {
 dump( Reference XPropertySet ( makePropertySet(), UNO_QUERY ) );
 }
+#endif
 
 static void printLevel (int level)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: distro-configs/LibreOfficeMacOSX.conf

2012-02-24 Thread Thorsten Behrens

 distro-configs/LibreOfficeMacOSX.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4591cd22409f870a0fa9263691945eea92359954
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Feb 24 10:47:53 2012 +0100

Use internal libxml for Mac release builds.

Following up from 49843f0f9788e01805d8d0d27428fe5e6a4cc530, actually
use internal libxml for release builds.

diff --git a/distro-configs/LibreOfficeMacOSX.conf 
b/distro-configs/LibreOfficeMacOSX.conf
index 9366a04..1a1fd09 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,6 +1,7 @@
 --with-vendor=The Document Foundation
 --enable-epm
 --enable-binfilter
+--without-system-libxml
 --disable-cairo-canvas
 --with-java-target-version=1.5
 --enable-ext-presenter-minimizer
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/LibreOfficeMacOSX.conf

2012-02-24 Thread Norbert Thiebaud

 distro-configs/LibreOfficeMacOSX.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 39f7bbb201adefa0ad593f5a0a9b2d33facd68bd
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Feb 24 10:47:53 2012 +0100

Use internal libxml for Mac release builds.

Following up from 49843f0f9788e01805d8d0d27428fe5e6a4cc530, actually
use internal libxml for release builds.

Signed-off-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/distro-configs/LibreOfficeMacOSX.conf 
b/distro-configs/LibreOfficeMacOSX.conf
index 9366a04..1a1fd09 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,6 +1,7 @@
 --with-vendor=The Document Foundation
 --enable-epm
 --enable-binfilter
+--without-system-libxml
 --disable-cairo-canvas
 --with-java-target-version=1.5
 --enable-ext-presenter-minimizer
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/inc_openoffice

2012-02-24 Thread Andras Timar

 instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a4ae955534ccc449ddf55fe1b5e5a25065af2ecd
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 11:38:17 2012 +0100

fdo#44717 More helpful text when installer detects a running soffice.bin

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index 110925c..b80d173 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -8,4 +8,4 @@ en-US  = The same version of this product is already 
installed.
 en-US = An older version of [ProductName] was found. To install a newer 
version, the older version needs to be removed first.
 
 [OOO_CUSTOMACTION_4]
-en-US = Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the 
[DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are 
using a multi-user system, also make sure that no other user has 
[DEFINEDPRODUCT] [DEFINEDVERSION] open.
+en-US = Setup detected a running soffice.bin process. Before you restart the 
installation, please exit the application that owns soffice.bin. It can be 
LibreOffice, OpenOffice.org, Lotus Symphony, etc. Also check for the running 
Quickstarter on Windows taskbar. If you are using a multi-user system, also 
make sure that no other user has this application open.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2012-02-24 Thread Andras Timar

 scp2/source/ooo/common_brand.scp |2 +-
 scp2/source/ooo/registryitem_ooo.scp |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 06dd0fda38f07a74ba8469542ed4afe93b47ee9c
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 11:46:39 2012 +0100

fdo#46377 BASISINSTALLLOCATION = INSTALLLOCATION

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6ded2c4..69c0a71 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1396,7 +1396,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
 Section = Bootstrap;
 Order = 4;
 Key = BASISINSTALLLOCATION;
-Value = [INSTALLLOCATION]Basis\\;
+Value = [INSTALLLOCATION];
 Inifiletablekey = BasisInstallLocation;
 Inifiletableaction = 1;
 Styles = (INIFILETABLE);
diff --git a/scp2/source/ooo/registryitem_ooo.scp 
b/scp2/source/ooo/registryitem_ooo.scp
index 5bc40d6..803f979 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -334,7 +334,7 @@ RegistryItem 
gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
Subkey = 
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -343,7 +343,7 @@ RegistryItem 
gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
Subkey = 
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -352,7 +352,7 @@ RegistryItem 
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 Subkey = Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%PRODUCTVERSION;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_PRODUCTVERSION);
 End
 
@@ -361,7 +361,7 @@ RegistryItem 
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
 Subkey = 
Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (ALWAYS_REQUIRED);
 End
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/inc filter/Library_msfilter.mk filter/Package_inc.mk filter/source sc/source sd/source sw/source

2012-02-24 Thread Michael Meeks

 filter/Library_msfilter.mk|1 
 filter/Package_inc.mk |1 
 filter/inc/filter/msfilter/msdffimp.hxx   |7 
 filter/inc/filter/msfilter/msfiltertracer.hxx |   97 --
 filter/inc/filter/msfilter/svdfppt.hxx|4 
 filter/source/msfilter/msdffimp.cxx   |   26 --
 filter/source/msfilter/msfiltertracer.cxx |  230 --
 filter/source/msfilter/svdfppt.cxx|   20 --
 sc/source/filter/excel/xiescher.cxx   |2 
 sc/source/filter/excel/xltracer.cxx   |   13 -
 sc/source/filter/inc/xltracer.hxx |7 
 sd/source/filter/ppt/pptin.cxx|   17 -
 sd/source/filter/ppt/pptin.hxx|3 
 sd/source/filter/sdpptwrp.cxx |1 
 sw/source/filter/ww8/tracer.cxx   |   76 
 sw/source/filter/ww8/tracer.hxx   |3 
 sw/source/filter/ww8/ww8par.cxx   |3 
 17 files changed, 16 insertions(+), 495 deletions(-)

New commits:
commit 168fc5c022538d287293bf933adde4b98c6aca37
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Fri Feb 24 11:43:42 2012 +0100

Removed MSFilterTracer and all references to it

diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 316a47d..e454dfb 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,msfilter,\
filter/source/msfilter/eschesdo \
filter/source/msfilter/mscodec \
filter/source/msfilter/msdffimp \
-   filter/source/msfilter/msfiltertracer \
filter/source/msfilter/msocximex \
filter/source/msfilter/msoleexp \
filter/source/msfilter/mstoolbar \
diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk
index af2ade6..27a6c45 100644
--- a/filter/Package_inc.mk
+++ b/filter/Package_inc.mk
@@ -24,7 +24,6 @@ $(eval $(call 
gb_Package_add_file,filter_inc,inc/filter/msfilter/countryid.hxx,f
 $(eval $(call 
gb_Package_add_file,filter_inc,inc/filter/msfilter/escherex.hxx,filter/msfilter/escherex.hxx))
 $(eval $(call 
gb_Package_add_file,filter_inc,inc/filter/msfilter/mscodec.hxx,filter/msfilter/mscodec.hxx))
 $(eval $(call 
gb_Package_add_file,filter_inc,inc/filter/msfilter/msdffimp.hxx,filter/msfilter/msdffimp.hxx))
-$(eval $(call 
gb_Package_add_file,filter_inc,inc/filter/msfilter/msfiltertracer.hxx,filter/msfilter/msfiltertracer.hxx))
 $(eval $(call 
gb_Package_add_file,filter_inc,inc/filter/msfilter/msocximex.hxx,filter/msfilter/msocximex.hxx))
 $(eval $(call 
gb_Package_add_file,filter_inc,inc/filter/msfilter/msoleexp.hxx,filter/msfilter/msoleexp.hxx))
 $(eval $(call 
gb_Package_add_file,filter_inc,inc/filter/msfilter/mstoolbar.hxx,filter/msfilter/mstoolbar.hxx))
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx 
b/filter/inc/filter/msfilter/msdffimp.hxx
index 1616adb..be40fda 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -37,7 +37,6 @@
 #include tools/gen.hxx
 #include tools/table.hxx
 #include svx/msdffdef.hxx
-#include filter/msfilter/msfiltertracer.hxx
 #include vcl/graph.hxx
 #include string.h
 #include map
@@ -576,7 +575,6 @@ public:
 DffRecordManagermaShapeRecords;
 ColorData   mnDefaultColor;
 
-MSFilterTracer* mpTracer;
 sal_BoolmbTracing;
 
 Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const;
@@ -619,12 +617,11 @@ public:
  long  nApplicationScale=  0,
  ColorData mnDefaultColor_  =  COL_DEFAULT,
  sal_uLong nDefaultFontHeight_  = 24,
- SvStream* pStData2_=  0,
- MSFilterTracer* pTracer= NULL );
+ SvStream* pStData2_=  0 );
 
 // in PPT werden die Parameter DGGContainerOffset und PicStream
 // mit Hilfe einer Init Routine Uebergeben.
-SvxMSDffManager( SvStream rStCtrl, const String rBaseURL, 
MSFilterTracer* pTracer );
+SvxMSDffManager( SvStream rStCtrl, const String rBaseURL );
 void InitSvxMSDffManager(sal_uInt32 nOffsDgg_, SvStream* pStData_, 
sal_uInt32 nSvxMSDffOLEConvFlags);
 void SetDgContainer( SvStream rSt );
 
diff --git a/filter/inc/filter/msfilter/msfiltertracer.hxx 
b/filter/inc/filter/msfilter/msfiltertracer.hxx
deleted file mode 100644
index e8fd049..000
--- a/filter/inc/filter/msfilter/msfiltertracer.hxx
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you

[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - wizards/com

2012-02-24 Thread Jan Holesovsky

 wizards/com/sun/star/wizards/ui/ControlScroller.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83ba2fb18f3ec7835591c6ffeda6e713bc09a9f9
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Feb 23 20:00:40 2012 +0100

fdo#46339: Fix Query Wizard by putting the right ElementName

Signed-off-by: CaolÃ¡n McNamara caol...@redhat.com
Signed-off-by: Jan Holesovsky ke...@suse.cz
Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java 
b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index a04d1c1..037a3ee 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -111,7 +111,7 @@ public abstract class ControlScroller
 iStartPosY = iCompPosY + SORELFIRSTPOSY;
 int ScrollHeight = iCompHeight - 2;
 nlineincrement = 1;
-sIncSuffix = 
com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(),
 imgBackground);
+sIncSuffix = 
com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(),
 TitleScrollBar);
 xScrollBar = CurUnoDialog.insertScrollBar(TitleScrollBar + 
sIncSuffix, 0,
 new AdjustmentListenerImpl(),
 new String[]
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

2012-02-24 Thread Michael Meeks

 oox/source/drawingml/textliststyle.cxx   |2 +-
 oox/source/drawingml/textparagraphproperties.cxx |2 +-
 oox/source/helper/propertyset.cxx|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 602908b300d4d688d50355ebeca5d3063f25f475
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 24 11:19:56 2012 +

fix oox debug build with DBG_UTIL guard for 'dump' usage

diff --git a/oox/source/drawingml/textliststyle.cxx 
b/oox/source/drawingml/textliststyle.cxx
index edd50f0..663a5d5 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -66,7 +66,7 @@ void TextListStyle::apply( const TextListStyle 
rTextListStyle )
 applyStyleList( rTextListStyle.getListStyle(), getListStyle() );
 }
 
-#if OSL_DEBUG_LEVEL  0
+#ifdef DBG_UTIL
 void TextListStyle::dump() const
 {
 for ( int i = 0; i  9; i++ )
diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index a916f45..6eea22f 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -467,7 +467,7 @@ float TextParagraphProperties::getCharHeightPoints( float 
fDefault ) const
 }
 
 
-#if OSL_DEBUG_LEVEL  0
+#ifdef DBG_UTIL
 
 void TextParagraphProperties::dump() const
 {
diff --git a/oox/source/helper/propertyset.cxx 
b/oox/source/helper/propertyset.cxx
index 71f0d4e..e973318 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -178,7 +178,7 @@ bool PropertySet::implSetPropertyValue( const OUString 
rPropName, const Any rV
 return false;
 }
 
-#if OSL_DEBUG_LEVEL  0
+#ifdef DBG_UTIL
 void PropertySet::dump()
 {
 PropertyMap::dump( Reference XPropertySet ( getXPropertySet(), UNO_QUERY 
) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-24 Thread Petr Mladek

 scp2/source/ooo/common_brand.scp |2 +-
 scp2/source/ooo/registryitem_ooo.scp |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 05e415f8e98107ef4267939d93b641a35d58cce2
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 11:46:39 2012 +0100

fdo#46377 BASISINSTALLLOCATION = INSTALLLOCATION

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index aa8c77a..bb5e8ca 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1387,7 +1387,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
 Section = Bootstrap;
 Order = 4;
 Key = BASISINSTALLLOCATION;
-Value = [INSTALLLOCATION]Basis\\;
+Value = [INSTALLLOCATION];
 Inifiletablekey = BasisInstallLocation;
 Inifiletableaction = 1;
 Styles = (INIFILETABLE);
diff --git a/scp2/source/ooo/registryitem_ooo.scp 
b/scp2/source/ooo/registryitem_ooo.scp
index 5bc40d6..803f979 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -334,7 +334,7 @@ RegistryItem 
gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
Subkey = 
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -343,7 +343,7 @@ RegistryItem 
gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
Subkey = 
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -352,7 +352,7 @@ RegistryItem 
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 Subkey = Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%PRODUCTVERSION;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_PRODUCTVERSION);
 End
 
@@ -361,7 +361,7 @@ RegistryItem 
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
 Subkey = 
Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (ALWAYS_REQUIRED);
 End
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 2 commits - RepositoryExternal.mk sdext/Library_pdfimport.mk

2012-02-24 Thread David Tardon

 RepositoryExternal.mk  |   27 +++
 sdext/Library_pdfimport.mk |5 +++--
 2 files changed, 26 insertions(+), 6 deletions(-)

New commits:
commit 09fae00a9b7dc8408ec0eba2a2c09ff66b860eeb
Author: David Tardon dtar...@redhat.com
Date:   Tue Feb 21 08:57:47 2012 +0100

fix platform ID

diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 9f4528a..f59d988 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -32,10 +32,11 @@ $(eval $(call gb_Library_add_api,pdfimport,\
 udkapi \
 ))
 
-# FIXME: set PLATFORMID correctly
+include $(OUTDIR)/inc/rtlbootstrap.mk
+
 $(eval $(call gb_Library_add_defs,pdfimport,\
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
--DPDFI_IMPL_IDENTIFIER=\com.sun.star.PDFImport-$(PLATFORMID)\ \
+-DPDFI_IMPL_IDENTIFIER=\com.sun.star.PDFImport-$(RTL_OS)-$(RTL_ARCH)\ \
 ))
 
 $(eval $(call gb_Library_add_package_headers,pdfimport,\
commit b2f603970a9916c232d6df640b75235fa4401ba1
Author: David Tardon dtar...@redhat.com
Date:   Tue Feb 21 06:58:02 2012 +0100

fix build with internal xpdf

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f39768e..577c570 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1026,15 +1026,34 @@ endef
 
 else # !SYSTEM_POPPLER
 
-# FIXME: what are the libs created by xpdf?
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-   poppler \
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+   fofi \
+   Goo \
+   xpdf \
 ))
 
 define gb_LinkTarget__use_poppler
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(OUTDIR)/inc/xpdf \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+   fofi \
+   Goo \
+   xpdf \
+)
+
+ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-   poppler \
+   objc \
 )
+else ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+   advapi32 \
+   gdi32 \
+)
+endif
 
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - configure.in moz/makefile.mk moz/patches solenv/gbuild

2012-02-24 Thread Lubos Lunak

 configure.in |6 +++---
 moz/makefile.mk  |1 -
 moz/patches/seamonkey-1.1.14.source-typeof.patch |   18 --
 solenv/gbuild/platform/WNT_INTEL_GCC.mk  |2 +-
 solenv/gbuild/platform/unxgcc.mk |2 +-
 5 files changed, 5 insertions(+), 24 deletions(-)

New commits:
commit 5fd1a34816b81fee6f54ad93d0047daaeaea51c1
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Fri Feb 24 13:25:32 2012 +0100

Revert Work around g++ -std=c++0x rejecting typeof keyword

We now default to -std=gnu++0x, so this shouldn't be necessary.

This reverts commit 437fe5a11f68d1848c49121394f16f09611b.

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 4146f41..7f926e5 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,7 +88,6 @@ PATCH_FILES = \
 patches/nss-linux3.patch \
 
patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
 patches/clang_missing_this_pointers.patch \
-patches/seamonkey-1.1.14.source-typeof.patch
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/seamonkey-1.1.14.source-typeof.patch 
b/moz/patches/seamonkey-1.1.14.source-typeof.patch
deleted file mode 100644
index 632e155..000
--- a/moz/patches/seamonkey-1.1.14.source-typeof.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 misc/mozilla/xpcom/base/nscore.h   2006-08-24 23:46:32.0 +0200
-+++ misc/build/mozilla/xpcom/base/nscore.h 2012-02-21 09:22:51.136057997 
+0100
-@@ -211,9 +211,14 @@
-  *  when http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11893 is fixed.
-  */
- 
-+// At least g++ (GCC) 4.6.2 20111027 (Red Hat 4.6.2-1) with -std=c++0x no
-+// longer recognizes typeof as a (GCC extension) keyword (an alternative fix
-+// might be to check the GCC version, as the bug mentioned above is reportedly
-+// fixed in GCC 4.4.3, see
-+// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9381#c15):
- #ifdef __GNUC__
- #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \
--  typeof(class::func) name
-+  __typeof__(class::func) name
- #else
- #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \
-   ret (NS_STDCALL class::*name) args
commit 1cf7ab61a71d4b7295942ff5c855896e60c15081
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Fri Feb 24 13:24:01 2012 +0100

use -std=gnu++0x rather than -std=c++0x

The gcc default for C++ is -std=gnu++98, and -std=c++98 is used
explicitly or with -ansi, so the C++0x default should be gnu++0x.

diff --git a/configure.in b/configure.in
index cefc6e8..9c24409 100644
--- a/configure.in
+++ b/configure.in
@@ -4333,9 +4333,9 @@ if test $GCC = yes; then
 AC_MSG_RESULT([no])
 fi
 
-AC_MSG_CHECKING([whether $CC supports -std=c++0x without Language Defect 
757])
+AC_MSG_CHECKING([whether $CC supports -std=gnu++0x without Language Defect 
757])
 save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS=$CXXFLAGS -std=c++0x
+CXXFLAGS=$CXXFLAGS -std=gnu++0x
 AC_LANG_PUSH([C++])
 
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -6702,7 +6702,7 @@ if test $with_system_mdds = yes; then
 dnl ===
 AC_MSG_CHECKING([which hash container mdds shall use])
 if test x$HAVE_CXX0X = xTRUE; then
-MDDS_CPPFLAGS=-std=c++0x
+MDDS_CPPFLAGS=-std=gnu++0x
 AC_MSG_RESULT([std::unordered_map])
 else
 MDDS_CPPFLAGS=-DMDDS_HASH_CONTAINER_BOOST
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 43d0d28..bf6155b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -75,7 +75,7 @@ endif
 
 ifeq ($(HAVE_CXX0X),TRUE)
 # We can turn on additional useful checks with c++0x
-# FIXME still does not compile fully gb_CXXFLAGS += -std=c++0x
+# FIXME still does not compile fully gb_CXXFLAGS += -std=gnu++0x
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS += \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 51693c9..67871be 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -103,7 +103,7 @@ endif
 ifeq ($(HAVE_CXX0X),TRUE)
 #Currently, as well as for its own merits, c++11/c++0x mode allows use to use
 #a template for SAL_N_ELEMENTS to detect at compiler time its misuse
-gb_CXXFLAGS += -std=c++0x
+gb_CXXFLAGS += -std=gnu++0x
 
 #We have so many std::auto_ptr uses that we need to be able to disable
 #warnings for those so that -Werror continues to be useful, seeing as moving
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-02-24 Thread Stephan Bergmann

 sc/source/filter/excel/impop.cxx|2 
 sc/source/filter/excel/xlroot.cxx   |4 -
 sc/source/filter/excel/xltracer.cxx |  103 ++--
 sc/source/filter/inc/xltracer.hxx   |   19 +-
 4 files changed, 11 insertions(+), 117 deletions(-)

New commits:
commit 4c5f388aa40036afea2a51156a41f4eea7ef1d7a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 24 14:04:20 2012 +0100

-Werror=unused-parameter

Not sure if this rather radical shrinking of XclTracer is good, though (or
if the class already has become obsolete anyway)?

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 533bbb9..c7504ce 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -1088,7 +1088,7 @@ void ImportExcel::TableOp( void )
 else
 {
 bTabTruncated = sal_True;
-GetTracer().TraceInvalidRow(GetCurrScTab(), nLastRow, MAXROW);
+GetTracer().TraceInvalidRow(nLastRow, MAXROW);
 }
 }
 
diff --git a/sc/source/filter/excel/xlroot.cxx 
b/sc/source/filter/excel/xlroot.cxx
index 0177ce4..cfd8805 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -183,9 +183,7 @@ XclRoot::XclRoot( XclRootData rRootData ) :
 
 // filter tracer
 // do not use CREATE_OUSTRING for conditional expression
-mrData.mxTracer.reset( new XclTracer( GetDocUrl(), IsExport() ?
-
OUString(RTL_CONSTASCII_USTRINGPARAM(Office.Tracing/Export/Excel))
-  : 
OUString(RTL_CONSTASCII_USTRINGPARAM(Office.Tracing/Import/Excel )) ) );
+mrData.mxTracer.reset( new XclTracer( GetDocUrl() ) );
 }
 
 XclRoot::XclRoot( const XclRoot rRoot ) :
diff --git a/sc/source/filter/excel/xltracer.cxx 
b/sc/source/filter/excel/xltracer.cxx
index 586d47f..8600d80 100644
--- a/sc/source/filter/excel/xltracer.cxx
+++ b/sc/source/filter/excel/xltracer.cxx
@@ -36,48 +36,7 @@ using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::PropertyValue;
 
-// 
-
-// Trace Table details are grouped by functionality using the context entry.
-// Each separate context starts at the next 1000 interval. New entries should
-// be added to their appropriate context. New contexts should be added onto
-// the end. Any gaps in the 1000 sequence or within the 1000 are the result
-// of trace events no longer present.
-static const XclTracerDetails pTracerDetails[] =
-{
-{ eUnKnown, 0, UNKNOWN,UNKNOWN, 
Unknown trace property.},
-{ eRowLimitExceeded,1000,  Limits, Sheet,   Row 
limit exceeded.},
-{ eTabLimitExceeded,1001,  Limits, Sheet,   Sheet 
limit exceeded.  },
-{ ePassword,2000,  Protection, Password,
Document is password protected.},
-{ ePrintRange,  3000,  Print,  Print Range, Print 
Range present.   },
-{ eShortDate,   4000,  CellFormatting, Short Dates, 
Possible Date format issue.},
-{ eBorderLineStyle, 4004,  CellFormatting, Border,  Line 
style not supported., },
-{ eFillPattern, 4005,  CellFormatting, Pattern, Fill 
Pattern not supported.,   },
-{ eInvisibleGrid,   5000,  Properties, Grid Invisible,  Grid 
invisible on first sheet.  },
-{ eFormattedNote,   6000,  Notes,  Formatting,  Text 
may be formatted. },
-{ eFormulaExtName,  7000,  Formula,External Name,   
External names not supported.  },
-{ eFormulaMissingArg,   7001,  Formula,Missing 
Argument,Parameter missing.  },
-{ ePivotDataSource, 8000,  Chart,  Pivot,   
External data source not supported.},
-{ ePivotChartExists,8001,  Chart,  Pivot,   Pivot 
Chart not supported.},
-{ eChartUnKnownType,8002,  Chart,  Type,Chart 
Type not supported.},
-{ eChartTrendLines, 8003,  Chart,  Type,Chart 
trendlines not supported.},
-{ eChartOnlySheet,  8004,  Chart,  Type,Chart 
only sheet not supported.},
-{ eChartRange,  8005,  Chart,  Source Data, Chart 
source ranges too complex.},
-{ eChartDSName, 8006,  Chart,  Source Data, 
Series titles not linked to cells.},
-{ eChartDataTable,  8007,  Chart,  Legend,  Data 
table not supported.},
-{ eChartLegendPosition, 8008,  Chart,  Legend,  
Position not guaranteed.},
-{ eChartTextFormatting, 8009,  Chart,  Formatting,  Text 
formatting present.},
-{ eChartEmbeddedObj,8010,  Chart,  Area,
Object inside

[Libreoffice-commits] .: writerfilter/source

2012-02-24 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   15 +++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit b538f6a0f4193531e1187874b4b35a4384d6fcd1
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Feb 24 15:38:55 2012 +0100

fdo#45187 revert writerfilter import, fixed the shapes import

This reverts commit 0e26bd20978cbdd7c59368044c2a21b98ffba164. Sadly
without a test document for the original issue there is no better fix
for this one.

Acked-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Acked-by: CÃ©dric Bosdonnat cedric.bosdonnat@free.fr

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d775650..8e5b9ea 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -192,7 +192,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bIsColumnBreakDeferred( false ),
 m_bIsPageBreakDeferred( false ),
 m_bIsInShape( false ),
-m_bRemovedLastAnchored( false ),
+m_bShapeContextAdded( false ),
 m_pLastSectionContext( ),
 m_nCurrentTabStopIndex( 0 ),
 m_sCurrentParaStyleId(),
@@ -1062,8 +1062,6 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr 
pPropertyMap )
 // this is normal: the shape is already attached
 }
 m_aAnchoredStack.pop( );
-m_aTextAppendStack.pop( );
-m_bRemovedLastAnchored = true;
 }
 
 // Get the end of paragraph character inserted
@@ -1204,10 +1202,10 @@ void DomainMapper_Impl::appendOLE( const 
::rtl::OUString rStreamName, OLEHandle
 // gives a better ( visually ) result
 
xOLEProperties-setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_ANCHOR_TYPE ),  uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) 
);
 // remove ( if valid ) associated shape ( used for graphic replacement 
)
-if ( m_aAnchoredStack.size()  0 )
+if ( m_bShapeContextAdded )
 {
 if ( lcl_removeShape(  m_xTextDocument, pOLEHandler-getShape(), 
m_aAnchoredStack, m_aTextAppendStack ) )
-m_bRemovedLastAnchored = true; // ensure PopShapeContext 
processing doesn't pop the append stack
+m_bShapeContextAdded = false; // ensure PopShapeContext 
processing doesn't pop the append stack
 }
 
 //
@@ -1219,6 +1217,7 @@ void DomainMapper_Impl::appendOLE( const ::rtl::OUString 
rStreamName, OLEHandle
 (void)rEx;
 OSL_FAIL( Exception in creation of OLE object );
 }
+
 }
 
 void DomainMapper_Impl::appendStarMath( const Value val )
@@ -1549,7 +1548,7 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference drawing::XShape
 {
 // Add the shape to the text append stack
 m_aTextAppendStack.push( uno::Reference text::XTextAppend ( xShape, 
uno::UNO_QUERY_THROW ) );
-m_bRemovedLastAnchored = false;
+m_bShapeContextAdded = true;
 
 // Add the shape to the anchored objects stack
 uno::Reference text::XTextContent  xTxtContent( xShape, 
uno::UNO_QUERY_THROW );
@@ -1588,11 +1587,11 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference drawing::XShape
 
 void DomainMapper_Impl::PopShapeContext()
 {
-if ( !m_bRemovedLastAnchored  m_aAnchoredStack.size()  0 )
+if ( m_bShapeContextAdded )
 {
 RemoveLastParagraph();
 m_aTextAppendStack.pop();
-m_aAnchoredStack.pop();
+m_bShapeContextAdded = false;
 }
 m_bIsInShape = false;
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index c4899cb..924c8dd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -295,7 +295,7 @@ private:
 bool   
 m_bIsColumnBreakDeferred;
 bool   
 m_bIsPageBreakDeferred;
 bool   
 m_bIsInShape;
-bool   
 m_bRemovedLastAnchored;
+bool   
 m_bShapeContextAdded;
 
 LineNumberSettings 
 m_aLineNumberSettings;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2012-02-24 Thread Petr Mladek

 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 24404329b71f12886830b6511ece8af10b2a7df1
Author: Petr Mladek pmla...@suse.cz
Date:   Fri Feb 24 15:54:46 2012 +0100

bump product version to 3.5.2-rc0+, release number to 200

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 1988ba1..2d32336 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-   UREPACKAGEVERSION 3.5.1
+   UREPACKAGEVERSION 3.5.2
URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -58,7 +58,7 @@ LibreOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSION 3.5.2
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.1
+   PACKAGEVERSION 3.5.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -117,7 +117,7 @@ LibreOffice_wJRE
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSION 3.5.2
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.1
+   PACKAGEVERSION 3.5.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -176,7 +176,7 @@ LibreOffice_Dev
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSION 3.5.2
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.1
+   PACKAGEVERSION 3.5.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -279,7 +279,7 @@ LibreOffice_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.1
+PACKAGEVERSION 3.5.2
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -323,7 +323,7 @@ LibreOffice_Dev_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.1
+PACKAGEVERSION 3.5.2
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -371,7 +371,7 @@ LibreOffice_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.1
+PACKAGEVERSION 3.5.2
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -415,7 +415,7 @@ LibreOffice_Dev_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.1
+PACKAGEVERSION 3.5.2
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -463,7 +463,7 @@ OxygenOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5

[Libreoffice-commits] .: l10ntools/source solenv/inc

2012-02-24 Thread Andras Timar

 l10ntools/source/help/HelpLinker.cxx |2 +-
 solenv/inc/_tg_zip.mk|   30 ++
 solenv/inc/rules.mk  |2 +-
 solenv/inc/tg_help.mk|   16 +---
 solenv/inc/tg_zip.mk |3 +--
 5 files changed, 18 insertions(+), 35 deletions(-)

New commits:
commit 995b2f887bd75283d2d395d9430cd0472f7356ae
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 16:43:03 2012 +0100

more silent output of non-verbose help build

diff --git a/l10ntools/source/help/HelpLinker.cxx 
b/l10ntools/source/help/HelpLinker.cxx
index eea87d5..0103f43 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -702,7 +702,7 @@ void HelpLinker::link() throw( HelpProcessingException )
 fs::path fsAdditionalFileName( additionalFileName, fs::native );
 std::string aNativeStr = 
fsAdditionalFileName.native_file_string();
 const char* pStr = aNativeStr.c_str();
-std::cerr  pStr;
+HCDBG(std::cerr  pStr  std::endl);
 
 fs::path fsTargetName( indexDirParentName / additionalFileKey );
 
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index 2dfe467..0f04434 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -47,7 +47,6 @@ $(MISC)/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN)
 ZIP1HELPVAR=$(BIN)/$(ZIP1TARGET)
 
 $(ZIP1DEPFILE) :
-@echo #  $(MISC)/$(@:f)
 .IF $(ZIP1DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
 $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) 
$(foreach,j,$(ZIP1LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
@@ -58,7 +57,7 @@ $(ZIP1DEPFILE) :
 
 
 $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
-@echo [ZIP] $(@:f)
+@echo [ building ZIP ] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ 
$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
 .IF $(ZIP1DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)
@@ -124,7 +123,6 @@ $(MISC)/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : 
$(ZIP2TARGETN)
 ZIP2HELPVAR=$(BIN)/$(ZIP2TARGET)
 
 $(ZIP2DEPFILE) :
-@echo #  $(MISC)/$(@:f)
 .IF $(ZIP2DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
 $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) 
$(foreach,j,$(ZIP2LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
@@ -135,7 +133,7 @@ $(ZIP2DEPFILE) :
 
 
 $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
-@echo [ZIP] $(@:f)
+@echo [ building ZIP ] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ 
$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
 .IF $(ZIP2DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ 
$(@:db))}$(ZIP2EXT)
@@ -201,7 +199,6 @@ $(MISC)/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : 
$(ZIP3TARGETN)
 ZIP3HELPVAR=$(BIN)/$(ZIP3TARGET)
 
 $(ZIP3DEPFILE) :
-@echo #  $(MISC)/$(@:f)
 .IF $(ZIP3DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP3DIR)
 $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) 
$(foreach,j,$(ZIP3LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
@@ -212,7 +209,7 @@ $(ZIP3DEPFILE) :
 
 
 $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
-@echo [ZIP] $(@:f)
+@echo [ building ZIP ] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ 
$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
 .IF $(ZIP3DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ 
$(@:db))}$(ZIP3EXT)
@@ -278,7 +275,6 @@ $(MISC)/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : 
$(ZIP4TARGETN)
 ZIP4HELPVAR=$(BIN)/$(ZIP4TARGET)
 
 $(ZIP4DEPFILE) :
-@echo #  $(MISC)/$(@:f)
 .IF $(ZIP4DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP4DIR)
 $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) 
$(foreach,j,$(ZIP4LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
@@ -289,7 +285,7 @@ $(ZIP4DEPFILE) :
 
 
 $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
-@echo [ZIP] $(@:f)
+@echo [ building ZIP ] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz/)

[Libreoffice-commits] .: solenv/inc

2012-02-24 Thread Lubos Lunak

 solenv/inc/unxgcc.mk  |2 +-
 solenv/inc/wntgcci.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 752de2112756b49854942c532b083dbe9ea63a2f
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Fri Feb 24 16:47:21 2012 +0100

missed instances of -std=c++0x when switching to gnu++0x

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a3231a6..14983dd 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -88,7 +88,7 @@ CFLAGSCXX= -pipe $(ARCH_FLAGS)
 CFLAGSCXX+=-fvisibility-inlines-hidden
 .ENDIF # $(HAVE_GCC_VISIBILITY_FEATURE) == TRUE
 .IF $(HAVE_CXX0X) == TRUE
-CFLAGSCXX+=-std=c++0x
+CFLAGSCXX+=-std=gnu++0x
 .IF $(GCCNUMVER) = 00040005
 CFLAGSCXX+=-Wno-deprecated-declarations
 .ENDIF
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 6795d0f..bdf46b4 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -48,7 +48,7 @@ CFLAGSCC=-pipe $(ARCH_FLAGS)
 CFLAGSCXX=-pipe $(ARCH_FLAGS)
 
 .IF $(HAVE_CXX0X) == TRUE
-# FIXME still does not compile fully CFLAGSCXX+=-std=c++0x
+# FIXME still does not compile fully CFLAGSCXX+=-std=gnu++0x
 .ENDIF
 
 CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.1.1'

2012-02-24 Thread Petr Mladek

Tag 'libreoffice-3.5.1.1' created by Petr Mladek pmla...@suse.cz at 
2012-02-24 15:35 -0800

Tag 3.5.1.1 (3.5.1-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPR65hAAoJEPQ0oe+v7q6javYQAMkD5gAcxVD9DC897BJ4uR+r
2imf086TKRGtiuAQv9e09AcIrHmkcwdiVFEaIYVbnuh5le4GJzqfVqifsv5s8rMk
sriYVzHH0sDfwqhH7JMogglSSw/LeOPpTHuELD4p3kw+1aRpxHl4tZ+yIRhjA+6J
JU2m2SAsZkFxFQ9uB715lnus7apUG1xFsh36GaesXxtVgfMYCyd/TlivtAfLnPnF
DvboygpFD/WD+4X1vTxVA7Yzw/kqlAVdjDrS4Q14uBVWfD5zhLQLnnEpHAi01ssY
YVLD3eVupmtnNHwRxb13mDMz7CW/aIuvxw5rJuXvwPcoLTdo6gUWGy3AfjF+Sgot
qRotURDevziXVFVGyYlD5bXBIwNvhDOjfDIt203oGj8Ox+oz+6TI/NmWtNed+v1y
j1PdYAJeaqQVPFEB/aBxn9fPozXuu2cQml3y/ZnSVGjRjxVZx6oaiZFEBKWG4wGQ
DvZ1H+/istBhS3/lIEJNF5mY8KNiL50aQkmpx/LFTUS7/+20yQupRkJWpJ7lFgdV
/8f+HNEDRyMSIx1gEn4T+gV3h8DoNdZIufnTx0xkDIQ+6dEsshivOtNhmjLzl8vT
XyMZSSuSyRCc2+j46RhMlRzFZHcv7Gk/z7n//DMPz47FLvdjOWISjEjdwddoQ/09
3yfSb6UtsNE8GtCwm6Cc
=P0xN
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-838:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.1.1'

2012-02-24 Thread Petr Mladek

Tag 'libreoffice-3.5.1.1' created by Petr Mladek pmla...@suse.cz at 
2012-02-24 15:36 -0800

Tag 3.5.1.1 (3.5.1-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPR65hAAoJEPQ0oe+v7q6jsxEQAM6GTNQ7lnIZ+n9emJajcz+k
+jnUUnGOpYyPg2MfxPxDwqVVr+vr+uaFUD5HlU15KowkIIFgoXDh/vU8xqrQ62NR
bO8kODxoxZJFrdybHGdQpLB+WegG70Klm2p6EmR+kJq78HzL+rN5sQR2BwXwqU5q
5tuMnzBsf4n2IuKp3nbjZf5AfPQnhIGGr+xUgXlzAUwRUBz/JFwLCmG5fxus7oi9
t7b68Ba2immKINtEWQf4/3TYr/WzbEtidYgcnMEfGgijQKgmqaJC39SuEG/PWHuG
4d3wSvDehDdEQSvWWd3W6YU7ifAZ94uOm1gdblId+uw3dbcyLcmk9ua2hD3tSCkG
yBCBA/borQrb8CADhw8thfDyBXcoc/awVpkuat48Yp603rDlriURUmxlUHbJ7oCM
9YnfpiMuvQGPC6pljTxhNgkv1/zcBlErimUpWx2taA+VffwIMVgdnzA3TepqpMQs
R8SSI1RVTsGc0DEZEUDtK7UEkVmizQZTBA744kDg5/ZYYOZhPBm4G7shF97NcgOS
cZ5K0xu+c0f85zNnYKm64QLmMk9PU+A/3CD96DxMk6L740nic8hKHEslDbiGS6Bn
RAIaofZpuEcp8MZd+xmKfLY4lBiLTvq8Rls0daUuEB59bXf/L4PvG///36EFSnaZ
r5KcEzRnzD/zWFqCXDWk
=n+Xb
-END PGP SIGNATURE-

Changes since libreoffice-3.5.0.1-3:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.1.1'

2012-02-24 Thread Petr Mladek

Tag 'libreoffice-3.5.1.1' created by Petr Mladek pmla...@suse.cz at 
2012-02-24 15:36 -0800

Tag 3.5.1.1 (3.5.1-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPR65hAAoJEPQ0oe+v7q6jzU8P/jZ8bbZm/IsZ4wEKD5F/jK1G
cAWTRwz5W2P0cd4dKno4B3ioKqAXBS9VBcGb8AnGYOKzjIS+b6dW2Ow0+jPtRF4b
WVFNgaEuhc+Vjl9aMWmk5MMtxztZec9vTuNHyrti16xH4ArK9TjBD3YmaLoj/cKS
tAI2ZjRGtVeaMRlLfiIOXhnKQwwHpWK2CISHDoxy0t9eHNOU+gsZpqLB+sDEMpbl
5mHDWZ2AOMg1xCB+V1Cz5HQcm0bHu3vezvwWu4JzGtMINsJTRLRaPXkJhPCSVJaY
yVFnfUahI8gB8CbiOxRPcvF9gLtvY18DX4pJWKDLYIHVD+A0uP1SA7qsjEuMsf+g
XgDLAchWWEK5YZQfbFY5NII1LP3iwupmW4PxQY93LafjO/e5WR2xp7S4LxMr47J7
Fc/b4TLZo842jaFzfUfJyf27JwhjjaGfTGGZVVsmRWl/tEaHJhqHtXbK/4rhHMNe
dMJM7OP8t0u7Kv2TI+k9ApTM2Q/tb+HFeYwYNMHOW3OV4+ASrI5TKXEa6RGU3gU9
QhUU5GCUo22xJqnWA+9aHNK+100DWvOjkvdxOwEo7XPhUfwtGCaZC0LyPiU2/hq5
GpjA0rOtVlQDAAqKY4HMWivXSfdOjrxD80cQeuCCwwVwpmYWRfaaOIJSRc5YJ+HG
WFwsLWRBmnHEmVEg99Rk
=1LrB
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-30:
---
 0 files changed
---
___
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 configmgr/source configure.in

2012-02-24 Thread Stephan Bergmann

 config_host.mk.in|1 -
 configmgr/source/partial.cxx |   15 ++-
 configure.in |   17 -
 3 files changed, 14 insertions(+), 19 deletions(-)

New commits:
commit 9cbef2656e07867fd84c9350d8b9e9baeb9bcef5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 24 17:40:30 2012 +0100

Removed unused --enable-ugly

diff --git a/config_host.mk.in b/config_host.mk.in
index f7dd207..ff976a7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -130,7 +130,6 @@ export ENABLE_SCRIPTING_PYTHON=@ENABLE_SCRIPTING_PYTHON@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
 export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
 export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@
-export ENABLE_UGLY=@ENABLE_UGLY@
 export ENABLE_XMLSEC=@ENABLE_XMLSEC@
 export ENABLE_ZENITY=@ENABLE_ZENITY@
 export EPM=@EPM@
diff --git a/configure.in b/configure.in
index 9c24409..3b27ac8 100644
--- a/configure.in
+++ b/configure.in
@@ -751,12 +751,6 @@ AC_ARG_ENABLE(binfilter,
 ,enable_binfilter=no
 )
 
-AC_ARG_ENABLE(ugly,
-AS_HELP_STRING([--enable-ugly],
-[Enables ugly pieces of functionality.]),
-,enable_ugly=no
-)
-
 AC_ARG_ENABLE(rpath,
 AS_HELP_STRING([--disable-rpath],
 [Disable the use of relative paths in shared libraries.]),
@@ -3439,17 +3433,6 @@ else
 AC_MSG_RESULT([no])
 fi
 
-dnl Enable ugly pieces of code we're better off without
-dnl ===
-if test $enable_ugly = yes; then
-BUILD_TYPE=$BUILD_TYPE DICTIONARIES
-SCPDEFS=$SCPDEFS -DWITH_UGLY
-ENABLE_UGLY=YES
-else
-ENABLE_UGLY=NO
-fi
-AC_SUBST(ENABLE_UGLY)
-
 dnl Test whether to include MySpell dictionaries
 dnl ===
 AC_MSG_CHECKING([whether to include MySpell dictionaries])
commit f3f79cc9e6c265baf48955d53f7e888205e0b3e0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 24 17:19:32 2012 +0100

Resolves fdo#46074: Fix Partial::contains for paths that go past a leaf node

Paths that already failed at the root node were not reported as 
CONTAINS_NOT,
so that they were erroneously migrated, but with broken content (values of 
set
member properties were nil).

diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index 7922e2c..088de36 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -76,6 +76,12 @@ Partial::Partial(
 std::set rtl::OUString  const  includedPaths,
 std::set rtl::OUString  const  excludedPaths)
 {
+// The Partial::Node tree built up here encodes the following information:
+// * Inner node, startInclude: an include starts here that contains 
excluded
+//   sub-trees
+// * Inner node, !startInclude: contains in-/excluded sub-trees
+// * Leaf node, startInclude: an include starts here
+// * Leaf node, !startInclude: an exclude starts here
 for (std::set rtl::OUString ::const_iterator i(includedPaths.begin());
  i != includedPaths.end(); ++i)
 {
@@ -119,12 +125,19 @@ Partial::~Partial() {}
 Partial::Containment Partial::contains(Path const  path) const {
 //TODO: For set elements, the segment names recorded in the node tree need
 // not match the corresponding path segments, so this function can fail.
+
+// * If path ends at a leaf node or goes past a leaf node:
+// ** If that leaf node is startInclude: = CONTAINS_NODE
+// ** If that leaf node is !startInclude: = CONTAINS_NOT
+// * If path ends at inner node:
+// ** If there is some startInclude along its trace: = CONTAINS_NODE
+// ** If there is no startInclude along its trace: = CONTAINS_SUBNODES
 Node const * p = root_;
 bool includes = false;
 for (Path::const_iterator i(path.begin()); i != path.end(); ++i) {
 Node::Children::const_iterator j(p-children.find(*i));
 if (j == p-children.end()) {
-break;
+return p-startInclude ? CONTAINS_NODE : CONTAINS_NOT;
 }
 p = j-second;
 includes |= p-startInclude;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - android/qa basic/source test/Package_unittest.mk test/user-template toolkit/source

2012-02-24 Thread Michael Meeks

 android/qa/desktop/Makefile  |4 +++
 basic/source/inc/namecont.hxx|8 +++---
 basic/source/uno/namecont.cxx|   39 ---
 test/Package_unittest.mk |2 -
 test/user-template/user/basic/dialog.xlc |4 ---
 test/user-template/user/basic/script.xlc |4 ---
 toolkit/source/awt/vclxtoolkit.cxx   |8 +-
 7 files changed, 26 insertions(+), 43 deletions(-)

New commits:
commit 1c7c2c032301247416d977af17ddd4183cd339f4
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 24 16:11:18 2012 +

test: remove, now redundant dummy dialog.xlc / script.xlc

diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
index ce48f68..b861c93 100644
--- a/test/Package_unittest.mk
+++ b/test/Package_unittest.mk
@@ -28,8 +28,6 @@
 $(eval $(call gb_Package_Package,test_unittest,$(SRCDIR)/test/user-template))
 
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/registry/modifications.xcd,registry/modifications.xcd))
-$(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/basic/dialog.xlc,user/basic/dialog.xlc))
-$(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/basic/script.xlc,user/basic/script.xlc))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/wordbook/sl.dic,user/wordbook/sl.dic))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/wordbook/en-US.dic,user/wordbook/en-US.dic))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/wordbook/technical.dic,user/wordbook/technical.dic))
diff --git a/test/user-template/user/basic/dialog.xlc 
b/test/user-template/user/basic/dialog.xlc
deleted file mode 100644
index aed4ac2..000
--- a/test/user-template/user/basic/dialog.xlc
+++ /dev/null
@@ -1,4 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!DOCTYPE library:libraries PUBLIC -//OpenOffice.org//DTD OfficeDocument 
1.0//EN libraries.dtd
-library:libraries xmlns:library=http://openoffice.org/2000/library; 
xmlns:xlink=http://www.w3.org/1999/xlink;
-/library:libraries
diff --git a/test/user-template/user/basic/script.xlc 
b/test/user-template/user/basic/script.xlc
deleted file mode 100644
index aed4ac2..000
--- a/test/user-template/user/basic/script.xlc
+++ /dev/null
@@ -1,4 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!DOCTYPE library:libraries PUBLIC -//OpenOffice.org//DTD OfficeDocument 
1.0//EN libraries.dtd
-library:libraries xmlns:library=http://openoffice.org/2000/library; 
xmlns:xlink=http://www.w3.org/1999/xlink;
-/library:libraries
commit 3bc31727bb7107e770f48871cf7700a16e9bbc68
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 24 15:07:37 2012 +

android: package more useful sounding libraries

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 528174b..8c07351 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -121,6 +121,7 @@ copy-stuff: buildrcs
  freetype \
  fsstorage.uno \
  gcc3_uno \
+ hypenlo \
  i18nisolang1gcc3 \
  i18npaperlo \
  i18npool.uno \
@@ -132,6 +133,8 @@ copy-stuff: buildrcs
  jvmaccessgcc3 \
  jvmfwk \
  lnglo \
+ introspection.uno \
+ lnth \
  localebe1.uno \
  localedata_en \
  localedata_es \
@@ -146,6 +149,7 @@ copy-stuff: buildrcs
  sclo \
  scfiltlo \
  sotlo \
+ spelllo \
  stocservices.uno \
  store \
  svllo \
commit 63ac26703974f8481b112b1a881329fa7a8bca96
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 24 15:06:52 2012 +

toolkit: fix module name for svt to 'merged' when using mergedlibs

diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 3a8e2c6..fe21cc6 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1094,7 +1094,13 @@ css::uno::Reference css::awt::XWindowPeer  
VCLXToolkit::ImplCreateWindow(
 // try to load the lib
 if ( !fnSvtCreateWindow  !hSvToolsLib )
 {
-::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( svt, 
sal_True );
+::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
+#ifdef LIBO_MERGELIBS
+   
merged,
+#else
+   svt,
+#endif
+   
sal_True );
 hSvToolsLib = osl_loadModuleRelative(
 thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
 if ( hSvToolsLib )
commit 1543f1ec6deba898f71b04d242af8bed74dcd8d6
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 24 14:22:54 2012 +

[Libreoffice-commits] .: 2 commits - android/qa vcl/android

2012-02-24 Thread Michael Meeks

 android/qa/desktop/Makefile |5 +++--
 vcl/android/androidinst.cxx |   22 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit c45e87d037ca11e6d173ab57fce295c5f01d2ccc
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 24 16:52:44 2012 +

android: more libs corrections

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 8c07351..490a7a8 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -121,7 +121,7 @@ copy-stuff: buildrcs
  freetype \
  fsstorage.uno \
  gcc3_uno \
- hypenlo \
+ hyphenlo \
  i18nisolang1gcc3 \
  i18npaperlo \
  i18npool.uno \
@@ -134,7 +134,7 @@ copy-stuff: buildrcs
  jvmfwk \
  lnglo \
  introspection.uno \
- lnth \
+ lnthlo \
  localebe1.uno \
  localedata_en \
  localedata_es \
@@ -170,6 +170,7 @@ copy-stuff: buildrcs
  xstor \
  \
  swlo \
+ swuilo \
  swdlo \
  ); do \
$(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
commit b8f41e584cb876327c78e55bdfffb0424facfe41
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 24 16:40:29 2012 +

android: get basic 0-9, a-z keyinput working

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 16a5125..94d5bbc 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -309,8 +309,6 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow)
 pFrame-PostPaint(true);
 BlitFrameToWindow (aOutBuffer, pFrame-getDevice());
 }
-else // Sucky the frame is invisible - why !?
-fprintf (stderr, invisible frame\n);
 }
 }
 else
@@ -435,12 +433,26 @@ int32_t AndroidSalInstance::onInputEvent (struct 
android_app* app, AInputEvent*
 SalKeyEvent aEvent;
 int64_t nNsTime = AKeyEvent_getEventTime(event);
 
+// FIXME: really we need a Java wrapper app as Mozilla has that does
+// key event translation for us, and provides -much- cleaner events.
 nEvent = (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_UP ?
   SALEVENT_KEYUP : SALEVENT_KEYINPUT);
+sal_uInt16 nCode = KeyToCode(event);
+sal_uInt16 nMetaState = KeyMetaStateToCode(event);
+if (nCode = KEY_0  nCode = KEY_9)
+aEvent.mnCharCode = '0' + nCode - KEY_0;
+else if (nCode = KEY_A  nCode = KEY_Z)
+aEvent.mnCharCode = (nMetaState  KEY_SHIFT ? 'A' : 'a') + nCode - 
KEY_A;
+else if (nCode == KEY_SPACE)
+aEvent.mnCharCode = ' ';
+else if (nCode == KEY_COMMA)
+aEvent.mnCharCode = ',';
+else if (nCode == KEY_POINT)
+aEvent.mnCharCode = '.';
+else
+aEvent.mnCharCode = 0;
 aEvent.mnTime = nNsTime / (1000 * 1000);
-aEvent.mnCode = KeyToCode(event);
-aEvent.mnCode |= KeyMetaStateToCode(event);
-aEvent.mnCharCode = 'a'; // the unicode of it all ...
+aEvent.mnCode = nMetaState | nCode;
 aEvent.mnRepeat = AKeyEvent_getRepeatCount(event);
 
 SalFrame *pFocus = SvpSalFrame::GetFocusFrame();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - clucene/configs clucene/source distro-configs/LibreOfficeMinGW.conf fpicker/source sal/inc sal/systools

2012-02-24 Thread Jan Holesovsky

 clucene/configs/_clucene-config-LINUX.h |   30 -
 clucene/configs/_clucene-config-MSVC.h  |  224 +++
 clucene/configs/_clucene-config-generic.h   |   30 -
 clucene/configs/clucene-config-MINGW.h  |  148 +
 clucene/configs/clucene-config-MSVC.h   |  296 
+-
 clucene/configs/clucene-config-generic.h|   40 -
 clucene/source/Makefile |6 
 distro-configs/LibreOfficeMinGW.conf|1 
 fpicker/source/win32/filepicker/FPentry.cxx |2 
 fpicker/source/win32/filepicker/VistaFilePicker.cxx |6 
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx |6 
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx |6 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |6 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx |6 
 sal/inc/systools/win32/snprintf.h   |3 
 sal/systools/win32/uwinapi/sntprintf.c  |4 
 16 files changed, 487 insertions(+), 327 deletions(-)

New commits:
commit 3dee9ff1c938cbc2272772c1c6df6f11ef5bab0e
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri Feb 24 18:53:02 2012 +0100

MinGW: Make clucene build.

diff --git a/clucene/configs/clucene-config-MINGW.h 
b/clucene/configs/clucene-config-MINGW.h
new file mode 100644
index 000..be6f487
--- /dev/null
+++ b/clucene/configs/clucene-config-MINGW.h
@@ -0,0 +1,148 @@
+#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H
+#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1
+
+/* src/shared/CLucene/clucene-config.h.
+*  Generated automatically at end of cmake.
+*/
+
+/* CMake will look for these headers: */
+#define _CL_HAVE_STRING_H  1
+#define _CL_HAVE_MEMORY_H  1
+/* #undef _CL_HAVE_UNISTD_H */
+#define _CL_HAVE_IO_H  1
+#define _CL_HAVE_DIRECT_H  1
+/* #undef _CL_HAVE_DIRENT_H */
+/* #undef _CL_HAVE_SYS_DIR_H */
+/* #undef _CL_HAVE_SYS_NDIR_H */
+#define _CL_HAVE_ERRNO_H  1
+#define _CL_HAVE_WCHAR_H  1
+#define _CL_HAVE_WCTYPE_H
+#define _CL_HAVE_CTYPE_H  1
+#define _CL_HAVE_WINDOWS_H  1
+/* #undef _CL_HAVE_WINDEF_H */
+#define _CL_HAVE_SYS_TYPES_H  1
+/* #undef _CL_HAVE_DLFCN_H */
+/* #undef _CL_HAVE_EXT_HASH_MAP */
+/* #undef _CL_HAVE_EXT_HASH_SET */
+/* #undef _CL_HAVE_TR1_UNORDERED_MAP */
+/* #undef _CL_HAVE_TR1_UNORDERED_SET */
+/* #undef _CL_HAVE_HASH_MAP */
+/* #undef _CL_HAVE_HASH_SET */
+/* #undef _CL_HAVE_NDIR_H */
+#define _CL_HAVE_SYS_STAT_H  1
+#define _CL_HAVE_SYS_TIMEB_H  1
+/* #undef _CL_HAVE_SYS_TIME_H */
+#define _CL_HAVE_TCHAR_H 1
+/* #undef _CL_HAVE_SYS_MMAN_H */
+#define _CL_HAVE_WINERROR_H 1
+/* #undef _CL_HAVE_STDINT_H */
+
+// our needed types
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+
+/* undef float_t*/
+typedef unsigned long _cl_dword_t;
+/* undef size_t size_t */
+
+/* tchar  _T definitions... */
+/* undef TCHAR TCHAR */
+/* #undef _T */
+
+/* CMake will determine these specifics. Things like bugs, etc */
+
+/* if we can't support the map/set hashing */
+/* #undef LUCENE_DISABLE_HASHING */
+
+/* Define if you have POSIX threads libraries and header files. */
+/* #undef _CL_HAVE_PTHREAD */
+
+/* Define if you have Win32 threads libraries and header files. */
+#define _CL_HAVE_WIN32_THREADS  1
+
+/* Define if we have gcc atomic functions */
+/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */
+
+/* Define what eval method is required for float_t to be defined (for GCC). */
+/* #undef _FLT_EVAL_METHOD */
+
+/* If we use hashmaps, which namespace do we use: */
+#define CL_NS_HASHING(func)
+/* If we use hashmaps, which classes do we use: */
+#define _CL_HASH_MAP
+#define _CL_HASH_SET
+
+/* define if the compiler implements namespaces */
+#define _CL_HAVE_NAMESPACES
+
+/* Defined if the snprintf overflow test fails */
+/* #undef _CL_HAVE_SNPRINTF_BUG */
+
+/* Defined if the swprintf test fails */
+/* #undef _CL_HAVE_SNWPRINTF_BUG */
+
+/* How to define a static const in a class */
+#define LUCENE_STATIC_CONSTANT(type, assignment)  static const type assignment
+
+/* Define to the necessary symbol if this constant uses a non-standard name on
+   your system. */
+//todo: not checked
+/* #undef _CL_PTHREAD_CREATE_JOINABLE */
+
+/* Define to 1 if the `S_IS*' macros in sys/stat.h do not work properly. */
+//todo: not being checked for...
+/* #undef _CL_STAT_MACROS_BROKEN */
+
+/* Define to 1 if you can safely include both sys/time.h and time.h. */
+//not actually used for anything...
+/* #undef _CL_TIME_WITH_SYS_TIME */
+
+/* Define that we will be using -fvisibility=hidden, and
+ * make public classes visible using __attribute__ ((visibility(default)))
+ */
+/*

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 9 commits - sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sdext/Module_sdext.mk sdext/Package_minimize

2012-02-24 Thread David Tardon

 sdext/Extension_minimizer.mk   |6 
 sdext/Extension_pdfimport.mk   |5 
 sdext/Extension_presenter.mk   |5 
 sdext/Module_sdext.mk  |3 
 sdext/Package_minimizer_manifest.mk|   36 
 sdext/Package_pdfimport_manifest.mk|   36 
 sdext/Package_presenter_manifest.mk|   36 
 sdext/platform.mk  |   49 +
 sdext/source/minimizer/Makefile|   40 
 sdext/source/minimizer/description.xml |4 
 sdext/source/minimizer/manifest.xml|2 
 sdext/source/pdfimport/config/Makefile |   43 -
 sdext/source/pdfimport/config/manifest.xml |   14 -
 sdext/source/pdfimport/description.xml |4 
 sdext/source/pdfimport/manifest.xml|   14 +
 sdext/source/presenter/Makefile|   40 
 sdext/source/presenter/description.xml |4 
 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile |4 
 sdext/source/presenter/manifest.xml|2 
 solenv/gbuild/Extension.mk |   86 
--
 solenv/gbuild/TargetLocations.mk   |1 
 solenv/gbuild/platform/WNT_INTEL_GCC.mk|5 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk|5 
 solenv/gbuild/platform/com_GCC_defs.mk |5 
 solenv/gbuild/platform/solaris.mk  |5 
 25 files changed, 144 insertions(+), 310 deletions(-)

New commits:
commit 6def461beb77a30f00e0f4cd88f791b8c434c38d
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 24 18:29:22 2012 +0100

set localize.sdf path separately for each file

It cannot be done at the main target, because there is no guarantee that
all help (or properties) files are in one directory.

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 449c74f..da06010 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -161,15 +161,15 @@ define gb_Extension_localize_properties
 $(call gb_Extension_get_target,$(1)) : FILES += $(2)
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst 
-,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF2 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
-$(call gb_Extension_get_target,$(1)) : $$(SDF2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 endif
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_rootdir,$(1))/$(2)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@)  \
cp -f $$ $$@ \
-   $(if $(strip $(gb_WITH_LANG)), $(gb_Extension_PROPMERGECOMMAND) -i 
$$@ -m $$(SDF2))
+   $(if $(strip $(gb_WITH_LANG)), $(gb_Extension_PROPMERGECOMMAND) -i 
$$@ -m $$(SDF))
 
 endef
 
@@ -177,8 +177,6 @@ endef
 define gb_Extension_localize_help
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(foreach 
lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF3 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
-$(call gb_Extension_get_target,$(1)) : $$(SDF3)
 $(foreach lang,$(gb_Extension_LANGS),$(call 
gb_Extension_localize_help_onelang,$(1),$(subst 
lang,$(lang),$(2)),$(3),$(lang)))
 endif
 
@@ -186,10 +184,12 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_rootdir,$(1))/$(2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)  \
-   $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$) -o 
$$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3)
+   $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$) -o 
$$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF)
 
 endef
 
commit 7e107b68f8e7a2a92090291f7bb0b63596349afb
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 24 18:05:12 2012 +0100

fail if any previous

[Libreoffice-commits] .: sc/source

2012-02-24 Thread Kohei Yoshida

 sc/source/filter/excel/xichart.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 89e836c64a885b676673af33bf98e5ef97869daf
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Feb 24 15:42:09 2012 -0500

fdo#40320: Insert only a placeholder since the caller relies on this 
behavior.

diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index df6a14d..a483064 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2135,8 +2135,9 @@ XclImpChTextRef* XclImpChSeries::GetDataLabelRef( 
sal_uInt16 nPointIdx )
 XclImpChTextMap::iterator itr = maLabels.lower_bound(nPointIdx);
 if (itr == maLabels.end() || maLabels.key_comp()(nPointIdx, 
itr-first))
 {
-// No object exists at this point index position.  Insert a new 
one.
-XclImpChTextRef p(new XclImpChText(GetChRoot()));
+// No object exists at this point index position.  Insert a new
+// placeholder.
+XclImpChTextRef p;
 itr = maLabels.insert(itr, XclImpChTextMap::value_type(nPointIdx, 
p));
 }
 return itr-second;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: clucene/Library_clucene.mk

2012-02-24 Thread Matus Kukan

 clucene/Library_clucene.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 654a5bdd6cdd594d9268deabb5629fc8720d7514
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Fri Feb 24 21:50:45 2012 +0100

filter out not needed uwinapi which is not yet built

diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 29f0854..2fe7c5f 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -54,8 +54,9 @@ $(eval $(call gb_Library_add_defs,clucene,\
 ))
 endif
 
+# clucene does not depend on sal nor needs uwinapi here
 $(eval $(call gb_Library_add_linked_libs,clucene,\
-$(gb_STDLIBS) \
+$(filter-out uwinapi,$(gb_STDLIBS)) \
 ))
 
 ifeq ($(OS),LINUX)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-02-24 Thread Kohei Yoshida

 sc/source/filter/excel/xichart.cxx |  122 +++--
 sc/source/filter/inc/xichart.hxx   |8 --
 2 files changed, 66 insertions(+), 64 deletions(-)

New commits:
commit ba8918aebd2b9f030e0fd684accc9bf21bd1eac3
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Feb 24 15:55:55 2012 -0500

Untangled the code a bit.

diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index a483064..5503c21 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1830,30 +1830,56 @@ void XclImpChSeries::ReadSubRecord( XclImpStream rStrm 
)
 }
 }
 
-void XclImpChSeries::SetDataFormat( XclImpChDataFormatRef xDataFmt )
+void XclImpChSeries::SetDataFormat( const XclImpChDataFormatRef xDataFmt )
 {
-if( xDataFmt )
+if (!xDataFmt)
+return;
+
+sal_uInt16 nPointIdx = xDataFmt-GetPointPos().mnPointIdx;
+if (nPointIdx == EXC_CHDATAFORMAT_ALLPOINTS)
 {
-XclImpChDataFormatRef* pxDataFmt = GetDataFormatRef( 
xDataFmt-GetPointPos().mnPointIdx );
-// do not overwrite existing data format
-if( pxDataFmt  !*pxDataFmt )
-{
-*pxDataFmt = xDataFmt;
-// #i51639# register series format index at chart type group
-if( (pxDataFmt == mxSeriesFmt)  !HasParentSeries() )
-if( XclImpChTypeGroup* pTypeGroup = 
GetChartData().GetTypeGroup( mnGroupIdx ).get() )
-pTypeGroup-SetUsedFormatIndex( xDataFmt-GetFormatIdx() );
-}
+if (mxSeriesFmt)
+// Don't overwrite the existing format.
+return;
+
+mxSeriesFmt = xDataFmt;
+if (HasParentSeries())
+return;
+
+XclImpChTypeGroupRef pTypeGroup = 
GetChartData().GetTypeGroup(mnGroupIdx);
+if (pTypeGroup)
+pTypeGroup-SetUsedFormatIndex(xDataFmt-GetFormatIdx());
+
+return;
+}
+
+if (nPointIdx = EXC_CHDATAFORMAT_MAXPOINTCOUNT)
+// Above the max point count.  Bail out.
+return;
+
+XclImpChDataFormatMap::iterator itr = maPointFmts.lower_bound(nPointIdx);
+if (itr == maPointFmts.end() || maPointFmts.key_comp()(nPointIdx, 
itr-first))
+{
+// No object exists at this point index position.  Insert it.
+itr = maPointFmts.insert(itr, 
XclImpChDataFormatMap::value_type(nPointIdx, xDataFmt));
 }
 }
 
-void XclImpChSeries::SetDataLabel( XclImpChTextRef xLabel )
+void XclImpChSeries::SetDataLabel( const XclImpChTextRef xLabel )
 {
-if( xLabel )
+if (!xLabel)
+return;
+
+sal_uInt16 nPointIdx = xLabel-GetPointPos().mnPointIdx;
+if ((nPointIdx != EXC_CHDATAFORMAT_ALLPOINTS)  (nPointIdx = 
EXC_CHDATAFORMAT_MAXPOINTCOUNT))
+// Above the maximum allowed data points. Bail out.
+return;
+
+XclImpChTextMap::iterator itr = maLabels.lower_bound(nPointIdx);
+if (itr == maLabels.end() || maLabels.key_comp()(nPointIdx, itr-first))
 {
-XclImpChTextRef* pxLabel = GetDataLabelRef( 
xLabel-GetPointPos().mnPointIdx );
-if( pxLabel  !*pxLabel )
-*pxLabel = xLabel;
+// No object exists at this point index position.  Insert it.
+itr = maLabels.insert(itr, XclImpChTextMap::value_type(nPointIdx, 
xLabel));
 }
 }
 
@@ -1911,11 +1937,28 @@ void XclImpChSeries::FinalizeDataFormats()
 // set text labels to data formats
 for( XclImpChTextMap::iterator aTIt = maLabels.begin(), aTEnd = 
maLabels.end(); aTIt != aTEnd; ++aTIt )
 {
-if( XclImpChDataFormatRef* pxDataFmt = GetDataFormatRef( 
aTIt-first ) )
+sal_uInt16 nPointIdx = aTIt-first;
+if (nPointIdx == EXC_CHDATAFORMAT_ALLPOINTS)
 {
-if( !*pxDataFmt )
-*pxDataFmt = CreateDataFormat( aTIt-first, 
EXC_CHDATAFORMAT_DEFAULT );
-(*pxDataFmt)-SetDataLabel( aTIt-second );
+if (!mxSeriesFmt)
+mxSeriesFmt = CreateDataFormat(nPointIdx, 
EXC_CHDATAFORMAT_DEFAULT);
+mxSeriesFmt-SetDataLabel(aTIt-second);
+}
+else if (nPointIdx  EXC_CHDATAFORMAT_MAXPOINTCOUNT)
+{
+XclImpChDataFormatRef p;
+XclImpChDataFormatMap::iterator itr = 
maPointFmts.lower_bound(nPointIdx);
+if (itr == maPointFmts.end() || 
maPointFmts.key_comp()(nPointIdx, itr-first))
+{
+// No object exists at this point index position.  Insert
+// a new one.
+p = CreateDataFormat(nPointIdx, EXC_CHDATAFORMAT_DEFAULT);
+itr = maPointFmts.insert(
+itr, XclImpChDataFormatMap::value_type(nPointIdx, p));
+}
+else
+p = itr-second;
+p-SetDataLabel(aTIt-second);
 }
 }
 
@@ -2108,43 +2151,6 @@ XclImpChDataFormatRef

[Libreoffice-commits] .: officecfg/registry

2012-02-24 Thread Andras Timar

 officecfg/registry/data/org/openoffice/VCL.xcu |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1e343276ecb7e88482e0dd8b2a1e170dbffbe8ba
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 23:16:31 2012 +0100

fdo#46571 add Gurmukhi MT font for pa-IN

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 4d8f11d..265b4ec 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -731,22 +731,22 @@
 /node
 node oor:name=pa-IN oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma/value
  /prop
   prop oor:name=CTL_DISPLAY oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
   prop oor:name=CTL_HEADING oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
   prop oor:name=CTL_PRESENTATION oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
   prop oor:name=CTL_SPREADSHEET oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
   prop oor:name=CTL_TEXT oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
 /node
 node oor:name=ta oor:op=replace
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: fpicker/Executable_kdefilepicker.mk

2012-02-24 Thread Stephan Bergmann

 fpicker/Executable_kdefilepicker.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 77ffeb2dc5b14d37e47403c93f229da917da0141
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 24 23:14:25 2012 +0100

Disable WaE in fpicker/source/unx/kde

...as the included kde headers produce lots of warnings.

diff --git a/fpicker/Executable_kdefilepicker.mk 
b/fpicker/Executable_kdefilepicker.mk
index 036e59a..9f8cca2 100644
--- a/fpicker/Executable_kdefilepicker.mk
+++ b/fpicker/Executable_kdefilepicker.mk
@@ -56,4 +56,6 @@ $(eval $(call 
gb_Executable_add_generated_cxxobjects,kdefilepicker,\
CustomTarget/fpicker/source/unx/kde/kdefilepicker.moc \
 ))
 
+$(eval $(call gb_Executable_set_warnings_not_errors,kdefilepicker))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: packimages/Package_images.mk

2012-02-24 Thread Matus Kukan

 packimages/Package_images.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit aa2456ecb15a0f14b3e0a6470124a82f1460596f
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Sat Feb 25 00:29:20 2012 +0100

use gb_Helper_PHONY here

diff --git a/packimages/Package_images.mk b/packimages/Package_images.mk
index 157a9e5..21be311 100644
--- a/packimages/Package_images.mk
+++ b/packimages/Package_images.mk
@@ -29,11 +29,9 @@ $(eval $(call 
gb_Package_Package,packimages_images,$(WORKDIR)/CustomTarget/packi
 
 $(eval $(call gb_Package_add_customtarget,packimages_images,packimages/pack))
 
-# hack to rerun custom target's makefile every time
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,packimages/pack,\
-   packimages_rerun \
+   $(gb_Helper_PHONY) \
 ))
-packimages_rerun:
 
 $(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-24 Thread Kohei Yoshida

 sc/inc/dpoutput.hxx  |   46 -
 sc/qa/unit/ucalc.cxx |   14 --
 sc/source/core/data/dpobject.cxx |4 
 sc/source/core/data/dpoutput.cxx |  196 +++
 sc/source/core/data/dptabsrc.cxx |   11 +-
 5 files changed, 140 insertions(+), 131 deletions(-)

New commits:
commit 1fb5aea16f11c90aaac23486e584a17e0655b621
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Sat Feb 25 00:42:02 2012 -0500

Show column/row grand totals only when at least one column/row field exists.

Otherwise the grand total would be just a duplicate of the data field
area.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 37a8ee7..89bc980 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1662,9 +1662,7 @@ void Test::testPivotTableFilters()
 { 0, 0 },
 { Data, 0 },
 { Sum - Val1, 8 },
-{ Sum - Val2, 80 },
-{ Total Sum - Val1, 8 },
-{ Total Sum - Val2, 80 }
+{ Sum - Val2, 80 }
 };
 
 bSuccess = checkDPTableOutput2(m_pDoc, aOutRange, aOutputCheck, 
DataPilot table output (unfiltered));
@@ -1676,7 +1674,7 @@ void Test::testPivotTableFilters()
 ScAddress aFormulaAddr = aOutRange.aEnd;
 aFormulaAddr.IncRow(2);
 m_pDoc-SetString(aFormulaAddr.Col(), aFormulaAddr.Row(), 
aFormulaAddr.Tab(),
-  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(=B8)));
+  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(=B6)));
 double fTest = m_pDoc-GetValue(aFormulaAddr);
 CPPUNIT_ASSERT_MESSAGE(Incorrect formula value that references a cell in 
the pivot table output., fTest == 80.0);
 
@@ -1698,9 +1696,7 @@ void Test::testPivotTableFilters()
 { 0, 0 },
 { Data, 0 },
 { Sum - Val1, 4 },
-{ Sum - Val2, 40 },
-{ Total Sum - Val1, 4 },
-{ Total Sum - Val2, 40 }
+{ Sum - Val2, 40 }
 };
 
 bSuccess = checkDPTableOutput2(m_pDoc, aOutRange, aOutputCheck, 
DataPilot table output (filtered by page));
@@ -1730,9 +1726,7 @@ void Test::testPivotTableFilters()
 { 0, 0 },
 { Data, 0 },
 { Sum - Val1, 2 },
-{ Sum - Val2, 20 },
-{ Total Sum - Val1, 2 },
-{ Total Sum - Val2, 20 }
+{ Sum - Val2, 20 }
 };
 
 bSuccess = checkDPTableOutput2(m_pDoc, aOutRange, aOutputCheck, 
DataPilot table output (filtered by query));
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 22f17ef..24dc55f 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -863,8 +863,15 @@ void ScDPSource::CreateRes_Impl()
 aInitState.AddMember( nPageDims[i], GetMemberId( nPageDims[i],  
pDim-GetSelectedData() ) );
 }
 
-pColResRoot = new ScDPResultMember( pResData, bColumnGrand );
-pRowResRoot = new ScDPResultMember( pResData, bRowGrand );
+// Show grand total columns only when the option is set *and* there is at
+// least one column field.  Same for the grand total rows.
+sal_uInt16 nDataLayoutOrient = GetDataLayoutOrientation();
+long nColDimCount2 = nColDimCount - (nDataLayoutOrient == 
sheet::DataPilotFieldOrientation_COLUMN ? 1 : 0);
+long nRowDimCount2 = nRowDimCount - (nDataLayoutOrient == 
sheet::DataPilotFieldOrientation_ROW ? 1 : 0);
+bool bShowColGrand = bColumnGrand  nColDimCount2  0;
+bool bShowRowGrand = bRowGrand  nRowDimCount2  0;
+pColResRoot = new ScDPResultMember(pResData, bShowColGrand);
+pRowResRoot = new ScDPResultMember(pResData, bShowRowGrand);
 
 FillCalcInfo(false, aInfo, bHasAutoShow);
 long nColLevelCount = aInfo.aColLevels.size();
commit 778a6993b971f13f4008491f54296e57b9026238
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Feb 24 22:03:15 2012 -0500

boolean cleanup in ScDPOutput.

diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index 1aec7e7..24de356 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -81,7 +81,6 @@ private:
 com::sun::star::uno::Reference
 com::sun::star::sheet::XDimensionsSupplier xSource;
 ScAddress   aStartPos;
-boolbDoFilter;
 ScDPOutLevelData*   pColFields;
 ScDPOutLevelData*   pRowFields;
 ScDPOutLevelData*   pPageFields;
@@ -91,8 +90,6 @@ private:
 com::sun::star::uno::Sequence
 com::sun::star::uno::Sequence
 com::sun::star::sheet::DataResult  aData;
-boolbResultsError;
-boolmbHasDataLayout;
 rtl::OUString   aDataDescription;
 
 // Number format related parameters
@@ -103,12 +100,9 @@ private:
 sal_uInt32  nSingleNumFmt;
 
 // Output geometry related parameters
-boolbSizesValid;
-boolbSizeOverflow;
 long

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

[Libreoffice-commits] .: distro-configs/LibreOfficeMacOSX.conf

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/LibreOfficeMacOSX.conf

[Libreoffice-commits] .: instsetoo_native/inc_openoffice

[Libreoffice-commits] .: scp2/source

[Libreoffice-commits] .: filter/inc filter/Library_msfilter.mk filter/Package_inc.mk filter/source sc/source sd/source sw/source

[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - wizards/com

[Libreoffice-commits] .: oox/source

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

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 2 commits - RepositoryExternal.mk sdext/Library_pdfimport.mk

[Libreoffice-commits] .: 2 commits - configure.in moz/makefile.mk moz/patches solenv/gbuild

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: writerfilter/source

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

[Libreoffice-commits] .: l10ntools/source solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.1.1'

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.1.1'

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.1.1'

[Libreoffice-commits] .: 2 commits - config_host.mk.in configmgr/source configure.in

[Libreoffice-commits] .: 5 commits - android/qa basic/source test/Package_unittest.mk test/user-template toolkit/source

[Libreoffice-commits] .: 2 commits - android/qa vcl/android

[Libreoffice-commits] .: 5 commits - clucene/configs clucene/source distro-configs/LibreOfficeMinGW.conf fpicker/source sal/inc sal/systools

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 9 commits - sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sdext/Module_sdext.mk sdext/Package_minimize

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: clucene/Library_clucene.mk

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: officecfg/registry

[Libreoffice-commits] .: fpicker/Executable_kdefilepicker.mk

[Libreoffice-commits] .: packimages/Package_images.mk

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

31 matches

Site Navigation

Mail list logo

Footer information