date:20120402

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

2012-04-02 Thread Miklos Vajna

 oox/inc/oox/vml/vmlshape.hxx   |1 +
 oox/source/token/properties.txt|2 ++
 oox/source/vml/vmlshape.cxx|9 -
 oox/source/vml/vmlshapecontext.cxx |1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit f1afee4b1f40d45b6b4a11e7b1bfe5253627e80f
Author: CÃ©dric Bosdonnat 
Date:   Fri Mar 23 15:28:29 2012 +0100

n#751573: docx, no mso-fit-shape-to-text means the textbox size is fixed

(cherry picked from commit 3751ab6910d06ca01d1980fce40792560afc9ebb)

Conflicts:

oox/inc/oox/vml/vmlshape.hxx
oox/source/vml/vmlshapecontext.cxx

Signed-off-by: Miklos Vajna 

diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 65683f7..1926a08 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -78,6 +78,7 @@ struct ShapeTypeModel
 ::rtl::OUString maHeight;   /// Height of the shape 
bounding box (number with unit).
 ::rtl::OUString maMarginLeft;   /// X position of the shape 
bounding box to shape anchor (number with unit).
 ::rtl::OUString maMarginTop;/// Y position of the shape 
bounding box to shape anchor (number with unit).
+sal_BoolmbAutoHeight;   /// If true, the height value 
is a minimum value (mostly used for textboxes)
 
 StrokeModel maStrokeModel;  /// Border line formatting.
 FillModel   maFillModel;/// Shape fill formatting.
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 9127c38..b754f1d 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -179,6 +179,7 @@ FooterIsDynamicHeight
 FooterIsOn
 FooterIsShared
 FormulaConvention
+FrameIsAutomaticHeight
 Function
 GapwidthSequence
 Geometry3D
@@ -416,6 +417,7 @@ Size
 Size100thMM
 SizePixel
 SizeProtect
+SizeType
 SkipDuplicates
 SortInfo
 Sound
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index b9bd653..4f1b40f 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -170,7 +170,8 @@ void lclSetXShapeRect( const Reference< XShape >& rxShape, 
const Rectangle& rSha
 
 // 
 
-ShapeTypeModel::ShapeTypeModel()
+ShapeTypeModel::ShapeTypeModel():
+mbAutoHeight( sal_False )
 {
 }
 
@@ -425,6 +426,12 @@ Reference< XShape > SimpleShape::implConvertAndInsert( 
const Reference< XShapes
 Reference< XShape > xShape = mrDrawing.createAndInsertXShape( maService, 
rxShapes, rShapeRect );
 convertShapeProperties( xShape );
 
+if ( maService.equalsAscii( "com.sun.star.text.TextFrame" ) )
+{
+PropertySet( xShape ).setAnyProperty( PROP_FrameIsAutomaticHeight, 
makeAny( maTypeModel.mbAutoHeight ) );
+PropertySet( xShape ).setAnyProperty( PROP_SizeType, makeAny( 
maTypeModel.mbAutoHeight ? SizeType::MIN : SizeType::FIX ) );
+}
+
 // Import Legacy Fragments (if any)
 if( xShape.is() && !maShapeModel.maLegacyDiagramPath.isEmpty() )
 {
diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index 6980ce3..cb64424 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -346,6 +346,7 @@ void ShapeTypeContext::setStyle( const OUString& rStyle )
 else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "height" 
) ) )mrTypeModel.maHeight = aValue;
 else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"margin-left" ) ) )   mrTypeModel.maMarginLeft = aValue;
 else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"margin-top" ) ) )mrTypeModel.maMarginTop = aValue;
+else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"mso-fit-shape-to-text" ) ) )  mrTypeModel.mbAutoHeight = sal_True;
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - svl/source svtools/inc svtools/source svx/inc svx/source svx/util

2012-04-02 Thread Takeshi Abe

 svl/source/config/ctloptions.cxx   |   
 1 -
 svl/source/config/languageoptions.cxx  |   
 1 -
 svtools/inc/svtools/toolboxcontroller.hxx  |   
 2 --
 svtools/source/config/test/test.cxx|   
 1 -
 svtools/source/contnr/templwin.cxx |   
 1 -
 svtools/source/control/fmtfield.cxx|   
 1 -
 svtools/source/edit/texteng.cxx|   
 1 -
 svtools/source/edit/textview.cxx   |   
 1 -
 svtools/source/hatchwindow/documentcloser.cxx  |   
 1 -
 svtools/source/misc/embedhlp.cxx   |   
 1 -
 svtools/source/misc/imap2.cxx  |   
 2 --
 svtools/source/uno/miscservices.cxx|   
 1 -
 svx/inc/svx/fmtools.hxx|   
 1 -
 svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx|   
 1 -
 svx/inc/svx/splitcelldlg.hxx   |   
 1 -
 svx/inc/svx/svdhdl.hxx |   
 3 ---
 svx/inc/svx/svdmodel.hxx   |   
 1 -
 svx/source/accessibility/ChildrenManagerImpl.cxx   |   
 1 -
 svx/source/accessibility/DescriptionGenerator.cxx  |   
 1 -
 svx/source/customshapes/EnhancedCustomShapeEngine.hxx  |   
 1 -
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx|   
 1 -
 svx/source/dialog/hdft.cxx |   
 1 -
 svx/source/dialog/imapwnd.cxx  |   
 1 -
 svx/source/dialog/svxruler.cxx |   
 1 -
 svx/source/engine3d/float3d.cxx|   
 1 -
 svx/source/engine3d/obj3d.cxx  |   
 2 --
 svx/source/fmcomp/dbaexchange.cxx  |   
 2 --
 svx/source/fmcomp/dbaobjectex.cxx  |   
 2 --
 svx/source/fmcomp/gridcell.cxx |   
 1 -
 svx/source/fmcomp/gridctrl.cxx |   
 1 -
 svx/source/form/fmPropBrw.cxx  |   
 1 -
 svx/source/form/fmobjfac.cxx   |   
 1 -
 svx/source/form/fmshell.cxx|   
 1 -
 svx/source/form/fmshimp.cxx|   
 1 -
 svx/source/form/fmtools.cxx|   
 2 --
 svx/source/form/fmundo.cxx |   
 1 -
 svx/source/form/tbxform.cxx|   
 1 -
 svx/source/inc/filtnav.hxx |   
 1 -
 svx/source/inc/fmcontrolbordermanager.hxx  |   
 1 -
 svx/source/items/chrtitem.cxx  |   
 1 -
 svx/source/sdr/contact/objectcontact.cxx   |   
 1 -
 svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx   |   
 1 -
 svx/source/sdr/contact/viewcontactofunocontrol.cxx |   
 1 -
 svx/source/sdr/contact/viewobjectcontact.cxx   |   
 1 -
 svx/source/sdr/properties/circleproperties.cxx |   
 1 -
 svx/source/sdr/properties/customshapeproperties.cxx|   
 1 -
 svx/source/svdraw/svdcrtv.cxx  |   
 1 -
 svx/source/svdraw/svddrgmt.cxx |   
 1 -
 svx/source/svdraw/svdedxv.cxx  |   
 1 -
 svx/source/svdraw/svdoashp.cxx |   
 1 -
 svx/source/svdraw/svdoattr.cxx |   
 1 -
 svx/source/svdraw/svdobj.cxx   |   
 1 -
 svx/source/svdraw/svdocirc.cxx |   
 1 -
 svx/source/svdraw/svdoole2.cxx |   
 1 -
 svx/source/svdraw/svdopath.cxx |   
 1 -
 svx/source/svdraw/svdotxat.cxx |   
 3 ---
 svx/source/svdraw/svdpage.cxx  |   
 1 -
 svx/source/svdraw/svdpagv.cxx  |   
 7 ---

[Libreoffice-commits] .: 5 commits - android/Bootstrap android/experiments sal/android

2012-04-02 Thread Tor Lillqvist

 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java   
 |   27 +
 android/experiments/DocumentLoader/Makefile
 |   18 +++
 
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 |3 
 sal/android/lo-bootstrap.c 
 |   49 +++---
 4 files changed, 83 insertions(+), 14 deletions(-)

New commits:
commit 6b6ca3d1168323651e87c51268b5c0c37532999b
Author: Tor Lillqvist 
Date:   Mon Apr 2 12:39:31 2012 +0300

Automate setting of FONTCONFIG_FILE

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 443b770..98df770 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -127,6 +127,18 @@ public class Bootstrap extends NativeActivity
 
 // Extract files from the .apk that can't be used mmapped directly 
from it
 extract_files();
+
+// If we notice that a fonts.conf file was extracted, automatically
+// set the FONTCONFIG_FILE env var.
+InputStream i;
+try {
+i = activity.getAssets().open("unpack/etc/fonts/fonts.conf");
+}
+catch (java.io.IOException e) {
+i = null;
+}
+if (i != null)
+putenv("FONTCONFIG_FILE=" + dataDir + "/etc/fonts/fonts.conf");
 }
 
 @Override
commit 366cba7d6f3a100d51b576927dde446ab36e9483
Author: Tor Lillqvist 
Date:   Mon Apr 2 12:38:48 2012 +0300

Add fonts.conf to this app, too

diff --git a/android/experiments/DocumentLoader/Makefile 
b/android/experiments/DocumentLoader/Makefile
index 2bacbbb..76210a0 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -196,6 +196,9 @@ copy-stuff:
echo 'ProductMinor=1' >> assets/program/versionrc
echo 'ProductSource=OOO350' >> assets/program/versionrc
echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
+# Assets that are unpacked at run-time into the app's data directory.
+   mkdir -p assets/unpack/etc/fonts
+   cp fonts.conf assets/unpack/etc/fonts
 #
 # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
 #
commit a9a50cd9ffcd53c631fd13d20aa7e0609d92fc4d
Author: Tor Lillqvist 
Date:   Mon Apr 2 12:38:23 2012 +0300

Refactor where patch_libgnustl_shared() and extract_files() are called

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index c60c9e9..443b770 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -38,6 +38,7 @@ import android.util.Log;
 import fi.iki.tml.CommandLine;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Scanner;
 
@@ -73,7 +74,10 @@ public class Bootstrap extends NativeActivity
 
 // To be called after you are sure libgnustl_shared.so
 // has been loaded
-public static native void patch_libgnustl_shared();
+static native void patch_libgnustl_shared();
+
+// Extracts files in the .apk that need to be extraced into the app's tree
+static native void extract_files();
 
 // Wrapper for getpid()
 public static native int getpid();
@@ -97,6 +101,8 @@ public class Bootstrap extends NativeActivity
 // (contentbroker.cxx), also this called indirectly through the 
lo-bootstrap library
 public static native void initUCBHelper();
 
+// This setup() method is called 1) in apps that use *this* class as their 
activity from onCreate(),
+// and 2) should be called from other kinds of LO code using apps.
 public static void setup(Activity activity)
 {
 String dataDir = null;
@@ -114,6 +120,13 @@ public class Bootstrap extends NativeActivity
 if (!setup(dataDir, 
activity.getApplication().getPackageResourcePath(), llpa))
 return;
 
+// We build LO code against the shared GNU C++ library
+dlopen("libgnustl_shared.so");
+// and need to patch it.
+patch_libgnustl_shared();
+
+// Extract files from the .apk that can't be used mmapped directly 
from it
+extract_files();
 }
 
 @Override
diff --git 
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index d47a6ef..93ed87e 100644
--- 
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ 
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -52,9 +52,6 @@ public class DocumentLoader
 
 Bootstrap.pu

[Libreoffice-commits] .: dbaccess/CppunitTest_dbaccess_macros_test.mk extensions/CppunitTest_extensions_test_update.mk filter/CppunitTest_filter_tga_test.mk filter/CppunitTest_filter_tiff_test.mk hwpf

2012-04-02 Thread Lubos Lunak

 dbaccess/CppunitTest_dbaccess_macros_test.mk   |1 -
 extensions/CppunitTest_extensions_test_update.mk   |1 -
 filter/CppunitTest_filter_tga_test.mk  |1 -
 filter/CppunitTest_filter_tiff_test.mk |1 -
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk  |1 -
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |1 -
 sc/CppunitTest_sc_cellrangeobj.mk  |1 -
 sc/CppunitTest_sc_chart_regression_test.mk |1 -
 sc/CppunitTest_sc_databaserangeobj.mk  |1 -
 sc/CppunitTest_sc_datapilotfieldobj.mk |1 -
 sc/CppunitTest_sc_datapilottableobj.mk |1 -
 sc/CppunitTest_sc_filters_test.mk  |1 -
 sc/CppunitTest_sc_macros_test.mk   |1 -
 sc/CppunitTest_sc_namedrangeobj.mk |1 -
 sc/CppunitTest_sc_namedrangesobj.mk|1 -
 sc/CppunitTest_sc_subsequent_filters_test.mk   |1 -
 sc/CppunitTest_sc_tableautoformatfield.mk  |1 -
 sc/CppunitTest_sc_tablesheetobj.mk |1 -
 sc/CppunitTest_sc_tablesheetsobj.mk|1 -
 sc/CppunitTest_sc_ucalc.mk |1 -
 sd/CppunitTest_sd_filters_test.mk  |1 -
 sd/CppunitTest_sd_regression_test.mk   |1 -
 sd/CppunitTest_sd_uimpress.mk  |1 -
 sdext/CppunitTest_pdfimport.mk |1 -
 solenv/gbuild/CppunitTest.mk   |1 +
 sot/CppunitTest_sot_test_sot.mk|1 -
 svtools/CppunitTest_svtools_filters_test.mk|1 -
 sw/CppunitTest_sw_filters_test.mk  |1 -
 sw/CppunitTest_sw_layout_test.mk   |1 -
 sw/CppunitTest_sw_macros_test.mk   |1 -
 sw/CppunitTest_sw_regression_test.mk   |1 -
 sw/CppunitTest_sw_subsequent_ooxmltok.mk   |1 -
 sw/CppunitTest_sw_subsequent_rtftok.mk |1 -
 sw/CppunitTest_sw_swdoc_test.mk|1 -
 34 files changed, 1 insertion(+), 33 deletions(-)

New commits:
commit 802518c59a2cf4b47ff893305ad9781db4353ec2
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Apr 2 12:23:15 2012 +0200

always pass --headless to cppunits

