[Libreoffice-commits] .: external/Package_jawt.mk

2012-12-26 Thread Libreoffice Gerrit user
 external/Package_jawt.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0abaaf092451f1450c3a939f8872fdd27437b8d5
Author: David Tardon 
Date:   Thu Dec 27 07:47:55 2012 +0100

fix delivery of libjawt.dll.a

Change-Id: I57b1c99d1e4a92ca7d61f6c54683016945ffa14c

diff --git a/external/Package_jawt.mk b/external/Package_jawt.mk
index f5e3743..cc58cf9 100644
--- a/external/Package_jawt.mk
+++ b/external/Package_jawt.mk
@@ -9,6 +9,6 @@
 
 $(eval $(call gb_Package_Package,jawt,$(call 
gb_CustomTarget_get_workdir,external/jawt)))
 
-$(eval $(call gb_Package_add_file,jawt,libjawt.dll.a,lib/libjawt.dll.a))
+$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-12-26 Thread Libreoffice Gerrit user
 sw/source/filter/xml/XMLRedlineImportHelper.cxx |   30 
 sw/source/filter/xml/XMLRedlineImportHelper.hxx |6 ++--
 sw/source/filter/xml/swxml.cxx  |   20 
 sw/source/filter/xml/wrtxml.cxx |   26 ++--
 sw/source/filter/xml/wrtxml.hxx |4 +--
 sw/source/filter/xml/xmlexp.hxx |2 -
 6 files changed, 43 insertions(+), 45 deletions(-)

New commits:
commit 699132c269a6c6d9e815fc582e2e6a106e469233
Author: Takeshi Abe 
Date:   Wed Dec 26 20:50:41 2012 +0900

Remove deserted variables

Change-Id: Ied7eef51ad46e79f8e3d55f8bdcf38d15fa68c09

diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 5c05b42..d5c9ea2 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -56,9 +56,7 @@ class SwXMLExport : public SvXMLExport
 SvXMLItemMapEntriesRef  xTableCellItemMap;
 UniReference < XMLPropertySetMapper > xParaPropMapper;
 
-sal_BoolbExportWholeDoc : 1;// export whole document?
 sal_BoolbBlock : 1; // export text block?
-sal_BoolbExportFirstTableOnly : 1;
 sal_BoolbShowProgress : 1;
 sal_BoolbSavedShowChanges : 1;
 
commit f832713838ced5030f9e0ae78b13c85545f69d6f
Author: Takeshi Abe 
Date:   Wed Dec 26 20:50:15 2012 +0900

sal_Bool to bool

Change-Id: I788473f88d78cd3818dfed20112fa36cea81de0d

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index fb942bb..d1cece0 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -103,7 +103,7 @@ public:
 void CopyPositionInto(SwPosition& rPos, SwDoc & rDoc);
 SwDoc* GetDoc();
 
-sal_Bool IsValid();
+bool IsValid();
 };
 
 XTextRangeOrNodeIndexPosition::XTextRangeOrNodeIndexPosition() :
@@ -193,7 +193,7 @@ SwDoc* XTextRangeOrNodeIndexPosition::GetDoc()
 return (NULL != pIndex) ? pIndex->GetNodes().GetDoc() : 
lcl_GetDocViaTunnel(xRange);
 }
 
-sal_Bool XTextRangeOrNodeIndexPosition::IsValid()
+bool XTextRangeOrNodeIndexPosition::IsValid()
 {
 return ( xRange.is() || (pIndex != NULL) );
 }
@@ -233,7 +233,7 @@ public:
 RedlineInfo* pNextRedline;
 
 /// store whether we expect an adjustment for this redline
-sal_Bool bNeedsAdjustment;
+bool bNeedsAdjustment;
 };
 
 RedlineInfo::RedlineInfo() :
@@ -246,7 +246,7 @@ RedlineInfo::RedlineInfo() :
 aAnchorEnd(),
 pContentIndex(NULL),
 pNextRedline(NULL),
-bNeedsAdjustment( sal_False )
+bNeedsAdjustment( false )
 {
 }
 
@@ -262,7 +262,7 @@ RedlineInfo::~RedlineInfo()
 //
 
 XMLRedlineImportHelper::XMLRedlineImportHelper(
-sal_Bool bNoRedlinesPlease,
+bool bNoRedlinesPlease,
 const Reference & rModel,
 const Reference & rImportInfo ) :
 sEmpty(),
@@ -278,9 +278,9 @@ XMLRedlineImportHelper::XMLRedlineImportHelper(
 xImportInfoPropertySet(rImportInfo)
 {
 // check to see if redline mode is handled outside of component
-sal_Bool bHandleShowChanges = sal_True;
-sal_Bool bHandleRecordChanges = sal_True;
-sal_Bool bHandleProtectionKey = sal_True;
+bool bHandleShowChanges = true;
+bool bHandleRecordChanges = true;
+bool bHandleProtectionKey = true;
 if ( xImportInfoPropertySet.is() )
 {
 Reference xInfo =
@@ -333,7 +333,7 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
 else
 {
 // try if only the adjustment was missing
-pInfo->bNeedsAdjustment = sal_False;
+pInfo->bNeedsAdjustment = false;
 if( IsReady(pInfo) )
 {
 OSL_FAIL("RedlineInfo without adjustment; now inserted");
@@ -355,9 +355,9 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
 
 // set redline mode, either to info property set, or directly to
 // the document
-sal_Bool bHandleShowChanges = sal_True;
-sal_Bool bHandleRecordChanges = sal_True;
-sal_Bool bHandleProtectionKey = sal_True;
+bool bHandleShowChanges = true;
+bool bHandleRecordChanges = true;
+bool bHandleProtectionKey = true;
 if ( xImportInfoPropertySet.is() )
 {
 Reference xInfo =
@@ -535,7 +535,7 @@ void XMLRedlineImportHelper::SetCursor(
 }
 
 // also remember that we expect an adjustment for this redline
-pInfo->bNeedsAdjustment = sal_True;
+pInfo->bNeedsAdjustment = true;
 }
 else
 {
@@ -576,7 +576,7 @@ void XMLRedlineImportHelper::AdjustStartNodeCursor(
 // RedlineInfo found; now set Cursor
 RedlineInfo* pInfo = aFind->second;
 
-pInfo->bNeedsAdjustment = sal_False;
+pInfo->bNeedsAdjustment = false;
 
 // if now ready, insert into document
 if( IsReady(pIn

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Marco Menardi  changed:

   What|Removed |Added

 Depends on||58699

--- Comment #61 from Marco Menardi  ---
Add https://bugs.freedesktop.org/show_bug.cgi?id=58699
If you select "impress remote" menu item by mistake and don't have android
device to connect, the dialog window never close and you have to kill Impress
loosing your last editing.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice-qa] [ANN] LibreOffice 4.0.0 Beta2 available

2012-12-26 Thread Bjoern Michaelsen
On Sat, Dec 22, 2012 at 11:02:05PM +0100, Thorsten Behrens wrote:
> The release is available for Windows, Linux and Mac OS X from our QA
> builds download page at
> 
>   http://www.libreoffice.org/download/pre-releases/

And beta packages for Ubuntu raring can also be found at (in fact for a few 
days already):

https://launchpad.net/~libreoffice/+archive/libreoffice-prereleases/+packages

Best,

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


[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 58779, which changed state.

Bug 58779 Summary: "Ctrl+P". print dialog not shown. prints file directly
https://bugs.freedesktop.org/show_bug.cgi?id=58779

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|NOTABUG |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] convert icu to gbuild and add to tail_build

2012-12-26 Thread Peter Foley (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1488

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/1488/1

convert icu to gbuild and add to tail_build

Change-Id: Id7d8bc05b1393cc2bae4a531c8a47f62df24b1d6
---
M Module_tail_build.mk
M RepositoryExternal.mk
M RepositoryModule_ooo.mk
M editeng/Library_editeng.mk
M forms/Library_frm.mk
M hunspell/StaticLibrary_hunspell.mk
M i18npool/CppunitTest_i18npool_test_breakiterator.mk
M i18npool/CppunitTest_i18npool_test_textsearch.mk
M i18npool/Executable_gencoll_rule.mk
M i18npool/Library_i18npool.mk
M i18npool/Library_i18nsearch.mk
M i18nutil/Library_i18nutil.mk
A icu/ExternalPackage_icu.mk
A icu/ExternalProject_icu.mk
A icu/Makefile
A icu/Module_icu.mk
A icu/UnpackedTarball_icu.mk
A icu/UnpackedTarball_icu_data.mk
M icu/icu4c-buffer-overflow.patch
M icu/icu4c-mkdir.patch
M icu/icu4c-solarisgcc.patch
M icu/icu4c-warnings.patch
D icu/makefile.mk
M icu/prj/build.lst
M icu/prj/d.lst
D icu/prj/dmake
M l10ntools/Executable_helpex.mk
M l10ntools/Executable_stringex.mk
M l10ntools/Executable_transex3.mk
M l10ntools/Executable_treex.mk
M l10ntools/Executable_uiex.mk
M l10ntools/Executable_xrmex.mk
M l10ntools/StaticLibrary_transex.mk
M linguistic/Library_lng.mk
M lotuswordpro/Library_lwpft.mk
M solenv/gbuild/UnpackedTarball.mk
M svx/Library_svx.mk
M sw/Library_msword.mk
M sw/Library_sw.mk
M tail_build/prj/build.lst
M vcl/Library_vcl.mk
41 files changed, 327 insertions(+), 423 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/1488
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7d8bc05b1393cc2bae4a531c8a47f62df24b1d6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley 

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


[Libreoffice-commits] .: Makefile.in

2012-12-26 Thread Libreoffice Gerrit user
 Makefile.in |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 01402f9d4ba0bc8bf8634ced4bfd6d41060d6913
Author: Peter Foley 
Date:   Wed Dec 26 16:38:49 2012 -0500

dont build postprocess twice

Change-Id: I344030d48c3f872cc63b5c1f444d18075fd160f5

diff --git a/Makefile.in b/Makefile.in
index 8c5f060..d4d4b9f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -275,8 +275,7 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
$(GNUMAKE) connectivity
 endif
cd $(SRC_ROOT)/postprocess && unset MAKEFLAGS && \
-   $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- 
-P$(PARALLELISM) && \
-   $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+   $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- 
-P$(PARALLELISM)
 
 build: build-postprocess
 ifeq ($(OS_FOR_BUILD),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54157

mariosv  changed:

   What|Removed |Added

 CC||mari...@miguelangel.mobi

--- Comment #60 from mariosv  ---
(In reply to comment #59)
> adding Bug 58779 - print dialog not shown. prints file directly
> 
> recent regression with effect on a very basic and frequently used function.

Works as intended. Not a bug.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 58779, which changed state.

Bug 58779 Summary: print dialog not shown. prints file directly
https://bugs.freedesktop.org/show_bug.cgi?id=58779

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |NOTABUG

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: 2 commits - sal/inc sal/Library_sal.mk vcl/inc vcl/Library_vcl.mk vcl/source

2012-12-26 Thread Libreoffice Gerrit user
 sal/Library_sal.mk  |2 
 sal/inc/pch/precompiled_sal.cxx |   12 +
 sal/inc/pch/precompiled_sal.hxx |   31 +++
 vcl/Library_vcl.mk  |2 
 vcl/inc/pch/precompiled_vcl.cxx |   12 +
 vcl/inc/pch/precompiled_vcl.hxx |  356 
 vcl/source/app/svdata.cxx   |2 
 7 files changed, 416 insertions(+), 1 deletion(-)

New commits:
commit e90807267808eb062b93d762c50c02113ca40db5
Author: Lubos Lunak 
Date:   Wed Dec 26 22:14:40 2012 +0100

PCH for Library_vcl

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9b93f52..66e18c4 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -44,6 +44,8 @@ endif
 
 $(eval $(call gb_Library_use_package,vcl,vcl_inc))
 
+$(eval $(call 
gb_Library_set_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
 $(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager))
 
 $(eval $(call gb_Library_set_include,vcl,\
diff --git a/vcl/inc/pch/precompiled_vcl.cxx b/vcl/inc/pch/precompiled_vcl.cxx
new file mode 100644
index 000..79285a8
--- /dev/null
+++ b/vcl/inc/pch/precompiled_vcl.cxx
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "precompiled_vcl.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
new file mode 100644
index 000..8e9a6b2
--- /dev/null
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -0,0 +1,356 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "basegfx/matrix/b2dhommatrix.hxx"
+#include "basegfx/polygon/b2dpolygon.hxx"
+#include "basegfx/polygon/b2dpolygontools.hxx"
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/awt/XDisplayConnection.hpp"
+#include "com/sun/star/awt/XExtendedToolkit.hpp"
+#include "com/sun/star/awt/XToolkit.hpp"
+#include "com/sun/star/awt/XTopWindow.hpp"
+#include "com/sun/star/awt/XWindow.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyValues.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/configuration/theDefaultProvider.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/datatransfer/XTransferable.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboardEx.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboardListener.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp"
+#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
+#include "com/sun/star/datatransfer/dnd/XDragSource.hpp"
+#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
+#include "com/sun/star/frame/Desktop.hpp"
+#include "com/sun/star/graphic/GraphicProvider.hpp"
+#include "com/sun/star/graphic/XGraphicProvider.hpp"
+#include "com/sun/star/i18n/TransliterationModules.hpp"
+#include "com/sun/star/i18n/WordType.hpp"
+#include "com/sun/star/i18n/XBreakIterator.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XSeekable.hpp"
+#include "com/sun/star/java/JavaDisabledException.hpp"
+#include "com/sun/star/java/JavaNotConfiguredException.hpp"
+#include "com/sun/star/java/JavaVMCreationFailureException.hpp"
+#include "com/sun/star/java/MissingJavaRuntimeException.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/linguistic2/LinguServiceManager.hpp"
+#include "com/sun/star/rendering/XCanvas.hpp"
+#include "com/sun/star/rendering/XSpriteCanvas.hpp"
+#include "com/sun/star/script/XInvocation.hpp"
+#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFilterManag

[Libreoffice-commits] .: 2 commits - solenv/gbuild

2012-12-26 Thread Libreoffice Gerrit user
 solenv/gbuild/platform/com_MSC_class.mk |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e36f556026defbc88b1a5a4400130cd753a46148
Author: Tor Lillqvist 
Date:   Wed Dec 26 21:05:08 2012 +0200

Cosmetics

Change-Id: Ib7225307f51c8764c4b2b0e4ce45702d7919a017

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index b779783..3af4af8 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -194,8 +194,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter 
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(COMMA)5.01, 
-SUBSYSTEM:CONSOLE$(COMMA)5.01)) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
-   $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64 
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
-   $(if $(filter 
80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64,),) \
+   $(if $(filter YES,$(LIBRARY_X64)), \
+   -LIBPATH:$(OUTDIR)/lib/x64 \
+   -LIBPATH:$(COMPATH)/lib/amd64 \
+   -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
+   $(if $(filter 
80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64)) \
$(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call 
gb_Library_get_filename,$(lib))) \
commit 92dfaaa0bfd08de58ccf9387c805ade24c04b41b
Author: Tor Lillqvist 
Date:   Wed Dec 26 21:02:48 2012 +0200

Subsystem 5.01 is invalid for 64-bit code, says the linker

Change-Id: I77f714bca9ddebffd6241d901661471aa27f03d5

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 2f93937..b779783 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -192,7 +192,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter 
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-   $(if $(filter YES,$(TARGETGUI)), 
-SUBSYSTEM:WINDOWS$(COMMA)5.01, -SUBSYSTEM:CONSOLE$(COMMA)5.01) \
+   $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter 
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(COMMA)5.01, 
-SUBSYSTEM:CONSOLE$(COMMA)5.01)) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
$(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64 
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
$(if $(filter 
80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64,),) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: xmloff/source

2012-12-26 Thread Libreoffice Gerrit user
 xmloff/source/draw/shapeexport2.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 9e41982ac165092ed024b8ab318eedc7fcf4c6a9
Author: Markus Mohrhard 
Date:   Wed Dec 26 19:57:34 2012 +0100

text:p is not allowed for chart objects, fdo#58571

Change-Id: I24c485d31ea3f0540164ff65074b392be1e557e6

diff --git a/xmloff/source/draw/shapeexport2.cxx 
b/xmloff/source/draw/shapeexport2.cxx
index d4f1e23..2ebd96a 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1662,8 +1662,12 @@ void XMLShapeExport::ImpExportOLE2Shape(
 if( !sClassId.isEmpty() )
 mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID, 
sClassId );
 
-// #i118485# Add text export, the draw OLE shape allows text 
now
-ImpExportText( xShape );
+if(eShapeType != XmlShapeTypePresChartShape && eShapeType != 
XmlShapeTypeDrawChartShape)
+{
+// #i118485# Add text export, the draw OLE shape allows 
text now
+// fdo#58571 chart objects don't allow text:p
+ImpExportText( xShape );
+}
 
 if(!bExportEmbedded)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-4-0' - xmloff/source

2012-12-26 Thread Libreoffice Gerrit user
 xmloff/source/draw/shapeexport2.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c5229f497008051b078e9f76e00031dfb3b6f41f
Author: Markus Mohrhard 
Date:   Wed Dec 26 19:57:34 2012 +0100

text:p is not allowed for chart objects, fdo#58571

Change-Id: I24c485d31ea3f0540164ff65074b392be1e557e6

diff --git a/xmloff/source/draw/shapeexport2.cxx 
b/xmloff/source/draw/shapeexport2.cxx
index d4f1e23..2ebd96a 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1662,8 +1662,12 @@ void XMLShapeExport::ImpExportOLE2Shape(
 if( !sClassId.isEmpty() )
 mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID, 
sClassId );
 
-// #i118485# Add text export, the draw OLE shape allows text 
now
-ImpExportText( xShape );
+if(eShapeType != XmlShapeTypePresChartShape && eShapeType != 
XmlShapeTypeDrawChartShape)
+{
+// #i118485# Add text export, the draw OLE shape allows 
text now
+// fdo#58571 chart objects don't allow text:p
+ImpExportText( xShape );
+}
 
 if(!bExportEmbedded)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/qa

2012-12-26 Thread Libreoffice Gerrit user
 sc/qa/unit/rangelst_test.cxx |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 095700d0859178e68d9a54f9efe8011a5d2b9c48
Author: Luboš Luňák 
Date:   Wed Dec 26 15:24:25 2012 +0100

fix operator lookup with clang

I'm not sure if this is clang being more strict or buggy, probably the 
latter.

Change-Id: I900ba2cd2b1d4c23e41e4787be4263954ce8b4c0

diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx
index 62d9002..f543175 100644
--- a/sc/qa/unit/rangelst_test.cxx
+++ b/sc/qa/unit/rangelst_test.cxx
@@ -73,21 +73,19 @@ private:
 ScDocShellRef m_xDocShRef;
 };
 
-namespace {
-
-std::ostream& operator<<(std::ostream& rStrm, const ScAddress& rAddr)
+static std::ostream& operator<<(std::ostream& rStrm, const ScAddress& rAddr)
 {
 rStrm << "Col: " << rAddr.Col() << " Row: " << rAddr.Row() << " Tab: " << 
rAddr.Tab() << "\n";
 return rStrm;
 }
 
-std::ostream& operator<<(std::ostream& rStrm, const ScRange& rRange)
+static std::ostream& operator<<(std::ostream& rStrm, const ScRange& rRange)
 {
 rStrm << "ScRange: " << rRange.aStart << rRange.aEnd << "\n";
 return rStrm;
 }
 
-std::ostream& operator<<(std::ostream& rStrm, const ScRangeList& rList)
+static std::ostream& operator<<(std::ostream& rStrm, const ScRangeList& rList)
 {
 rStrm << "ScRangeList: \n";
 for(size_t i = 0; i < rList.size(); ++i)
@@ -95,9 +93,6 @@ std::ostream& operator<<(std::ostream& rStrm, const 
ScRangeList& rList)
 return rStrm;
 }
 
-}
-
-
 void Test::setUp()
 {
 BootstrapFixture::setUp();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27  changed:

   What|Removed |Added

 Depends on||58779

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27  changed:

   What|Removed |Added

 Depends on|58779   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27  changed:

   What|Removed |Added

 Depends on||58779

--- Comment #59 from tommy27  ---
adding Bug 58779 - print dialog not shown. prints file directly

recent regression with effect on a very basic and frequently used function.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: dbaccess/source

2012-12-26 Thread Libreoffice Gerrit user
 dbaccess/source/ui/dlg/adodatalinks.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a6077f6d7e79c4aeba59c749da21319fe0256d57
Author: Lubos Lunak 
Date:   Wed Dec 26 19:20:24 2012 +0100

fix windows PCH build

diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx 
b/dbaccess/source/ui/dlg/adodatalinks.cxx
index bbc2964..f56b2cd 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -24,6 +24,9 @@
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
 #endif
+// LO/windows.h conflict
+#undef WB_LEFT
+#undef WB_RIGHT
 #include "msdasc.h"// OLE DB Service Component header
 #if defined _MSC_VER
 #pragma warning(push, 1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fdo#57950: remove consecutive append in basctl with StringBu...

2012-12-26 Thread Marcos Souza (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1486

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/1486/1

fdo#57950: remove consecutive append in basctl with StringBuffer

Change-Id: I43464dd702c6b4a63df39b6a4b35bec63712d5e6
Signed-off-by: Marcos Paulo de Souza 
---
M basctl/source/basicide/baside2.cxx
1 file changed, 2 insertions(+), 7 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/1486
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43464dd702c6b4a63df39b6a4b35bec63712d5e6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza 

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


[Libreoffice-commits] .: external/glibc

2012-12-26 Thread Libreoffice Gerrit user
 external/glibc/glibc-2.1.3.patch |   34 ++
 1 file changed, 34 insertions(+)

New commits:
commit 96d3a20f387191013bd3fbd485e31e39166b979c
Author: Tor Lillqvist 
Date:   Wed Dec 26 18:17:49 2012 +0200

WaE: unreferenced formal parameters and old-style declarators

Change-Id: I3bdf909d169696b0ce79ee9830aa99ae880636db

diff --git a/external/glibc/glibc-2.1.3.patch b/external/glibc/glibc-2.1.3.patch
index bedaad0..a9feecc 100644
--- a/external/glibc/glibc-2.1.3.patch
+++ b/external/glibc/glibc-2.1.3.patch
@@ -27,3 +27,37 @@
 const char *__shortopts,
 const struct option *__longopts, int *__longind,
 int __long_only);
+--- misc/glibc-2.1.3/posix/getopt1.c
 misc/build/glibc-2.1.3/posix/getopt1.c
+@@ -62,6 +62,13 @@
+ #ifndef   NULL
+ #define NULL 0
+ #endif
++
++#ifdef _MSC_VER
++// C4100: unreferenced formal parameter
++#pragma warning (disable: 4100)
++// C4131: uses old-style declarator
++#pragma warning (disable: 4131)
++#endif
+ 
+ int
+ getopt_long (argc, argv, options, long_options, opt_index)
+
+--- misc/glibc-2.1.3/posix/getopt.c
 misc/build/glibc-2.1.3/posix/getopt.c
+@@ -86,6 +86,13 @@
+ #  define _(msgid)(msgid)
+ # endif
+ #endif
++
++#ifdef _MSC_VER
++// C4100: unreferenced formal parameter
++#pragma warning (disable: 4100)
++// C4131: uses old-style declarator
++#pragma warning (disable: 4131)
++#endif
+ 
+ /* This version of `getopt' appears to the caller like standard Unix `getopt'
+but it behaves differently for the user, since it allows the user
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #190 from Alexander  ---
Please, look at the bug 47838,
https://bugs.freedesktop.org/show_bug.cgi?id=47838
It's one of the oldest bugs (from early releases of the OO.org). Can anybody
fix it? It is really annoying - all new releases of the LO with it stops many
people from using LobreOffice and Writer in particular.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #189 from iveand  ---
(In reply to comment #188)
> Added 54275: this bug prevents Ubuntu Linux users (not confirmed for other
> distros) to be able to save documents to mounted gvfs samba shares (when
> navigating via nautilus sidebar menu).
> 

Confirmed bug 54275 still present in Linux 64 bit Version 4.0.0.0.beta2 (Build
ID: 4104d660979c57e1160b5135634f732918460a0).

Again, problem is that a user is unable to save a NEW document to a samba share
in Linux (am able to open and modify and save existing documents).

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: compilerplugins/clang

2012-12-26 Thread Libreoffice Gerrit user
 compilerplugins/clang/plugin.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6ede7ad5939562eb4be824542957c52012dbbe0b
Author: Lubos Lunak 
Date:   Wed Dec 26 15:42:51 2012 +0100

fix build

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 696118c..62412e6 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "bodynotinblock.hxx"
 #include "lclstaticfix.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: external/prj

2012-12-26 Thread Libreoffice Gerrit user
 external/prj/build.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 28195613d367970ca5d3af6f877b6000a8a1963a
Author: Luboš Luňák 
Date:   Wed Dec 26 15:38:12 2012 +0100

fix dmake build of module external ... I think

Not that I have any clue about dmake, but without this it seems
like incremental make doesn't remake external if necessary, and
with this copied and adjusted from other non-tail_build module
it seems to work *shrug*.

Change-Id: If6818860d12ed752814574028895870a60d6a7d1

diff --git a/external/prj/build.lst b/external/prj/build.lst
index 563ab86..9f9f552 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -1,2 +1,2 @@
-el  external :   soltools NULL
-el externalusr1 - all el_mkout NULL
+el  external : soltools NULL
+el  external\prjnmake - all 
el_external NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sc/qa

2012-12-26 Thread Libreoffice Gerrit user
 sc/qa/unit/rangelst_test.cxx |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 3a5f326c7553fac3d9741b2d99f720461289f81e
Author: Luboš Luňák 
Date:   Wed Dec 26 15:24:25 2012 +0100

fix operator lookup with clang

I'm not sure if this is clang being more strict or buggy, probably the 
latter.

Change-Id: I900ba2cd2b1d4c23e41e4787be4263954ce8b4c0

diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx
index 62d9002..f543175 100644
--- a/sc/qa/unit/rangelst_test.cxx
+++ b/sc/qa/unit/rangelst_test.cxx
@@ -73,21 +73,19 @@ private:
 ScDocShellRef m_xDocShRef;
 };
 
-namespace {
-
-std::ostream& operator<<(std::ostream& rStrm, const ScAddress& rAddr)
+static std::ostream& operator<<(std::ostream& rStrm, const ScAddress& rAddr)
 {
 rStrm << "Col: " << rAddr.Col() << " Row: " << rAddr.Row() << " Tab: " << 
rAddr.Tab() << "\n";
 return rStrm;
 }
 
-std::ostream& operator<<(std::ostream& rStrm, const ScRange& rRange)
+static std::ostream& operator<<(std::ostream& rStrm, const ScRange& rRange)
 {
 rStrm << "ScRange: " << rRange.aStart << rRange.aEnd << "\n";
 return rStrm;
 }
 
-std::ostream& operator<<(std::ostream& rStrm, const ScRangeList& rList)
+static std::ostream& operator<<(std::ostream& rStrm, const ScRangeList& rList)
 {
 rStrm << "ScRangeList: \n";
 for(size_t i = 0; i < rList.size(); ++i)
@@ -95,9 +93,6 @@ std::ostream& operator<<(std::ostream& rStrm, const 
ScRangeList& rList)
 return rStrm;
 }
 
-}
-
-
 void Test::setUp()
 {
 BootstrapFixture::setUp();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 8 commits - compilerplugins/clang compilerplugins/Makefile-clang.mk config/config_clang.h.in config/config_global.h.in configure.ac solenv/bin solenv/doc solenv/gbuild

2012-12-26 Thread Libreoffice Gerrit user
 compilerplugins/Makefile-clang.mk |2 -
 compilerplugins/clang/plugin.cxx  |   27 --
 compilerplugins/clang/sallogareas.cxx |8 ++-
 config/config_clang.h.in  |   12 +++
 config/config_global.h.in |5 
 configure.ac  |7 ++
 solenv/bin/update_pch.sh  |4 +--
 solenv/doc/gbuild/solenv/gbuild/linktarget.mk |2 -
 solenv/doc/gbuild/solenv/gbuild/types.mk  |4 ---
 solenv/gbuild/PrecompiledHeaders.mk   |4 +--
 solenv/gbuild/platform/com_GCC_class.mk   |4 +--
 11 files changed, 47 insertions(+), 32 deletions(-)

New commits:
commit 34e53da47bee5c1799339e8e550662d55f01555a
Author: Lubos Lunak 
Date:   Wed Dec 26 13:57:24 2012 +0100

add a systematic solution

diff --git a/configure.ac b/configure.ac
index d5ce6af..e5b44da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4165,11 +4165,7 @@ if test "$cross_compiling" = "yes"; then
 config_host.mk.in \
 configure \
 Makefile.in \
-config/config_clang.h.in \
-config/config_global.h.in \
-config/config_graphite.h.in \
-config/config_telepathy.h.in \
-config/config_vclplug.h.in \
+config/config_*.h.in \
 bin/get_config_variables \
 $srcdir/solenv/bin/getcompver.awk \
 $SRC_ROOT/solenv/inc/langlist.mk \
commit 6340adaf8b22cb36ce71a0eecfa066f350cfae7e
Author: Lubos Lunak 
Date:   Wed Dec 26 13:27:09 2012 +0100

LC_ALL=C for consistent sort

diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh
index 693aee6..f89bfb2 100755
--- a/solenv/bin/update_pch.sh
+++ b/solenv/bin/update_pch.sh
@@ -103,7 +103,7 @@ function filter_ignore()
 )
 
 # " in #include "foo" breaks echo down below, so " -> @
-cat $tmpfile | sort -u | filter_ignore | sed 's/"/@/g' | \
+cat $tmpfile | LC_ALL=C sort -u | filter_ignore | sed 's/"/@/g' | \
 (
 while read line; do
 file=`echo $line | sed 's/.*[<"@]\([^>"@]*\)[>"@].*/\1/'`
commit 9f44fe19eb4d9bc668f1325a5dd53c3823c86312
Author: Lubos Lunak 
Date:   Wed Dec 26 12:51:31 2012 +0100

INCLUDE_STL does not exist

diff --git a/solenv/doc/gbuild/solenv/gbuild/linktarget.mk 
b/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
index 3de605e..0321c8a 100644
--- a/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
@@ -112,7 +112,6 @@ namespace gb
 List LINKED_LIBS;
 List AUXTARGETS;
 List INCLUDE;
-List INCLUDE_STL;
 List LINKED_STATIC_LIBS;
 List CFLAGS;
 List CXXFLAGS;
@@ -140,7 +139,6 @@ namespace gb
 static const List CXXFLAGS;
 static const List LDFLAGS;
 static const List INCLUDE;
-static const List INCLUDE_STL;
 };
 }
 /* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk 
b/solenv/doc/gbuild/solenv/gbuild/types.mk
index acad953..8cdf802 100644
--- a/solenv/doc/gbuild/solenv/gbuild/types.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/types.mk
@@ -160,10 +160,6 @@ namespace gb { namespace types
 /// \$\$(INCLUDE) contains the current paths and can be used if
 /// just a few need to be modified.
 void set_include(List include);
-/// Sets the stl include paths for C++ compilation.
-/// \$\$(INCLUDE_STL) contains the current paths and can be used if
-/// just a few need to be modified.
-void set_include_stl(List include_stl);
 };
 /// A target using the resource compiler
 class UsesRsc
diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index b8ad133..56acfd0 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -51,10 +51,10 @@ $(call gb_NoexPrecompiledHeader_get_dep_target,%) :
echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : 
$$(gb_Helper_PHONY)' > $@)
 
 $(call gb_PrecompiledHeader_get_target,%) :
-   $(call 
gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+   $(call 
gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE))
 
 $(call gb_NoexPrecompiledHeader_get_target,%) :
-   $(call 
gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+   $(call 
gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE))
 
 .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call 
gb_NoExPrecompiledHeader_get_clean_target,%)
 $(call gb_PrecompiledHeader_get_clean_target,%) :
commit be

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2012-12-26 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Joren De Cuyper  changed:

   What|Removed |Added

 Depends on||58766

--- Comment #58 from Joren De Cuyper  ---
I add "Bug 58766 - : tools -> options -> advanced -> enable macro recording"
because of the 'setting loss'. Can't find this feature in 3.6.4.3, so I think
this is a 'new feature' of 4.0.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: sw/inc

2012-12-26 Thread Libreoffice Gerrit user
 sw/inc/index.hxx   |4 ++--
 sw/inc/ndtxt.hxx   |2 +-
 sw/inc/node.hxx|2 --
 sw/inc/tblenum.hxx |2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 4cf17dc564669bde2bdb15de3677761f3ec59d76
Author: Philipp Riemer 
Date:   Wed Dec 26 12:14:11 2012 +0100

translate remaining German comments in sw/inc

Change-Id: I76b03fd1fe374562fc7714361d08bc683ca8cb01

diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 0186b7f..e664538 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -129,8 +129,8 @@ public:
 explicit SwIndexReg();
 virtual ~SwIndexReg();
 
-// rtti, abgeleitete moegens gleichtun oder nicht. Wenn sie es gleichtun
-// kann ueber das SwIndexReg typsicher gecastet werden.
+/// rtti, derived classes might do the same. If so, one can cast typesavely
+/// via SwIndexReg.
 TYPEINFO();
 
 void MoveTo( SwIndexReg& rArr );
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index c0bf53b..18c2b02 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -206,7 +206,7 @@ public:
 /// End: Data collected during idle time
 
 protected:
-/// fuers Umhaengen der TxtFmtCollections (Outline-Nummerierung!!)
+/// for hanging TxtFmtCollections somewhere else (Outline-Numbering!)
 virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
 virtual void SwClientNotify( const SwModify&, const SfxHint& );
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index eeb7037..b79401f 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -569,8 +569,6 @@ public:
 /// Set pointer in format of section on itself.
 void NodesArrChgd();
 
-// ueberprueft bei _nicht_ versteckten Bereichen, ob es Inhalt gibt, der
-// _nicht_ in einem versteckten (Unter-)Bereich liegt
 /** Check for not hidden areas whether there is content that is not in
a hidden sub-area. */
 sal_Bool IsCntntHidden() const;
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index 1462998..ed41c0a 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -54,7 +54,7 @@ enum TblChgMode
 enum SplitTbl_HeadlineOption
 {
 HEADLINE_NONE = 0,  // Leave everything in place.
-HEADLINE_BORDERCOPY,// von der davor obere Line der vorhergehen 
Line
+HEADLINE_BORDERCOPY,// Copy border of the previous line.
 HEADLINE_CNTNTCOPY, // Copy 1st line with all contents.
 HEADLINE_BOXATTRCOPY,   // Copy box attributs of 1st line.
 HEADLINE_BOXATRCOLLCOPY // Copy box attributes and paragraph styles of 
1st line.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: oox/source

2012-12-26 Thread Libreoffice Gerrit user
 oox/source/export/drawingml.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit e481740cc894ea21c8e7a49100d56ca572a21a76
Author: Muthu Subramanian 
Date:   Wed Dec 26 16:18:51 2012 +0530

n#793999: PPTX Export - background image fit to slide.

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 781feba..1a57432 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -561,6 +561,11 @@ void DrawingML::WriteBlipMode( Reference< XPropertySet > 
rXPropSet )
 case BitmapMode_REPEAT:
 mpFS->singleElementNS( XML_a, XML_tile, FSEND );
 break;
+case BitmapMode_STRETCH:
+mpFS->startElementNS( XML_a, XML_stretch, FSEND );
+mpFS->singleElementNS( XML_a, XML_fillRect, FSEND );
+mpFS->endElementNS( XML_a, XML_stretch );
+break;
 default:
 ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-4-0' - l10ntools/source

2012-12-26 Thread Libreoffice Gerrit user
 l10ntools/source/po.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a97bf2e3bc43a709eb72bdc695f96aeecf1174b1
Author: Zolnai Tamás 
Date:   Sun Dec 23 03:51:17 2012 +0100

fdo#58673 Generate the same keyid for pots as for merge

Change-Id: I65c71d22570c62c84d359b12aa5375016be1f69a

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index cdc2c98..06530a3 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -432,14 +432,14 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE 
eType)
 /*Default case is unneeded because the type of eType has
   only three element*/
 }
-m_pGenPo->setExtractCom(
-( !vParts[HELPTEXT].isEmpty() ?  vParts[HELPTEXT] + "\n" : OString( "" 
)) +
-lcl_GenKeyId(
-vParts[SOURCEFILE] + sMsgCtxt + vParts[eType] ) );
 m_pGenPo->setMsgCtxt(sMsgCtxt);
 m_pGenPo->setMsgId(
 lcl_UnEscapeSDFText(
 vParts[eType],vParts[SOURCEFILE].endsWith(".xhp")));
+m_pGenPo->setExtractCom(
+( !vParts[HELPTEXT].isEmpty() ?  vParts[HELPTEXT] + "\n" : OString( "" 
)) +
+lcl_GenKeyId(
+m_pGenPo->getReference() + sMsgCtxt + m_pGenPo->getMsgId() ) );
 m_bIsInitialized = true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: librelogo/source

2012-12-26 Thread Libreoffice Gerrit user
 librelogo/source/ChangeLog  |6 ++
 librelogo/source/LibreLogo/LibreLogo.py |   12 
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 8d7f13d24c4853c460c53dbcf1ad2f8d8dc2fd05
Author: László Németh 
Date:   Wed Dec 26 10:55:45 2012 +0100

librelogo fixes, ca/cs/et/pt_BR/ro lang. guessing for translation

Change-Id: Ia3f753a192a262fb8b86c8c0c654db3bcaf3863e

diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index 36c8345..f5112b3 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-26 László Németh:
+* fix turtle position and rotation at repeated hideturtle/showturtle
+* add new languages, fix Czech and Brazilian Portuguese for
+  language guessing at translation
+* fix line break to paragraph break conversion at translation 
+
 2012-12-17 László Németh:
 * handle possible translation problems (strip terminating bars)
 * keep double compilation of the commands
diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index c89f92e..df5bdc0 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -25,7 +25,7 @@ else:
 __lngpath__ = 
unohelper.fileUrlToSystemPath(re.sub("program/(fundamental.ini|fundamentalrc)$",
 "", urebootstrap))
 __lngpath__ = __lngpath__ + "share/Scripts/python/LibreLogo/".replace("/", 
os.sep)
 
-__translang__ = "cz|de|dk|el|en|es|fr|hu|it|nl|no|pl|pt|ru|se|sl" # FIXME 
supported languages for language guessing, expand this list, according to the 
localizations
+__translang__ = "ca|cs|de|dk|el|en|es|et|fr|hu|it|nl|no|pl|pt|ro|ru|se|sl" # 
FIXME supported languages for language guessing, expand this list, according to 
the localizations
 __lng__ = {}
 __docs__ = {}
 __prevcode__ = None
@@ -303,7 +303,7 @@ def __translate__(arg = None):
 guess.enableLanguages(tuple([Locale(i, "", "") for i in 
__translang__.split("|")]))
 guess = guess.guessPrimaryLanguage(text, 0, len(text))
 try:
-l = {'cs': 'cs_CZ', 'el': 'el_GR', 'en': 'en_US'}[guess.Language]
+l = {'cs': 'cs_CZ', 'el': 'el_GR', 'en': 'en_US', 'pt': 
'pt_BR'}[guess.Language]
 except:
 l = guess.Language + '_' + guess.Language.upper()
 lang = __l12n__(l)
@@ -344,7 +344,8 @@ def __translate__(arg = None):
 _.doc.getText().setString(text)
 # convert to paragraphs
 __dispatcher__(".uno:ExecuteSearch", 
(__getprop__("SearchItem.SearchString", r"\n"), 
__getprop__("SearchItem.ReplaceString", r"\n"), \
-__getprop__("Quiet", True), __getprop__("SearchItem.Command", 3), 
__getprop__("SearchItem.StyleFamily", 2)))
+__getprop__("Quiet", True), __getprop__("SearchItem.Command", 3), 
__getprop__("SearchItem.StyleFamily", 2), \
+__getprop__("SearchItem.AlgorithmType", 1), 
__getprop__("SearchItem.RowDirection", 1), 
__getprop__("SearchItem.SearchFlags", 65536)))
 
 class LogoProgram(threading.Thread):
 def __init__(self, code):
@@ -482,6 +483,7 @@ def hideturtle():
 turtle = __getshape__(__TURTLE__)
 if turtle:
 z = turtle.getPosition()
+z = __Point__(z.X + turtle.BoundRect.Width / 2.0, z.Y + 
turtle.BoundRect.Height / 2.0)
 turtle.PolyPolygon = __TURTLESHAPE__[1]
 __visible__(turtle, False)
 turtle.LineTransparence, turtle.FillTransparence = 100, 100 # for 
saved files
@@ -494,7 +496,9 @@ def showturtle():
 if not turtle.Parent:
 _.drawpage.add(turtle)
 z = turtle.getPosition()
-turtle.PolyPolygon = __TURTLESHAPE__[0]
+r, turtle.RotateAngle = turtle.RotateAngle, 0
+turtle.PolyPolygon, turtle.RotateAngle = __TURTLESHAPE__[0], r
+z = __Point__(z.X - turtle.BoundRect.Width / 2.0, z.Y - 
turtle.BoundRect.Height / 2.0) 
 turtle.setPosition(z)
 pencolor(_.pencolor)
 fillcolor(_.areacolor)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-4-0' - librelogo/source

2012-12-26 Thread Libreoffice Gerrit user
 librelogo/source/ChangeLog  |6 ++
 librelogo/source/LibreLogo/LibreLogo.py |   12 
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 19accd583bea496e0f1ccbbb2669edd17fc1db8b
Author: László Németh 
Date:   Wed Dec 26 10:08:23 2012 +0100

librelogo fixes, ca/cs/et/pt_BR/ro lang. guessing for translation

Change-Id: I70d7089712b2dac0b0d6cdc9a5f13e603e47d0f8

diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index 36c8345..f5112b3 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-26 László Németh:
+* fix turtle position and rotation at repeated hideturtle/showturtle
+* add new languages, fix Czech and Brazilian Portuguese for
+  language guessing at translation
+* fix line break to paragraph break conversion at translation 
+
 2012-12-17 László Németh:
 * handle possible translation problems (strip terminating bars)
 * keep double compilation of the commands
diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index c89f92e..df5bdc0 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -25,7 +25,7 @@ else:
 __lngpath__ = 
unohelper.fileUrlToSystemPath(re.sub("program/(fundamental.ini|fundamentalrc)$",
 "", urebootstrap))
 __lngpath__ = __lngpath__ + "share/Scripts/python/LibreLogo/".replace("/", 
os.sep)
 
-__translang__ = "cz|de|dk|el|en|es|fr|hu|it|nl|no|pl|pt|ru|se|sl" # FIXME 
supported languages for language guessing, expand this list, according to the 
localizations
+__translang__ = "ca|cs|de|dk|el|en|es|et|fr|hu|it|nl|no|pl|pt|ro|ru|se|sl" # 
FIXME supported languages for language guessing, expand this list, according to 
the localizations
 __lng__ = {}
 __docs__ = {}
 __prevcode__ = None
@@ -303,7 +303,7 @@ def __translate__(arg = None):
 guess.enableLanguages(tuple([Locale(i, "", "") for i in 
__translang__.split("|")]))
 guess = guess.guessPrimaryLanguage(text, 0, len(text))
 try:
-l = {'cs': 'cs_CZ', 'el': 'el_GR', 'en': 'en_US'}[guess.Language]
+l = {'cs': 'cs_CZ', 'el': 'el_GR', 'en': 'en_US', 'pt': 
'pt_BR'}[guess.Language]
 except:
 l = guess.Language + '_' + guess.Language.upper()
 lang = __l12n__(l)
@@ -344,7 +344,8 @@ def __translate__(arg = None):
 _.doc.getText().setString(text)
 # convert to paragraphs
 __dispatcher__(".uno:ExecuteSearch", 
(__getprop__("SearchItem.SearchString", r"\n"), 
__getprop__("SearchItem.ReplaceString", r"\n"), \
-__getprop__("Quiet", True), __getprop__("SearchItem.Command", 3), 
__getprop__("SearchItem.StyleFamily", 2)))
+__getprop__("Quiet", True), __getprop__("SearchItem.Command", 3), 
__getprop__("SearchItem.StyleFamily", 2), \
+__getprop__("SearchItem.AlgorithmType", 1), 
__getprop__("SearchItem.RowDirection", 1), 
__getprop__("SearchItem.SearchFlags", 65536)))
 
 class LogoProgram(threading.Thread):
 def __init__(self, code):
@@ -482,6 +483,7 @@ def hideturtle():
 turtle = __getshape__(__TURTLE__)
 if turtle:
 z = turtle.getPosition()
+z = __Point__(z.X + turtle.BoundRect.Width / 2.0, z.Y + 
turtle.BoundRect.Height / 2.0)
 turtle.PolyPolygon = __TURTLESHAPE__[1]
 __visible__(turtle, False)
 turtle.LineTransparence, turtle.FillTransparence = 100, 100 # for 
saved files
@@ -494,7 +496,9 @@ def showturtle():
 if not turtle.Parent:
 _.drawpage.add(turtle)
 z = turtle.getPosition()
-turtle.PolyPolygon = __TURTLESHAPE__[0]
+r, turtle.RotateAngle = turtle.RotateAngle, 0
+turtle.PolyPolygon, turtle.RotateAngle = __TURTLESHAPE__[0], r
+z = __Point__(z.X - turtle.BoundRect.Width / 2.0, z.Y - 
turtle.BoundRect.Height / 2.0) 
 turtle.setPosition(z)
 pencolor(_.pencolor)
 fillcolor(_.areacolor)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PUSHED] OUString cleanup in oox

2012-12-26 Thread Muthu Subramanian K (via Code Review)
Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/1485

Approvals:
  Muthu Subramanian K: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/1485
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3c121acddd515621325c93735bb3dd88592749e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: José Guilherme Vanz 
Gerrit-Reviewer: Muthu Subramanian K 

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


[Libreoffice-commits] .: oox/source

2012-12-26 Thread Libreoffice Gerrit user
 oox/source/ole/axbinaryreader.cxx|6 ---
 oox/source/ole/axbinarywriter.cxx|4 --
 oox/source/ole/axcontrol.cxx |   38 
 oox/source/ole/axcontrolfragment.cxx |1 
 oox/source/ole/axfontdata.cxx|2 -
 oox/source/ole/olehelper.cxx |   37 +++
 oox/source/ole/oleobjecthelper.cxx   |2 -
 oox/source/ole/olestorage.cxx|2 -
 oox/source/ole/vbacontrol.cxx|6 +--
 oox/source/ole/vbahelper.cxx |3 -
 oox/source/ole/vbamodule.cxx |   54 ---
 oox/source/ole/vbaproject.cxx|   10 ++
 12 files changed, 70 insertions(+), 95 deletions(-)

New commits:
commit ed338bc212725f422f0def21aafc82f05e350646
Author: José Guilherme Vanz 
Date:   Wed Dec 26 01:06:08 2012 -0200

OUString cleanup in oox

Change-Id: Id3c121acddd515621325c93735bb3dd88592749e
Signed-off-by: José Guilherme Vanz 
Reviewed-on: https://gerrit.libreoffice.org/1485
Reviewed-by: Muthu Subramanian K 
Tested-by: Muthu Subramanian K 

diff --git a/oox/source/ole/axbinaryreader.cxx 
b/oox/source/ole/axbinaryreader.cxx
index 9b660c0..1e4c626 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -26,10 +26,6 @@ namespace ole {
 
 // 
 
-using ::rtl::OUString;
-
-// 
-
 namespace {
 
 const sal_uInt32 AX_STRING_SIZEMASK = 0x7FFF;
@@ -218,7 +214,7 @@ void AxBinaryPropertyReader::readStringProperty( OUString& 
orValue )
 }
 }
 
-void AxBinaryPropertyReader::readGuidProperty( ::rtl::OUString& orGuid )
+void AxBinaryPropertyReader::readGuidProperty( OUString& orGuid )
 {
 if( startNextProperty() )
 maLargeProps.push_back( ComplexPropVector::value_type( new 
GuidProperty( orGuid ) ) );
diff --git a/oox/source/ole/axbinarywriter.cxx 
b/oox/source/ole/axbinarywriter.cxx
index e5ed29a..f8cbc0c 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -34,10 +34,6 @@ namespace ole {
 
 // 
 
-using ::rtl::OUString;
-
-// 
-
 namespace {
 
 const sal_uInt32 AX_STRING_SIZEMASK = 0x7FFF;
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index b39b77a..7145083 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -558,11 +558,11 @@ void ControlConverter::convertToAxState( PropertySet& 
rPropSet,
 // control is awt or not )
 rPropSet.getProperty( nState, PROP_State );
 
-rValue = rtl::OUString(); // empty e.g. 'don't know'
+rValue = OUString(); // empty e.g. 'don't know'
 if ( nState == API_STATE_UNCHECKED )
-rValue = rtl::OUString( '0' );
+rValue = OUString('0');
 else if ( nState == API_STATE_CHECKED )
-rValue = rtl::OUString( '1' );
+rValue = OUString('1');
 
 // tristate
 if( bSupportsTriState && rPropSet.getProperty( bTmp, PROP_TriState ) )
@@ -2414,16 +2414,16 @@ HtmlSelectModel::HtmlSelectModel()
 bool
 HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm )
 {
-static String sMultiple( RTL_CONSTASCII_USTRINGPARAM(" listValues;
+data = data.replaceAll( "\x0D\x0A" , "\x0A" );
+std::vector< OUString > listValues;
 std::vector< sal_Int16 > selectedIndices;
 
 // Ultra hacky parser for the info
@@ -2431,10 +2431,10 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& 
rInStrm )
 
 for ( sal_Int32 nToken = 0; nToken < nTokenCount; ++nToken )
 {
-String sLine( data.GetToken( nToken, '\n' ) );
+OUString sLine( data.getToken( nToken, '\n' ) );
 if ( !nToken ) // first line will tell us if multiselect is enabled
 {
-if ( sLine.CompareTo( sMultiple, sMultiple.Len() ) == 
COMPARE_EQUAL )
+if ( sLine == sMultiple )
 mnMultiSelect = true;
 }
 // skip first and last lines, no data there
@@ -2442,17 +2442,17 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& 
rInStrm )
 {
 if ( comphelper::string::getTokenCount(sLine, '>') )
 {
-String displayValue  = sLine.GetToken( 1, '>' );
-if ( displayValue.Len() )
+OUString displayValue  = sLine.getToken( 1, '>' );
+if ( displayValue.getLength() )
 {
 // Really we should be using a proper html parser
 // escaping some common bits to be escaped
-displayValue.SearchAndReplace( String( 
RTL_CONSTASCII_USTRINGPARAM( "<" ) ), String( 
RTL_CONSTASCII_USTRINGPARAM("<") ) );
-displayValue.SearchAndReplace( String( 
RTL