They should not need any actual UI anyway, and most of them already
pass the option manually.
http://lists.freedesktop.org/archives/libreoffice/2012-March/029109.html

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk 
b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 04ef85b..de72fdf 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -124,7 +124,6 @@ $(eval $(call 
gb_CppunitTest_add_components,dbaccess_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,dbaccess_macros_test,\
---headless \
 --protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector \
 "-env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
diff --git a/extensions/CppunitTest_extensions_test_update.mk 
b/extensions/CppunitTest_extensions_test_update.mk
index 8137721..ba0b7b9 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -76,7 +76,6 @@ $(eval $(call 
gb_CppunitTest_add_components,extensions_test_update,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,extensions_test_update,\
---headless \
 --protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector \
 "-env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
diff --git a/filter/CppunitTest_filter_tga_test.mk 
b/filter/CppunitTest_filter_tga_test.mk
index aba7214..3faed54 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_CppunitTest_add_components,filter_tga_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,filter_tga_test,\
---headless \
 --protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector \
 "-env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
diff --git a/filter/CppunitTest_filter_tiff_test.mk 
b/filter/CppunitTest_filter_tiff_test.mk
index 33480d1..a6ea2f3 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_CppunitTest_add_components,filter_tiff_test,\
 ))
 
 $(eval $(call gb_CppunitTest

[Libreoffice-commits] .: desktop/source

2012-04-02 Thread David Tardon

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit c4c6b52a214b474353013f9b1b03d56a5d9a0380
Author: David Tardon 
Date:   Mon Apr 2 12:46:43 2012 +0200

fdo#47963 do not increase height of checkboxes

Especially as it is obvious the grow is unbounded .-)

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 5e94e31..0450159 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1247,19 +1247,16 @@ void ExtMgrDialog::Resize()
 long nWidth = m_aBundledCbx.GetCtrlTextWidth( m_aBundledCbx.GetText() );
 Size aBCBSize(m_aBundledCbx.GetSizePixel());
 aBCBSize.Width() = nWidth + 30;
-aBCBSize.Height() += 3;
 m_aBundledCbx.SetSizePixel( aBCBSize );
 
 nWidth = m_aSharedCbx.GetCtrlTextWidth( m_aSharedCbx.GetText() );
 Size aSCBSize(m_aSharedCbx.GetSizePixel());
 aSCBSize.Width() = nWidth + 30;
-aSCBSize.Height() += 3;
 m_aSharedCbx.SetSizePixel( aSCBSize );
 
 nWidth = m_aUserCbx.GetCtrlTextWidth( m_aUserCbx.GetText() );
 Size aUCBSize(m_aUserCbx.GetSizePixel());
 aUCBSize.Width() = nWidth + 30;
-aUCBSize.Height() += 3;
 m_aUserCbx.SetSizePixel( aUCBSize );
 
 offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_SP_CTRL_GROUP_X - aBCBSize.Width() - 
aSCBSize.Width() - aUCBSize.Width() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-02 Thread Olivier Hallot

 starmath/inc/dialog.hxx|   14 +++
 starmath/source/dialog.cxx |   89 -
 starmath/source/smres.src  |   64 ++--
 3 files changed, 162 insertions(+), 5 deletions(-)

New commits:
commit e2786b3878c391d8b7f4b53b40f30453dbbffbd9
Author: Karan Desai 
Date:   Sun Apr 1 10:17:21 2012 +0530

Added Help Buttons to dialog buttons in starmath

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index de3a02f..23f1297 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -105,6 +105,7 @@ class SmFontDialog : public ModalDialog
 CheckBoxaBoldCheckBox;
 CheckBoxaItalicCheckBox;
 OKButtonaOKButton1;
+HelpButton  aHelpButton1;
 CancelButtonaCancelButton1;
 SmShowFont  aShowFont;
 FixedText   aFixedText2;
@@ -114,6 +115,7 @@ class SmFontDialog : public ModalDialog
 DECL_LINK(FontSelectHdl, ComboBox *);
 DECL_LINK(FontModifyHdl, ComboBox *);
 DECL_LINK(AttrChangeHdl, CheckBox *);
+DECL_LINK(HelpButtonClickHdl, Button *);
 
 voidInitColor_Impl();
 
@@ -144,10 +146,12 @@ class SmFontSizeDialog : public ModalDialog
 MetricField aBorderSize;
 FixedLine   aFixedLine1;
 OKButtonaOKButton1;
+HelpButton  aHelpButton1;
 CancelButtonaCancelButton1;
 PushButton  aDefaultButton;
 
 DECL_LINK(DefaultButtonClickHdl, Button *);
+DECL_LINK(HelpButtonClickHdl, Button *);
 
 public:
 SmFontSizeDialog(Window *pParent, bool bFreeRes = true);
@@ -177,6 +181,7 @@ class SmFontTypeDialog : public ModalDialog
 FixedLine   aFixedLine1;
 FixedLine   aFixedLine2;
 OKButtonaOKButton1;
+HelpButton  aHelpButton1;
 CancelButtonaCancelButton1;
 MenuButton  aMenuButton;
 PushButton  aDefaultButton;
@@ -185,6 +190,7 @@ class SmFontTypeDialog : public ModalDialog
 
 DECL_LINK(MenuSelectHdl, Menu *);
 DECL_LINK(DefaultButtonClickHdl, Button *);
+DECL_LINK(HelpButtonClickHdl, Button *);
 
 public:
 SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice, bool 
bFreeRes = true);
@@ -236,6 +242,7 @@ class SmDistanceDialog : public ModalDialog
 FixedText   aFixedText4;
 MetricField aMetricField4;
 OKButtonaOKButton1;
+HelpButton  aHelpButton1;
 CancelButtonaCancelButton1;
 MenuButton  aMenuButton;
 PushButton  aDefaultButton;
@@ -249,6 +256,7 @@ class SmDistanceDialog : public ModalDialog
 DECL_LINK(GetFocusHdl, Control *);
 DECL_LINK(MenuSelectHdl, Menu *);
 DECL_LINK(DefaultButtonClickHdl, Button *);
+DECL_LINK(HelpButtonClickHdl, Button *);
 DECL_LINK(CheckBoxClickHdl, CheckBox *);
 
 using   Window::SetHelpId;
@@ -277,10 +285,12 @@ class SmAlignDialog : public ModalDialog
 RadioButton  aRight;
 FixedLineaFixedLine1;
 OKButton aOKButton1;
+HelpButton   aHelpButton1;
 CancelButton aCancelButton1;
 PushButton   aDefaultButton;
 
 DECL_LINK(DefaultButtonClickHdl, Button *);
+DECL_LINK(HelpButtonClickHdl, Button *);
 
 public:
 SmAlignDialog(Window *pParent, bool bFreeRes = true);
@@ -348,6 +358,7 @@ class SmSymbolDialog : public ModalDialog
 SmShowSymbolSet aSymbolSetDisplay;
 FixedText   aSymbolName;
 SmShowSymbolaSymbolDisplay;
+HelpButton  aHelpBtn;
 PushButton  aGetBtn;
 PushButton  aCloseBtn;
 PushButton  aEditBtn;
@@ -366,6 +377,7 @@ class SmSymbolDialog : public ModalDialog
 DECL_LINK(CloseClickHdl, Button *);
 DECL_LINK(EditClickHdl, Button *);
 DECL_LINK(GetClickHdl, Button *);
+DECL_LINK(HelpButtonClickHdl, Button *);
 
 voidFillSymbolSets(bool bDeleteText = true);
 voidSetSymbolSetManager(SmSymbolManager &rMgr);
@@ -426,6 +438,7 @@ class SmSymDefineDialog : public ModalDialog
 SmShowChar  aSymbolDisplay;
 FixedText   aSymbolSetName;
 OKButtonaOkBtn;
+HelpButton  aHelpBtn;
 CancelButtonaCancelBtn;
 PushButton  aAddBtn;
 PushButton  aChangeBtn;
@@ -450,6 +463,7 @@ class SmSymDefineDialog : public ModalDialog
 DECL_LINK(AddClickHdl, Button *);
 DECL_LINK(ChangeClickHdl, Button *);
 DECL_LINK(DeleteClickHdl, Button *);
+DECL_LINK(HelpButtonClickHdl, Button *);
 
 voidFillSymbols(ComboBox &rComboBox, bool bDeleteText = true);
 voidFillSymbolSets(ComboBox &rComboBox, bool bDeleteText = true);
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 4895514..6679ae7 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -327,6 +328,16 @@ void SmFontDialog::SetFont(const Font &rFont)
 aShowFont.SetFont(Face);
 }
 
+IMPL_LINK( SmFont

[Libreoffice-commits] .: oox/source

2012-04-02 Thread Muthu Subramanian

 oox/source/drawingml/fillproperties.cxx  |4 ++--
 oox/source/drawingml/graphicshapecontext.cxx |   21 -
 oox/source/drawingml/shape.cxx   |   15 +--
 oox/source/token/properties.txt  |3 +++
 4 files changed, 38 insertions(+), 5 deletions(-)

New commits:
commit 8866e1986d354f0eb7eb26d78e6b6a22c6fda632
Author: Muthu Subramanian 
Date:   Mon Apr 2 17:33:32 2012 +0530

n747499: PPTX embedded media playback.

Currently plays the embedded audio files.
The image for the audio file seems to be
rendered bad, currently.

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 07df75d..4a94c01 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -440,9 +440,9 @@ void GraphicProperties::pushToPropMap( PropertyMap& 
rPropMap, const GraphicHelpe
 if( nContrast != 0 )
 rPropMap[ PROP_AdjustContrast ] <<= nContrast;
 
-// TODO: Audio content, yet to be implemented
+// Media content
 if( !maAudio.msEmbed.isEmpty() )
-rPropMap[ PROP_Sound ] <<= maAudio.msEmbed;
+rPropMap[ PROP_MediaURL ] <<= maAudio.msEmbed;
 }
 
 // 
diff --git a/oox/source/drawingml/graphicshapecontext.cxx 
b/oox/source/drawingml/graphicshapecontext.cxx
index f01854c..2230a3b 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -26,6 +26,7 @@
  *
  /
 
+#include 
 #include "oox/drawingml/graphicshapecontext.hxx"
 #include 
 
@@ -42,6 +43,9 @@
 #include "oox/vml/vmlshapecontainer.hxx"
 #include "oox/drawingml/fillproperties.hxx"
 #include "oox/drawingml/transform2dcontext.hxx"
+#include "oox/helper/binaryinputstream.hxx"
+#include "oox/helper/binaryoutputstream.hxx"
+#include 
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -77,7 +81,22 @@ Reference< XFastContextHandler > 
GraphicShapeContext::createFastChildContext( sa
 xRet.set( new BlipFillContext( *this, xAttribs, 
mpShapePtr->getGraphicProperties().maBlipProps ) );
 break;
 case XML_wavAudioFile:
-getEmbeddedWAVAudioFile( getRelations(), xAttribs, 
mpShapePtr->getGraphicProperties().maAudio );
+{
+getEmbeddedWAVAudioFile( getRelations(), xAttribs, 
mpShapePtr->getGraphicProperties().maAudio );
+if( !mpShapePtr->getGraphicProperties().maAudio.msEmbed.isEmpty() )
+{
+Reference< XMultiServiceFactory > xFactory = 
comphelper::getProcessServiceFactory();
+Reference< XInputStream > xInStrm( 
getFilter().openInputStream( mpShapePtr->getGraphicProperties().maAudio.msEmbed 
), UNO_SET_THROW );
+Reference< XTempFile > xTempFile( xFactory->createInstance( 
CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
+Reference< XOutputStream > xOutStrm( 
xTempFile->getOutputStream(), UNO_SET_THROW );
+BinaryXOutputStream aOutStrm( xOutStrm, false );
+BinaryXInputStream aInStrm( xInStrm, false );
+aInStrm.copyToStream( aOutStrm );
+
+xTempFile->setRemoveFile( false );
+mpShapePtr->getGraphicProperties().maAudio.msEmbed = 
xTempFile->getUri();
+}
+}
 break;
 }
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index d9f30f7..01ee819 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -330,11 +330,22 @@ Reference< XShape > Shape::createAndInsert(
 sal_Bool bClearText,
 basegfx::B2DHomMatrix& aParentTransformation )
 {
+bool bIsEmbMedia = false;
 OSL_TRACE("Shape::createAndInsert id: %s", rtl::OUStringToOString(msId, 
RTL_TEXTENCODING_UTF8 ).getStr());
 
 awt::Rectangle aShapeRectHmm( maPosition.X / 360, maPosition.Y / 360, 
maSize.Width / 360, maSize.Height / 360 );
 
-OUString aServiceName = finalizeServiceName( rFilterBase, rServiceName, 
aShapeRectHmm );
+OUString aServiceName;
+if( rServiceName == 
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape") 
) &&
+mpGraphicPropertiesPtr && 
!mpGraphicPropertiesPtr->maAudio.msEmbed.isEmpty() )
+{
+aServiceName = finalizeServiceName( rFilterBase, OUString( 
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.MediaShape" ) ), 
aShapeRectHmm );
+bIsEmbMedia = true;
+}
+else
+{
+aServiceName = finalizeServiceName( rFilterBase, rServiceName, 
aShapeRectHmm );
+}
 sal_Bool bIsCustomShape = aServiceName.equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.CustomShape" ) ) || 
aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"com.sun.star.drawing.ConnectorShape" ) );
 
 basegfx::B2

[Libreoffice-commits] .: 2 commits - sw/qa writerfilter/source

2012-04-02 Thread Miklos Vajna

 sw/qa/extras/rtftok/data/fdo48104.rtf  |6 ++
 sw/qa/extras/rtftok/rtftok.cxx |   25 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   18 +-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 --
 4 files changed, 31 insertions(+), 20 deletions(-)

New commits:
commit 0f330ea25840690d05516adc20cfb3d1a9d33317
Author: Miklos Vajna 
Date:   Mon Apr 2 14:24:53 2012 +0200

RtfModelTest: introduce common getPages() method

diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 7f9b498..ac7a2e4 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -103,6 +103,8 @@ private:
 void load(const OUString& rURL);
 /// Get the length of the whole document.
 int getLength();
+/// Get page count.
+int getPages();
 uno::Reference mxComponent;
 };
 
@@ -130,6 +132,15 @@ int RtfModelTest::getLength()
 return aBuf.getLength();
 }
 
+int RtfModelTest::getPages()
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+return xCursor->getPage();
+}
+
 void RtfModelTest::setUp()
 {
 test::BootstrapFixture::setUp();
@@ -382,11 +393,7 @@ void RtfModelTest::testFdo43965()
 CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), aBorder.LineWidth);
 
 // Finally, make sure that we have two pages
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
 void RtfModelTest::testN751020()
@@ -476,11 +483,7 @@ void RtfModelTest::testFdo45394()
 void RtfModelTest::testFdo48104()
 {
 load(OUString(RTL_CONSTASCII_USTRINGPARAM("fdo48104.rtf")));
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
commit 7b58fc3dafc789aa55fff5ffef6ab83c3aa8b6e0
Author: Miklos Vajna 
Date:   Mon Apr 2 14:10:39 2012 +0200

fdo#48104 fix RTF import of \page in inner groups

If we have a postponed page break and it's sent to dmapper during a new
inner group, we'll still have the page break request after the parser
state is popped, leading to duplicated page breaks. Instead of the
earlier workaround, just send the proper token to the domain mapper, and
it'll handle it properly.

diff --git a/sw/qa/extras/rtftok/data/fdo48104.rtf 
b/sw/qa/extras/rtftok/data/fdo48104.rtf
new file mode 100644
index 000..64d5e59
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo48104.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+first page\par
+\page 
+{second page first line\par}
+second page second line\par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index f13e15d..7f9b498 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -75,6 +75,7 @@ public:
 void testFdo47036();
 void testFdo46955();
 void testFdo45394();
+void testFdo48104();
 
 CPPUNIT_TEST_SUITE(RtfModelTest);
 #if !defined(MACOSX) && !defined(WNT)
@@ -93,6 +94,7 @@ public:
 CPPUNIT_TEST(testFdo47036);
 CPPUNIT_TEST(testFdo46955);
 CPPUNIT_TEST(testFdo45394);
+CPPUNIT_TEST(testFdo48104);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -471,6 +473,16 @@ void RtfModelTest::testFdo45394()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
 }
 
+void RtfModelTest::testFdo48104()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM("fdo48104.rtf")));
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e63c451..038ead9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -280,7 +280,6 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
 m_bFormField(false),
 m_bWasInFrame(false),
 m_bIsInFr

[Libreoffice-commits] .: Branch 'feature/tubes2' - 4 commits - tubes/inc tubes/source

2012-04-02 Thread Will Thompson

 tubes/inc/tubes/conference.hxx |   39 +++-
 tubes/inc/tubes/manager.hxx|   14 +
 tubes/source/conference.cxx|  358 +
 tubes/source/manager.cxx   |   70 +---
 4 files changed, 242 insertions(+), 239 deletions(-)

New commits:
commit 0af429b1446fecc82e679519755350df984c6cae
Author: Will Thompson 
Date:   Sun Apr 1 15:30:39 2012 +0100

tubes: make conference hold a TpDBusTubeChannel

It already was, actually. :)

diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index 118def6..fca6e2e 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -49,7 +49,7 @@ class TeleConference : public 
boost::enable_shared_from_this
 {
 public:
 
-TeleConference( TeleManager* pManager, TpAccount *pAccount, TpChannel* 
pChannel, const rtl::OString& rSessionId );
+TeleConference( TeleManager* pManager, TpAccount *pAccount, 
TpDBusTubeChannel* pChannel, const rtl::OString& rSessionId );
 ~TeleConference();
 
 /// Close channel and call finalize()
@@ -79,8 +79,8 @@ public:
 // --- following only to be called only by manager's callbacks ---
 // TODO: make friends instead
 
-voidsetChannel( TpAccount* pAccount, TpChannel* 
pChannel );
-TpChannel*  getChannel() const  { return mpChannel; }
+voidsetChannel( TpAccount* pAccount, 
TpDBusTubeChannel* pChannel );
+TpDBusTubeChannel*  getChannel() const  { return mpChannel; }
 boolofferTube();
 boolacceptTube();
 /// got tube accepted on other end as well?
@@ -117,7 +117,7 @@ private:
 rtl::OStringmaSessionId;
 TeleManager*mpManager;
 TpAccount*  mpAccount;
-TpChannel*  mpChannel;
+TpDBusTubeChannel*  mpChannel;
 gchar*  mpAddress;
 GDBusConnection*mpTube;
 guint   maObjectRegistrationId;
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index 9c2e8d7..1cd9248 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -142,7 +142,7 @@ static void TeleConference_ChannelCloseHandler(
 
 
 void TeleConference::TubeOfferedHandler(
-TpChannel*  pChannel,
+TpChannel*  pBaseChannel,
 const gchar*pAddress,
 const GError*   pError,
 gpointerpUserData,
@@ -168,8 +168,9 @@ void TeleConference::TubeOfferedHandler(
 if (!pAddress)
 return;
 
+TpDBusTubeChannel* pChannel = TP_DBUS_TUBE_CHANNEL( pBaseChannel);
 SAL_WARN_IF( pChannel != pConference->getChannel(), "tubes", 
"TeleConference::TubeOfferedHandler: not my channel");
-if (pChannel != pConference->getChannel())
+if ((pChannel) != pConference->getChannel())
 return;
 
 pConference->mpAddress = g_strdup( pAddress );
@@ -192,7 +193,7 @@ bool TeleConference::tryToOpen()
 }
 
 void TeleConference::TubeChannelStateChangedHandler(
-TpChannel*  pChannel,
+TpChannel*  pBaseChannel,
 guint   nState,
 gpointerpUserData,
 GObject*/*weak_object*/
@@ -207,6 +208,7 @@ void TeleConference::TubeChannelStateChangedHandler(
 if (!pConference)
 return;
 
+TpDBusTubeChannel* pChannel = TP_DBUS_TUBE_CHANNEL( pBaseChannel);
 SAL_WARN_IF( pChannel != pConference->getChannel(), "tubes",
 "TeleConference::TubeChannelStateChangedHandler: not my channel");
 if (pChannel != pConference->getChannel())
@@ -217,7 +219,7 @@ void TeleConference::TubeChannelStateChangedHandler(
 }
 
 
-TeleConference::TeleConference( TeleManager* pManager, TpAccount* pAccount, 
TpChannel* pChannel, const rtl::OString& rSessionId )
+TeleConference::TeleConference( TeleManager* pManager, TpAccount* pAccount, 
TpDBusTubeChannel* pChannel, const rtl::OString& rSessionId )
 :
 maSessionId( rSessionId ),
 mpManager( pManager),
@@ -238,7 +240,7 @@ TeleConference::~TeleConference()
 }
 
 
-void TeleConference::setChannel( TpAccount *pAccount, TpChannel* pChannel )
+void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* 
pChannel )
 {
 OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have 
channel");
 if (mpChannel)
@@ -254,7 +256,7 @@ void TeleConference::setChannel( TpAccount *pAccount, 
TpChannel* pChannel )
 GError* pError = NULL;
 TpProxySignalConnection* pProxySignalConnection =
 
tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed(
-mpChannel,
+TP_CHANNEL( mpChannel),
 &TeleConference::TubeChannelStateChangedHandler,
 this,
 NULL,
@@ -295,7 +297,7 @@ bool TeleConference::acceptTube()
 if (!mpChannel || mpTube)
 return false;
 
-tp_cli_channel_type_dbus_tube_call_accept( mpC

[Libreoffice-commits] .: sal/inc sal/rtl sal/util tools/inc

2012-04-02 Thread Michael Meeks

 sal/inc/rtl/ustrbuf.h  |   28 +
 sal/inc/rtl/ustrbuf.hxx|7 ++
 sal/rtl/source/strimp.hxx  |   18 
 sal/rtl/source/string.cxx  |5 
 sal/rtl/source/strtmpl.cxx |8 ---
 sal/rtl/source/uri.cxx |2 +
 sal/rtl/source/ustrbuf.cxx |   50 -
 sal/rtl/source/ustring.cxx |   15 -
 sal/util/sal.map   |2 +
 tools/inc/tools/string.hxx |4 ++-
 10 files changed, 89 insertions(+), 50 deletions(-)

New commits:
commit 1426d4432c59ef42f28642ec63e57517223eb32d
Author: Michael Meeks 
Date:   Fri Mar 30 18:27:58 2012 +0100

sal: expose more stringbuffer related instrumentation points

Avoid ref/unref pair in makeStringAndClear, hook into the
stringbuffer-like 'String' class to expose it's conversion to
immutable strings, and fixup misc. missing instrumentation.

diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h
index 0863da0..1051d0d 100644
--- a/sal/inc/rtl/ustrbuf.h
+++ b/sal/inc/rtl/ustrbuf.h
@@ -179,6 +179,34 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uStringbuffer_remove(
sal_Int32 start,
sal_Int32 len );
 
+/**
+Returns an immutable rtl_uString object, while clearing the string buffer.
+
+This method is primarily used to allow these completed
+string allocation events to be traced.
+
+@param  ppThis  The string, on that the operation should take place
+@param  nCapacity   pointer to the capacity of the string buffer
+
+@since LibreOffice 3.6
+ */
+SAL_DLLPUBLIC rtl_uString * SAL_CALL rtl_uStringBuffer_makeStringAndClear(
+/*inout*/ rtl_uString ** ppThis,
+sal_Int32 *nCapacity );
+
+/**
+References and returns an immutable rtl_uString object, from a mutable
+string-buffer object.
+
+This method is primarily used to allow legacy 'String' class
+conversions to OUString to be accurately traced.
+
+@param  pThis  The string, on that the operation should take place
+
+@since LibreOffice 3.6
+ */
+SAL_DLLPUBLIC rtl_uString * SAL_CALL rtl_uStringBuffer_refReturn( rtl_uString 
*pThis );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 99afe44..02a507c 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -181,10 +181,9 @@ public:
  */
 OUString makeStringAndClear()
 {
-OUString aRet( pData );
-rtl_uString_new(&pData);
-nCapacity = 0;
-return aRet;
+return OUString(
+  rtl_uStringBuffer_makeStringAndClear( &pData, &nCapacity ),
+  SAL_NO_ACQUIRE );
 }
 
 /**
diff --git a/sal/rtl/source/strimp.hxx b/sal/rtl/source/strimp.hxx
index a9e5a38..82f7f41 100644
--- a/sal/rtl/source/strimp.hxx
+++ b/sal/rtl/source/strimp.hxx
@@ -54,6 +54,24 @@ sal_Int16 rtl_ImplGetDigit( sal_Unicode ch, sal_Int16 nRadix 
);
 
 sal_Bool rtl_ImplIsWhitespace( sal_Unicode c );
 
+// string lifetime instrumentation / diagnostics
+#if 0
+#  include 
+#  define RTL_LOG_STRING_NEW(s)  \
+  do { 
\
+  fprintf (stderr, "+%s\n",
\
+   rtl::OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr()); 
\
+  } while (0)
+#  define RTL_LOG_STRING_DELETE(s)   \
+  do { 
\
+  fprintf (stderr, "-%s\n",
\
+   rtl::OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr()); 
\
+  } while (0)
+#else
+#  define RTL_LOG_STRING_NEW(s)
+#  define RTL_LOG_STRING_DELETE(s)
+#endif
+
 #endif /* INCLUDED_RTL_SOURCE_STRIMP_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/string.cxx b/sal/rtl/source/string.cxx
index 9c5393f..42c8ae2 100644
--- a/sal/rtl/source/string.cxx
+++ b/sal/rtl/source/string.cxx
@@ -71,6 +71,11 @@ static rtl_String const aImplEmpty_rtl_String =
 #define IMPL_RTL_STRINGDATA rtl_String
 #define IMPL_RTL_EMPTYSTRINGaImplEmpty_rtl_String
 
+#undef RTL_LOG_STRING_NEW
+#define RTL_LOG_STRING_NEW(s)
+#undef RTL_LOG_STRING_DELETE
+#define RTL_LOG_STRING_DELETE(s)
+
 /* === */
 
 /* Include String/UString template code */
diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index 8e1de8b..2a33907 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -49,12 +49,6 @@ inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* pDest,
 }
 */
 
-// for instrumentation / diagnostics
-#ifndef RTL_LOG_STRING_NEW
-#  define RTL_LOG_STRING_N

[Libreoffice-commits] .: instsetoo_native/inc_sdkoo

2012-04-02 Thread Andras Timar

 instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a4c725f72df1253e5d4e61ede750b4b24c1e1672
Author: Andras Timar 
Date:   Sun Apr 1 17:37:27 2012 +0200

PRODUCTNAME is not defined in this context, we need BRANDPACKAGEVERSION

diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 61c3294..87f622e 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,7 +1,7 @@
 Signature_ RootKey NameType
 s72i2  s255S255I2
 RegLocator Signature_
-basisinstalluser   1   
Software\LibreOffice\Layers\Basis\[PRODUCTVERSION]  BASISINSTALLLOCATION
2
-basisinstalluser_  1   
Software\LibreOffice\Layers_\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION
2
-basisinstallmachine2   
Software\LibreOffice\Layers\Basis\[PRODUCTVERSION]  BASISINSTALLLOCATION
2
-basisinstallmachine_   2   
Software\LibreOffice\Layers_\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION
2
+basisinstalluser   1   
Software\LibreOffice\Layers\Basis\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION
2
+basisinstalluser_  1   
Software\LibreOffice\Layers_\Basis\[BRANDPACKAGEVERSION]
BASISINSTALLLOCATION2
+basisinstallmachine2   
Software\LibreOffice\Layers\Basis\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION
2
+basisinstallmachine_   2   
Software\LibreOffice\Layers_\Basis\[BRANDPACKAGEVERSION]
BASISINSTALLLOCATION2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cppuhelper/inc

2012-04-02 Thread Stephan Bergmann

 cppuhelper/inc/cppuhelper/implementationentry.hxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9a6f7f674be0a3b82bc82a78737178326d622268
Author: Stephan Bergmann 
Date:   Mon Apr 2 15:08:28 2012 +0200

Updated workaround comment

diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx 
b/cppuhelper/inc/cppuhelper/implementationentry.hxx
index 747ec7f..1aeba63 100644
--- a/cppuhelper/inc/cppuhelper/implementationentry.hxx
+++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx
@@ -31,8 +31,10 @@
 #include 
 #include "cppuhelperdllapi.h"
 
-// MinGW wants it the one way around while MSVC wants it the other (and
-// everywhere else, SAL_CALL is empty, so doesn't matter):
+// MinGW wants it the one way around while MSVC wants it the other (cf.
+//  "Syntactic __cdecl
+// incompatibility with MSVC"; and everywhere else, SAL_CALL is empty, so
+// doesn't matter):
 #if defined __GNUC__
 #define MY_FN_PTR(name) SAL_CALL (* name)
 #else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-04-02 Thread Lubos Lunak

 sw/source/filter/ww8/ww8par.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3bbe44404f0ff98dbbaeb3d1b3adaede9c27b1a5
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Apr 2 15:21:38 2012 +0200

prevent a memory leak

Based on a patch from Arnaud Versini
(http://lists.freedesktop.org/archives/libreoffice/2012-April/029240.html)

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 541adc8..6fe9784 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2716,6 +2716,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long 
nEnd, long nCpOfs)
 pStr->length = nEndUsed;
 
 emulateMSWordAddTextToParagraph(rtl::OUString(pStr, SAL_NO_ACQUIRE));
+pStr = NULL;
 rPos += nL2;
 if (!maApos.back()) //a para end in apo doesn't count
 bWasParaEnd = false;//kein CR
@@ -2723,6 +2724,8 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long 
nEnd, long nCpOfs)
 
 if (hConverter)
 rtl_destroyTextToUnicodeConverter(hConverter);
+if (pStr)
+rtl_uString_release(pStr);
 delete [] p8Bits;
 return nL2 >= nStrLen;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - libcdr/libcdr-0.0.5.patch libcdr/libcdr-0.0.5-zip.patch libcdr/libcdr-0.0.6.patch libcdr/makefile.mk ooo.lst.in

2012-04-02 Thread Fridrich Strba

 libcdr/libcdr-0.0.5-zip.patch |  214 --
 libcdr/libcdr-0.0.5.patch |   20 ---
 libcdr/libcdr-0.0.6.patch |   20 +++
 libcdr/makefile.mk|7 -
 ooo.lst.in|2 
 5 files changed, 24 insertions(+), 239 deletions(-)

New commits:
commit 54a1a17597031e95a3d785beebfe57a098412eb5
Author: Fridrich Å trba 
Date:   Mon Apr 2 15:41:48 2012 +0200

Fetch the right libcdr

diff --git a/ooo.lst.in b/ooo.lst.in
index 5de0e5a..00f57db 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-4def42cfe3527ed7c515bea8cc3f23b8-libcdr-0.0.5.tar.bz2
+44d0c579b342f6cdbc0f76534c5d29b2-libcdr-0.0.6.tar.bz2
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
 @FREETYPE_TARBALL@
commit 4bbb2cd002d018d5e3bc3d6de85067e6fc6ae236
Author: Fridrich Å trba 
Date:   Mon Apr 2 15:36:14 2012 +0200

Uploading new shiny libcdr 0.0.6

diff --git a/libcdr/libcdr-0.0.5-zip.patch b/libcdr/libcdr-0.0.5-zip.patch
deleted file mode 100644
index 0354cf9..000
--- a/libcdr/libcdr-0.0.5-zip.patch
+++ /dev/null
@@ -1,214 +0,0 @@
 misc/libcdr-0.0.5/src/lib/CDRInternalStream.cpp2012-03-15 
11:30:05.0 +0100
-+++ misc/build/libcdr-0.0.5/src/lib/CDRInternalStream.cpp  2012-03-22 
09:51:18.381882859 +0100
-@@ -49,19 +49,19 @@
-   m_offset(0),
-   m_buffer()
- {
--  unsigned long tmpNumBytesRead = 0;
--
--  const unsigned char *tmpBuffer = 0;
-+  if (!size)
-+return;
- 
-   if (!compressed)
-   {
--tmpBuffer = input->read(size, tmpNumBytesRead);
-+unsigned long tmpNumBytesRead = 0;
-+const unsigned char *tmpBuffer = input->read(size, tmpNumBytesRead);
- 
- if (size != tmpNumBytesRead)
-   return;
- 
- m_buffer = std::vector(size);
--memcpy(&m_buffer[0], &tmpBuffer[0], size);
-+memcpy(&m_buffer[0], tmpBuffer, size);
-   }
-   else
-   {
-@@ -80,7 +80,8 @@
- if (ret != Z_OK)
-   return;
- 
--tmpBuffer = input->read(size, tmpNumBytesRead);
-+unsigned long tmpNumBytesRead = 0;
-+const unsigned char *tmpBuffer = input->read(size, tmpNumBytesRead);
- 
- if (size != tmpNumBytesRead)
-   return;
-@@ -99,6 +100,7 @@
-   case Z_DATA_ERROR:
-   case Z_MEM_ERROR:
- (void)inflateEnd(&strm);
-+m_buffer.clear();
- return;
-   }
- 
-@@ -109,7 +111,7 @@
- 
- }
- while (strm.avail_out == 0);
--
-+(void)inflateEnd(&strm);
-   }
- }
- 
 misc/libcdr-0.0.5/src/lib/CDRZipStream.cpp 2012-03-16 11:20:15.0 
+0100
-+++ misc/build/libcdr-0.0.5/src/lib/CDRZipStream.cpp   2012-03-22 
09:51:00.332335588 +0100
-@@ -30,6 +30,7 @@
- 
- 
- #include 
-+#include 
- #include "CDRZipStream.h"
- #include "CDRInternalStream.h"
- #include "libcdr_utils.h"
-@@ -231,9 +232,9 @@
-   return true;
- }
- 
--static bool findCentralDirectoryEnd(WPXInputStream *input, long &startOffset)
-+static bool findCentralDirectoryEnd(WPXInputStream *input)
- {
--  input->seek(startOffset, WPX_SEEK_SET);
-+  input->seek(0, WPX_SEEK_SET);
-   try
-   {
- while (!input->atEOS())
-@@ -242,7 +243,6 @@
-   if (signature == CDIR_END_SIG)
-   {
- input->seek(-4, WPX_SEEK_CUR);
--startOffset = input->tell();
- return true;
-   }
-   else
-@@ -256,9 +256,9 @@
-   return false;
- }
- 
--static bool isZipStream(WPXInputStream *input, long &startOffset)
-+static bool isZipStream(WPXInputStream *input)
- {
--  if (!findCentralDirectoryEnd(input, startOffset))
-+  if (!findCentralDirectoryEnd(input))
- return false;
-   CentralDirectoryEnd end;
-   if (!readCentralDirectoryEnd(input, end))
-@@ -276,17 +276,16 @@
-   return true;
- }
- 
--static bool findDataStream(WPXInputStream *input, unsigned &size, bool 
&compressed, long &startOffset, const char *name)
-+static bool findDataStream(WPXInputStream *input, CentralDirectoryEntry 
&entry, const char *name)
- {
-   unsigned short name_size = strlen(name);
--  if (!findCentralDirectoryEnd(input, startOffset))
-+  if (!findCentralDirectoryEnd(input))
- return false;
-   CentralDirectoryEnd end;
-   if (!readCentralDirectoryEnd(input, end))
- return false;
-   input->seek(end.cdir_offset, WPX_SEEK_SET);
--  CentralDirectoryEntry entry;
--  while (!input->atEOS() && input->tell() < startOffset && input->tell() < 
end.cdir_offset + end.cdir_size)
-+  while (!input->atEOS() && (unsigned)input->tell() < end.cdir_offset + 
end.cdir_size)
-   {
- if (!readCentralDirectoryEntry(input, entry))
-   return false;
-@@ -303,17 +302,63 @@
- return false;
-   if (!areHeadersConsistent(header, entry))
- return false;
--  size = entry.uncompressed_size;
--  compressed = (entry.compression != 0);
-   return true;
- }
- 
-+WPXInputStream *getSubstr

[Libreoffice-commits] .: sal/rtl

2012-04-02 Thread Michael Meeks

 sal/rtl/source/uri.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 54bc03051702ad279dfd17471a3d5c30003c892d
Author: Michael Meeks 
Date:   Mon Apr 2 14:26:43 2012 +0100

sal: reduce allocation thrash in URI encode / decode

This saves 1% of string allocation / destruction on startup.

diff --git a/sal/rtl/source/uri.cxx b/sal/rtl/source/uri.cxx
index 5febefd..3945e04 100644
--- a/sal/rtl/source/uri.cxx
+++ b/sal/rtl/source/uri.cxx
@@ -609,8 +609,8 @@ void SAL_CALL rtl_uriEncode(rtl_uString * pText, sal_Bool 
const * pCharClass,
 
 sal_Unicode const * p = pText->buffer;
 sal_Unicode const * pEnd = p + pText->length;
-sal_Int32 nCapacity = 0;
-rtl_uString_new(pResult);
+sal_Int32 nCapacity = pText->length;
+rtl_uString_new_WithLength(pResult, nCapacity);
 while (p < pEnd)
 {
 EscapeType eType;
@@ -676,8 +676,8 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText,
 {
 sal_Unicode const * p = pText->buffer;
 sal_Unicode const * pEnd = p + pText->length;
-sal_Int32 nCapacity = 0;
-rtl_uString_new(pResult);
+sal_Int32 nCapacity = pText->length;
+rtl_uString_new_WithLength(pResult, nCapacity);
 while (p < pEnd)
 {
 EscapeType eType;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-02 Thread Andras Timar

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 330726cc715df115420b04b974f263a23651e75f
Author: David Tardon 
Date:   Mon Apr 2 12:46:43 2012 +0200

fdo#47963 do not increase height of checkboxes

Especially as it is obvious the grow is unbounded .-)

Signed-off-by: Andras Timar 

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index de324ef..58e06ed 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1247,19 +1247,16 @@ void ExtMgrDialog::Resize()
 long nWidth = m_aBundledCbx.GetCtrlTextWidth( m_aBundledCbx.GetText() );
 Size aBCBSize(m_aBundledCbx.GetSizePixel());
 aBCBSize.Width() = nWidth + 30;
-aBCBSize.Height() += 3;
 m_aBundledCbx.SetSizePixel( aBCBSize );
 
 nWidth = m_aSharedCbx.GetCtrlTextWidth( m_aSharedCbx.GetText() );
 Size aSCBSize(m_aSharedCbx.GetSizePixel());
 aSCBSize.Width() = nWidth + 30;
-aSCBSize.Height() += 3;
 m_aSharedCbx.SetSizePixel( aSCBSize );
 
 nWidth = m_aUserCbx.GetCtrlTextWidth( m_aUserCbx.GetText() );
 Size aUCBSize(m_aUserCbx.GetSizePixel());
 aUCBSize.Width() = nWidth + 30;
-aUCBSize.Height() += 3;
 m_aUserCbx.SetSizePixel( aUCBSize );
 
 offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_SP_CTRL_GROUP_X - aBCBSize.Width() - 
aSCBSize.Width() - aUCBSize.Width() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-04-02 Thread Miklos Vajna

 sw/source/filter/ww8/ww8atr.cxx  |2 +-
 sw/source/filter/ww8/ww8par6.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 36e176ee2354e62d5e4208fb0ae2a101ba32d7f5
Author: Miklos Vajna 
Date:   Mon Apr 2 16:03:22 2012 +0200

ww8: sprmPFContextualSpacing is a Bool8 value

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 7fcba60..16a5539 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3889,7 +3889,7 @@ void WW8AttributeOutput::FormatULSpace( const 
SvxULSpaceItem& rUL )
 if (m_rWW8Export.bWrtWW8 && rUL.GetContext())
 {
 m_rWW8Export.InsUInt16(NS_sprm::LN_PContextualSpacing);
-m_rWW8Export.InsUInt16(rUL.GetContext());
+m_rWW8Export.pO->push_back( (sal_uInt8)rUL.GetContext() );
 }
 }
 }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e995640..993020c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4177,7 +4177,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const 
sal_uInt8* pData, short nLe
 pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
 return;
 }
-short nPara = SVBT16ToShort( pData );
+short nPara = nId == 0x246D ? SVBT16ToShort( pData ) : 0 != *pData;
 if( nPara < 0 )
 nPara = -nPara;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-04-02 Thread Miklos Vajna

 sw/source/filter/ww8/ww8par6.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e650f3ec528777b56d45f4a652ff0569f8b925b4
Author: Miklos Vajna 
Date:   Mon Apr 2 16:27:18 2012 +0200

SwWW8ImplReader::Read_UL: make this a bit less hard to read

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 993020c..65cea9d 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4177,7 +4177,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const 
sal_uInt8* pData, short nLe
 pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
 return;
 }
-short nPara = nId == 0x246D ? SVBT16ToShort( pData ) : 0 != *pData;
+short nPara = ((nId == 0x246D) ? SVBT16ToShort( pData ) : (0 != *pData));
 if( nPara < 0 )
 nPara = -nPara;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: post_download.in

2012-04-02 Thread Andras Timar

 post_download.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a312d8a0a20add8cb6aecda4141e3cc299c1ffbc
Author: Andras Timar 
Date:   Mon Apr 2 16:48:36 2012 +0200

Bump version number in AC_INIT (I wonder if that is used)

diff --git a/post_download.in b/post_download.in
index 79b637e..0161233 100644
--- a/post_download.in
+++ b/post_download.in
@@ -1,4 +1,4 @@
-AC_INIT([LibreOffice],[3.5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[3.6],[],[],[http://documentfoundation.org/])
 AC_PREREQ([2.59])
 
 echo ""
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - i18npool/source sal/inc sal/rtl

2012-04-02 Thread Lubos Lunak

 i18npool/source/isolang/isolang.cxx |   20 ++--
 sal/inc/rtl/string.hxx  |4 +++-
 sal/inc/rtl/ustring.hxx |3 +++
 sal/rtl/source/strtmpl.cxx  |2 ++
 4 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 1cdb1ea6a8071f9cd802c30ae78a35332782cb31
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Apr 2 16:56:13 2012 +0200

don't use string literals with embedded \0's

Followup to 791f27683311e487947b0464a0cb132b19fd0e12.

diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 5e40487..35a9250 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -659,9 +659,9 @@ void MsLangId::convertLanguageToIsoNames( LanguageType 
nLang,
 do
 {
 if ( pEntry->mnLang == nLang )
-{
-rLangStr = rtl::OString( pEntry->maLangStr );
-rCountry = rtl::OString( pEntry->maCountry );
+{  // avoid embedded \0 warning
+rLangStr = rtl::OString( static_cast< const char* >( 
pEntry->maLangStr ));
+rCountry = rtl::OString( static_cast< const char* >( 
pEntry->maCountry ));
 return;
 }
 ++pEntry;
@@ -675,9 +675,9 @@ void MsLangId::convertLanguageToIsoNames( LanguageType 
nLang,
 do
 {
 if ( pNoneStdEntry->mnLang == nLang )
-{
-rLangStr = rtl::OString( pNoneStdEntry->maLangStr );
-rCountry = rtl::OString( pNoneStdEntry->maCountry );
+{  // avoid embedded \0 warning
+rLangStr = rtl::OString( static_cast< const char* >( 
pNoneStdEntry->maLangStr ));
+rCountry = rtl::OString( static_cast< const char* >( 
pNoneStdEntry->maCountry ));
 return;
 }
 ++pNoneStdEntry;
@@ -1082,12 +1082,12 @@ LanguageType MsLangId::convertUnxByteStringToLanguage(
 rtl::OString aUpperCountry = aCountry.toAsciiUpperCase();
 const IsoLangGLIBCModifiersEntry* pGLIBCModifiersEntry = 
aImplIsoLangGLIBCModifiersEntries;
 do
-{
-if (( aLowerLang.equals( pGLIBCModifiersEntry->maLangStr ) ) &&
-   ( aAtString.equals( pGLIBCModifiersEntry->maAtString ) ))
+{ // avoid embedded \0 warning
+if (( aLowerLang.equals( static_cast< const char* >( 
pGLIBCModifiersEntry->maLangStr ))) &&
+   ( aAtString.equals( static_cast< const char* >( 
pGLIBCModifiersEntry->maAtString 
 {
 if ( aUpperCountry.isEmpty() ||
- aUpperCountry.equals( pGLIBCModifiersEntry->maCountry ) )
+ aUpperCountry.equals( static_cast< const char* >( 
pGLIBCModifiersEntry->maCountry )))
{
 return pGLIBCModifiersEntry->mnLang;
}
commit 60b596665fff7c110c6b12da192f5712fb145028
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Apr 2 16:52:36 2012 +0200

warn on \0 embedded in string literals, after all

Seeing 791f27683311e487947b0464a0cb132b19fd0e12 I've changed my mind,
some embedded \0 can be actually well hidden:
struct foo { const char txt[3]; };
const foos[] = { { "a" }, { "bb" }};
If somebody wants an embedded \0 in a string literal, they need to
say it explicitly by specifying the size.

diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 8dbb413..a00e186 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -196,7 +196,9 @@ public:
   New string from a string literal.
 
   If there are any embedded \0's in the string literal, the result is 
undefined.
-  Use the overload that explicitly accepts length.
+  Use the overload that explicitly accepts length or cast the literal
+  explicitly to const char*.
+
   @since LibreOffice 3.6
 
   @paramliteral   a string literal
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 8035bdc..518ef3d 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -190,6 +190,9 @@ public:
   is not pure ASCII, it needs to be converted to OUString by explicitly
   providing the encoding to use for the conversion.
 
+  If there are any embedded \0's in the string literal, the result is 
undefined.
+  Use the overload that explicitly accepts length or fromAscii().
+
   @paramliteral the 8-bit ASCII string literal
 
   @since LibreOffice 3.6
diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index 2a33907..be86ab3 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -1220,6 +1220,8 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromLiteral)( 
IMPL_RTL_STRINGDATA** ppThis
 /* Check ASCII range */
 SAL_WARN_IF( ((unsigned char)*pCharStr) > 127, "rtl.string",
 "rtl_uString_newFromLiteral - Found char > 127" );
+SAL_

[Libreoffice-commits] .: 2 commits - dbaccess/source sw/source

2012-04-02 Thread Philipp Weissenbacher

 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |   30 +-
 sw/source/core/text/frmcrsr.cxx|  179 -
 sw/source/core/text/itratr.hxx |   24 +-
 sw/source/core/text/noteurl.cxx|2 
 sw/source/core/text/pordrop.hxx|   18 -
 sw/source/core/text/porfly.hxx |6 
 sw/source/core/text/porftn.hxx |6 
 sw/source/core/text/porglue.hxx|4 
 sw/source/core/text/porref.cxx |4 
 sw/source/core/text/portab.hxx |2 
 sw/source/core/text/portox.cxx |6 
 sw/source/core/text/portxt.cxx |   51 ++--
 sw/source/core/text/portxt.hxx |4 
 sw/source/core/text/possiz.hxx |2 
 sw/source/core/text/txtinit.cxx|   27 +-
 sw/source/core/text/widorp.hxx |   10 
 16 files changed, 179 insertions(+), 196 deletions(-)

New commits:
commit 0987fc044ccc73dcb2f4daadc9e08322687a0663
Author: Philipp Weissenbacher 
Date:   Wed Mar 28 17:24:08 2012 +0200

Translate German comments

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 4133630..4a72dbd 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -505,8 +505,8 @@ void SAL_CALL 
OSingleSelectQueryComposer::appendFilterByColumn( const Reference<
 throw SQLException(sError,*this,SQLSTATE_GENERAL,1000,Any() );
 }
 
-// filter anhaengen
-// select ohne where und order by aufbauen
+// Attach filter
+// Construct SELECT without WHERE and ORDER BY
 ::rtl::OUString aQuote  = m_xMetaData->getIdentifierQuoteString();
 if ( m_aCurrentColumns[SelectColumns]->hasByName(aName) )
 {
@@ -978,22 +978,22 @@ sal_Bool 
OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OS
 ::std::vector< ::std::vector < 
PropertyValue > >& rFilters, const Reference< 
::com::sun::star::util::XNumberFormatter > & xFormatter) const
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com", 
"OSingleSelectQueryComposer::setORCriteria" );
-// Runde Klammern um den Ausdruck
+// Round brackets around the expression
 if (pCondition->count() == 3 &&
 SQL_ISPUNCTUATION(pCondition->getChild(0),"(") &&
 SQL_ISPUNCTUATION(pCondition->getChild(2),")"))
 {
 return setORCriteria(pCondition->getChild(1), _rIterator, rFilters, 
xFormatter);
 }
-// oder Verknuepfung
+// OR logic expression
 // a searchcondition can only look like this: search_condition 
SQL_TOKEN_OR boolean_term
 else if (SQL_ISRULE(pCondition,search_condition))
 {
 sal_Bool bResult = sal_True;
 for (int i = 0; bResult && i < 3; i+=2)
 {
-// Ist das erste Element wieder eine OR-Verknuepfung?
-// Dann rekursiv absteigen ...
+// Is the first element a OR logic expression again?
+// Then descend recursively ...
 if (SQL_ISRULE(pCondition->getChild(i),search_condition))
 bResult = setORCriteria(pCondition->getChild(i), _rIterator, 
rFilters, xFormatter);
 else
@@ -1015,14 +1015,14 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( 
OSQLParseNode * pCondition,
 OSQLParseTreeIterator& _rIterator, ::std::vector < PropertyValue >& 
rFilter, const Reference< XNumberFormatter > & xFormatter) const
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com", 
"OSingleSelectQueryComposer::setANDCriteria" );
-// Runde Klammern
+// Round brackets
 if (SQL_ISRULE(pCondition,boolean_primary))
 {
 // this should not occur
 OSL_FAIL("boolean_primary in And-Criteria");
 return sal_False;
 }
-// Das erste Element ist (wieder) eine AND-Verknuepfung
+// The first element is an AND logical expression again
 else if ( SQL_ISRULE(pCondition,boolean_term) && pCondition->count() == 3 )
 {
 return setANDCriteria(pCondition->getChild(0), _rIterator, rFilter, 
xFormatter) &&
@@ -1227,7 +1227,7 @@ sal_Bool 
OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
 aItem.Handle = getPredicateType(pCondition->getChild(1));
 rFilter.push_back(aItem);
 }
-else // kann sich nur um einen Expr. Ausdruck handeln
+else // Can only be an expression
 {
 PropertyValue aItem;
 ::rtl::OUString aName, aValue;
@@ -1235,12 +1235,12 @@ sal_Bool 
OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
 OSQLParseNode *pLhs = pCondition->getChild(0);
 OSQLParseNode *pRhs = pCondition->getChil

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/inc_sdkoo

2012-04-02 Thread Michael Meeks

 instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c775526bd26647b1ec44aeef155a50aa306914fa
Author: Andras Timar 
Date:   Sun Apr 1 17:37:27 2012 +0200

PRODUCTNAME is not defined in this context, we need BRANDPACKAGEVERSION

Signed-off-by: Michael Meeks 

diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 61c3294..87f622e 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,7 +1,7 @@
 Signature_ RootKey NameType
 s72i2  s255S255I2
 RegLocator Signature_
-basisinstalluser   1   
Software\LibreOffice\Layers\Basis\[PRODUCTVERSION]  BASISINSTALLLOCATION
2
-basisinstalluser_  1   
Software\LibreOffice\Layers_\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION
2
-basisinstallmachine2   
Software\LibreOffice\Layers\Basis\[PRODUCTVERSION]  BASISINSTALLLOCATION
2
-basisinstallmachine_   2   
Software\LibreOffice\Layers_\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION
2
+basisinstalluser   1   
Software\LibreOffice\Layers\Basis\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION
2
+basisinstalluser_  1   
Software\LibreOffice\Layers_\Basis\[BRANDPACKAGEVERSION]
BASISINSTALLLOCATION2
+basisinstallmachine2   
Software\LibreOffice\Layers\Basis\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION
2
+basisinstallmachine_   2   
Software\LibreOffice\Layers_\Basis\[BRANDPACKAGEVERSION]
BASISINSTALLLOCATION2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - cui/source sc/source

2012-04-02 Thread Markus Mohrhard

 cui/source/inc/border.hxx   |3 +--
 cui/source/tabpages/border.cxx  |   15 +--
 sc/source/core/data/docpool.cxx |5 +
 3 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 149650b087ab5b15ef23e4ac6af5368b2820af1e
Author: Markus Mohrhard 
Date:   Mon Apr 2 17:20:26 2012 +0200

show synchronized checked only if all margins are the same, related 
fdo#44337

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 7766ec9..ecb6c9e 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -125,8 +125,7 @@ private:
 boolmbTLBREnabled;  /// true = Top-left to 
bottom-right border enabled.
 boolmbBLTREnabled;  /// true = Bottom-left to 
top-right border enabled.
 boolmbUseMarginItem;
-
-static sal_Bool bSync;
+boolmbSync;
 
 #ifdef _SVX_BORDER_CXX
 // Handler
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 390d60a..fd9c63c 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -86,8 +86,6 @@ static sal_uInt16 pRanges[] =
 0
 };
 
-sal_Bool SvxBorderTabPage::bSync = sal_True;
-
 // ---
 void lcl_SetDecimalDigitsTo1(MetricField& rField)
 {
@@ -147,7 +145,8 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
 mbVerEnabled( false ),
 mbTLBREnabled( false ),
 mbBLTREnabled( false ),
-mbUseMarginItem( false )
+mbUseMarginItem( false ),
+mbSync(true)
 
 {
 // diese Page braucht ExchangeSupport
@@ -217,7 +216,6 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
 SetFieldUnit(aRightMF, eFUnit);
 SetFieldUnit(aTopMF, eFUnit);
 SetFieldUnit(aBottomMF, eFUnit);
-aSynchronizeCB.Check(bSync);
 aSynchronizeCB.SetClickHdl(LINK(this, SvxBorderTabPage, 
SyncHdl_Impl));
 aLeftMF.SetModifyHdl(LINK(this, SvxBorderTabPage, 
ModifyDistanceHdl_Impl));
 aRightMF.SetModifyHdl(LINK(this, SvxBorderTabPage, 
ModifyDistanceHdl_Impl));
@@ -571,6 +569,11 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
 }
 
 LinesChanged_Impl( 0 );
+if(aLeftMF.GetValue() == aRightMF.GetValue() && aTopMF.GetValue() == 
aBottomMF.GetValue() && aTopMF.GetValue() == aLeftMF.GetValue())
+mbSync = true;
+else
+mbSync = false;
+aSynchronizeCB.Check(mbSync);
 }
 
 // ---
@@ -1153,7 +1156,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl)
 
 IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField)
 {
-if ( bSync )
+if ( mbSync )
 {
 sal_Int64 nVal = pField->GetValue();
 if(pField != &aLeftMF)
@@ -1170,7 +1173,7 @@ IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, 
MetricField*, pField)
 
 IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox)
 {
-bSync = pBox->IsChecked();
+mbSync = pBox->IsChecked();
 return 0;
 }
 
commit 843dd3f75e4d35b8ae5fd3be6804e54233292948
Author: Markus Mohrhard 
Date:   Mon Apr 2 17:23:46 2012 +0200

this hack in no longer needed, fdo#44337

excel import now uses the stored row height and we should go back to a
symetric default margin

diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 3061856..36f0d3b 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -275,10 +275,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, 
sal_Bool bLoadRefCounts )
 ppPoolDefaults[ ATTR_SHRINKTOFIT - ATTR_STARTINDEX ] = new 
SfxBoolItem( ATTR_SHRINKTOFIT );
 ppPoolDefaults[ ATTR_BORDER_TLBR - ATTR_STARTINDEX ] = new 
SvxLineItem( ATTR_BORDER_TLBR );
 ppPoolDefaults[ ATTR_BORDER_BLTR - ATTR_STARTINDEX ] = new 
SvxLineItem( ATTR_BORDER_BLTR );
-SvxMarginItem* pItem = new SvxMarginItem( ATTR_MARGIN );
-pItem->SetTopMargin( 27 );
-pItem->SetBottomMargin( 27 );
-ppPoolDefaults[ ATTR_MARGIN  - ATTR_STARTINDEX ] = pItem;
+ppPoolDefaults[ ATTR_MARGIN  - ATTR_STARTINDEX ] = new 
SvxMarginItem( ATTR_MARGIN );
 ppPoolDefaults[ ATTR_MERGE   - ATTR_STARTINDEX ] = new ScMergeAttr;
 ppPoolDefaults[ ATTR_MERGE_FLAG  - ATTR_STARTINDEX ] = new 
ScMergeFlagAttr;
 ppPoolDefaults[ ATTR_VALUE_FORMAT- ATTR_STARTINDEX ] = new 
SfxUInt32Item( ATTR_VALUE_FORMAT, 0 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'update' - check.php

2012-04-02 Thread Jan Holesovsky

 check.php |   20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit df91ff99377c9811ae434aa12f4532def56f26b3
Author: Jan Holesovsky 
Date:   Mon Apr 2 17:47:45 2012 +0200

Offer update to 3.5.2 RC2 (from 3.5.2 RC1).

diff --git a/check.php b/check.php
index a5157a3..3b5ad78 100644
--- a/check.php
+++ b/check.php
@@ -107,6 +107,12 @@ $update_versions = array(
 '45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' => 'LO-3.5',  # 3.5.1 RC1
 # To be uncommented when 3.5.2 Final is out
 #'dc9775d-05ecbee-0851ad3-1586698-727bf66' => 'LO-3.5',  # 3.5.1 RC2 / 
Final
+
+# 3.5.2 versions
+# "-pre" to be deleted when 3.5.2 Final is out
+'1488b14-519dc6f-43021d0-52136ea-8d338cc' => 'LO-3.5-pre',  # 3.5.2 RC1
+# To be uncommented when 3.5.3 Final is out
+#'281b639-6baa1d3-ef66a77-d866f25-f36d45f' => 'LO-3.5',  # 3.5.2 RC2 / 
Final
 );
 
 # Descriptions of the target versions
@@ -119,10 +125,18 @@ $update_map = array(
   'version' => '3.5.1',
   'update_type' => 'text/html',
   'update_src'  => 'http://www.libreoffice.org/download/'),
-# To be uncommented when 3.5.2 RC2 is out, to get updates from 3.5.2 RC1
+
+# To be removed when 3.5.2 RC2 becomes Final
+'LO-3.5-pre' => array('gitid'   => 
'281b639-6baa1d3-ef66a77-d866f25-f36d45f',
+  'id'  => 'LibreOffice 3.5.2 RC2',
+  'version' => '3.5.2 RC2',
+  'update_type' => 'text/html',
+  'update_src'  => 
'http://www.libreoffice.org/download/pre-releases/'),
+
+# To be uncommented when 3.5.3 RC2 is out, to get updates from 3.5.3 RC1
 #'LO-3.5-pre' => array('gitid'   => '',
-#  'id'  => 'LibreOffice 3.5.2 RC2',
-#  'version' => '3.5.2 RC2',
+#  'id'  => 'LibreOffice 3.5.3 RC2',
+#  'version' => '3.5.3 RC2',
 #  'update_type' => 'text/html',
 #  'update_src'  => 
'http://www.libreoffice.org/download/pre-releases/'),
 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gdb

2012-04-02 Thread David Tardon

 solenv/gdb/boost/__init__.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9bbb398ef9722e7e1862f6379470ccdd9fc59743
Author: David Tardon 
Date:   Mon Apr 2 18:32:19 2012 +0200

call the right function :blush:

diff --git a/solenv/gdb/boost/__init__.py b/solenv/gdb/boost/__init__.py
index 734ba01..353ee3b 100644
--- a/solenv/gdb/boost/__init__.py
+++ b/solenv/gdb/boost/__init__.py
@@ -24,9 +24,9 @@ import boost.smart_ptr
 import boost.unordered
 
 def register_pretty_printers(obj):
-boost.optional.register_pretty_printer(obj)
-boost.ptr_container.register_pretty_printer(obj)
-boost.smart_ptr.register_pretty_printer(obj)
-boost.unordered.register_pretty_printer(obj)
+boost.optional.register_pretty_printers(obj)
+boost.ptr_container.register_pretty_printers(obj)
+boost.smart_ptr.register_pretty_printers(obj)
+boost.unordered.register_pretty_printers(obj)
 
 # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gdb

2012-04-02 Thread David Tardon

 solenv/gdb/boost/__init__.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b4f5ef6304c0caf162a044a4022b4371535ec29a
Author: David Tardon 
Date:   Mon Apr 2 18:32:19 2012 +0200

call the right function :blush:

diff --git a/solenv/gdb/boost/__init__.py b/solenv/gdb/boost/__init__.py
index 734ba01..353ee3b 100644
--- a/solenv/gdb/boost/__init__.py
+++ b/solenv/gdb/boost/__init__.py
@@ -24,9 +24,9 @@ import boost.smart_ptr
 import boost.unordered
 
 def register_pretty_printers(obj):
-boost.optional.register_pretty_printer(obj)
-boost.ptr_container.register_pretty_printer(obj)
-boost.smart_ptr.register_pretty_printer(obj)
-boost.unordered.register_pretty_printer(obj)
+boost.optional.register_pretty_printers(obj)
+boost.ptr_container.register_pretty_printers(obj)
+boost.smart_ptr.register_pretty_printers(obj)
+boost.unordered.register_pretty_printers(obj)
 
 # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2012-04-02 Thread Tomáš Chvátal

 i18npool/source/breakiterator/data/char.txt|1 -
 i18npool/source/breakiterator/data/char_in.txt |3 ---
 2 files changed, 4 deletions(-)

New commits:
commit 0c08a84c04b166ab6479716e2c33cd444d7e3dbe
Author: Arfrever Frehtes Taifersar Arahesis 
Date:   Mon Apr 2 18:46:32 2012 +0200

Make ICU build with icu-49 by removing no-longer used variables.

Signed-off-by: Tomas Chvatal 

diff --git a/i18npool/source/breakiterator/data/char.txt 
b/i18npool/source/breakiterator/data/char.txt
index 8e49a56..acb932e 100644
--- a/i18npool/source/breakiterator/data/char.txt
+++ b/i18npool/source/breakiterator/data/char.txt
@@ -16,7 +16,6 @@
 $CR  = [\p{Grapheme_Cluster_Break = CR}];
 $LF  = [\p{Grapheme_Cluster_Break = LF}];
 $Control = [\p{Grapheme_Cluster_Break = Control}];
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
 $Extend  = [\p{Grapheme_Cluster_Break = Extend}];
 $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
 # True Indic wants to move by syllables. Break up SpacingMark. This based on 
Unicode 6.0 data
diff --git a/i18npool/source/breakiterator/data/char_in.txt 
b/i18npool/source/breakiterator/data/char_in.txt
index 5e1ed67..5ad12a7 100644
--- a/i18npool/source/breakiterator/data/char_in.txt
+++ b/i18npool/source/breakiterator/data/char_in.txt
@@ -15,7 +15,6 @@
 $CR  = [\p{Grapheme_Cluster_Break = CR}];
 $LF  = [\p{Grapheme_Cluster_Break = LF}];
 $Control = [\p{Grapheme_Cluster_Break = Control}];
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
 $Extend  = [\p{Grapheme_Cluster_Break = Extend}];
 $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
 $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
@@ -72,7 +71,6 @@ $L ($L | $V | $LV | $LVT);
 [^$Control $CR $LF] $Extend;
 
 [^$Control $CR $LF] $SpacingMark;
-$Prepend [^$Control $CR $LF];
 
 
 ## -
@@ -94,7 +92,6 @@ $T ($LVT | $T);
 
 $Extend  [^$Control $CR $LF];
 $SpacingMark [^$Control $CR $LF];
-[^$Control $CR $LF] $Prepend;
 
 
 ## -
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sal/qa

2012-04-02 Thread Lubos Lunak

 sal/qa/osl/security/osl_Security.cxx |   94 +--
 sal/qa/osl/security/osl_Security_Const.h |   19 --
 2 files changed, 55 insertions(+), 58 deletions(-)

New commits:
commit a7eb227cfcd783ffdccdcec9b56451fb54c26eb6
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Apr 2 18:59:53 2012 +0200

fix crude command line arguments handling

diff --git a/sal/qa/osl/security/osl_Security.cxx 
b/sal/qa/osl/security/osl_Security.cxx
index 223c5f9..92b9fe4 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -38,6 +38,7 @@
 #endif
 #include 
 #include 
+#include 
 #include 
 
 using namespace osl;
@@ -353,7 +354,7 @@ class MyTestPlugInImpl: public 
CPPUNIT_NS::TestPlugInDefaultImpl
 
 
 void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
-   const CPPUNIT_NS::PlugInParameters & parameters)
+   const CPPUNIT_NS::PlugInParameters & )
 {
 /// start message
 t_print("#Initializing ...\n" );
@@ -633,44 +634,53 @@ void MyTestPlugInImpl::initialize( 
CPPUNIT_NS::TestFactoryRegistry *,
 t_print("Administrator.\n" );
 
 /// get and display forwarded text if available.
-aStringForward = ::rtl::OUString::createFromAscii( 
parameters.getCommandLine().c_str() );
-if ( !aStringForward.isEmpty() && aStringForward.indexOf( (sal_Unicode)' ' 
) != -1 )
+rtl::OUString args[ 3 ];
+int argsCount = 0;
+sal_uInt32 n = rtl_getAppCommandArgCount();
+// skip first, that's the module name
+for (sal_uInt32 i = 1; i < n; ++i)
 {
-sal_Int32 nFirstSpacePoint = aStringForward.indexOf( (sal_Unicode)' ' 
);;
-sal_Int32 nLastSpacePoint = aStringForward.lastIndexOf( (sal_Unicode)' 
' );;
-if ( nFirstSpacePoint == nLastSpacePoint )
-/// only forwarded two parameters, username and password.
+rtl::OUString arg;
+rtl_getAppCommandArg(i, &arg.pData);
+if( !arg.isEmpty() && arg[ 0 ] == '-' )
+continue;
+if( argsCount >= 3 )
 {
-aLogonUser = aStringForward.copy( 0, nFirstSpacePoint );
-t_print("\n#Forwarded username: ");
-printUString( aLogonUser);
-
-aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, 
aStringForward.getLength( ) - 1 );
-t_print("#Forwarded password: ");
-for (int i = nFirstSpacePoint+1; i <= 
aStringForward.getLength()-1; ++i)
-t_print("*");
-t_print("\n" );
-}
-else
-/// forwarded three parameters, username, password and fileserver.
-{
-aLogonUser = aStringForward.copy( 0, nFirstSpacePoint );
-t_print("#Forwarded username: ");
-printUString( aLogonUser);
-
-aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, 
nLastSpacePoint );
-t_print("#Forwarded password: ");
-for (int i = nFirstSpacePoint+1; i <= nLastSpacePoint; ++i)
-t_print("*");
-t_print("\n" );
-
-aFileServer = aStringForward.copy( nLastSpacePoint +1, 
aStringForward.getLength( ) - 1 );
-t_print("#Forwarded FileServer: ");
-printUString( aFileServer );
-
+SAL_WARN( "sal", "Too many test arguments" );
+continue;
 }
+args[ argsCount++ ] = arg;
+}
+/// only forwarded two parameters, username and password.
+if( argsCount == 2 )
+{
+aLogonUser = args[ 0 ];
+t_print("\n#Forwarded username: ");
+printUString( aLogonUser);
+
+aLogonPasswd = args[ 1 ];
+t_print("#Forwarded password: ");
+for (int i = 0; i < aLogonPasswd.getLength(); ++i)
+t_print("*");
+t_print("\n" );
+}
+else if( argsCount == 3 )
+/// forwarded three parameters, username, password and fileserver.
+{
+aLogonUser = args[ 0 ];
+t_print("#Forwarded username: ");
+printUString( aLogonUser);
+
+aLogonPasswd = args[ 1 ];
+t_print("#Forwarded password: ");
+for (int i = 0; i < aLogonPasswd.getLength(); ++i)
+t_print("*");
+t_print("\n" );
+
+aFileServer = args[ 2 ];
+t_print("#Forwarded FileServer: ");
+printUString( aFileServer );
 }
-
 t_print("#\n#Initialization Done.\n" );
 
 }
commit 174a1d3c3da7457884a2f79016e8a9375fd5297e
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Apr 2 18:41:12 2012 +0200

fix very ... uhm ... inventive and confusing use of empty string

diff --git a/sal/qa/osl/security/osl_Security.cxx 
b/sal/qa/osl/security/osl_Security.cxx
index 4a0a1a9..223c5f9 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -129,12 +129,12 @@ namespace osl_Security
 
 
 SAL_CPPUNIT_TEST_SUITE( logonUser );
-if  ( !aStringForward.equals( aNullUrl )  && aStringForward.indexOf( 
(sal_Unicode)' ' ) != -1 && ( aStringForw

[Libreoffice-commits] .: sd/source

2012-04-02 Thread Lubos Lunak

 sd/source/filter/eppt/eppt.cxx   |   10 --
 sd/source/filter/eppt/eppt.hxx   |2 +-
 sd/source/filter/eppt/epptso.cxx |2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit b89bf99ff2c8008951d72d58747793790b13299d
Author: Rafael Dominguez 
Date:   Sat Mar 24 18:08:59 2012 -0430

Replace List with std:vector.

diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 1f7606f..f3c79df 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -465,8 +465,6 @@ PPTWriter::~PPTWriter()
 while( aStyleSheetIter < maStyleSheetList.end() )
 delete *aStyleSheetIter++;
 
-for ( pPtr = maHyperlink.First(); pPtr; pPtr = maHyperlink.Next() )
-delete (EPPTHyperlink*)pPtr;
 for ( pPtr = maExOleObj.First(); pPtr; pPtr = maExOleObj.Next() )
 delete (PPTExOleObjEntry*)pPtr;
 
@@ -962,7 +960,7 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& 
rStrm )
 rStrm << (sal_uInt32)0; // property size
 rStrm << (sal_uInt32)0; // property count
 
-for ( EPPTHyperlink* pLink = (EPPTHyperlink*)maHyperlink.First(); pLink; 
pLink = (EPPTHyperlink*)maHyperlink.Next() )
+for ( std::vector::const_iterator pIter = 
maHyperlink.begin(); pIter != maHyperlink.end(); ++pIter )
 {
 nParaCount += 6;
 rStrm   << (sal_uInt32)3// Type VT_I4
@@ -986,15 +984,15 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& 
rStrm )
 //  = 7 :" "  " " (PPT) text range
 //  = 8 :" "  " " (Project) task
 
-sal_uInt32 nUrlLen = pLink->aURL.Len();
-const sal_Unicode* pUrl = pLink->aURL.GetBuffer();
+sal_uInt32 nUrlLen = pIter->aURL.Len();
+const sal_Unicode* pUrl = pIter->aURL.GetBuffer();
 
 sal_uInt32 nInfo = 7;
 
 rStrm   << (sal_uInt32)3// Type VT_I4
 << nInfo;   // Info
 
-switch( pLink->nType & 0xff )
+switch( pIter->nType & 0xff )
 {
 case 1 :// click action to slidenumber
 {
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 96f19c4..d8bbc56 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -213,7 +213,7 @@ class PPTWriter : public PPTWriterBase, public 
PPTExBulletProvider
 sal_uInt32  mnShapeMasterTitle;
 sal_uInt32  mnShapeMasterBody;
 
-ListmaHyperlink;
+std::vector  maHyperlink;
 
 ppt::ExSoundCollection  maSoundCollection;
 
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 6841e54..6e8f8ca 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -413,7 +413,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const String& 
rBookmarkURL, const s
 if ( !aRelUrl.isEmpty() )
 sBookmarkURL = aRelUrl;
 }
-maHyperlink.Insert( new EPPTHyperlink( sBookmarkURL, nType ), LIST_APPEND 
);
+maHyperlink.push_back( EPPTHyperlink( sBookmarkURL, nType ) );
 
 *mpExEmbed  << (sal_uInt16)0xf
 << (sal_uInt16)EPP_ExHyperlink
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source sfx2/inc sw/source

2012-04-02 Thread Lubos Lunak

 cui/source/tabpages/paragrph.cxx  |9 ++
 sfx2/inc/sfx2/htmlmode.hxx|1 
 sw/source/filter/html/htmlatr.cxx |   55 --
 sw/source/ui/shells/txtattr.cxx   |2 -
 4 files changed, 5 insertions(+), 62 deletions(-)

New commits:
commit ce219689caafb5e28e96437bdab18034a5015409
Author: Harri PitkÃ¤nen 
Date:   Sun Apr 1 09:27:11 2012 +0300

Remove unused HTMLMODE_FIRSTLINE

HTMLMODE_FIRSTLINE was disabled in all HTML export modes. It seems to
have been used to add first line indent for paragraphs in Netscape
version 3 but all currently available export modes use CSS for that.

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index a2334b5..24ebdeb 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -611,11 +611,8 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet 
)
 aRightIndent.Disable();
 aTopDist.Disable();  //HTML3.2 und NS 3.0
 aBottomDist.Disable();
-if(!(nHtmlMode & HTMLMODE_FIRSTLINE)) //NS 3.0
-{
-aFLineIndent.Disable();
-aFLineLabel.Disable();
-}
+aFLineIndent.Disable();
+aFLineLabel.Disable();
 }
 }
 
@@ -1282,7 +1279,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
 aLastLineLB.Hide();
 aLastLineFT.Hide();
 aExpandCB.Hide();
-if(!(nHtmlMode & (HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE)) )
+if(!(nHtmlMode & HTMLMODE_FULL_STYLES) )
 aJustify.Disable();
 aSnapToGridCB.Show(sal_False);
 }
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index 63b0bfe..0cbcda8 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -35,7 +35,6 @@
 #define HTMLMODE_SOME_STYLES0x0020 /* mind. MS IE */
 #define HTMLMODE_FULL_STYLES0x0040 /* == SW */
 #define HTMLMODE_PARA_BLOCK 0x0100
-#define HTMLMODE_FIRSTLINE  0x0400 /* First-line intent with Spacer == 
NS 3.0 */
 #define HTMLMODE_SOME_ABS_POS   0x2000
 #define HTMLMODE_RESERVED1  0x4000
 #define HTMLMODE_RESERVED0  0x8000
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 9d15312..f0121ce 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -120,30 +120,6 @@ HTMLOutEvent aAnchorEventTable[] =
 
 static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt );
 
-static Writer& OutHTML_HoriSpacer( Writer& rWrt, sal_Int16 nSize )
-{
-OSL_ENSURE( nSize>0, "horizontaler SPACER mit negativem Wert?" );
-if( nSize <= 0 )
-return rWrt;
-
-if( Application::GetDefaultDevice() )
-{
-nSize = (sal_Int16)Application::GetDefaultDevice()
-->LogicToPixel( Size(nSize,0), MapMode(MAP_TWIP) ).Width();
-}
-
-rtl::OStringBuffer sOut;
-sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_spacer).append(' ').
- append(OOO_STRING_SVTOOLS_HTML_O_type).append('=').
- append(OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal).append(' ').
- append(OOO_STRING_SVTOOLS_HTML_O_size).append('=').
- append(static_cast(nSize)).append('>');
-
-rWrt.Strm() << sOut.getStr();
-
-return rWrt;
-}
-
 sal_uInt16 SwHTMLWriter::GetDefListLvl( const String& rNm, sal_uInt16 nPoolId )
 {
 if( nPoolId == RES_POOLCOLL_HTML_DD )
@@ -1077,18 +1053,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 rInfo.aToken = rtl::OString();
 }
 
-// ??? Warum nicht ueber den Hint-Mechanismus ???
-if( rHWrt.IsHTMLMode(HTMLMODE_FIRSTLINE) )
-{
-const SvxLRSpaceItem& rLRSpaceTmp =
-pNodeItemSet ? ((const SvxLRSpaceItem 
&)pNodeItemSet->Get(RES_LR_SPACE))
- : rFmt.GetLRSpace();
-if( rLRSpaceTmp.GetTxtFirstLineOfst() > 0 )
-{
-OutHTML_HoriSpacer( rWrt, rLRSpaceTmp.GetTxtFirstLineOfst() );
-}
-}
-
 if( nBulletGrfLvl != 255 )
 {
 OSL_ENSURE( aNumInfo.GetNumRule(), "Wo ist die Numerierung 
geblieben???" );
@@ -2527,24 +2491,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const 
SwCntntNode& rNode )
 do {
 if ( pHt->GetEnd() && !pHt->HasDummyChar() )
 {
-if( RES_CHRATR_KERNING == pHt->Which() &&
-rHTMLWrt.IsHTMLMode(HTMLMODE_FIRSTLINE) &&
-*pHt->GetEnd() - nStrPos == 1 &&
-' ' == rStr.GetChar(nStrPos) &&
-((const SvxKerningItem&)pHt->GetAttr()).GetValue() 
> 0 )
-{
-// Wenn erlaubt, wird das Ding als Spacer 
exportiert
-
-bOutChar = sal_False;   // Space nicht ausgeben
-bWriteBreak = sal_False;

[Libreoffice-commits] .: configure.in

2012-04-02 Thread Tor Lillqvist

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d3208f2342f57863654562d0f3cffb6ce7b57daa
Author: Tor Lillqvist 
Date:   Mon Apr 2 20:36:06 2012 +0300

Fix copy/paste error

diff --git a/configure.in b/configure.in
index e150c89..0100f97 100644
--- a/configure.in
+++ b/configure.in
@@ -2325,7 +2325,7 @@ if test "$_os" = "Darwin"; then
   MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk"
 fi
 if test ! -d "$MACOSX_SDK_PATH"; then
-  MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk"
+  MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk"
 fi
 macosx_sdk_value="1050"
 AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/coretext' - configure.in

2012-04-02 Thread Tor Lillqvist

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da7e47c25767ad86484249385daa58b2726a0895
Author: Tor Lillqvist 
Date:   Mon Apr 2 20:36:06 2012 +0300

Fix copy/paste error

diff --git a/configure.in b/configure.in
index b66521c..1636e42 100644
--- a/configure.in
+++ b/configure.in
@@ -2285,7 +2285,7 @@ if test "$_os" = "Darwin" ; then
   MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk"
 fi
 if test ! -d "$MACOSX_SDK_PATH"; then
-  MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk"
+  MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk"
 fi
 macosx_sdk_value="1050"
 AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - offapi/com offapi/type_reference offapi/UnoApi_offapi.mk udkapi/UnoApi_udkapi.mk

2012-04-02 Thread Stephan Bergmann

 offapi/UnoApi_offapi.mk|   74 ++---
 offapi/com/sun/star/awt/MenuBar.idl|5 
 offapi/com/sun/star/awt/PopupMenu.idl  |5 
 offapi/com/sun/star/awt/TabController.idl  |6 
 offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl |6 
 offapi/com/sun/star/embed/FileSystemStorageFactory.idl |  111 +++
 offapi/com/sun/star/embed/StorageFactory.idl   |  147 
--
 offapi/com/sun/star/frame/DispatchHelper.idl   |   13 
 offapi/com/sun/star/frame/DispatchRecorderSupplier.idl |8 
 offapi/com/sun/star/frame/DocumentTemplates.idl|   14 
 offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl |   19 -
 offapi/com/sun/star/graphic/GraphicProvider.idl|5 
 offapi/com/sun/star/mozilla/MozillaBootstrap.idl   |   12 
 offapi/com/sun/star/plugin/PluginManager.idl   |5 
 offapi/com/sun/star/scanner/ScannerManager.idl |6 
 offapi/com/sun/star/sheet/RecentFunctions.idl  |   10 
 offapi/com/sun/star/task/JobExecutor.idl   |8 
 offapi/com/sun/star/text/DefaultNumberingProvider.idl  |5 
 offapi/com/sun/star/ucb/AnyCompareFactory.idl  |   10 
 offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl  |9 
 offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl  |8 
 offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl  |8 
 offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl  |8 
 offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl|9 
 offapi/com/sun/star/ucb/PropertiesManager.idl  |8 
 offapi/com/sun/star/ucb/SimpleFileAccess.idl   |6 
 offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl  |9 
 offapi/com/sun/star/ucb/Store.idl  |9 
 offapi/com/sun/star/util/PathSubstitution.idl  |   12 
 offapi/com/sun/star/util/TextSearch.idl|5 
 offapi/com/sun/star/util/URLTransformer.idl|6 
 offapi/type_reference/types.rdb|binary
 udkapi/UnoApi_udkapi.mk|   28 +
 33 files changed, 222 insertions(+), 372 deletions(-)

New commits:
commit 01550b2968f2e95deacaff544f8a4c2e9f5196ea
Author: Stephan Bergmann 
Date:   Mon Apr 2 16:36:19 2012 +0200

Improved comment (after recent clean up)

diff --git a/offapi/com/sun/star/frame/DocumentTemplates.idl 
b/offapi/com/sun/star/frame/DocumentTemplates.idl
index ac8dd13..d4a9729 100644
--- a/offapi/com/sun/star/frame/DocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/DocumentTemplates.idl
@@ -35,8 +35,11 @@
 module com {  module sun {  module star {  module frame {
 
 //=
-/** is an abstract service for accessing the document templates of the office
+/** is a service for accessing the document templates of the office
 and manipulate them ( add or rename or remove templates )
+
+It implements a high level interface on top of an ucb content provider 
which
+is used for template configuration.
 */
 published service DocumentTemplates : XDocumentTemplates;
 
commit 3893b00efb752942c6517bdf21d0a2cdc8ab14ab
Author: Noel Grandin 
Date:   Fri Mar 30 02:29:53 2012 +0200

fdo#46808, Adapt UNO services to new style

Update selected IDL files to use new syntax.
Update the makefiles to generate the necessary new include files.

Signed-off-by: Stephan Bergmann 

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index f9aee07..ffe8d77 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -47,6 +47,9 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,
ContainerWindowProvider \
DialogProvider \
DialogProvider2 \
+   MenuBar \
+   PopupMenu \
+   TabController \
UnoControlDialogModelProvider \
 ))
 $(eval $(call 
gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
@@ -88,6 +91,7 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/depl
 $(eval $(call 
gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
DocumentProperties \
DocumentRevisionListPersistence \
+   OleEmbeddedServerRegistration \
OOXMLDocumentPropertiesImporter \
 ))
 $(eval $(call 
gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
@@ -105,8 +109,10 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/draw
 ))
 $(eval $(call 
gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
DocumentCloser \
+   FileSystemStorageFactory \
Insta

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

2012-04-02 Thread Tor Lillqvist

 android/experiments/DocumentLoader/fonts.conf |  155 ++
 vcl/android/androidinst.cxx   |9 -
 2 files changed, 159 insertions(+), 5 deletions(-)

New commits:
commit f834d986d5a1e7e66f4029476d058fbf5f63d8d1
Author: Tor Lillqvist 
Date:   Mon Apr 2 21:57:41 2012 +0300

Add fonts.conf

diff --git a/android/experiments/DocumentLoader/fonts.conf 
b/android/experiments/DocumentLoader/fonts.conf
new file mode 100644
index 000..64d714c
--- /dev/null
+++ b/android/experiments/DocumentLoader/fonts.conf
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+   /system/fonts
+
+   
+   serif
+   
+   DroidSerif
+   Roboto
+   
+   
+   
+   sans-serif
+   
+   Roboto
+   DroidSerif
+   
+   
+   
+   monospace
+   
+   DroidSansMono
+   
+   
+
+
+   
+   
+   mono
+   
+   
+   monospace
+   
+   
+
+
+   
+   
+   sans serif
+   
+   
+   sans-serif
+   
+   
+
+
+   
+   
+   sans
+   
+   
+   sans-serif
+   
+   
+
+
+   conf.d
+
+
+
+   
+   /data/data/org.libreoffice.android.libo/fontconfig
+
+   
+
+   
+   0x0020   
+   0x00A0   
+   0x00AD   
+   0x034F   
+   0x0600   
+   0x0601   
+   0x0602   
+   0x0603   
+   0x06DD   
+   0x070F   
+   0x115F   
+   0x1160   
+   0x1680   
+   0x17B4   
+   0x17B5   
+   0x180E   
+   0x2000   
+   0x2001   
+   0x2002   
+   0x2003   
+   0x2004   
+   0x2005   
+   0x2006   
+   0x2007   
+   0x2008   
+   0x2009   
+   0x200A   
+   0x200B   
+   0x200C   
+   0x200D   
+   0x200E   
+   0x200F   
+   0x2028   
+   0x2029   
+   0x202A   
+   0x202B   
+   0x202C   
+   0x202D   
+   0x202E   
+   0x202F   
+   0x205F   
+   0x2060   
+   0x2061   
+   0x2062   
+   0x2063   
+   0x206A   
+   0x206B   
+   0x206C   
+   0x206D   
+   0x206E   
+   0x206F   
+   0x2800   
+   0x3000   
+   0x3164   
+   0xFEFF   
+   0xFFA0   
+   0xFFF9   
+   0xFFFA   
+   0xFFFB   
+   
+
+   
+   30
+   
+   
+
+
commit 337a154b4f90ce90da30f81720a9debfb19e6d43
Author: Tor Lillqvist 
Date:   Mon Apr 2 21:48:46 2012 +0300

Don't crash in a non-NativeActivity app where mpApp is NULL

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index af78a22..52ebe53 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -378,14 +378,13 @@ static const char *app_cmd_name(int cmd)
 
 void AndroidSalInstance::GetWorkArea( Rectangle& rRect )
 {
-ANativeWindow *pWindow = mpApp->window;
-if (!pWindow)
+if (!mpApp || !mpApp->window)
 rRect = Rectangle( Point( 0, 0 ),
Size( 800, 600 ) );
 else
 rRect = Rectangle( Point( 0, 0 ),
-   Size( ANativeWindow_getWidth( pWindow ),
- ANativeWindow_getHeight( pWindow ) ) );
+   Size( ANativeWindow_getWidth( mpApp->window ),
+ ANativeWindow_getHeight( mpApp->window ) ) );
 }
 
 void AndroidSalInstance::onAppCmd (struct android

[Libreoffice-commits] .: offapi/com

2012-04-02 Thread Markus Mohrhard

 offapi/com/sun/star/table/XTableColumns.idl |6 --
 1 file changed, 6 deletions(-)

New commits:
commit c730a9de1b40d0e731f2ca8621aa7864452a9a7a
Author: Markus Mohrhard 
Date:   Mon Apr 2 21:19:36 2012 +0200

this methods don't throw, adapt documentation

diff --git a/offapi/com/sun/star/table/XTableColumns.idl 
b/offapi/com/sun/star/table/XTableColumns.idl
index 41e3ed0..ab7a327 100644
--- a/offapi/com/sun/star/table/XTableColumns.idl
+++ b/offapi/com/sun/star/table/XTableColumns.idl
@@ -48,9 +48,6 @@ published interface XTableColumns: 
com::sun::star::container::XIndexAccess
 
 /** inserts new columns.
 
-When the index or combination of index and count is out
-of bounds an exception will be thrown.
-
 @param nIndex
 is the index the first inserted column will have.
 
@@ -63,9 +60,6 @@ published interface XTableColumns: 
com::sun::star::container::XIndexAccess
 
 /** deletes columns.
 
-When the index or combination of index and count is out
-of bounds an exception will be thrown.
-
 @param nIndex
 is the index of the first column to delete.
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

2012-04-02 Thread Michael Meeks

 sfx2/source/appl/shutdowniconunx.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8fa3aae7b302d3c9846bfa352c1db619a5b05ca0
Author: Michael Meeks 
Date:   Mon Apr 2 20:26:24 2012 +0100

fdo#34324 - fix colorspace conversion for greyscale bitmaps

diff --git a/sfx2/source/appl/shutdowniconunx.cxx 
b/sfx2/source/appl/shutdowniconunx.cxx
index b249544..8aad0f6 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -90,6 +90,9 @@ static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId )
 Bitmap pInSalBitmap = aIcon.GetBitmap();
 AlphaMask pInSalAlpha = aIcon.GetAlpha();
 
+if( pInSalBitmap.GetBitCount() != 24 )
+pInSalBitmap.Convert( BMP_CONVERSION_24BIT );
+
 Bitmap::ScopedReadAccess pSalBitmap(pInSalBitmap);
 AlphaMask::ScopedReadAccess pSalAlpha(pInSalAlpha);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-04-02 Thread Philipp Weissenbacher

 sw/source/core/text/frmcrsr.cxx |   27 ---
 1 file changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 25db817c873bb7f2548d7f8d7fdc65194d306755
Author: Philipp Weissenbacher 
Date:   Mon Apr 2 21:39:03 2012 +0200

Remove superfluous bug numbers

diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 2f6dfc2..1ca3794 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star;
 
 
 /*
- * 1170-SurvivalKit: For how long do we get past the last char of the line.
+ * - SurvivalKit: For how long do we get past the last char of the line.
  * - RightMargin abstains from adjusting position with -1
  * - GetCharRect returns a GetEndCharRect for MV_RIGHTMARGIN
  * - GetEndCharRect sets bRightMargin to sal_True
@@ -77,7 +77,7 @@ using namespace ::com::sun::star;
 SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
   const sal_Bool bRightMargin, const sal_Bool 
bNoScroll = sal_True )
 {
-// 8810: vgl. 1170, RightMargin in the last master line
+// RightMargin in the last master line
 const xub_StrLen nOffset = rPos.nContent.GetIndex();
 SwTxtFrm *pFrmAtPos = pFrm;
 if( !bNoScroll || pFrm->GetFollow() )
@@ -153,7 +153,6 @@ sal_Bool lcl_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew )
  *  GetFrmAtOfst(), GetFrmAtPos()
  */
 
-// OD 07.10.2003 #110978#
 SwTxtFrm& SwTxtFrm::GetFrmAtOfst( const xub_StrLen nWhere )
 {
 SwTxtFrm* pRet = this;
@@ -292,7 +291,7 @@ sal_Bool SwTxtFrm::GetCharRect( SwRect& rOrig, const 
SwPosition &rPos,
 SwTxtCursor  aLine( pFrm, &aInf );
 nNextOfst = aLine.GetEnd();
 // See comment in AdjustFrm
-// 1170: Include the line's last char?
+// Include the line's last char?
 bRet = bRightMargin ? aLine.GetEndCharRect( &rOrig, nOffset, 
pCMS, nMaxY )
 : aLine.GetCharRect( &rOrig, nOffset, pCMS, 
nMaxY );
 }
@@ -458,8 +457,6 @@ sal_Bool SwTxtFrm::GetAutoPos( SwRect& rOrig, const 
SwPosition &rPos ) const
 
 /** determine top of line for given position in the text frame
 
-OD 11.11.2003 #i22341#
-OD 2004-03-18 #114789# - corrections:
 - Top of first paragraph line is the top of the printing area of the text 
frame
 - If a proportional line spacing is applied use top of anchor character as
   top of the line.
@@ -483,7 +480,7 @@ bool SwTxtFrm::GetTopOfLine( SwTwips& _onTopOfLine,
 SWRECTFN( this )
 if ( IsEmpty() || !(Prt().*fnRect->fnGetHeight)() )
 {
-// OD 2004-03-18 #i11860# - consider upper space amount considered
+// consider upper space amount considered
 // for previous frame and the page grid.
 _onTopOfLine = (this->*fnRect->fnGetPrtTop)();
 }
@@ -493,7 +490,7 @@ bool SwTxtFrm::GetTopOfLine( SwTwips& _onTopOfLine,
 SwTxtFrm* pFrm = &(const_cast(this)->GetFrmAtOfst( 
nOffset ));
 pFrm->GetFormatted();
 SWREFRESHFN( pFrm )
-// OD 2004-03-18 #114789# - If proportional line spacing is applied
+// If proportional line spacing is applied
 // to the text frame, the top of the anchor character is also the
 // top of the line.
 // Otherwise the line layout determines the top of the line
@@ -569,7 +566,7 @@ struct SwFillData
 sal_Bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
 const sal_Bool bChgFrm, SwCrsrMoveState* pCMS ) const
 {
-// 8804: _GetCrsrOfst is called by GetCrsrOfst and GetKeyCrsrOfst.
+// _GetCrsrOfst is called by GetCrsrOfst and GetKeyCrsrOfst.
 // Never just a return sal_False.
 
 if( IsLocked() || IsHiddenNow() )
@@ -627,7 +624,7 @@ sal_Bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const 
Point& rPoint,
 if( pCMS && pCMS->eState == MV_NONE && aLine.GetEnd() == nOffset )
 ((SwCrsrMoveState*)pCMS)->eState = MV_RIGHTMARGIN;
 
-// 6776: pPos is a pure IN parameter and must not be evaluated.
+// pPos is a pure IN parameter and must not be evaluated.
 // pIter->GetCrsrOfst returns from a nesting with STRING_LEN.
 // If SwTxtIter::GetCrsrOfst calls GetCrsrOfst further by itself
 // nNode changes the position.
@@ -804,7 +801,7 @@ public:
 sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
 sal_Bool bSetInReadOnly ) const
 {
-// 8626: Set the RightMargin if needed
+// Set the RightMargin if needed
 SwSetToRightMargin aSet;
 
 if( IsInTab() &&
@@ -831,7 +828,7 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips 
nOffset,
 SwTxtSizeInfo aInf( (SwTxtFrm*)this );
 SwTxtCursor  aLine( ((SwTxtFrm*)thi

[Libreoffice-commits] .: 2 commits - svx/source sw/source

2012-04-02 Thread Caolán McNamara

 svx/source/tbxctrls/linectrl.cxx |4 ++--
 svx/source/tbxctrls/tbcontrl.cxx |6 +++---
 sw/source/filter/ww8/ww8par.hxx  |1 +
 sw/source/filter/ww8/ww8par6.cxx |   19 ++-
 4 files changed, 20 insertions(+), 10 deletions(-)

New commits:
commit a482b89e4d9c41b6f7c1616d193ac6cde05a69a7
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 2 20:57:02 2012 +0100

Resolves: fdo#48096 torn off popups trigger keyboard focus problems

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index c81177e..ccc047c 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -379,7 +379,7 @@ SvxLineEndWindow::SvxLineEndWindow(
 const String& rWndTitle ) :
 SfxPopupWindow( nSlotId,
 rFrame,
-WinBits( WB_STDPOPUP ) ),
+WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
 aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | 
WB_NO_DIRECTSELECT ) ),
 nCols   ( 2 ),
 nLines  ( 12 ),
@@ -400,7 +400,7 @@ SvxLineEndWindow::SvxLineEndWindow(
 SfxPopupWindow( nSlotId,
 rFrame,
 pParentWindow,
-WinBits( WB_STDPOPUP ) ),
+WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
 aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | 
WB_NO_DIRECTSELECT ) ),
 nCols   ( 2 ),
 nLines  ( 12 ),
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index cb56fac..f9f25a8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -822,7 +822,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&   
 rCommand,
   Window*
pParentWindow,
   const ::Color  
rLastColor ) :
 
-SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
+SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | 
WB_OWNERDRAWDECORATION ) ),
 
 theSlotId( nSlotId ),
 aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | 
WB_NO_DIRECTSELECT) ),
@@ -1049,7 +1049,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, 
SfxItemState eState, co
 
 SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< 
XFrame >& rFrame, Window* pParentWindow ) :
 
-SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
+SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | 
WB_OWNERDRAWDECORATION ) ),
 aFrameSet   ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | 
WB_NO_DIRECTSELECT ) ),
 bParagraphMode(sal_False)
 
@@ -1326,7 +1326,7 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
 
 SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< 
XFrame >& rFrame, Window* pParentWindow ) :
 
-SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | 
WB_AUTOSIZE ) ),
+SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | 
WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ),
 m_aLineStyleLb( this )
 {
 try
commit b89e0c5b56e50ff62d0e5defdf9fe92620cc877a
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 2 16:56:54 2012 +0100

split out ContextualSpacing

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index b86c5b6..7b4ec8e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1588,6 +1588,7 @@ public: // eigentlich private, geht aber leider nur 
public
 void Read_UL(   sal_uInt16 nId, const sal_uInt8*, short nLen );
 void Read_ParaAutoBefore(sal_uInt16 , const sal_uInt8 *pData, short nLen);
 void Read_ParaAutoAfter(sal_uInt16 , const sal_uInt8 *pData, short nLen);
+void Read_ParaContextualSpacing( sal_uInt16 nId, const sal_uInt8* pData, 
short nLen );
 void Read_LineSpace(sal_uInt16, const sal_uInt8*, short nLen );
 void Read_Justify(sal_uInt16, const sal_uInt8*, short nLen);
 void Read_IdctHint(sal_uInt16, const sal_uInt8*, short nLen);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 65cea9d..33baeb7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4177,7 +4177,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const 
sal_uInt8* pData, short nLe
 pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
 return;
 }
-short nPara = ((nId == 0x246D) ? SVBT16ToShort( pData ) : (0 != *pData));
+short nPara = SVBT16ToShort( pData );
 if( nPara < 0 )
 nPara = -nPara;
 
@@ -4195,9 +4195,6 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const 
sal_uInt8* pData, short nLe
 case 0xA414:
 aUL.SetLower( nPara );
 break;
-case 0x246D:
-aUL.SetContextValue( nPara );
-

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

2012-04-02 Thread Michael Meeks

 sfx2/source/appl/shutdowniconunx.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 33894f76b4555e2261cd723fd5fc93998b42aae1
Author: Michael Meeks 
Date:   Mon Apr 2 20:26:24 2012 +0100

fdo#34324 - fix colorspace conversion for greyscale bitmaps

Signed-off-by: Andras Timar 

diff --git a/sfx2/source/appl/shutdowniconunx.cxx 
b/sfx2/source/appl/shutdowniconunx.cxx
index 9ce5ff0..d65765d 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -90,6 +90,9 @@ static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId )
 Bitmap pInSalBitmap = aIcon.GetBitmap();
 AlphaMask pInSalAlpha = aIcon.GetAlpha();
 
+if( pInSalBitmap.GetBitCount() != 24 )
+pInSalBitmap.Convert( BMP_CONVERSION_24BIT );
+
 Bitmap::ScopedReadAccess pSalBitmap(pInSalBitmap);
 AlphaMask::ScopedReadAccess pSalAlpha(pInSalAlpha);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - cui/source solenv/gbuild writerfilter/source

2012-04-02 Thread Michael Stahl

 cui/source/inc/border.hxx  |3 +--
 cui/source/tabpages/border.cxx |   15 +--
 solenv/gbuild/filter-showIncludes.pl   |   19 +--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 
 4 files changed, 31 insertions(+), 14 deletions(-)

New commits:
commit b2d8d2d3cacbfc6d505248b81ea0e94272def439
Author: Miklos Vajna 
Date:   Fri Mar 23 12:47:41 2012 +0100

fdo#47326 fix RTF import of mixed super/nonsuper text

In most cases \super has its own group, but it's valid to have mixed
super and non-super text in a single group, as long as \super and
\nosupersub keywords are used: handle this.
(backport of f84e0e6b1b0ec5f52ee963a62ac420cd872a771e)

Signed-off-by: Michael Stahl 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 241e05d..d5d8ee6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1950,6 +1950,14 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 
m_aStates.top().aCharacterSprms->push_back(make_pair(NS_ooxml::LN_EG_RPrBase_vertAlign,
 pValue));
 }
 break;
+case RTF_NOSUPERSUB:
+if (m_pCurrentBuffer == &m_aSuperBuffer)
+{
+replayBuffer(m_aSuperBuffer);
+m_pCurrentBuffer = 0;
+}
+
m_aStates.top().aCharacterSprms.erase(NS_ooxml::LN_EG_RPrBase_vertAlign);
+break;
 case RTF_LINEPPAGE:
 case RTF_LINECONT:
 {
commit b2a20dad907bfd6ca14847d548b44ad8b9ee5321
Author: Markus Mohrhard 
Date:   Mon Apr 2 17:20:26 2012 +0200

show synchronized checked only if all margins are the same, related 
fdo#44337
(cherry picked from commit 149650b087ab5b15ef23e4ac6af5368b2820af1e)

Signed-off-by: Michael Stahl 

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 7766ec9..ecb6c9e 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -125,8 +125,7 @@ private:
 boolmbTLBREnabled;  /// true = Top-left to 
bottom-right border enabled.
 boolmbBLTREnabled;  /// true = Bottom-left to 
top-right border enabled.
 boolmbUseMarginItem;
-
-static sal_Bool bSync;
+boolmbSync;
 
 #ifdef _SVX_BORDER_CXX
 // Handler
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d6c474f..709d04b 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -86,8 +86,6 @@ static sal_uInt16 pRanges[] =
 0
 };
 
-sal_Bool SvxBorderTabPage::bSync = sal_True;
-
 // ---
 void lcl_SetDecimalDigitsTo1(MetricField& rField)
 {
@@ -147,7 +145,8 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
 mbVerEnabled( false ),
 mbTLBREnabled( false ),
 mbBLTREnabled( false ),
-mbUseMarginItem( false )
+mbUseMarginItem( false ),
+mbSync(true)
 
 {
 // diese Page braucht ExchangeSupport
@@ -217,7 +216,6 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
 SetFieldUnit(aRightMF, eFUnit);
 SetFieldUnit(aTopMF, eFUnit);
 SetFieldUnit(aBottomMF, eFUnit);
-aSynchronizeCB.Check(bSync);
 aSynchronizeCB.SetClickHdl(LINK(this, SvxBorderTabPage, 
SyncHdl_Impl));
 aLeftMF.SetModifyHdl(LINK(this, SvxBorderTabPage, 
ModifyDistanceHdl_Impl));
 aRightMF.SetModifyHdl(LINK(this, SvxBorderTabPage, 
ModifyDistanceHdl_Impl));
@@ -571,6 +569,11 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
 }
 
 LinesChanged_Impl( 0 );
+if(aLeftMF.GetValue() == aRightMF.GetValue() && aTopMF.GetValue() == 
aBottomMF.GetValue() && aTopMF.GetValue() == aLeftMF.GetValue())
+mbSync = true;
+else
+mbSync = false;
+aSynchronizeCB.Check(mbSync);
 }
 
 // ---
@@ -1153,7 +1156,7 @@ IMPL_LINK( SvxBorderTabPage, LinesChanged_Impl, void*, 
EMPTYARG )
 
 IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField)
 {
-if ( bSync )
+if ( mbSync )
 {
 sal_Int64 nVal = pField->GetValue();
 if(pField != &aLeftMF)
@@ -1170,7 +1173,7 @@ IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, 
MetricField*, pField)
 
 IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox)
 {
-bSync = pBox->IsChecked();
+mbSync = pBox->IsChecked();
 return 0;
 }
 
commit 9d8662264abfad3da87e1662abda4556333889f0
Author: Jan Holesovsky 
Date:   Fri Mar 30 13:44:33 2012 +0200

filter-showIncludes.pl: Attempt to prevent creating incomplete .d files.
(cherry picked from commit 3cf66a899ec1c8eed3a95b7f08824d5c8db0d0a8)

Signed-of

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

2012-04-02 Thread Kohei Yoshida

 sc/source/core/data/docpool.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 643fd5a6d2f72e55b243290b85be25f77dcf7be8
Author: Markus Mohrhard 
Date:   Mon Apr 2 17:23:46 2012 +0200

this hack in no longer needed, fdo#44337

excel import now uses the stored row height and we should go back to a
symetric default margin

Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 3061856..36f0d3b 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -275,10 +275,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, 
sal_Bool bLoadRefCounts )
 ppPoolDefaults[ ATTR_SHRINKTOFIT - ATTR_STARTINDEX ] = new 
SfxBoolItem( ATTR_SHRINKTOFIT );
 ppPoolDefaults[ ATTR_BORDER_TLBR - ATTR_STARTINDEX ] = new 
SvxLineItem( ATTR_BORDER_TLBR );
 ppPoolDefaults[ ATTR_BORDER_BLTR - ATTR_STARTINDEX ] = new 
SvxLineItem( ATTR_BORDER_BLTR );
-SvxMarginItem* pItem = new SvxMarginItem( ATTR_MARGIN );
-pItem->SetTopMargin( 27 );
-pItem->SetBottomMargin( 27 );
-ppPoolDefaults[ ATTR_MARGIN  - ATTR_STARTINDEX ] = pItem;
+ppPoolDefaults[ ATTR_MARGIN  - ATTR_STARTINDEX ] = new 
SvxMarginItem( ATTR_MARGIN );
 ppPoolDefaults[ ATTR_MERGE   - ATTR_STARTINDEX ] = new ScMergeAttr;
 ppPoolDefaults[ ATTR_MERGE_FLAG  - ATTR_STARTINDEX ] = new 
ScMergeFlagAttr;
 ppPoolDefaults[ ATTR_VALUE_FORMAT- ATTR_STARTINDEX ] = new 
SfxUInt32Item( ATTR_VALUE_FORMAT, 0 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-02 Thread Kohei Yoshida

 sc/source/filter/excel/xestyle.cxx |8 
 sc/source/filter/excel/xistyle.cxx |   37 +++--
 sc/source/filter/inc/xlconst.hxx   |   10 ++
 3 files changed, 29 insertions(+), 26 deletions(-)

New commits:
commit 487139d681fbf38a52cf5ea91d7e38f7eba290a0
Author: Markus Mohrhard 
Date:   Sun Apr 1 23:57:46 2012 +0200

use same border width information for xls import and export, fdo#44742

Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index 11757bb..39ecfcf 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1553,15 +1553,15 @@ void lclGetBorderLine(
 sal_uInt16 nDistance = pLine->GetDistance();
 if( nDistance > 0 )
 rnXclLine = EXC_LINE_DOUBLE;
-else if( nOuterWidth > DEF_LINE_WIDTH_2 )
+else if( nOuterWidth >= EXC_BORDER_THICK )
 rnXclLine = EXC_LINE_THICK;
-else if( nOuterWidth > DEF_LINE_WIDTH_1 )
+else if( nOuterWidth >= EXC_BORDER_MEDIUM )
 {
 rnXclLine = EXC_LINE_MEDIUM;
 if ( pLine->GetStyle( ) == ::editeng::DASHED )
 rnXclLine = EXC_LINE_MEDIUMDASHED;
 }
-else if( nOuterWidth > DEF_LINE_WIDTH_0 )
+else if( nOuterWidth >= EXC_BORDER_THIN )
 {
 rnXclLine = EXC_LINE_THIN;
 switch ( pLine->GetStyle( ) )
@@ -1576,7 +1576,7 @@ void lclGetBorderLine(
 break;
 }
 }
-else if( nOuterWidth > 0 )
+else if( nOuterWidth >= EXC_BORDER_HAIR )
 rnXclLine = EXC_LINE_HAIR;
 else
 rnXclLine = EXC_LINE_NONE;
diff --git a/sc/source/filter/excel/xistyle.cxx 
b/sc/source/filter/excel/xistyle.cxx
index 2131095..1f55f2d 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -890,33 +890,26 @@ bool XclImpCellBorder::HasAnyOuterBorder() const
 
 namespace {
 
-// TODO: These values are approximate; we should probably tweak these values
-// further to better match Excel's border thickness.
-#define XLS_LINE_WIDTH_HAIR1
-#define XLS_LINE_WIDTH_THIN6
-#define XLS_LINE_WIDTH_MEDIUM 18
-#define XLS_LINE_WIDTH_THICK  24
-
 /** Converts the passed line style to a ::editeng::SvxBorderLine, or returns 
false, if style is "no line". */
 bool lclConvertBorderLine( ::editeng::SvxBorderLine& rLine, const 
XclImpPalette& rPalette, sal_uInt8 nXclLine, sal_uInt16 nXclColor )
 {
 static const sal_uInt16 ppnLineParam[][ 4 ] =
 {
-//  outer width,   type
-{   0, ::editeng::SOLID },// 0 = 
none
-{   XLS_LINE_WIDTH_THIN,   ::editeng::SOLID },// 1 = 
thin
-{   XLS_LINE_WIDTH_MEDIUM, ::editeng::SOLID },// 2 = 
medium
-{   XLS_LINE_WIDTH_THIN,   ::editeng::DASHED },   // 3 = 
dashed
-{   XLS_LINE_WIDTH_THIN,   ::editeng::DOTTED },   // 4 = 
dotted
-{   XLS_LINE_WIDTH_THICK,  ::editeng::SOLID },// 5 = 
thick
-{   XLS_LINE_WIDTH_THIN,   ::editeng::DOUBLE }, // 6 = 
double
-{   XLS_LINE_WIDTH_HAIR,   ::editeng::SOLID },// 7 = 
hair
-{   XLS_LINE_WIDTH_MEDIUM, ::editeng::DASHED },   // 8 = 
med dash
-{   XLS_LINE_WIDTH_THIN,   ::editeng::SOLID },// 9 = 
thin dashdot
-{   XLS_LINE_WIDTH_MEDIUM, ::editeng::SOLID },// A = 
med dashdot
-{   XLS_LINE_WIDTH_THIN,   ::editeng::SOLID },// B = 
thin dashdotdot
-{   XLS_LINE_WIDTH_MEDIUM, ::editeng::SOLID },// C = 
med dashdotdot
-{   XLS_LINE_WIDTH_MEDIUM, ::editeng::SOLID } // D = 
med slant dashdot
+//  outer width,type
+{   0,  ::editeng::SOLID },// 0 = none
+{   EXC_BORDER_THIN,::editeng::SOLID },// 1 = thin
+{   EXC_BORDER_MEDIUM,  ::editeng::SOLID },// 2 = 
medium
+{   EXC_BORDER_THIN,::editeng::DASHED },   // 3 = 
dashed
+{   EXC_BORDER_THIN,::editeng::DOTTED },   // 4 = 
dotted
+{   EXC_BORDER_THICK,   ::editeng::SOLID },// 5 = thick
+{   EXC_BORDER_THIN,::editeng::DOUBLE }, // 6 = 
double
+{   EXC_BORDER_HAIR,::editeng::SOLID },// 7 = hair
+{   EXC_BORDER_MEDIUM,  ::editeng::DASHED },   // 8 = med 
dash
+{   EXC_BORDER_THIN,::editeng::SOLID },// 9 = thin 
dashdot
+{   EXC_BORDER_MEDIUM,  ::editeng::SOLID },// A = med 
dashdot
+{   EXC_BORDER_THIN,::editeng::SOLID },// B = thin 
dashdotdot
+{   EXC_BORDER_MEDIUM,  ::editeng::SOLID },

[Libreoffice-commits] .: 3 commits - basctl/source svtools/inc svtools/source svtools/workben sw/inc sw/source

2012-04-02 Thread Michael Stahl

 basctl/source/basicide/baside2.hxx  |5 +
 basctl/source/basicide/baside2b.cxx |   16 +---
 svtools/inc/svtools/calendar.hxx|   16 ++--
 svtools/source/control/calendar.cxx |  134 +---
 svtools/workben/svdem.cxx   |2 
 sw/inc/crsrsh.hxx   |1 
 sw/inc/tblsel.hxx   |3 
 sw/source/core/crsr/trvltbl.cxx |2 
 sw/source/core/frmedt/fetab.cxx |   14 +--
 sw/source/core/frmedt/tblsel.cxx|   25 ++
 10 files changed, 109 insertions(+), 109 deletions(-)

New commits:
commit 9ef0b8e3aa2137af67624dbd757fe464e44202ed
Author: Noel Grandin 
Date:   Mon Apr 2 23:18:19 2012 +0200

Convert tools/table.hxx to std::set in EditorWindow class in basctl module

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index c7b3f05..8adbe15 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -51,11 +51,11 @@ class SvxSearchItem;
 #include 
 #include 
 #include 
-#include 
 
 #include "breakpoint.hxx"
 #include "linenumberwindow.hxx"
 #include "objdlg.hxx"
+#include 
 
 #include 
 
@@ -95,6 +95,8 @@ inline void ProgressInfo::StepProgress()
 SetState( ++nCurState );
 }
 
+typedef std::set SyntaxLineSet;
+
 class EditorWindow : public Window, public SfxListener
 {
 private:
@@ -113,7 +115,7 @@ private:
 
 SyntaxHighlighter   aHighlighter;
 Timer   aSyntaxIdleTimer;
-Table   aSyntaxLineTable;
+SyntaxLineSet   aSyntaxLineTable;
 DECL_LINK(SyntaxTimerHdl, void *);
 ProgressInfo*   pProgress;
 ModulWindow*pModulWindow;
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index efe352f..ef67435 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -628,7 +628,7 @@ void EditorWindow::CreateEditEngine()
 
 
 for ( sal_uInt16 nLine = 0; nLine < nLines; nLine++ )
-aSyntaxLineTable.Insert( nLine, (void*)(sal_uInt16)1 );
+aSyntaxLineTable.insert( nLine );
 ForceSyntaxTimeout();
 
 DELETEZ( pProgress );
@@ -793,7 +793,7 @@ void EditorWindow::ImpDoHighlight( sal_uLong nLine )
 if ( aChanges.Len() )
 {
 for ( long n = aChanges.Min() + 1; n <= aChanges.Max(); n++ )
-aSyntaxLineTable.Insert( n, (void*)(sal_uLong)1 );
+aSyntaxLineTable.insert( n );
 aSyntaxIdleTimer.Start();
 }
 
@@ -868,7 +868,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong 
nPara )
 {
 if ( bDelayHighlight )
 {
-aSyntaxLineTable.Insert( nPara, (void*)(sal_uLong)1 );
+aSyntaxLineTable.insert( nPara );
 aSyntaxIdleTimer.Start();
 }
 else
@@ -884,13 +884,11 @@ IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl)
 // pEditEngine->SetUpdateMode( sal_False );
 
 bHighlightning = sal_True;
-sal_uInt16 nLine;
-void* p = aSyntaxLineTable.First();
-while ( p )
+for ( SyntaxLineSet::const_iterator it = aSyntaxLineTable.begin();
+  it != aSyntaxLineTable.end(); ++it )
 {
-nLine = (sal_uInt16)aSyntaxLineTable.GetCurKey();
+sal_uInt16 nLine = *it;
 DoSyntaxHighlight( nLine );
-p = aSyntaxLineTable.Next();
 }
 
 // #i45572#
@@ -899,7 +897,7 @@ IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl)
 
 pEditEngine->SetModified( bWasModified );
 
-aSyntaxLineTable.Clear();
+aSyntaxLineTable.clear();
 bHighlightning = sal_False;
 
 return 0;
commit e5a916d8e79a3d105040f3fb832134bf7b32
Author: Noel Grandin 
Date:   Thu Mar 29 18:14:00 2012 +0200

Convert tools/table.hxx usage to std::set in Calendar class in svtools 
module

Also change the API slightly, removing GetSelectedData(int index) and 
replacing
it with GetLastSelectedDate(), since the only usage of GetSelectedData in
the codebase only needed to get the last date.

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 922be10..c7b3f05 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -51,6 +51,7 @@ class SvxSearchItem;
 #include 
 #include 
 #include 
+#include 
 
 #include "breakpoint.hxx"
 #include "linenumberwindow.hxx"
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index 4d099d4..c9df5a1 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
@@ -36,8 +36,8 @@
 #include 
 #include 
 #include 
+#include 
 
-class Table;
 class MouseEvent;
 class TrackingEvent;
 class KeyEvent;
@@ -162,12 +162,15 @@ calls or by ending a selection.
 // - Calendar -
 // 
 
+typedef std::set IntDateSet;
+
+
 class SVT_DLLPUBLIC Calendar : public Control
 {
 private:
-Table*  mpSelectTable;
-Table*  mpOldSelectTable;
-Table*  mpRestoreSelectTable;
+IntDateSet* mpSelectT

[Libreoffice-commits] .: config_host.mk.in configure.in i18npool/CustomTarget_breakiterator.mk i18npool/source

2012-04-02 Thread Eike Rathke

 config_host.mk.in  |1 +
 configure.in   |6 ++
 i18npool/CustomTarget_breakiterator.mk |8 +++-
 i18npool/source/breakiterator/data/char.txt|1 +
 i18npool/source/breakiterator/data/char_in.txt |3 +++
 5 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 43084e8b30c101a44510b7a8267d5c2b316a17bb
Author: Eike Rathke 
Date:   Mon Apr 2 22:24:00 2012 +0200

only as of ICU 4.9 RBBI the Prepend property is empty

This reverts 0c08a84c04b166ab6479716e2c33cd444d7e3dbe and instead strips the
Prepend variable during build time.

diff --git a/config_host.mk.in b/config_host.mk.in
index ed5f6df..0e896d8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -208,6 +208,7 @@ export ICU_MAJOR=@ICU_MAJOR@
 export ICU_MICRO=@ICU_MICRO@
 export ICU_MINOR=@ICU_MINOR@
 export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
+export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
 export ILIB=@ILIB@
 @x_Cygwin@ export INCLUDE=
 export INPATH=@INPATH@
diff --git a/configure.in b/configure.in
index 0100f97..067fa4f 100644
--- a/configure.in
+++ b/configure.in
@@ -7487,6 +7487,7 @@ ICU_MAJOR=
 ICU_MINOR=
 ICU_MICRO=
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS=
+ICU_RECLASSIFIED_PREPEND_SET_EMPTY=
 AC_MSG_CHECKING([which icu to use])
 if test "$with_system_icu" = "yes"; then
 AC_MSG_RESULT([external])
@@ -7549,6 +7550,9 @@ You can use --with-system-icu-for-build=force to use it 
anyway.])
 if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge 
"4"; then
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
 fi
+if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge 
"9"; then
+ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
+fi
 fi
 
 libo_MINGW_CHECK_DLL([ICUDATA], [icudata][$ICU_MAJOR][$ICU_MINOR])
@@ -7558,6 +7562,7 @@ else
 AC_MSG_RESULT([internal])
 SYSTEM_ICU="NO"
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
+# ICU_RECLASSIFIED_PREPEND_SET_EMPTY not applied for our internal ICU 4.4.2
 BUILD_TYPE="$BUILD_TYPE ICU"
 fi
 
@@ -7569,6 +7574,7 @@ AC_SUBST(ICU_MAJOR)
 AC_SUBST(ICU_MINOR)
 AC_SUBST(ICU_MICRO)
 AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
+AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
 AC_SUBST([MINGW_ICUDATA_DLL])
 AC_SUBST([MINGW_ICUI18N_DLL])
 AC_SUBST([MINGW_ICUUC_DLL])
diff --git a/i18npool/CustomTarget_breakiterator.mk 
b/i18npool/CustomTarget_breakiterator.mk
index 10dce5f..a8379d7 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -95,10 +95,16 @@ $(IPBI)/%.brk : $(IPBI)/%.txt $(GENBRKTARGET)
$(call gb_Helper_abbreviate_dirs_native,\
$(GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> 
/dev/null))
 
-# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
+# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
+# Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if 
used.
+# NOTE: strips every line with _word_ 'Prepend', including $Prepend
 $(IPBI)/%.txt : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | 
$(IPBI)/.dir
 ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
+ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES)
+   sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  
Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\/d" $< 
> $@
+else
sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  
Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
+endif
 else
cp $< $@
 endif
diff --git a/i18npool/source/breakiterator/data/char.txt 
b/i18npool/source/breakiterator/data/char.txt
index acb932e..8e49a56 100644
--- a/i18npool/source/breakiterator/data/char.txt
+++ b/i18npool/source/breakiterator/data/char.txt
@@ -16,6 +16,7 @@
 $CR  = [\p{Grapheme_Cluster_Break = CR}];
 $LF  = [\p{Grapheme_Cluster_Break = LF}];
 $Control = [\p{Grapheme_Cluster_Break = Control}];
+$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
 $Extend  = [\p{Grapheme_Cluster_Break = Extend}];
 $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
 # True Indic wants to move by syllables. Break up SpacingMark. This based on 
Unicode 6.0 data
diff --git a/i18npool/source/breakiterator/data/char_in.txt 
b/i18npool/source/breakiterator/data/char_in.txt
index 5ad12a7..5e1ed67 100644
--- a/i18npool/source/breakiterator/data/char_in.txt
+++ b/i18npool/source/breakiterator/data/char_in.txt
@@ -15,6 +15,7 @@
 $CR  = [\p{Grapheme_Cluster_Break = CR}];
 $LF  = [\p{Grapheme_Cluster_Break = LF}];
 $Control = [\p{Grapheme_Cluster_Break = Control}];
+$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
 $Extend  = [\p{Grapheme_Cluster_Break = Extend}];
 $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
 $BengaliLetter = [\u0985-\u09

[Libreoffice-commits] .: 2 commits - postprocess/packcomponents Repository.mk scp2/source vcl/CustomTarget_kde_moc.mk vcl/Executable_kdefilepicker.mk vcl/Module_vcl.mk vcl/Package_kde_moc.mk vcl/unx

2012-04-02 Thread Matus Kukan

 Repository.mk  |6 
 postprocess/packcomponents/makefile.mk |4 ---
 scp2/source/ooo/file_library_ooo.scp   |   16 -
 vcl/CustomTarget_kde_moc.mk|   40 +
 vcl/Executable_kdefilepicker.mk|4 ---
 vcl/Module_vcl.mk  |2 +
 vcl/Package_kde_moc.mk |   36 -
 vcl/unx/kde/fpicker/Makefile   |   35 
 8 files changed, 42 insertions(+), 101 deletions(-)

New commits:
commit 19b7edb9c65793821bee984d2da43fbfbd605e74
Author: MatÃºÅ¡ Kukan 
Date:   Tue Apr 3 02:06:48 2012 +0200

fps_kde and fps_kde4 are no more

diff --git a/Repository.mk b/Repository.mk
index 74452fd..a112669 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -489,12 +489,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 $(if $(filter $(OS),WNT), \
 fps_odma \
 ) \
-$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
-fps_kde \
-) \
-$(if $(filter $(GUIBASE)$(ENABLE_KDE4),unxTRUE), \
-fps_kde4 \
-) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 47a7d7c..488e322 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -375,10 +375,6 @@ my_components += mozbootstrap
 .END
 .ENDIF
 
-.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != ""
-my_components += component/fpicker/source/unx/kde4/fps_kde4
-.END
-
 .IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != 
"headless"
 my_components += cmdmail
 .END
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 1b464cf..689a71b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -502,24 +502,8 @@ File gid_File_Lib_Desktopbe
 Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
 End
 
-#ifdef ENABLE_KDE4
-#ifndef MACOSX
-File gid_File_Lib_Fps_Kde4
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
-End
-#endif
-#endif
 #ifdef ENABLE_KDE
 #ifndef MACOSX
-File gid_File_Lib_Fps_Kde
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
-End
 File gid_File_Bin_KdeFilePicker
 BIN_FILE_BODY;
 Styles = (PACKED);
commit 8464e311309ca918ac3a7d111c0f6927bfe825f8
Author: MatÃºÅ¡ Kukan 
Date:   Tue Apr 3 01:40:29 2012 +0200

vcl: use CustomTarget makefile for kde_moc

diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk
new file mode 100644
index 000..7d54c0b
--- /dev/null
+++ b/vcl/CustomTarget_kde_moc.mk
@@ -0,0 +1,40 @@
+# -*- 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 
+#  (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_CustomTarget_CustomTarget,vcl/unx/kde/fpicker,new_style))
+
+VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)
+
+$(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \
+   $(VCKF)/kdefilepicker.moc.cxx
+
+$(VCKF)/kdefilepicker.moc.cxx : \
+   $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx | $(VCKF)/.dir
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
+   $(MOC) -o $@ $<
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk
index 7820efc..2bfa978 100644
--- a/vcl/Executable_kdefilepicker.mk
+++ b/vcl/Executable_kdefilepicker.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,kdefilepicker))
 
-$(eval $(call gb_Executable_add_package_headers,kdefilepicker,\
-   vcl_kde_moc \
-))
-
 $(eval $(call gb_Executable_add_defs,kdefilepicker,\
$(KDE_CFLAGS) \
 ))
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index dcde2

[Libreoffice-commits] .: sal/inc

2012-04-02 Thread Lubos Lunak

 sal/inc/rtl/string.hxx  |3 +--
 sal/inc/rtl/ustring.hxx |2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit d5c5800bffe97911497a0603567417dea15f295f
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Tue Apr 3 07:38:00 2012 +0200

I'm dumb, fromAscii() stops at \0.

diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index a00e186..0f6246b 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -196,8 +196,7 @@ public:
   New string from a string literal.
 
   If there are any embedded \0's in the string literal, the result is 
undefined.
-  Use the overload that explicitly accepts length or cast the literal
-  explicitly to const char*.
+  Use the overload that explicitly accepts length.
 
   @since LibreOffice 3.6
 
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 518ef3d..ee1ba7f 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -191,7 +191,7 @@ public:
   providing the encoding to use for the conversion.
 
   If there are any embedded \0's in the string literal, the result is 
undefined.
-  Use the overload that explicitly accepts length or fromAscii().
+  Use the overload that explicitly accepts length.
 
   @paramliteral the 8-bit ASCII string literal
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-02 Thread Stephan Bergmann

 configure.in |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 844b4520a9f0879d7b756654cef8fdbaa03a9000
Author: Stephan Bergmann 
Date:   Tue Apr 3 08:58:05 2012 +0200

--enable-ext-languagetool requires --with-java

diff --git a/configure.in b/configure.in
index 067fa4f..2158d03 100644
--- a/configure.in
+++ b/configure.in
@@ -435,7 +435,7 @@ AC_ARG_ENABLE(ext-hunart,
 
 AC_ARG_ENABLE(ext-languagetool,
 AS_HELP_STRING([--enable-ext-languagetool],
-[Enable the LanguageTool extension.])
+[Enable the LanguageTool extension. Does not work --without-java.])
 )
 
 AC_ARG_ENABLE(ext-mysql-connector,
@@ -9604,6 +9604,9 @@ dnl Test whether to include LanguageTool extension
 dnl ===
 AC_MSG_CHECKING([for LanguageTool extension integration])
 if test "x$enable_ext_languagetool" = "xyes" -a 
"x$enable_extension_integration" != "xno"; then
+if test -z "$SOLAR_JAVA"; then
+AC_MSG_ERROR([--enable_ext_languagetool requires --with-java])
+fi
 BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

47 matches

Mail list logo