LibreOffice Gerrit News 2013-06-13
Moin! * Open changes on master for project core changed in the last 25 hours: solenv/bin: remove unreferenced obsoleted scripts in https://gerrit.libreoffice.org/4239 from Matúš Kukan remove last uses of config 'GUI' variable in https://gerrit.libreoffice.org/4188 from Matúš Kukan cleaner PATH: we tend to use absolute path in gbuild in https://gerrit.libreoffice.org/4238 from Matúš Kukan fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO in https://gerrit.libreoffice.org/4232 from Marcos Souza Convert Drop Caps tab page to UI widgets in https://gerrit.libreoffice.org/4236 from Olivier Hallot fdo#65655 : fix for Different_Odd_And_Even_Pages flag ignored in https://gerrit.libreoffice.org/4229 from Adam CloudOn fdo#64238: fix for missing footer bug in https://gerrit.libreoffice.org/4233 from Adam CloudOn * Merged changes on master for project core changed in the last 25 hours: fdo#60924 autoinstall - gbuild/scp2: Move some libs to OOO and clean a litt in https://gerrit.libreoffice.org/4231 from Marcos Souza sidebar: Conversion to .ui for NumberFormatPropertyPanel in https://gerrit.libreoffice.org/4176 from Prashant Pandey fdo#64977 Adding Tibetan Language Support in https://gerrit.libreoffice.org/4197 from Élie Roux Add Flat Document and MathML MIME types in https://gerrit.libreoffice.org/4230 from Samuel Mehrbrodt include cleanup in https://gerrit.libreoffice.org/4209 from Matteo Casalin Replace String with OUString (sd) in https://gerrit.libreoffice.org/4221 from Christina Roßmanith fdo#64626 clarify use of border line settings on toolbar in https://gerrit.libreoffice.org/4220 from Winfried Donkers * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: \end-daily-digestRemove unused icons after cleaning up Math zoom in https://gerrit.libreoffice.org/4117 from Rodolfo Ribeiro Gomes fdo#51296 Helptext added for hyperlinks, hlinks behave as in writer in https://gerrit.libreoffice.org/4051 from Akash Shetye fdo#44216 Prompt if objects from dropped slide should be fixed in aspect ra in https://gerrit.libreoffice.org/1348 from Rodolfo Ribeiro Gomes Bigger slide thumbnails in slidesorter. in https://gerrit.libreoffice.org/4052 from Thorsten Behrens remove unused code. in https://gerrit.libreoffice.org/3167 from navin patidar Change compareTo - == in dbaccess module in https://gerrit.libreoffice.org/3957 from Paulo Henrique Cuchi fdo#55582 writer, calc: insert shapes also when shapes selected in https://gerrit.libreoffice.org/1524 from Lennard Wasserthal show formula results of new formulas even if auto calc is disabled in https://gerrit.libreoffice.org/3625 from Markus Mohrhard Modified Insert-File... to Insert-Document... #fdo62097 in https://gerrit.libreoffice.org/3309 from Kesha Shah Resolved bug fdo#63766 in https://gerrit.libreoffice.org/3524 from gokul s Use OUString and sal_Int32 in GetNonMnemonicString() and GetCtrlTextWidth() in https://gerrit.libreoffice.org/3160 from Christina Roßmanith Template Manager: Use actual template icons if no thumbnail exists in https://gerrit.libreoffice.org/3278 from Stefan Knorr Disable database wizard's next-button if needed in https://gerrit.libreoffice.org/2889 from Mathias Hasselmann Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcmanager.cxx | 47 +
avmedia/source/vlc/vlcmanager.hxx | 53 +++
avmedia/source/vlc/vlcplayer.cxx | 84 ++
avmedia/source/vlc/vlcplayer.hxx | 61 +++
avmedia/source/vlc/vlcuno.cxx |3 -
5 files changed, 247 insertions(+), 1 deletion(-)
New commits:
commit 1bff858999cdb0aa03dd957fb556e64dbb6a0d62
Author: Minh Ngo nlmin...@gmail.com
Date: Thu Jun 13 09:43:51 2013 +0300
Initial player/manager patterns for the vlc module
Change-Id: I600c3b273343906fbaed18629f425ce5b590b92e
diff --git a/avmedia/source/vlc/vlcmanager.cxx
b/avmedia/source/vlc/vlcmanager.cxx
new file mode 100644
index 000..74f4111
--- /dev/null
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -0,0 +1,47 @@
+#include vlcmanager.hxx
+#include vlcplayer.hxx
+
+using namespace ::com::sun::star;
+
+namespace avmedia {
+namespace vlc {
+
+const rtl::OUString VLC_IMPLEMENTATION_NAME =
com.sun.star.comp.avmedia.Manager_VLC;
+
+Manager::Manager( const uno::Reference lang::XMultiServiceFactory rxMgr )
+: mxMgr( rxMgr )
+{
+}
+
+Manager::~Manager()
+{
+}
+
+uno::Reference media::XPlayer SAL_CALL Manager::createPlayer( const
rtl::OUString rURL )
+throw (uno::RuntimeException)
+{
+VLCPlayer* pPlayer( new VLCPlayer( mxMgr ) );
+uno::Reference media::XPlayer xRet( pPlayer );
+
+return xRet;
+}
+
+rtl::OUString SAL_CALL Manager::getImplementationName()
+throw (uno::RuntimeException)
+{
+return VLC_IMPLEMENTATION_NAME;
+}
+
+sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString ServiceName )
+throw (uno::RuntimeException)
+{
+return false;
+}
+
+uno::Sequence rtl::OUString SAL_CALL Manager::getSupportedServiceNames()
+throw (uno::RuntimeException)
+{
+return uno::Sequence rtl::OUString ();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/avmedia/source/vlc/vlcmanager.hxx
b/avmedia/source/vlc/vlcmanager.hxx
new file mode 100644
index 000..2632161
--- /dev/null
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef _VLCMANAGER_HXX
+#define _VLCMANAGER_HXX
+
+#include vlccommon.hxx
+
+#include com/sun/star/media/XManager.hpp
+
+namespace avmedia {
+namespace vlc {
+
+class Manager : public ::cppu::WeakImplHelper2
::com::sun::star::media::XManager,
+
::com::sun::star::lang::XServiceInfo
+{
+public:
+Manager( const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory rxMgr );
+~Manager();
+
+::com::sun::star::uno::Reference ::com::sun::star::media::XPlayer
SAL_CALL createPlayer( const rtl::OUString aURL ) throw
(::com::sun::star::uno::RuntimeException);
+
+rtl::OUString SAL_CALL getImplementationName() throw
(::com::sun::star::uno::RuntimeException);
+sal_Bool SAL_CALL supportsService( const rtl::OUString ServiceName )
throw (::com::sun::star::uno::RuntimeException);
+::com::sun::star::uno::Sequence rtl::OUString SAL_CALL
getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+private:
+::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory mxMgr;
+};
+
+}
+}
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
new file mode 100644
index 000..e977de4
--- /dev/null
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -0,0 +1,84 @@
+#include vlcplayer.hxx
+
+using namespace ::com::sun::star;
+
+namespace avmedia {
+namespace vlc {
+
+void SAL_CALL VLCPlayer::start()
+{
+}
+
+void SAL_CALL VLCPlayer::stop()
+{
+}
+
+::sal_Bool SAL_CALL VLCPlayer::isPlaying()
+{
+return false;
+}
+
+double SAL_CALL VLCPlayer::getDuration()
+{
+return 0.f;
+}
+
+void SAL_CALL VLCPlayer::setMediaTime( double fTime )
+{
+}
+
+double SAL_CALL VLCPlayer::getMediaTime()
+{
+return 0.f;
+}
+
+double SAL_CALL VLCPlayer::getRate()
+{
+
[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/InstallModule_ooo.mk scp2/source
Repository.mk | 50 ++-- scp2/InstallModule_ooo.mk |3 scp2/source/ooo/file_library_ooo.scp | 138 -- scp2/source/ooo/module_hidden_ooo.scp | 22 - 4 files changed, 25 insertions(+), 188 deletions(-) New commits: commit f5d3fb36ab240407433e7435b4d1e23380678465 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jun 13 07:49:15 2013 +0200 scp2: remove unused defines Change-Id: Icac7b4dd5dd31f39e0db09e251e7136e61a064aa diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index b8c6130..611e252 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -23,8 +23,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_CAIRO_CANVAS \ ENABLE_DIRECTX \ ENABLE_EVOAB2 \ - ENABLE_GSTREAMER \ - ENABLE_GSTREAMER_0_10 \ ENABLE_GTK \ ENABLE_GTK3 \ ENABLE_KAB \ @@ -38,7 +36,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_OPENGL \ ENABLE_TDE \ ENABLE_TDEAB \ - MERGELIBS \ SYSTEM_APACHE_COMMONS \ SYSTEM_BOOST \ SYSTEM_CAIRO \ commit 1c2ab8f7871e5b29f5c0025edfdd2ef9e1f795fa Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Tue Jun 11 19:37:26 2013 -0300 fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Conflicts: Repository.mk Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377 diff --git a/Repository.mk b/Repository.mk index 074b2d9..543275e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -297,6 +297,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ lng \ lnth \ $(if $(MERGELIBS),merged) \ + migrationoo2 \ + migrationoo3 \ msfilter \ $(if $(DISABLE_SCRIPTING),,msforms) \ mtfrenderer \ @@ -334,12 +336,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(ENABLE_TDEAB),tdeab1) \ $(if $(ENABLE_TDEAB),tdeabdrv1) \ textconversiondlgs \ + textfd \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ ucpexpand1 \ + ucpext \ + ucpcmis1 \ + ucptdoc1 \ unordf \ unoxml \ + updatefeed \ utl \ uui \ $(if $(DISABLE_SCRIPTING),,vbaevents) \ @@ -394,7 +401,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ spa \ spell \ sts \ - textfd \ vclplug_tde \ vclplug_kde \ vclplug_kde4 \ @@ -474,13 +480,22 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ + $(if $(ENABLE_GSTREAMER),avmediagst) \ + $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \ cached1 \ + collator_data \ comphelper \ + dbpool2 \ deployment \ + deploymentgui \ + dict_ja \ + dict_zh \ + embobj \ fileacc \ $(if $(SOLAR_JAVA),hsqldb) \ i18nlangtag \ i18nutil \ + index_data \ localedata_en \ localedata_es \ localedata_euro \ @@ -490,25 +505,25 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(DISABLE_SCRIPTING),,scriptframe) \ sdbc2 \ sofficeapp \ + srtrs1 \ + textconv_dict \ tvhlp1 \ ucb1 \ ucbhelper \ ucpfile1 \ + ucpftp1 \ + ucpchelp1 \ + ucphier1 \ + ucppkg1 \ + unopkgapp \ + xmlsecurity \ + xsec_fw \ xstor \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - avmediagst \ - avmediagst_0_10 \ avmediawin \ bluez_bluetooth \ - collator_data \ - dbpool2 \ - deploymentgui \ - dict_ja \ - dict_zh \ - embobj \ emboleobj \ - index_data \ java_uno_accessbridge \ libreoffice \ macab1 \ @@ -518,16 +533,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pyuno \ pyuno_wrapper \ recentfile \ - srtrs1 \ - textconv_dict \ ucpdav1 \ - ucpftp1 \ - ucpchelp1 \ - ucphier1 \ - ucppkg1 \ - unopkgapp \ - xmlsecurity \ - xsec_fw \ xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ @@ -578,17 +584,11 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cmdmail \ macbe1 \ - migrationoo2 \ - migrationoo3 \ OGLTrans \ pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ - ucpcmis1 \ - ucpext \ - ucptdoc1 \ - updatefeed \ $(if $(filter $(OS),MACOSX), \
[PUSHED] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4232 -- To view, visit https://gerrit.libreoffice.org/4232 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - starmath/inc starmath/source
starmath/inc/starmath.hrc | 20 ++---
starmath/source/ElementsDockingWindow.cxx | 44 +++---
starmath/source/commands.src | 20 ++---
3 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 34f0478ba80d38855c503890dd8422a8a4367d7e
Author: Andras Timar ati...@suse.com
Date: Thu Jun 13 08:00:58 2013 +0200
make categories localizable in Elements docking panel
Change-Id: Ic1e4af8f8dd60ab48d701b5d713beafd0ddd22df
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index ec4308a..d719d77 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -257,16 +257,16 @@ String RID_XSUCCEEDSEQUIVY { Text = ? succsim ?
; };
String RID_XNOTPRECEDESY { Text = ? nprec ? ; };
String RID_XNOTSUCCEEDSY { Text = ? nsucc ? ; };
-String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text = Unary/Binary Operators ;
};
-String RID_CATEGORY_RELATIONS { Text = Relations ; };
-String RID_CATEGORY_SET_OPERATIONS { Text = Set Operations ; };
-String RID_CATEGORY_FUNCTIONS { Text = Functions ; };
-String RID_CATEGORY_OPERATORS { Text = Operators ; };
-String RID_CATEGORY_ATTRIBUTES { Text = Attributes ; };
-String RID_CATEGORY_BRACKETS { Text = Brackets ; };
-String RID_CATEGORY_FORMATS{ Text = Formats ; };
-String RID_CATEGORY_OTHERS { Text = Others ; };
-String RID_CATEGORY_EXAMPLES { Text = Examples ; };
+String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text [ en-US ] = Unary/Binary
Operators ; };
+String RID_CATEGORY_RELATIONS { Text [ en-US ] = Relations ; };
+String RID_CATEGORY_SET_OPERATIONS { Text [ en-US ] = Set Operations
; };
+String RID_CATEGORY_FUNCTIONS { Text [ en-US ] = Functions ; };
+String RID_CATEGORY_OPERATORS { Text [ en-US ] = Operators ; };
+String RID_CATEGORY_ATTRIBUTES { Text [ en-US ] = Attributes ; };
+String RID_CATEGORY_BRACKETS { Text [ en-US ] = Brackets ; };
+String RID_CATEGORY_FORMATS{ Text [ en-US ] = Formats ; };
+String RID_CATEGORY_OTHERS { Text [ en-US ] = Others ; };
+String RID_CATEGORY_EXAMPLES { Text [ en-US ] = Examples ; };
//
commit eaf4c51ea981b7f314c8ea090b873e83df979a29
Author: Andras Timar ati...@suse.com
Date: Thu Jun 13 07:57:17 2013 +0200
typo: s/CATERGORY/CATEGORY/
Change-Id: I37f2db8b073ad1257101af02118cfbc91ee60f26
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 3b2e902..f03cd6d 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -422,16 +422,16 @@
#define RID_SPANISH_50_NAMES(RID_APP_START + 3113)
#define RID_SPANISH_60_NAMES(RID_APP_START + 3114)
-#define RID_CATERGORY_UNARY_BINARY_OPERATORS (RID_APP_START + 4001)
-#define RID_CATERGORY_RELATIONS (RID_APP_START + 4002)
-#define RID_CATERGORY_SET_OPERATIONS (RID_APP_START + 4003)
-#define RID_CATERGORY_FUNCTIONS (RID_APP_START + 4004)
-#define RID_CATERGORY_OPERATORS (RID_APP_START + 4005)
-#define RID_CATERGORY_ATTRIBUTES (RID_APP_START + 4006)
-#define RID_CATERGORY_BRACKETS (RID_APP_START + 4007)
-#define RID_CATERGORY_FORMATS(RID_APP_START + 4008)
-#define RID_CATERGORY_OTHERS (RID_APP_START + 4009)
-#define RID_CATERGORY_EXAMPLES (RID_APP_START + 4010)
+#define RID_CATEGORY_UNARY_BINARY_OPERATORS (RID_APP_START + 4001)
+#define RID_CATEGORY_RELATIONS (RID_APP_START + 4002)
+#define RID_CATEGORY_SET_OPERATIONS (RID_APP_START + 4003)
+#define RID_CATEGORY_FUNCTIONS (RID_APP_START + 4004)
+#define RID_CATEGORY_OPERATORS (RID_APP_START + 4005)
+#define RID_CATEGORY_ATTRIBUTES (RID_APP_START + 4006)
+#define RID_CATEGORY_BRACKETS (RID_APP_START + 4007)
+#define RID_CATEGORY_FORMATS(RID_APP_START + 4008)
+#define RID_CATEGORY_OTHERS (RID_APP_START + 4009)
+#define RID_CATEGORY_EXAMPLES (RID_APP_START + 4010)
#define BMP_ARROW_RIGHT 1
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 7be18ca..1ad05fc 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -364,34 +364,34 @@ void SmElementsControl::build()
switch(maCurrentSetId)
{
-case RID_CATERGORY_UNARY_BINARY_OPERATORS:
+case RID_CATEGORY_UNARY_BINARY_OPERATORS:
addElements(aUnaryBinaryOperatorsList,
sizeof(aUnaryBinaryOperatorsList) / sizeof(sal_uInt16));
break;
-case RID_CATERGORY_RELATIONS:
+case RID_CATEGORY_RELATIONS:
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - starmath/inc starmath/source
starmath/inc/starmath.hrc | 20 ++---
starmath/source/ElementsDockingWindow.cxx | 44 +++---
starmath/source/commands.src | 20 ++---
3 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 127111bb12d7c59135afb7996c2cdf17b5a8f15f
Author: Andras Timar ati...@suse.com
Date: Thu Jun 13 08:00:58 2013 +0200
make categories localizable in Elements docking panel
Change-Id: Ic1e4af8f8dd60ab48d701b5d713beafd0ddd22df
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index ec4308a..d719d77 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -257,16 +257,16 @@ String RID_XSUCCEEDSEQUIVY { Text = ? succsim ?
; };
String RID_XNOTPRECEDESY { Text = ? nprec ? ; };
String RID_XNOTSUCCEEDSY { Text = ? nsucc ? ; };
-String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text = Unary/Binary Operators ;
};
-String RID_CATEGORY_RELATIONS { Text = Relations ; };
-String RID_CATEGORY_SET_OPERATIONS { Text = Set Operations ; };
-String RID_CATEGORY_FUNCTIONS { Text = Functions ; };
-String RID_CATEGORY_OPERATORS { Text = Operators ; };
-String RID_CATEGORY_ATTRIBUTES { Text = Attributes ; };
-String RID_CATEGORY_BRACKETS { Text = Brackets ; };
-String RID_CATEGORY_FORMATS{ Text = Formats ; };
-String RID_CATEGORY_OTHERS { Text = Others ; };
-String RID_CATEGORY_EXAMPLES { Text = Examples ; };
+String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text [ en-US ] = Unary/Binary
Operators ; };
+String RID_CATEGORY_RELATIONS { Text [ en-US ] = Relations ; };
+String RID_CATEGORY_SET_OPERATIONS { Text [ en-US ] = Set Operations
; };
+String RID_CATEGORY_FUNCTIONS { Text [ en-US ] = Functions ; };
+String RID_CATEGORY_OPERATORS { Text [ en-US ] = Operators ; };
+String RID_CATEGORY_ATTRIBUTES { Text [ en-US ] = Attributes ; };
+String RID_CATEGORY_BRACKETS { Text [ en-US ] = Brackets ; };
+String RID_CATEGORY_FORMATS{ Text [ en-US ] = Formats ; };
+String RID_CATEGORY_OTHERS { Text [ en-US ] = Others ; };
+String RID_CATEGORY_EXAMPLES { Text [ en-US ] = Examples ; };
//
commit 52f5ae89034b680a10d3fdbdf79f99105718ebdf
Author: Andras Timar ati...@suse.com
Date: Thu Jun 13 07:57:17 2013 +0200
typo: s/CATERGORY/CATEGORY/
Change-Id: I37f2db8b073ad1257101af02118cfbc91ee60f26
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index a9bfbfa..4290aee 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -432,16 +432,16 @@
#define RID_SPANISH_50_NAMES(RID_APP_START + 3113)
#define RID_SPANISH_60_NAMES(RID_APP_START + 3114)
-#define RID_CATERGORY_UNARY_BINARY_OPERATORS (RID_APP_START + 4001)
-#define RID_CATERGORY_RELATIONS (RID_APP_START + 4002)
-#define RID_CATERGORY_SET_OPERATIONS (RID_APP_START + 4003)
-#define RID_CATERGORY_FUNCTIONS (RID_APP_START + 4004)
-#define RID_CATERGORY_OPERATORS (RID_APP_START + 4005)
-#define RID_CATERGORY_ATTRIBUTES (RID_APP_START + 4006)
-#define RID_CATERGORY_BRACKETS (RID_APP_START + 4007)
-#define RID_CATERGORY_FORMATS(RID_APP_START + 4008)
-#define RID_CATERGORY_OTHERS (RID_APP_START + 4009)
-#define RID_CATERGORY_EXAMPLES (RID_APP_START + 4010)
+#define RID_CATEGORY_UNARY_BINARY_OPERATORS (RID_APP_START + 4001)
+#define RID_CATEGORY_RELATIONS (RID_APP_START + 4002)
+#define RID_CATEGORY_SET_OPERATIONS (RID_APP_START + 4003)
+#define RID_CATEGORY_FUNCTIONS (RID_APP_START + 4004)
+#define RID_CATEGORY_OPERATORS (RID_APP_START + 4005)
+#define RID_CATEGORY_ATTRIBUTES (RID_APP_START + 4006)
+#define RID_CATEGORY_BRACKETS (RID_APP_START + 4007)
+#define RID_CATEGORY_FORMATS(RID_APP_START + 4008)
+#define RID_CATEGORY_OTHERS (RID_APP_START + 4009)
+#define RID_CATEGORY_EXAMPLES (RID_APP_START + 4010)
#define BMP_ARROW_RIGHT 1
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 7be18ca..1ad05fc 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -364,34 +364,34 @@ void SmElementsControl::build()
switch(maCurrentSetId)
{
-case RID_CATERGORY_UNARY_BINARY_OPERATORS:
+case RID_CATEGORY_UNARY_BINARY_OPERATORS:
addElements(aUnaryBinaryOperatorsList,
sizeof(aUnaryBinaryOperatorsList) / sizeof(sal_uInt16));
break;
-case RID_CATERGORY_RELATIONS:
+case RID_CATEGORY_RELATIONS:
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - starmath/source
starmath/source/commands.src | 50 ++-
1 file changed, 40 insertions(+), 10 deletions(-)
New commits:
commit 55689d877d1f216efce2d05448442b088aec980d
Author: Andras Timar ati...@suse.com
Date: Thu Jun 13 08:27:35 2013 +0200
work around lexer bug in l10ntools
Change-Id: Ie53e5475888b9a912f868c12c471b2521f6b0ea1
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index d719d77..e30e3e0 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -257,16 +257,46 @@ String RID_XSUCCEEDSEQUIVY { Text = ? succsim ?
; };
String RID_XNOTPRECEDESY { Text = ? nprec ? ; };
String RID_XNOTSUCCEEDSY { Text = ? nsucc ? ; };
-String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text [ en-US ] = Unary/Binary
Operators ; };
-String RID_CATEGORY_RELATIONS { Text [ en-US ] = Relations ; };
-String RID_CATEGORY_SET_OPERATIONS { Text [ en-US ] = Set Operations
; };
-String RID_CATEGORY_FUNCTIONS { Text [ en-US ] = Functions ; };
-String RID_CATEGORY_OPERATORS { Text [ en-US ] = Operators ; };
-String RID_CATEGORY_ATTRIBUTES { Text [ en-US ] = Attributes ; };
-String RID_CATEGORY_BRACKETS { Text [ en-US ] = Brackets ; };
-String RID_CATEGORY_FORMATS{ Text [ en-US ] = Formats ; };
-String RID_CATEGORY_OTHERS { Text [ en-US ] = Others ; };
-String RID_CATEGORY_EXAMPLES { Text [ en-US ] = Examples ; };
+String RID_CATEGORY_UNARY_BINARY_OPERATORS
+{
+Text [ en-US ] = Unary/Binary Operators ;
+};
+String RID_CATEGORY_RELATIONS
+{
+Text [ en-US ] = Relations ;
+};
+String RID_CATEGORY_SET_OPERATIONS
+{
+Text [ en-US ] = Set Operations ;
+};
+String RID_CATEGORY_FUNCTIONS
+{
+Text [ en-US ] = Functions ;
+};
+String RID_CATEGORY_OPERATORS
+{
+Text [ en-US ] = Operators ;
+};
+String RID_CATEGORY_ATTRIBUTES
+{
+Text [ en-US ] = Attributes ;
+};
+String RID_CATEGORY_BRACKETS
+{
+Text [ en-US ] = Brackets ;
+};
+String RID_CATEGORY_FORMATS
+{
+Text [ en-US ] = Formats ;
+};
+String RID_CATEGORY_OTHERS
+{
+Text [ en-US ] = Others ;
+};
+String RID_CATEGORY_EXAMPLES
+{
+Text [ en-US ] = Examples ;
+};
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/commands.src | 50 ++-
1 file changed, 40 insertions(+), 10 deletions(-)
New commits:
commit 3c3075bdc8c1d425ff7f1e6a94538aab7d6a5db2
Author: Andras Timar ati...@suse.com
Date: Thu Jun 13 08:27:35 2013 +0200
work around lexer bug in l10ntools
Change-Id: Ie53e5475888b9a912f868c12c471b2521f6b0ea1
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index d719d77..e30e3e0 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -257,16 +257,46 @@ String RID_XSUCCEEDSEQUIVY { Text = ? succsim ?
; };
String RID_XNOTPRECEDESY { Text = ? nprec ? ; };
String RID_XNOTSUCCEEDSY { Text = ? nsucc ? ; };
-String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text [ en-US ] = Unary/Binary
Operators ; };
-String RID_CATEGORY_RELATIONS { Text [ en-US ] = Relations ; };
-String RID_CATEGORY_SET_OPERATIONS { Text [ en-US ] = Set Operations
; };
-String RID_CATEGORY_FUNCTIONS { Text [ en-US ] = Functions ; };
-String RID_CATEGORY_OPERATORS { Text [ en-US ] = Operators ; };
-String RID_CATEGORY_ATTRIBUTES { Text [ en-US ] = Attributes ; };
-String RID_CATEGORY_BRACKETS { Text [ en-US ] = Brackets ; };
-String RID_CATEGORY_FORMATS{ Text [ en-US ] = Formats ; };
-String RID_CATEGORY_OTHERS { Text [ en-US ] = Others ; };
-String RID_CATEGORY_EXAMPLES { Text [ en-US ] = Examples ; };
+String RID_CATEGORY_UNARY_BINARY_OPERATORS
+{
+Text [ en-US ] = Unary/Binary Operators ;
+};
+String RID_CATEGORY_RELATIONS
+{
+Text [ en-US ] = Relations ;
+};
+String RID_CATEGORY_SET_OPERATIONS
+{
+Text [ en-US ] = Set Operations ;
+};
+String RID_CATEGORY_FUNCTIONS
+{
+Text [ en-US ] = Functions ;
+};
+String RID_CATEGORY_OPERATORS
+{
+Text [ en-US ] = Operators ;
+};
+String RID_CATEGORY_ATTRIBUTES
+{
+Text [ en-US ] = Attributes ;
+};
+String RID_CATEGORY_BRACKETS
+{
+Text [ en-US ] = Brackets ;
+};
+String RID_CATEGORY_FORMATS
+{
+Text [ en-US ] = Formats ;
+};
+String RID_CATEGORY_OTHERS
+{
+Text [ en-US ] = Others ;
+};
+String RID_CATEGORY_EXAMPLES
+{
+Text [ en-US ] = Examples ;
+};
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source xmloff/source
sc/source/core/data/column2.cxx|4 ++--
xmloff/source/chart/SchXMLTableContext.hxx |5 -
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit c688919620fb22e27471d222d99c0599ee0872e7
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jun 11 16:36:22 2013 +0200
a few more fixes for crashes around cell text attr storage
Change-Id: If5d6f4baf49b5828a1765b638eb4d2225f7b5400
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5e490bd..d25d5ba 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1421,7 +1421,7 @@ void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1,
SCROW nRow2, ScColumn r
for (; itBlk != itBlkEnd; ++itBlk)
{
nBlockEnd = nBlockStart + itBlk-size;
-if (nBlockStart = nRowPos nRowPos = nBlockEnd)
+if (nBlockStart = nRowPos nRowPos nBlockEnd)
{
// Found.
nOffsetInBlock = nRowPos - nBlockStart;
@@ -1443,7 +1443,7 @@ void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1,
SCROW nRow2, ScColumn r
if (!itBlk-data)
{
// Empty block.
-if (nBlockStart = nRowPos nRowPos = nBlockEnd)
+if (nBlockStart = nRowPos nRowPos nBlockEnd)
// This block contains the end row.
rDestCol.maCellTextAttrs.set_empty(nBlockStart +
nOffsetInBlock, nRowPos);
else
commit 52fcfa07078a24fc2229c87f928e2a39ac5635f0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jun 11 14:43:43 2013 +0200
remove method without definition
Change-Id: Ia41f28ed31fc254a6785c6444a78822eb969f2f9
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx
b/xmloff/source/chart/SchXMLTableContext.hxx
index 1d06dd5..20b87b5 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -73,11 +73,6 @@ class SchXMLTableHelper
private:
static void GetCellAddress( const OUString rStr, sal_Int32 rCol,
sal_Int32 rRow );
static sal_Bool GetCellRangeAddress( const OUString rStr,
SchNumericCellRangeAddress rResult );
-static void PutTableContentIntoSequence(
-const SchXMLTable rTable,
-SchNumericCellRangeAddress rAddress,
-sal_Int32 nSeriesIndex,
-com::sun::star::uno::Sequence com::sun::star::uno::Sequence double
aSequence );
static void AdjustMax( const SchNumericCellRangeAddress rAddr,
sal_Int32 nRows, sal_Int32 nColumns );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo65655.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 16
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 --
3 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit db23f89b76cb61b215bcae5495eadba2b5ceace2
Author: Adam Co rattles2...@gmail.com
Date: Tue Jun 11 18:21:27 2013 +0300
fdo#65655 : fix for Different_Odd_And_Even_Pages flag ignored
Signed-off-by: Miklos Vajna vmik...@suse.cz
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Icf9949bb00aa905d22aedfd8f2b297dfa89dfedb
diff --git a/sw/qa/extras/ooxmlexport/data/fdo65655.docx
b/sw/qa/extras/ooxmlexport/data/fdo65655.docx
new file mode 100644
index 000..5fe9451
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo65655.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index bcecf95..8b4308e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -73,6 +73,7 @@ public:
void testFdo64826();
void testPageBackground();
void testFdo65265();
+void testFdo65655();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -123,6 +124,7 @@ void Test::run()
{fdo64826.docx, Test::testFdo64826},
{page-background.docx, Test::testPageBackground},
{fdo65265.docx, Test::testFdo65265},
+{fdo65655.docx, Test::testFdo65655},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -700,6 +702,20 @@ void Test::testFdo65265()
CPPUNIT_ASSERT_EQUAL(OUString(Format),
getPropertyOUString(getRun(xParagraph2, 2), RedlineType));
}
+void Test::testFdo65655()
+{
+// The problem was that the DOCX had a non-blank odd footer and a blank
even footer
+// The 'Different Odd Even Pages' was turned on
+// However - LO assumed that because the 'even' footer is blank - it
should ignore the 'Different Odd Even Pages' flag
+// So it did not import it and did not export it
+uno::Referencebeans::XPropertySet
xPropertySet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+sal_Bool bValue = false;
+xPropertySet-getPropertyValue(HeaderIsShared) = bValue;
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
+xPropertySet-getPropertyValue(FooterIsShared) = bValue;
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fbc633d..c822739 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1377,7 +1377,10 @@ void
DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
uno::makeAny(sal_True) );
// if a left header is available then header are not shared
bool bLeft = eType == SectionPropertyMap::PAGE_LEFT;
-if( bLeft m_pSettingsTable-GetEvenAndOddHeaders())
+
+// If the 'Different Even Odd Pages' flag is turned on - do not
ignore it
+// Even if the 'Even' header is blank - the flag should be
imported (so it would look in LO like in Word)
+if( m_pSettingsTable-GetEvenAndOddHeaders())
xPageStyle-setPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_IS_SHARED),
uno::makeAny( false ));
//set the interface
@@ -1419,7 +1422,10 @@ void
DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType)
uno::makeAny(sal_True) );
// if a left header is available then footer is not shared
bool bLeft = eType == SectionPropertyMap::PAGE_LEFT;
-if( bLeft m_pSettingsTable-GetEvenAndOddHeaders())
+
+// If the 'Different Even Odd Pages' flag is turned on - do not
ignore it
+// Even if the 'Even' footer is blank - the flag should be
imported (so it would look in LO like in Word)
+if( m_pSettingsTable-GetEvenAndOddHeaders())
xPageStyle-setPropertyValue(rPropNameSupplier.GetName(PROP_FOOTER_IS_SHARED),
uno::makeAny( false ));
//set the interface
uno::Reference text::XText xFooterText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#65655 : fix for Different_Odd_And_Even_Pages flag ignore...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4229 -- To view, visit https://gerrit.libreoffice.org/4229 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf9949bb00aa905d22aedfd8f2b297dfa89dfedb Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Adam CloudOn rattles2...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - solenv/bin solenv/gbuild solenv/gdb vcl/headless vcl/inc vcl/Library_vcl.mk vcl/StaticLibrary_headless.mk
solenv/bin/gdb-core-bt.sh |2
solenv/gbuild/platform/com_GCC_defs.mk |2
solenv/gbuild/platform/macosx.mk |4
solenv/gbuild/platform/solaris.mk | 10 -
solenv/gbuild/platform/unxgcc.mk |8
solenv/gdb/libreoffice/sal.py |3
vcl/Library_vcl.mk |1
vcl/StaticLibrary_headless.mk |1
vcl/headless/svpbmp.cxx| 40
vcl/headless/svpelement.cxx| 287 -
vcl/headless/svpgdi.cxx|2
vcl/headless/svpvd.cxx |1
vcl/inc/headless/svpbmp.hxx| 13 -
vcl/inc/headless/svpelement.hxx| 40
vcl/inc/headless/svpframe.hxx |9 -
vcl/inc/headless/svpgdi.hxx|1
vcl/inc/headless/svpvd.hxx |8
17 files changed, 60 insertions(+), 372 deletions(-)
New commits:
commit 7142090557362ebf5314573317a68132383c460c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 13 09:46:40 2013 +0200
Remove dead code related to unused WITH_SVP_LISTENING
Change-Id: I8a12d0ea18a60541d9a11db26cc417a190443ff4
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 761f497..45bdcfd 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -496,7 +496,6 @@ vcl_generic_code= \
vcl_headless_code= \
vcl/headless/svpbmp \
vcl/headless/svpdummies \
-vcl/headless/svpelement \
vcl/headless/svpframe \
vcl/headless/svpgdi \
vcl/headless/svpinst \
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index a64d9d4..1b63851 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/vcl/StaticLibrary_headless.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_StaticLibrary_use_api,headless,\
$(eval $(call gb_StaticLibrary_add_exception_objects,headless,\
vcl/headless/svpbmp \
vcl/headless/svpdummies \
- vcl/headless/svpelement \
vcl/headless/svpframe \
vcl/headless/svpprn \
vcl/headless/svptext \
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 0b5eb52..cd5a2f9 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -349,5 +349,45 @@ bool SvpSalBitmap::GetSystemData( BitmapSystemData )
return false;
}
+sal_uInt32 SvpSalBitmap::getBitCountFromScanlineFormat( sal_Int32 nFormat )
+{
+sal_uInt32 nBitCount = 1;
+switch( nFormat )
+{
+case Format::ONE_BIT_MSB_GREY:
+case Format::ONE_BIT_LSB_GREY:
+case Format::ONE_BIT_MSB_PAL:
+case Format::ONE_BIT_LSB_PAL:
+nBitCount = 1;
+break;
+case Format::FOUR_BIT_MSB_GREY:
+case Format::FOUR_BIT_LSB_GREY:
+case Format::FOUR_BIT_MSB_PAL:
+case Format::FOUR_BIT_LSB_PAL:
+nBitCount = 4;
+break;
+case Format::EIGHT_BIT_PAL:
+case Format::EIGHT_BIT_GREY:
+nBitCount = 8;
+break;
+case Format::SIXTEEN_BIT_LSB_TC_MASK:
+case Format::SIXTEEN_BIT_MSB_TC_MASK:
+nBitCount = 16;
+break;
+case Format::TWENTYFOUR_BIT_TC_MASK:
+nBitCount = 24;
+break;
+case Format::THIRTYTWO_BIT_TC_MASK_BGRA:
+case Format::THIRTYTWO_BIT_TC_MASK_ARGB:
+case Format::THIRTYTWO_BIT_TC_MASK_ABGR:
+case Format::THIRTYTWO_BIT_TC_MASK_RGBA:
+nBitCount = 32;
+break;
+default:
+OSL_FAIL( unsupported basebmp format );
+break;
+}
+return nBitCount;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/headless/svpelement.cxx b/vcl/headless/svpelement.cxx
deleted file mode 100644
index 8b6f360..000
--- a/vcl/headless/svpelement.cxx
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include headless/svpelement.hxx
-
-#include basebmp/scanlineformats.hxx
-#include osl/diagnose.h
-
-#if defined WITH_SVP_LISTENING
-#include osl/thread.h
-#include vcl/svapp.hxx
-#include rtl/strbuf.hxx
-#include vcl/bitmap.hxx
-#include tools/stream.hxx
-
[Libreoffice-commits] core.git: vcl/source
vcl/source/glyphs/graphite_features.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9760621b5c93edb829478c284e4b61537824e702
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 13 10:04:20 2013 +0200
Work around -Werror=type-limits when plain char is unsigned
...assuming the original intent of the code was to check for ASCII range
0x20--
0x7F.
Change-Id: I8033890a76e059d997efb01431207a453f00a981
diff --git a/vcl/source/glyphs/graphite_features.cxx
b/vcl/source/glyphs/graphite_features.cxx
index ec33500..609c88b 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -207,7 +207,7 @@ bool GrFeatureParser::isCharId(const OString id, size_t
offset, size_t length)
for (size_t i = 0; i length; i++)
{
if (i 0 id[offset+i] == '\0') continue;
-if ((id[offset+i] 0x20) || (id[offset+i] 0))
+if (id[offset+i] 0x20 || static_castsigned char(id[offset+i]) 0)
return false;
if (i==0 (id[offset+i] 0x41))
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) New commits: commit 348c7ca4b7676b10864bade1d5a16761b7927418 Author: Tor Lillqvist t...@iki.fi Date: Thu Jun 13 11:11:41 2013 +0300 Simplify EPM tests for OS X We always should use the internal epm anyway on OS X, so no need to look for PackageMaker.app in /Developer which doesn't even exist any more. Change-Id: I943f34e14e9ce0c3bec5bd7b86612a62e5b9e83d diff --git a/configure.ac b/configure.ac index bdca5c3..7c7575e 100644 --- a/configure.ac +++ b/configure.ac @@ -6785,7 +6785,9 @@ AC_MSG_CHECKING([whether to enable EPM for packing]) if test $enable_epm = yes; then AC_MSG_RESULT([yes]) if test $_os != WINNT; then -if test -n $with_epm; then +if test $_os = Darwin; then +EPM=internal +elif test -n $with_epm; then EPM=$with_epm else AC_PATH_PROG(EPM, epm, no) @@ -6806,17 +6808,6 @@ if test $enable_epm = yes; then if test `echo $EPM_VERSION | cut -d'.' -f1` -gt 3 || \ test `echo $EPM_VERSION | cut -d'.' -f1` -eq 3 -a `echo $EPM_VERSION | cut -d'.' -f2` -ge 7; then AC_MSG_RESULT([OK, = 3.7]) -if test $_os = Darwin; then -AC_MSG_CHECKING([which PackageMaker EPM thinks to use]) -_pm=`strings $EPM | grep PackageMaker | cut -d -f1` -if test $_pm = /Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker; then -AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)]) -elif test $_pm = /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then -AC_MSG_RESULT([$_pm, ok]) -else # we never should get here, but go safe -AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)]) -fi -fi else AC_MSG_RESULT([too old. epm = 3.7 is required.]) echo EPM will be built. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [comment] fdo#64238: fix for missing footer bug
Hi Adam, On Thu, Jun 13, 2013 at 11:21:42AM +0300, Adam Fyne adam.f...@cloudon.com wrote: I've never done such an operation as 'rebasing' against newer master. Does this require me to do 'git pull' ? A 'git pull -r', yes. If there are conflicts, you'll need to resolve those during 'git pull -r'. Will I have to build all the project? You will need to run a toplevel 'make'. That doesn't necessaryly mean a full build, depends on how old your local master is. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#36791 : fix for import of greeting card
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4240
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/4240/1
fdo#36791 : fix for import of greeting card
Change-Id: Id9d68e3e5bc2e2335ef1d1b3a8605a0de64ae8ea
---
M editeng/source/editeng/editeng.cxx
M editeng/source/outliner/outliner.cxx
M include/editeng/editeng.hxx
M include/editeng/outliner.hxx
M include/oox/vml/vmltextbox.hxx
M oox/source/vml/vmlshape.cxx
M oox/source/vml/vmlshapecontext.cxx
M oox/source/vml/vmltextbox.cxx
M oox/source/vml/vmltextboxcontext.cxx
M svx/source/customshapes/EnhancedCustomShape2d.cxx
M svx/source/svdraw/svdmodel.cxx
M svx/source/svdraw/svdograf.cxx
M svx/source/svdraw/svdotextdecomposition.cxx
M svx/source/unodraw/unoshap2.cxx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
M sw/source/core/layout/fly.cxx
M sw/source/filter/ww8/docxattributeoutput.cxx
17 files changed, 190 insertions(+), 14 deletions(-)
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 9bf29e5..7aa5cf1 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -102,6 +102,7 @@
{
DBG_CTOR( EditEngine, 0 );
pImpEditEngine = new ImpEditEngine( this, pItemPool );
+mpStripRec = new Rectangle();
}
EditEngine::~EditEngine()
@@ -1879,12 +1880,34 @@
{
DBG_CHKTHIS( EditEngine, 0 );
VirtualDevice aTmpDev;
+#if 0 // Modify for greeting.docx error.
Rectangle aBigRect( Point( 0, 0 ), Size( 0x7FFF, 0x7FFF ) );
if ( IsVertical() )
{
aBigRect.Right() = 0;
aBigRect.Left() = -0x7FFF;
}
+#endif
+// Set Clipping area
+Rectangle aBigRect;
+
+GetStripArea(aBigRect);
+sal_uInt32 rectHeight = aBigRect.GetHeight();
+
+sal_uInt16 nParaNum = GetParagraphCount();
+sal_uInt32 nHeight = 0;
+sal_uInt32 nLastHeight = 0;
+for(int i = 0; i nParaNum; i ++)
+{
+nLastHeight = GetTextHeight( i );
+nHeight += nLastHeight;
+if (nHeight = rectHeight)
+break;
+}
+
+aBigRect.Top() = 0;
+aBigRect.Bottom() = (rectHeight - nLastHeight);
+
pImpEditEngine-Paint( aTmpDev, aBigRect, Point(), sal_True );
}
@@ -2936,11 +2959,21 @@
return pImpEditEngine-InsertLineBreak(rEditSelection);
}
+void EditEngine::SetStripArea( const Rectangle rRect )
+{
+(*mpStripRec) = rRect;
+}
+
+void EditEngine::GetStripArea( Rectangle rRect )
+{
+rRect = (*mpStripRec);
+}
+
+
EFieldInfo::EFieldInfo()
{
pFieldItem = NULL;
}
-
EFieldInfo::EFieldInfo( const SvxFieldItem rFieldItem, sal_Int32 nPara,
sal_uInt16 nPos ) : aPosition( nPara, nPos )
{
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index db6915d..895bbfa 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1335,6 +1335,7 @@
bBlockInsCallback = sal_False;
nMaxDepth = 9;
+mStripRec = Rectangle();
pParaList = new ParagraphList;
pParaList-SetVisibleStateChangedHdl( LINK( this, Outliner,
ParaVisibleStateChangedHdl ) );
@@ -1784,6 +1785,7 @@
{
DBG_CHKTHIS(Outliner,0);
bStrippingPortions = sal_True;
+pEditEngine-SetStripArea(GetStripArea());
pEditEngine-StripPortions();
bStrippingPortions = sal_False;
}
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index a3ba78d..d71043d 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -129,6 +129,7 @@
private:
ImpEditEngine* pImpEditEngine;
+Rectangle* mpStripRec;
EDITENG_DLLPRIVATE EditEngine( const EditEngine );
EDITENG_DLLPRIVATE EditEngine operator=( const EditEngine );
@@ -579,6 +580,9 @@
bool Undo(EditView* pView);
bool Redo(EditView* pView);
+
+virtual voidSetStripArea( const Rectangle rRect );
+virtual voidGetStripArea( Rectangle rRect );
};
#endif // _MyEDITENG_HXX
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index c9c0b0b..7f2f1ba 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -633,6 +633,8 @@
sal_uLong nDummy;
+Rectangle mStripRec;
+
DECL_LINK( ParaVisibleStateChangedHdl, Paragraph* );
DECL_LINK( BeginMovingParagraphsHdl, void* );
DECL_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo* );
@@ -1040,6 +1042,9 @@
// convenient method to determine the bullets/numbering status for all
paragraphs
sal_Int32 GetBulletsNumberingStatus() const;
+
+voidSetStripArea( const Rectangle rRect ) { mStripRec = rRect; }
+Rectangle GetStripArea() const { return mStripRec; };
};
#endif
diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index 4975e6b..3643855 100644
--- a/include/oox/vml/vmltextbox.hxx
+++
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 866d14f815491635074d0c2e66f4332ba8e1f887 Author: Winfried Donkers o...@dci-electronics.nl Date: Mon Jun 10 12:47:13 2013 +0200 fdo#64626 clarify use of border line settings on toolbar Using the toolbar button to set border lines in calc, lines are added, but not removed. I thought this to be a bug, but it isn't. Using the toolbar button is for addition, and using the same button with the SHIFT key is for addition+deletion. Unfortunately, this is not mentioned in help files or hints. This patch remedies this by giving a better hint when using the toolbar button. Change-Id: I0cf5cc9bffbec363cde3c7493f024cdfa72c54f4 Reviewed-on: https://gerrit.libreoffice.org/4220 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz (cherry picked from commit e2e0db8f2967d866cba5c5400617d97aceaeefe9) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 74fbeeb..08bb637 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2767,7 +2767,7 @@ /node node oor:name=.uno:SetBorderStyle oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USBorders/value + value xml:lang=en-USBorders, add lines; SHIFT to add and remove/value /prop prop oor:name=Properties oor:type=xs:int value1/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 4.1] fdo#64626 clarify use of border line settings on toolbar
On Wed, Jun 12, 2013 at 10:26:32AM +0200, Winfried Donkers w.donk...@dci-electronics.nl wrote: I propose to include this patch in version 4.1: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e2e0db8f2967d866cba5c5400617d97aceaeefe9 Pushed. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/page-graphic-background.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
sw/source/filter/ww8/docxexport.cxx |3 ++-
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 837ccd73e23f31f1fe2da1972a9f41b60373f8e5
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jun 12 15:13:32 2013 +0200
DOCX: don't export auto color as page background
That auto here would mean black, potentially rendering the whole
document unreadable.
Change-Id: Ie17a6a9b00c9ab24204291d09175a3fba69cd4ea
diff --git a/sw/qa/extras/ooxmlexport/data/page-graphic-background.odt
b/sw/qa/extras/ooxmlexport/data/page-graphic-background.odt
new file mode 100644
index 000..15050e6
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/page-graphic-background.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8b4308e..494076c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -72,6 +72,7 @@ public:
void testI120928();
void testFdo64826();
void testPageBackground();
+void testPageGraphicBackground();
void testFdo65265();
void testFdo65655();
@@ -123,6 +124,7 @@ void Test::run()
{i120928.docx, Test::testI120928},
{fdo64826.docx, Test::testFdo64826},
{page-background.docx, Test::testPageBackground},
+{page-graphic-background.odt, Test::testPageGraphicBackground},
{fdo65265.docx, Test::testFdo65265},
{fdo65655.docx, Test::testFdo65655},
};
@@ -692,6 +694,15 @@ void Test::testPageBackground()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050),
getPropertysal_Int32(xPageStyle, BackColor));
}
+void Test::testPageGraphicBackground()
+{
+// No idea how the graphic background should be exported (seems there is no
+// way to do a non-tiling export to OOXML), but at least the background
+// color shouldn't be black.
+uno::Referencebeans::XPropertySet
xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getPropertysal_Int32(xPageStyle,
BackColor));
+}
+
void Test::testFdo65265()
{
// Redline (tracked changes) of text formatting were not exported
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index 0afa634..40dc957 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -746,7 +746,8 @@ boost::optionalconst SvxBrushItem*
DocxExport::getBackground()
{
// The 'color' is set for the first page style - take it and use it as
the background color of the entire DOCX
const SvxBrushItem* pBrush = (const SvxBrushItem*)pItem;
-oRet.reset(pBrush);
+if (pBrush-GetColor().GetColor() != COL_AUTO)
+oRet.reset(pBrush);
}
return oRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [comment] fdo#64238: fix for missing footer bug
On Thu, Jun 13, 2013 at 11:59:24AM +0300, Adam Fyne adam.f...@cloudon.com wrote: Isn't there some magic way to do this with 'fetch' on the branch I worked on ? If you want to avoid 'git pull -r' for some reason, you can do it manually: git fetch origin git rebase origin/master signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/Library_avmediavlc.mk avmedia/source
avmedia/Library_avmediavlc.mk |2 ++ avmedia/source/vlc/vlcmanager.cxx |5 - 2 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 6b2d4bececb1fd588076b6a2e573f539f3242b58 Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 13 10:05:10 2013 +0100 build the new modules, and close a couple of namespaces. Change-Id: I04bc100310f886cd07eb1440a37028a2e52d879e diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk index f4b1b24..465fe2f 100644 --- a/avmedia/Library_avmediavlc.mk +++ b/avmedia/Library_avmediavlc.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Library_use_libraries,avmediavlc,\ )) $(eval $(call gb_Library_add_exception_objects,avmediavlc,\ + avmedia/source/vlc/vlcmanager \ + avmedia/source/vlc/vlcplayer \ avmedia/source/vlc/vlcuno \ )) diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 74f4111..5286eb6 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -44,4 +44,7 @@ uno::Sequence rtl::OUString SAL_CALL Manager::getSupportedServiceNames() return uno::Sequence rtl::OUString (); } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +} // end namespace vlc +} // end namespace avmedia + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 504638e73f2a6d5bfcba9eb83db4fcdebe4f37f8 Author: Tor Lillqvist t...@iki.fi Date: Thu Jun 13 12:22:49 2013 +0300 Disable Graphite for Android and iOS It definitely does not make sense for iOS, I assume. For Android the situation is unclear, but let's disable it for now. It causes linking errors currently anyway as the graphite_serverfont.cxx is not compiled for Android. (Whether it could and should be compiled then instead of disabling Graphite, I don't know.) Change-Id: I1a874d304af508d2217da08e49dc158664f2e9d2 diff --git a/configure.ac b/configure.ac index 7c7575e..a2f82db 100644 --- a/configure.ac +++ b/configure.ac @@ -8373,7 +8373,7 @@ dnl Graphite dnl === AC_MSG_CHECKING([whether to enable graphite support]) -if test $_os != Darwin test $enable_graphite = -o $enable_graphite != no; then +if test $_os != Darwin -a $_os != Android -a $_os != iOS -a \( -z $enable_graphite -o $enable_graphite != no \); then AC_MSG_RESULT([yes]) ENABLE_GRAPHITE=TRUE AC_DEFINE(ENABLE_GRAPHITE) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de435e745ad8c32640342675103a48383a84b5a9 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 13 10:15:01 2013 +0100 Updated core Project: translations 0951535c576e6a2693b25311832b25bcd67b7bb3 diff --git a/translations b/translations index 134bbcf..0951535 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 134bbcf189eeaa9bb7f0efb726f3eb980f37085e +Subproject commit 0951535c576e6a2693b25311832b25bcd67b7bb3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: source/mn
source/mn/sysui/desktop/share.po |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 0951535c576e6a2693b25311832b25bcd67b7bb3 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 13 10:15:01 2013 +0100 parser error : EntityRef: expecting Change-Id: Id087f03e24e0153a95d554eee61f73049b59ff63 diff --git a/source/mn/sysui/desktop/share.po b/source/mn/sysui/desktop/share.po index 66f7f84..8ea79ae 100644 --- a/source/mn/sysui/desktop/share.po +++ b/source/mn/sysui/desktop/share.po @@ -253,7 +253,7 @@ msgctxt ms-word-document\n LngText.text msgid Microsoft Word Document -msgstr Microsoft Word ÐаÑимÑÑÑд +msgstr Microsoft Word ÐаÑимÑÑÑд #: documents.ulf msgctxt @@ -261,7 +261,7 @@ msgctxt ms-word-document2\n LngText.text msgid Microsoft Word Document -msgstr Microsoft Word ÐаÑимÑÑÑд +msgstr Microsoft Word ÐаÑимÑÑÑд #: documents.ulf msgctxt @@ -301,7 +301,7 @@ msgctxt ms-word-document-12\n LngText.text msgid Microsoft Word Document -msgstr Microsoft Word ÐаÑимÑÑÑд +msgstr Microsoft Word ÐаÑимÑÑÑд #: documents.ulf msgctxt @@ -349,7 +349,7 @@ msgctxt openxmlformats-officedocument-wordprocessingml-document\n LngText.text msgid Microsoft Word Document -msgstr Microsoft Word ÐаÑимÑÑÑд +msgstr Microsoft Word ÐаÑимÑÑÑд #: documents.ulf msgctxt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source icon-themes/galaxy icon-themes/hicontrast include/svx officecfg/registry svx/source sw/source uui/uiconfig
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |3 icon-themes/galaxy/svx/res/cropmarkers.png|binary icon-themes/galaxy/svx/res/cropmarkers2.png |binary icon-themes/galaxy/svx/res/markers.png|binary icon-themes/galaxy/svx/res/markers2.png |binary icon-themes/hicontrast/svx/res/cropmarkers.png|binary icon-themes/hicontrast/svx/res/markers.png|binary include/svx/svdhdl.hxx|4 - officecfg/registry/schema/org/openoffice/Office/Calc.xcs |4 - officecfg/registry/schema/org/openoffice/Office/Writer.xcs|8 +- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |8 +- svx/source/svdraw/svdhdl.cxx | 32 +- sw/source/ui/config/viewopt.cxx | 27 +--- sw/source/ui/docvw/edtwin.cxx |9 ++ uui/uiconfig/ui/setmasterpassworddlg.ui |1 15 files changed, 73 insertions(+), 23 deletions(-) New commits: commit 5bf554a89183c983cc492bcdcbc78967f3dbc415 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 13 10:25:19 2013 +0100 Related: fdo#65595 password dialog has truncated label Change-Id: I7b18bebb878fc5027109121595e444ef1d6a7cfc diff --git a/uui/uiconfig/ui/setmasterpassworddlg.ui b/uui/uiconfig/ui/setmasterpassworddlg.ui index a5670a7..e8c5ae9 100644 --- a/uui/uiconfig/ui/setmasterpassworddlg.ui +++ b/uui/uiconfig/ui/setmasterpassworddlg.ui @@ -152,7 +152,6 @@ property name=xalign0/property property name=label translatable=yesCaution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case sensitive./property property name=wrapTrue/property -property name=width_chars56/property property name=max_width_chars62/property /object packing commit 67608078a857fc128efc6bf4172f9ce4384d25c7 Author: Armin Le Grand a...@apache.org Date: Thu Dec 13 08:47:57 2012 + Resolves: #i121463# Enhanced handle visualization.. and some fixes in that region (cherry picked from commit 2ece2411aa1ab78e6aec269d08d8a9b526390939) Conflicts: default_images/svx/res/cropmarkers.png default_images/svx/res/cropmarkers2.png default_images/svx/res/cropmarkersACC.png default_images/svx/res/markers.png default_images/svx/res/markers2.png default_images/svx/res/markersACC.png officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Draw.xcs officecfg/registry/schema/org/openoffice/Office/Impress.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs sc/source/core/tool/viewopti.cxx sd/source/ui/app/optsitem.cxx svx/inc/svx/svdhdl.hxx svx/source/svdraw/svdhdl.cxx svx/source/svdraw/svdstr.src sw/source/ui/config/viewopt.cxx sw/source/ui/docvw/edtwin.cxx Change-Id: I4094c2ca18a3c29e8e24a15ddeb040808ce4605d diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index fa8d1eb..ccecd3e 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -133,6 +133,9 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool pOutlinerPool-SetPoolDefaultItem( SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT ) ); // 12pt } +// #i121463# Use big handles by default +SetMarkHdlSizePixel(9); + ReInit(); } diff --git a/icon-themes/galaxy/svx/res/cropmarkers.png b/icon-themes/galaxy/svx/res/cropmarkers.png index 38cb5b3..3048e01 100644 Binary files a/icon-themes/galaxy/svx/res/cropmarkers.png and b/icon-themes/galaxy/svx/res/cropmarkers.png differ diff --git a/icon-themes/galaxy/svx/res/cropmarkers2.png b/icon-themes/galaxy/svx/res/cropmarkers2.png new file mode 100644 index 000..c0f37ef Binary files /dev/null and b/icon-themes/galaxy/svx/res/cropmarkers2.png differ diff --git a/icon-themes/galaxy/svx/res/markers.png b/icon-themes/galaxy/svx/res/markers.png index af608b2..c954065 100644 Binary files a/icon-themes/galaxy/svx/res/markers.png and b/icon-themes/galaxy/svx/res/markers.png differ diff --git a/icon-themes/galaxy/svx/res/markers2.png b/icon-themes/galaxy/svx/res/markers2.png new file mode 100644 index 000..f52b91b Binary files /dev/null and b/icon-themes/galaxy/svx/res/markers2.png differ diff --git a/icon-themes/hicontrast/svx/res/cropmarkers.png
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2e/ce2411aa1ab78e6aec269d08d8a9b526390939
2e/ce2411aa1ab78e6aec269d08d8a9b526390939 |1 + 1 file changed, 1 insertion(+) New commits: commit c6e114c100b2dcc46ebdbf4be3d0c344c0272a68 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 13 10:38:02 2013 +0100 Notes added by 'git notes add' diff --git a/2e/ce2411aa1ab78e6aec269d08d8a9b526390939 b/2e/ce2411aa1ab78e6aec269d08d8a9b526390939 new file mode 100644 index 000..c538de7 --- /dev/null +++ b/2e/ce2411aa1ab78e6aec269d08d8a9b526390939 @@ -0,0 +1 @@ +merged as: 67608078a857fc128efc6bf4172f9ce4384d25c7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - uui/uiconfig
uui/uiconfig/ui/setmasterpassworddlg.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 509fa206b0f612d61740632c59351b69bbcfcade Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 13 10:25:19 2013 +0100 Related: fdo#65595 password dialog has truncated label Change-Id: I7b18bebb878fc5027109121595e444ef1d6a7cfc (cherry picked from commit 5bf554a89183c983cc492bcdcbc78967f3dbc415) diff --git a/uui/uiconfig/ui/setmasterpassworddlg.ui b/uui/uiconfig/ui/setmasterpassworddlg.ui index a5670a7..e8c5ae9 100644 --- a/uui/uiconfig/ui/setmasterpassworddlg.ui +++ b/uui/uiconfig/ui/setmasterpassworddlg.ui @@ -152,7 +152,6 @@ property name=xalign0/property property name=label translatable=yesCaution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case sensitive./property property name=wrapTrue/property -property name=width_chars56/property property name=max_width_chars62/property /object packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 4.0.4 RC2 test builds available
Hi *, for the upcoming new version 4.0.4, the RC2 builds now start to be available on pre-releases. This build is slated to be second release candidate build on the way towards 4.0.4, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#4.0.4_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 4.0.4 RC1 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-4-release-4.0.4.2.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-l10n] Deckard: a web based Glade Runner
On Wed, 2013-06-12 at 12:58 +0300, Коростіль Данило wrote: Added Nicolas, who is the developer. Top-posted to keep content. On Wed, Jun 12, 2013 at 2:05 PM, Miloš Šrámek milos.sra...@oeaw.ac.at wrote: Hi, there exists a web-based tool for display of translated glade dialogs: https://launchpad.net/deckard gnome dialogs: http://deckard.malizor.org/ It would be really great to have something like that for LO - it would simplify our work and simultaneously improve the quality of translations. On the launchpad page, it says: In the long run, it would be cool to have distinct instances for distinct projects like Xfce or LibreOffice. As I understand it, the runner takes translation from a po file in a repository, converts it and displays the dialog. So, to see the result, it is necessary to upload po file to the repository. Can we talk to Deckard developers regarding that? Milos -- - Milos Sramek Gregor Mendel Institute of Molecular Plant Biology, Dr. Bohr-Gasse 3, 1030 Vienna, Austria TEL: +43 1 79044 9810 EMAIL: milos.sra...@oeaw.ac.at - -- sankarshan mukhopadhyay https://twitter.com/#!/sankarshan As far as I know the tool is based on GTK3+, so at least we need to wait for the port to .ui dialog system. Nevertheless, even that couldn't mean it'd support LO, but I'm not sure. +dev list and Caolán McNamara. Probably Caolán who's converting the dialogs may tell us more. And yes, it's really really useful tool for localization QA, especially for such huge project as LO. So I'm looking forward to that great feature as well. Looks great. I think it should basically just work for LibreOffice and the 250+ new .ui elements. Our .uis pretend to be gtk3 ones, with a handful of custom widgets, mostly previews. We have a glade catalog for the custom ones to provide stubs for glade. So, what does deckard do there, does it load the .ui with standard gtk3 code, i.e. expects all the widgets to be instantiatable, or does it load it the glade way, i.e. can reuse a glade catalog to handle those ? There might also be a little bit of tweaking required to stitch the .po and .ui together because we're not (currently) using gettext natively in LibreOffice but are using it as an intermediate format so it probably wouldn't work to just throw a libreoffice .po with translations for a dialog at the normal gtk3 gettext loader and get it to do the right thing. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/core/txtnode/fntcache.cxx | 25 +
1 file changed, 25 insertions(+)
New commits:
commit d16f1df93976e13f136ab35f32765232d73e5e08
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jun 7 11:31:05 2013 +0200
ugly workaround for external leading with symbol fonts (bnc#823626)
I'd much rather find the code using external leading in Writer's layout,
but this font rendering and layout stuff is so complicated.
Change-Id: Iaf58af387a6727eb18f5a9d1613de3ae30d7c35e
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index bf15370..536bfba 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -372,6 +372,14 @@ sal_uInt16 SwFntObj::GetFontHeight( const ViewShell* pSh,
const OutputDevice rO
return nRet;
}
+static bool IsStarSymbol(const rtl::OUString rFontName)
+{
+sal_uInt16 nIndex = 0;
+rtl::OUString sFamilyNm(GetNextFontToken(rFontName, nIndex));
+return (sFamilyNm.equalsIgnoreAsciiCase(starsymbol) ||
+sFamilyNm.equalsIgnoreAsciiCase(opensymbol));
+}
+
sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice
rOut )
{
sal_uInt16 nRet = 0;
@@ -389,6 +397,23 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh,
const OutputDevice r
bSymbol = RTL_TEXTENCODING_SYMBOL == aMet.GetCharSet();
GuessLeading( *pSh, aMet );
nExtLeading = static_castsal_uInt16(aMet.GetExtLeading());
+/* HACK: There is something wrong with Writer's bullet rendering,
causing lines
+ with bullets to be higher than they should be. I think this is
because
+ Writer uses font's external leading incorrect, as the vertical
distance
+ added to every line instead of only a distance between multiple
lines,
+ which means a single bullet has external leading added even
though it
+ shouldn't, but frankly this is just an educated guess rather
than understanding
+ Writer's layout (heh).
+ Symbol font in some documents is 'StarSymbol; Arial Unicode
MS', and Windows
+ machines often do not have StarSymbol, falling back to Arial
Unicode MS, which
+ has unusually high external leading. So just reset external
leading for fonts
+ which are used to bullets, as those should not be used on
multiple lines anyway,
+ so in correct rendering external leading should be irrelevant
anyway.
+ Interestingly enough, bSymbol is false for 'StarSymbol; Arial
Unicode MS', so
+ also check explicitly.
+*/
+if( bSymbol || IsStarSymbol( pPrtFont-GetName()))
+nExtLeading = 0;
}
const IDocumentSettingAccess rIDSA =
*pSh-getIDocumentSettingAccess();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sw/source
include/oox/export/vmlexport.hxx|2 ++
oox/source/export/vmlexport.cxx |5 +
sw/source/filter/ww8/docxexport.cxx |2 ++
3 files changed, 9 insertions(+)
New commits:
commit c7e237045df1e0ed01c47ce85923cd182a101bc7
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Jun 13 12:07:33 2013 +0200
fdo#58819 VML export: handle objects anchored in the header / footer
Previously such shapes landed in the middle of section properties.
Change-Id: I7993eaa721e2b53d8adb1cbdee40992bbeb11416
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 54212a65..4e790c5 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -75,6 +75,8 @@ public:
::sax_fastparser::FSHelperPtr
GetFS() { return m_pSerializer; }
+void SetFS(::sax_fastparser::FSHelperPtr pSerializer);
+
/// Export the sdr object as VML.
///
/// Call this when you need to export the object as VML.
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index d6623c0..ca5e625 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -49,6 +49,11 @@ VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr
pSerializer, VMLTextExport*
memset( m_pShapeTypeWritten, 0, ESCHER_ShpInst_COUNT * sizeof( bool ) );
}
+void VMLExport::SetFS( ::sax_fastparser::FSHelperPtr pSerializer )
+{
+m_pSerializer = pSerializer;
+}
+
VMLExport::~VMLExport()
{
delete mpOutStrm, mpOutStrm = NULL;
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index 40dc957..99c6460 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -599,12 +599,14 @@ void DocxExport::WriteHeaderFooter( const SwFmt rFmt,
bool bHeader, const char*
// switch the serializer to redirect the output to word/styles.xml
m_pAttrOutput-SetSerializer( pFS );
+m_pVMLExport-SetFS( pFS );
// do the work
WriteHeaderFooterText( rFmt, bHeader );
// switch the serializer back
m_pAttrOutput-SetSerializer( m_pDocumentFS );
+m_pVMLExport-SetFS( m_pDocumentFS );
// close the tag
sal_Int32 nReference;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/dllmgr-x86.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c32dd08cfbaefb0d0a75a303b182e68d073ee262
Author: Noel Power noel.po...@suse.com
Date: Thu Jun 13 11:41:33 2013 +0100
blind ( windows ) fix re. uno::Refererence vs rtl::Reference foobar
fdo#65545
Change-Id: I81b877e8e1b6945c2f1265947ad915ed1070800a
diff --git a/basic/source/runtime/dllmgr-x86.cxx
b/basic/source/runtime/dllmgr-x86.cxx
index c517135..2bfd037 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -669,7 +669,7 @@ OUString fullDllName(OUString const name) {
struct SbiDllMgr::Impl: private boost::noncopyable {
private:
-typedef std::map OUString, Reference Dll Dlls;
+typedef std::map OUString, rtl::Reference Dll Dlls;
public:
Dll * getDll(OUString const name);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source
canvas/source/cairo/cairo_canvasbitmap.cxx | 55 -
1 file changed, 31 insertions(+), 24 deletions(-)
New commits:
commit deaa9689e217e9f7fb1cab1243a8763e40da5324
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Jun 13 12:47:02 2013 +0200
Add some error handling to bitmap conversion.
Fixup for 7cf2b5809f7137acc7a5eed9159042b3d748da01, makes sure cairo
has all data committed to the surface, and handle random errors.
Change-Id: I39e5b5777968c4563a8ce3870bac3d4182090f3b
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 496b5cf..277c133 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -172,39 +172,46 @@ namespace cairocanvas
::AlphaMask aMask( aSize );
BitmapWriteAccess *pRGBWrite( aRGB.AcquireWriteAccess() );
-BitmapWriteAccess *pMaskWrite( aMask.AcquireWriteAccess() );
-
-unsigned char *pSrc = cairo_image_surface_get_data( pPixels );
-unsigned int nStride = cairo_image_surface_get_stride( pPixels
);
-for( unsigned long y = 0; y (unsigned long) aSize.Height();
y++ )
+if( pRGBWrite )
{
-sal_uInt32 *pPix = (sal_uInt32 *)(pSrc + nStride * y);
-for( unsigned long x = 0; x (unsigned long)
aSize.Width(); x++ )
+BitmapWriteAccess *pMaskWrite( aMask.AcquireWriteAccess()
);
+if( pMaskWrite )
{
-sal_uInt8 nAlpha = (*pPix 24);
-sal_uInt8 nR = (*pPix 16) 0xff;
-sal_uInt8 nG = (*pPix 8) 0xff;
-sal_uInt8 nB = *pPix 0xff;
-if( nAlpha != 0 nAlpha != 255 )
+cairo_surface_flush(pPixels);
+unsigned char *pSrc = cairo_image_surface_get_data(
pPixels );
+unsigned int nStride = cairo_image_surface_get_stride(
pPixels );
+for( unsigned long y = 0; y (unsigned long)
aSize.Height(); y++ )
{
-//fprintf (stderr, From A(0x%.2x) 0x%.2x 0x%.2x
0x%.2x - ,
-// nAlpha, nR, nG, nB );
-// Cairo uses pre-multiplied alpha - we do not =
re-multiply
-nR = (sal_uInt8) MinMax( ((sal_uInt32)nR * 255) /
nAlpha, 0, 255 );
-nG = (sal_uInt8) MinMax( ((sal_uInt32)nG * 255) /
nAlpha, 0, 255 );
-nB = (sal_uInt8) MinMax( ((sal_uInt32)nB * 255) /
nAlpha, 0, 255 );
-//fprintf (stderr, 0x%.2x 0x%.2x 0x%.2x\n, nR,
nG, nB );
+sal_uInt32 *pPix = (sal_uInt32 *)(pSrc + nStride *
y);
+for( unsigned long x = 0; x (unsigned long)
aSize.Width(); x++ )
+{
+sal_uInt8 nAlpha = (*pPix 24);
+sal_uInt8 nR = (*pPix 16) 0xff;
+sal_uInt8 nG = (*pPix 8) 0xff;
+sal_uInt8 nB = *pPix 0xff;
+if( nAlpha != 0 nAlpha != 255 )
+{
+// Cairo uses pre-multiplied alpha - we do
not = re-multiply
+nR = (sal_uInt8) MinMax( ((sal_uInt32)nR *
255) / nAlpha, 0, 255 );
+nG = (sal_uInt8) MinMax( ((sal_uInt32)nG *
255) / nAlpha, 0, 255 );
+nB = (sal_uInt8) MinMax( ((sal_uInt32)nB *
255) / nAlpha, 0, 255 );
+}
+pRGBWrite-SetPixel( y, x, BitmapColor( nR,
nG, nB ) );
+pMaskWrite-SetPixelIndex( y, x, 255 - nAlpha
);
+pPix++;
+}
}
-pRGBWrite-SetPixel( y, x, BitmapColor( nR, nG, nB ) );
-pMaskWrite-SetPixelIndex( y, x, 255 - nAlpha );
-pPix++;
+aMask.ReleaseAccess( pMaskWrite );
}
+aRGB.ReleaseAccess( pRGBWrite );
}
-aMask.ReleaseAccess( pMaskWrite );
-aRGB.ReleaseAccess( pRGBWrite );
+// ignore potential errors above. will get caller a
+// uniformely white bitmap, but not that there would
+// be error handling in calling code ...
::BitmapEx *pBitmapEx = new ::BitmapEx( aRGB, aMask );
+cairo_destroy( pCairo );
cairo_surface_destroy( pPixels );
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 57176, which changed state. Bug 57176 Summary: EDITING: CONDITIONAL FORMATTING not restored by UNDO https://bugs.freedesktop.org/show_bug.cgi?id=57176 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME -- 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] core.git: Branch 'distro/suse/suse-4.0' - sc/source
sc/source/ui/view/output2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6d537f3300ff552a6aa015116b91e33e6d9bccca
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jun 7 05:28:04 2013 +0200
don't hide cell content behind pivot table buttons, fdo#60877
Change-Id: I1508aafcc7046c576a4d6de87900dc66f32b2f97
Reviewed-on: https://gerrit.libreoffice.org/4184
Reviewed-by: Kohei Yoshida kohei.yosh...@suse.de
Tested-by: Kohei Yoshida kohei.yosh...@suse.de
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 5461fec..6fa83c3 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1353,7 +1353,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY,
long nPosX, long nPosY
// (for automatic line break: only if not formatting for printer, as
in ScColumn::GetNeededSize)
if ( eType==OUTTYPE_WINDOW
- ( static_castconst
ScMergeFlagAttr(rPattern.GetItem(ATTR_MERGE_FLAG)).GetValue() SC_MF_AUTO )
+ ( static_castconst
ScMergeFlagAttr(rPattern.GetItem(ATTR_MERGE_FLAG)).GetValue()
(SC_MF_AUTO|SC_MF_BUTTON|SC_MF_BUTTON_POPUP) )
( !bBreak || mpRefDevice == pFmtDevice ) )
{
// filter drop-down width is now independent from row height
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO 4.0.4 RC1 splash-screen : back to 3.6 ???
On Wed, 2013-06-12 at 23:13 +0200, Jean-Baptiste Faure wrote: Hi, It's me or the splash-screen of 4.0.4.1 is the one of LO 3.6 : same size, almost same color ? Additionally I see 2 progress bars !?! Is this fixed in rc2 now ? I guess I fell asleep at the wheel and used the wrong configure line. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - drawinglayer/source editeng/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |4 ++--
editeng/source/editeng/impedit3.cxx| 18 +-
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 02062ecb539668a9c0f5a2b5408c7f7beb29c678
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 11 09:19:03 2013 +0200
Revert fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.
It caused some regressions. For example, see fdo65414 and fdo65562
This reverts commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3.
Change-Id: I0108463c78bbcb48a4c218d78e51deaa39caec0c
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 1a50490..1dfc2f4 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@ namespace drawinglayer
if(rTextCandidate.getFontAttribute().getRTL())
{
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED));
-nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
+nRTLLayoutMode |=
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
}
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 5fd8362..d56ea0e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4306,13 +4306,18 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice*
pOutDev, String* pString, x
void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16
nPara, sal_uInt16 nIndex )
{
+sal_Bool bCTL = sal_False;
sal_Bool bR2L = sal_False;
if ( nIndex == 0x )
{
+bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
bR2L = IsRightToLeft( nPara );
}
else
{
+ContentNode* pNode = GetEditDoc().GetObject( nPara );
+short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
+bCTL = nScriptType == i18n::ScriptType::COMPLEX;
// this change was discussed in issue 37190
bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
// it also works for issue 55927
@@ -4321,18 +4326,21 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice*
pOutDev, sal_uInt16 nPara,
sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
// We always use the left postion for DrawText()
-// Let VCL do CTL checking
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
-if ( !bR2L )
+if ( !bCTL !bR2L)
{
// No CTL/Bidi checking neccessary
nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
}
else
{
-//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT |
TEXT_LAYOUT_BIDI_STRONG;
+// CTL/Bidi checking neccessary
+// Don't use BIDI_STRONG, VCL must do some checks.
+nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
+
+if ( bR2L )
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
}
pOutDev-SetLayoutMode( nLayoutMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
doubt about extension
Anyone can tell me what IDE can i use to develope some extension?? tks -- Fabio Ebner *Email: *fabio.eb...@dnasolution.com.br *Telefone: 13 3221-3616 / 13 3221-6591* *Endereço: Avenida Ana Costa, 59 Cj 89 - Santos/SP* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Android
I will try my luck in German, because my English is to bad to say Schönen Guten Tag! Dies ist leider die einzige Mail Adresse, die ich finden konnte. Da ich keine Ahnung von chat oder was weiß ich habe, meine Ausführungen aber doch mehr als drei Sätze haben werden, hoffe ich, diese Mail erreicht jemanden, den es interessiert. Es ist nicht zu übersehen, dass es bei Libreoffice im Augenblich ein wenig langsamer vonstatten geht Auch der Aufruf im Frühling an die User, zu spenden, ist für mich immer ein Warnzeichen für den nahen Stillstand eines Projektes. Kommt bei den Programmierern erst der Kosten-Nutzen Gedanke auf, hat sich der ehrenamliche Enthusiasmus meist gelegt Egal. Nach der Überschrift, dreht es sich hier um Android. Ich habe ein Galaxy S3 von Samsung mit Multimedia Dockingstation. Das Teil ist einfach super! Vor allem, dass es plötzlich tatsächlich zum PC mutiert und sich auch so im Internet bewegt und nicht mehr als mobile device ist für einen Full HD Fernseher ganz große Klasse! Was mir noch fehlt ist mein bevorzugtes Office (seit Star Office 3.1 unter Windows 3.1)! Ich habe im wahrsten sinne des Wortes tausende an Dokumenten, die ich gerne in Zukunft ohne Laptop benutzen können möchte. LibreOffice Android kommt aber nicht in die Gänge ein fertiges Release oder eine einfache Installation herauszugeben. MIR würde schon genügen (und ich habe KEINE Ahnung von Compilieren oder Programmierenbin Arzt.), wenn es eine direkte Umsetzung des Office Paketes auf Android gäbe! Diese soll ja angeblich nahezu fertig sein! Nun also die Idee eines begeisterten Galaxy S3 dock Benutzers: warum realisiert man eine spezielle Android Oberfläche nicht als einfache Extension in LibreOffice? Man könnte es in etwa so versuchen, wie Samsung mit dem Multi-Window Modus, bei dem sich die Menüzeile auf der linken Seite einblenden läßt. Das kann ich mir nicht so schwer vorstellen. Normale Menüleiste einfach ausblenden, neue Menüleiste erstellen usw Das hätte den Vorteil, dass im Desktop-Modus das Programm mit allen normalen Menüs aufrufbar sein könnte, der eigentliche Code keiner Veränderung bedarf und die Menüanpassung unabhängig von der eigentlichen Programmentwicklung sozusage im Kleinen vorangetrieben werden kann. Als erste Version stelle ich mir einfach einen kurzen Startbidschirm vor, auf dem man herkömmliche oder Android Bedienung auswählt. Fertig. Das zu meiner Idee... Und nun noch meine Frage: Wie zum Henker installiere ich die täglichen Builds? Wenn ich versuche mit Android das Teil herunterzuladen, gibt es eine .txt Endung und dann geht gar nichts mehr damit! Was ich suche ist eine APK, die ich anklicke und die mir dann das ganz normale LibreOffice unter Android installiert. Könnt Ihr mir helfen? Und bitte Mein Englisch ist wirklich nicht zu gebrauchen fürs Computern und dank Beruf ist auch meine Zeit begrenzt mich (noch mehr) durch Texte zu wühlen. Das soll keinesfalls anmassend sein! Ich bin unendlich dankbar, sobald ich den Laptop nicht mehr mitschleppen muß! Vielen Dank für Ihre Aufmerksamkei! Hochachtungsvoll vor dem Spezialwissen anderer in eigener vollkommener Ahnungslosigkeit ob der diversen Lösungen angesprochener Probleme Euer Bernd ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - canvas/source
canvas/source/cairo/cairo_canvasbitmap.cxx | 55 -
1 file changed, 31 insertions(+), 24 deletions(-)
New commits:
commit 83b785e1924e418f98167205cd1b20054feffe3f
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Jun 13 12:47:02 2013 +0200
Add some error handling to bitmap conversion.
Fixup for 7cf2b5809f7137acc7a5eed9159042b3d748da01, makes sure cairo
has all data committed to the surface, and handle random errors.
Conflicts:
canvas/source/cairo/cairo_canvasbitmap.cxx
Change-Id: I39e5b5777968c4563a8ce3870bac3d4182090f3b
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 062af84..59a84d8 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -172,39 +172,46 @@ namespace cairocanvas
::AlphaMask aMask( aSize );
BitmapWriteAccess *pRGBWrite( aRGB.AcquireWriteAccess() );
-BitmapWriteAccess *pMaskWrite( aMask.AcquireWriteAccess() );
-
-unsigned char *pSrc = cairo_image_surface_get_data( pPixels );
-unsigned int nStride = cairo_image_surface_get_stride( pPixels
);
-for( unsigned long y = 0; y (unsigned long) aSize.Height();
y++ )
+if( pRGBWrite )
{
-sal_uInt32 *pPix = (sal_uInt32 *)(pSrc + nStride * y);
-for( unsigned long x = 0; x (unsigned long)
aSize.Width(); x++ )
+BitmapWriteAccess *pMaskWrite( aMask.AcquireWriteAccess()
);
+if( pMaskWrite )
{
-sal_uInt8 nAlpha = (*pPix 24);
-sal_uInt8 nR = (*pPix 16) 0xff;
-sal_uInt8 nG = (*pPix 8) 0xff;
-sal_uInt8 nB = *pPix 0xff;
-if( nAlpha != 0 nAlpha != 255 )
+cairo_surface_flush(pPixels);
+unsigned char *pSrc = cairo_image_surface_get_data(
pPixels );
+unsigned int nStride = cairo_image_surface_get_stride(
pPixels );
+for( unsigned long y = 0; y (unsigned long)
aSize.Height(); y++ )
{
-//fprintf (stderr, From A(0x%.2x) 0x%.2x 0x%.2x
0x%.2x - ,
-// nAlpha, nR, nG, nB );
-// Cairo uses pre-multiplied alpha - we do not =
re-multiply
-nR = (sal_uInt8) MinMax( ((sal_uInt32)nR * 255) /
nAlpha, 0, 255 );
-nG = (sal_uInt8) MinMax( ((sal_uInt32)nG * 255) /
nAlpha, 0, 255 );
-nB = (sal_uInt8) MinMax( ((sal_uInt32)nB * 255) /
nAlpha, 0, 255 );
-//fprintf (stderr, 0x%.2x 0x%.2x 0x%.2x\n, nR,
nG, nB );
+sal_uInt32 *pPix = (sal_uInt32 *)(pSrc + nStride *
y);
+for( unsigned long x = 0; x (unsigned long)
aSize.Width(); x++ )
+{
+sal_uInt8 nAlpha = (*pPix 24);
+sal_uInt8 nR = (*pPix 16) 0xff;
+sal_uInt8 nG = (*pPix 8) 0xff;
+sal_uInt8 nB = *pPix 0xff;
+if( nAlpha != 0 nAlpha != 255 )
+{
+// Cairo uses pre-multiplied alpha - we do
not = re-multiply
+nR = (sal_uInt8) MinMax( ((sal_uInt32)nR *
255) / nAlpha, 0, 255 );
+nG = (sal_uInt8) MinMax( ((sal_uInt32)nG *
255) / nAlpha, 0, 255 );
+nB = (sal_uInt8) MinMax( ((sal_uInt32)nB *
255) / nAlpha, 0, 255 );
+}
+pRGBWrite-SetPixel( y, x, BitmapColor( nR,
nG, nB ) );
+pMaskWrite-SetPixel( y, x, BitmapColor( 255 -
nAlpha ) );
+pPix++;
+}
}
-pRGBWrite-SetPixel( y, x, BitmapColor( nR, nG, nB ) );
-pMaskWrite-SetPixel( y, x, BitmapColor( 255 - nAlpha
) );
-pPix++;
+aMask.ReleaseAccess( pMaskWrite );
}
+aRGB.ReleaseAccess( pRGBWrite );
}
-aMask.ReleaseAccess( pMaskWrite );
-aRGB.ReleaseAccess( pRGBWrite );
+// ignore potential errors above. will get caller a
+// uniformely white bitmap, but not that there would
+// be error handling in calling code ...
::BitmapEx *pBitmapEx = new ::BitmapEx( aRGB, aMask );
+
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - canvas/source
canvas/source/cairo/cairo_canvasbitmap.cxx | 55 -
1 file changed, 31 insertions(+), 24 deletions(-)
New commits:
commit 243e40694936c21b781bf929a7153b1f8cb7f8ae
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Jun 13 12:47:02 2013 +0200
Add some error handling to bitmap conversion.
Fixup for 7cf2b5809f7137acc7a5eed9159042b3d748da01, makes sure cairo
has all data committed to the surface, and handle random errors.
Conflicts:
canvas/source/cairo/cairo_canvasbitmap.cxx
Change-Id: I39e5b5777968c4563a8ce3870bac3d4182090f3b
(cherry picked from commit 83b785e1924e418f98167205cd1b20054feffe3f)
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 062af84..59a84d8 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -172,39 +172,46 @@ namespace cairocanvas
::AlphaMask aMask( aSize );
BitmapWriteAccess *pRGBWrite( aRGB.AcquireWriteAccess() );
-BitmapWriteAccess *pMaskWrite( aMask.AcquireWriteAccess() );
-
-unsigned char *pSrc = cairo_image_surface_get_data( pPixels );
-unsigned int nStride = cairo_image_surface_get_stride( pPixels
);
-for( unsigned long y = 0; y (unsigned long) aSize.Height();
y++ )
+if( pRGBWrite )
{
-sal_uInt32 *pPix = (sal_uInt32 *)(pSrc + nStride * y);
-for( unsigned long x = 0; x (unsigned long)
aSize.Width(); x++ )
+BitmapWriteAccess *pMaskWrite( aMask.AcquireWriteAccess()
);
+if( pMaskWrite )
{
-sal_uInt8 nAlpha = (*pPix 24);
-sal_uInt8 nR = (*pPix 16) 0xff;
-sal_uInt8 nG = (*pPix 8) 0xff;
-sal_uInt8 nB = *pPix 0xff;
-if( nAlpha != 0 nAlpha != 255 )
+cairo_surface_flush(pPixels);
+unsigned char *pSrc = cairo_image_surface_get_data(
pPixels );
+unsigned int nStride = cairo_image_surface_get_stride(
pPixels );
+for( unsigned long y = 0; y (unsigned long)
aSize.Height(); y++ )
{
-//fprintf (stderr, From A(0x%.2x) 0x%.2x 0x%.2x
0x%.2x - ,
-// nAlpha, nR, nG, nB );
-// Cairo uses pre-multiplied alpha - we do not =
re-multiply
-nR = (sal_uInt8) MinMax( ((sal_uInt32)nR * 255) /
nAlpha, 0, 255 );
-nG = (sal_uInt8) MinMax( ((sal_uInt32)nG * 255) /
nAlpha, 0, 255 );
-nB = (sal_uInt8) MinMax( ((sal_uInt32)nB * 255) /
nAlpha, 0, 255 );
-//fprintf (stderr, 0x%.2x 0x%.2x 0x%.2x\n, nR,
nG, nB );
+sal_uInt32 *pPix = (sal_uInt32 *)(pSrc + nStride *
y);
+for( unsigned long x = 0; x (unsigned long)
aSize.Width(); x++ )
+{
+sal_uInt8 nAlpha = (*pPix 24);
+sal_uInt8 nR = (*pPix 16) 0xff;
+sal_uInt8 nG = (*pPix 8) 0xff;
+sal_uInt8 nB = *pPix 0xff;
+if( nAlpha != 0 nAlpha != 255 )
+{
+// Cairo uses pre-multiplied alpha - we do
not = re-multiply
+nR = (sal_uInt8) MinMax( ((sal_uInt32)nR *
255) / nAlpha, 0, 255 );
+nG = (sal_uInt8) MinMax( ((sal_uInt32)nG *
255) / nAlpha, 0, 255 );
+nB = (sal_uInt8) MinMax( ((sal_uInt32)nB *
255) / nAlpha, 0, 255 );
+}
+pRGBWrite-SetPixel( y, x, BitmapColor( nR,
nG, nB ) );
+pMaskWrite-SetPixel( y, x, BitmapColor( 255 -
nAlpha ) );
+pPix++;
+}
}
-pRGBWrite-SetPixel( y, x, BitmapColor( nR, nG, nB ) );
-pMaskWrite-SetPixel( y, x, BitmapColor( 255 - nAlpha
) );
-pPix++;
+aMask.ReleaseAccess( pMaskWrite );
}
+aRGB.ReleaseAccess( pRGBWrite );
}
-aMask.ReleaseAccess( pMaskWrite );
-aRGB.ReleaseAccess( pRGBWrite );
+// ignore potential errors above. will get caller a
+// uniformely white bitmap, but not that there would
+// be error handling in calling code ...
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 20 ---
1 file changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 33e392e7d4fbfc61480751311e7187a5730acc78
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed May 22 11:34:01 2013 +0200
n#816593: Floating table width import fix: adjust the frame width
(cherry picked from commit 9f4c8a8bca06b4c2a916a51909367b453fc41a8b)
Conflicts:
sw/qa/extras/ooxmlimport/data/table_width.docx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 2a5f503..41d2c04 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -774,9 +774,23 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel)
if (xTable.is() xStart.is() xEnd.is())
{
uno::Referencebeans::XPropertySet xTableProperties(xTable,
uno::UNO_QUERY);
-aFrameProperties.realloc(aFrameProperties.getLength() + 1);
-aFrameProperties[aFrameProperties.getLength() - 1].Name = Width;
-aFrameProperties[aFrameProperties.getLength() - 1].Value =
xTableProperties-getPropertyValue(Width);
+sal_Bool bIsRelative = sal_False;
+xTableProperties-getPropertyValue(IsWidthRelative) =
bIsRelative;
+if (!bIsRelative)
+{
+aFrameProperties.realloc(aFrameProperties.getLength() + 1);
+aFrameProperties[aFrameProperties.getLength() - 1].Name =
Width;
+aFrameProperties[aFrameProperties.getLength() - 1].Value =
xTableProperties-getPropertyValue(Width);
+}
+else
+{
+aFrameProperties.realloc(aFrameProperties.getLength() + 1);
+aFrameProperties[aFrameProperties.getLength() - 1].Name =
FrameWidthPercent;
+aFrameProperties[aFrameProperties.getLength() - 1].Value =
xTableProperties-getPropertyValue(RelativeWidth);
+
+// Applying the relative width to the frame, needs to have the
table width to be 100% of the frame width
+xTableProperties-setPropertyValue(RelativeWidth,
uno::makeAny(sal_Int16(100)));
+}
// A non-zero left margin would move the table out of the frame,
move the frame itself instead.
xTableProperties-setPropertyValue(LeftMargin,
uno::makeAny(sal_Int32(0)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/customshapegeometry.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit f3e29add840d5c6db8c1deff6b48b3701991a0ff
Author: Petr Mladek pmla...@suse.cz
Date: Thu Jun 13 14:30:06 2013 +0200
Revert bnc#819614: Fix runaway lines.
It caused several regressions when displaying shapes; for example,
in the test document for bnc#762695:
+ missing hyperboloids on several slides, e.g. 13, 14, 15
+ broken bubles on slide 32
This reverts commit c4345bcf488d24a45a6412cda41474de6baf00da.
diff --git a/oox/source/drawingml/customshapegeometry.cxx
b/oox/source/drawingml/customshapegeometry.cxx
index 55cf132..dada581 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -407,9 +407,8 @@ static EnhancedCustomShapeParameter GetAdjCoordinate(
CustomShapeProperties rCu
n = rValue[ 1 ];
}
if ( ( n = '0' ) ( n = '9' ) )
-{
-// seems to be a ST_Coordinate - convert EMUs to 1/100th mm
-aRet.Value = Any( GetCoordinate( rValue ) );
+{ // seems to be a ST_Coordinate
+aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: src/msodraw.py
src/msodraw.py | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 6428548cfcda4f1ff85cc0189532b6835e661a40
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Jun 13 14:33:18 2013 +0200
msodraw: dump more shape properties
diff --git a/src/msodraw.py b/src/msodraw.py
index d273479..79e27fc 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -687,7 +687,16 @@ class FOPT:
0x0182: ['fillOpacity'],
0x053F: ['Diagram Boolean Properties'],
0x03A9: ['metroBlob', MetroBlob],
-0x0105: ['pibName', PibName]
+0x0105: ['pibName', PibName],
+0x0085: ['WrapText'],
+0x0087: ['anchorText'],
+0x00C2: ['gtextAlign'],
+0x0147: ['adjustValue'],
+0x017F: ['Geometry Boolean Properties'],
+0x0180: ['fillType'],
+0x01C1: ['lineOpacity'],
+0x01D6: ['lineJoinStyle'],
+0x01D7: ['lineEndCapStyle'],
}
class E:
@@ -773,7 +782,7 @@ class FOPT:
if FOPT.propTable.has_key(prop.ID):
recHdl.appendLine('op name=%s value=0x%8.8X/' %
(FOPT.propTable[prop.ID][0], prop.value))
else:
-recHdl.appendLine('op value=0x%8.8X/' % prop.value)
+recHdl.appendLine('op name=todo value=0x%8.8X/'
% prop.value)
if prop.flagComplex:
recHdl.appendLine('todo what=FOPT: fComplex != 0
unhandled/')
recHdl.appendLine('/rgfopte')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - filter/source
filter/source/msfilter/msdffimp.cxx | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 05703e43389312f7e9856733fcb7384122047631
Author: Andre Fischer a...@apache.org
Date: Tue Jul 10 10:01:05 2012 +
bnc#823049 #i119872# Fixed import of custom shapes from PPT.
Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
(cherry picked from commit 5278c7770a350771a96780c0e0d7a0bdae0d55b9)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index c2b67c5..33a5b99 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2253,23 +2253,24 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream rIn, SfxIt
{
rIn nTmp;
nCommand = EnhancedCustomShapeSegmentCommand::UNKNOWN;
-nCnt = (sal_Int16)( nTmp 0xfff );
-switch( nTmp 12 )
+nCnt = (sal_Int16)( nTmp 0x1fff );//Last 13 bits for
segment points number
+switch( nTmp 13 )//First 3 bits for command type
{
case 0x0: nCommand =
EnhancedCustomShapeSegmentCommand::LINETO; if ( !nCnt ) nCnt = 1; break;
-case 0x1: nCommand =
EnhancedCustomShapeSegmentCommand::LINETO; if ( !nCnt ) nCnt = 1; break; //
seems to the relative lineto
-case 0x4: nCommand =
EnhancedCustomShapeSegmentCommand::MOVETO; if ( !nCnt ) nCnt = 1; break;
-case 0x2: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break;
-case 0x3: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break; //
seems to be the relative curveto
-case 0x8: nCommand =
EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nCnt = 0; break;
-case 0x6: nCommand =
EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nCnt = 0; break;
-case 0xa:
-case 0xb:
+case 0x1: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break;
+case 0x2: nCommand =
EnhancedCustomShapeSegmentCommand::MOVETO; if ( !nCnt ) nCnt = 1; break;
+case 0x3: nCommand =
EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nCnt = 0; break;
+case 0x4: nCommand =
EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nCnt = 0; break;
+case 0x5:
+case 0x6:
{
-switch ( ( nTmp 8 ) 0xf )
+switch ( ( nTmp 8 ) 0x1f )//5 bits next to
command type is for path escape type
{
case 0x0:
{
+//It is msopathEscapeExtension which is
transformed into LINETO.
+//If issue happens, I think this part can
be comment so that it will be taken as unknow command.
+//When export, origin data will be export
without any change.
nCommand =
EnhancedCustomShapeSegmentCommand::LINETO;
if ( !nCnt )
nCnt = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - solenv/gbuild svx/source
solenv/gbuild/UIConfig.mk|2 -
svx/source/table/tablecontroller.cxx | 42 +++
2 files changed, 43 insertions(+), 1 deletion(-)
New commits:
commit 14c139e3705c537556f493657f9cb01818d1f80d
Author: David Tardon dtar...@redhat.com
Date: Thu Jun 13 14:47:50 2013 +0200
fdo#62224 set spacing to content too
Change-Id: Idafcd96ff8b01139dfc22cf3d0d2f5e98759488e
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index b01839c..d4aba09 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2596,11 +2596,14 @@ struct LinesState
LinesState(SvxBoxItem rBoxItem_, SvxBoxInfoItem rBoxInfoItem_)
: rBoxItem(rBoxItem_)
, rBoxInfoItem(rBoxInfoItem_)
+, bDistanceIndeterminate(false)
{
std::fill_n(aBorderSet, 4, false);
std::fill_n(aInnerLineSet, 2, false);
std::fill_n(aBorderIndeterminate, 4, false);
std::fill_n(aInnerLineIndeterminate, 2, false);
+std::fill_n(aDistanceSet, 4, false);
+std::fill_n(aDistance, 4, 0);
}
SvxBoxItem rBoxItem;
@@ -2609,6 +2612,9 @@ struct LinesState
bool aInnerLineSet[2];
bool aBorderIndeterminate[4];
bool aInnerLineIndeterminate[2];
+bool aDistanceSet[4];
+sal_uInt16 aDistance[4];
+bool bDistanceIndeterminate;
};
class BoxItemWrapper
@@ -2694,6 +2700,21 @@ void lcl_MergeBorderOrInnerLine(
}
}
+void lcl_MergeDistance(
+LinesState rLinesState, const sal_uInt16 nIndex, const sal_uInt16
nDistance)
+{
+if (rLinesState.aDistanceSet[nIndex])
+{
+if (!rLinesState.bDistanceIndeterminate)
+rLinesState.bDistanceIndeterminate = nDistance !=
rLinesState.aDistance[nIndex];
+}
+else
+{
+rLinesState.aDistance[nIndex] = nDistance;
+rLinesState.aDistanceSet[nIndex] = true;
+}
+}
+
void lcl_MergeCommonBorderAttr(LinesState rLinesState, const SvxBoxItem
rCellBoxItem, const sal_Int32 nCellFlags)
{
if( (nCellFlags (CELL_BEFORE|CELL_AFTER|CELL_UPPER|CELL_LOWER)) != 0 )
@@ -2714,6 +2735,9 @@ void lcl_MergeCommonBorderAttr(LinesState rLinesState,
const SvxBoxItem rCellB
else if( nCellFlags CELL_AFTER )
lcl_MergeBorderLine(rLinesState, rCellBoxItem.GetLeft(),
BOX_LINE_RIGHT, VALID_RIGHT);
}
+
+// NOTE: inner distances for cells outside the selected range
+// are not relevant - we ignore them.
}
else
{
@@ -2723,6 +2747,11 @@ void lcl_MergeCommonBorderAttr(LinesState rLinesState,
const SvxBoxItem rCellB
lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetBottom(),
BOX_LINE_BOTTOM, VALID_BOTTOM, nCellFlags CELL_BOTTOM);
lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetLeft(),
BOX_LINE_LEFT, VALID_LEFT, nCellFlags CELL_LEFT);
lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetRight(),
BOX_LINE_RIGHT, VALID_RIGHT, nCellFlags CELL_RIGHT);
+
+lcl_MergeDistance(rLinesState, BOX_LINE_TOP,
rCellBoxItem.GetDistance(BOX_LINE_TOP));
+lcl_MergeDistance(rLinesState, BOX_LINE_BOTTOM,
rCellBoxItem.GetDistance(BOX_LINE_BOTTOM));
+lcl_MergeDistance(rLinesState, BOX_LINE_LEFT,
rCellBoxItem.GetDistance(BOX_LINE_LEFT));
+lcl_MergeDistance(rLinesState, BOX_LINE_RIGHT,
rCellBoxItem.GetDistance(BOX_LINE_RIGHT));
}
}
@@ -2794,6 +2823,19 @@ void
SvxTableController::FillCommonBorderAttrFromSelectedCells( SvxBoxItem rBox
aLinesState.rBoxInfoItem.SetValid(VALID_HORI);
if (!aLinesState.aInnerLineIndeterminate[BOXINFO_LINE_VERT])
aLinesState.rBoxInfoItem.SetValid(VALID_VERT);
+
+if (!aLinesState.bDistanceIndeterminate)
+{
+if (aLinesState.aDistanceSet[BOX_LINE_TOP])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_TOP],
BOX_LINE_TOP);
+if (aLinesState.aDistanceSet[BOX_LINE_BOTTOM])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_BOTTOM],
BOX_LINE_BOTTOM);
+if (aLinesState.aDistanceSet[BOX_LINE_LEFT])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_LEFT],
BOX_LINE_LEFT);
+if (aLinesState.aDistanceSet[BOX_LINE_RIGHT])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_RIGHT],
BOX_LINE_RIGHT);
+aLinesState.rBoxInfoItem.SetValid(VALID_DISTANCE);
+}
}
}
}
commit 118141cb83b6f8771f47dd4d685529f81a32eac3
Author: David Tardon dtar...@redhat.com
Date: Thu Jun 13 10:36:05 2013 +0200
gbuild: fix output
Change-Id: Ifbe4a0b6b93c5be6dfd64b6c77ef7172d3f1c425
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 82ff5a7..d76d5dd 100644
--- a/solenv/gbuild/UIConfig.mk
+++
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/table/tablecontroller.cxx | 42 +++
1 file changed, 42 insertions(+)
New commits:
commit 36ecf35102c619b4747fc7ae9af49d4ad052ad8a
Author: David Tardon dtar...@redhat.com
Date: Thu Jun 13 14:47:50 2013 +0200
fdo#62224 set spacing to content too
Change-Id: Idafcd96ff8b01139dfc22cf3d0d2f5e98759488e
(cherry picked from commit 14c139e3705c537556f493657f9cb01818d1f80d)
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index b91ea92..937489e 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2596,11 +2596,14 @@ struct LinesState
LinesState(SvxBoxItem rBoxItem_, SvxBoxInfoItem rBoxInfoItem_)
: rBoxItem(rBoxItem_)
, rBoxInfoItem(rBoxInfoItem_)
+, bDistanceIndeterminate(false)
{
std::fill_n(aBorderSet, 4, false);
std::fill_n(aInnerLineSet, 2, false);
std::fill_n(aBorderIndeterminate, 4, false);
std::fill_n(aInnerLineIndeterminate, 2, false);
+std::fill_n(aDistanceSet, 4, false);
+std::fill_n(aDistance, 4, 0);
}
SvxBoxItem rBoxItem;
@@ -2609,6 +2612,9 @@ struct LinesState
bool aInnerLineSet[2];
bool aBorderIndeterminate[4];
bool aInnerLineIndeterminate[2];
+bool aDistanceSet[4];
+sal_uInt16 aDistance[4];
+bool bDistanceIndeterminate;
};
class BoxItemWrapper
@@ -2694,6 +2700,21 @@ void lcl_MergeBorderOrInnerLine(
}
}
+void lcl_MergeDistance(
+LinesState rLinesState, const sal_uInt16 nIndex, const sal_uInt16
nDistance)
+{
+if (rLinesState.aDistanceSet[nIndex])
+{
+if (!rLinesState.bDistanceIndeterminate)
+rLinesState.bDistanceIndeterminate = nDistance !=
rLinesState.aDistance[nIndex];
+}
+else
+{
+rLinesState.aDistance[nIndex] = nDistance;
+rLinesState.aDistanceSet[nIndex] = true;
+}
+}
+
void lcl_MergeCommonBorderAttr(LinesState rLinesState, const SvxBoxItem
rCellBoxItem, const sal_Int32 nCellFlags)
{
if( (nCellFlags (CELL_BEFORE|CELL_AFTER|CELL_UPPER|CELL_LOWER)) != 0 )
@@ -2714,6 +2735,9 @@ void lcl_MergeCommonBorderAttr(LinesState rLinesState,
const SvxBoxItem rCellB
else if( nCellFlags CELL_AFTER )
lcl_MergeBorderLine(rLinesState, rCellBoxItem.GetLeft(),
BOX_LINE_RIGHT, VALID_RIGHT);
}
+
+// NOTE: inner distances for cells outside the selected range
+// are not relevant - we ignore them.
}
else
{
@@ -2723,6 +2747,11 @@ void lcl_MergeCommonBorderAttr(LinesState rLinesState,
const SvxBoxItem rCellB
lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetBottom(),
BOX_LINE_BOTTOM, VALID_BOTTOM, nCellFlags CELL_BOTTOM);
lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetLeft(),
BOX_LINE_LEFT, VALID_LEFT, nCellFlags CELL_LEFT);
lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetRight(),
BOX_LINE_RIGHT, VALID_RIGHT, nCellFlags CELL_RIGHT);
+
+lcl_MergeDistance(rLinesState, BOX_LINE_TOP,
rCellBoxItem.GetDistance(BOX_LINE_TOP));
+lcl_MergeDistance(rLinesState, BOX_LINE_BOTTOM,
rCellBoxItem.GetDistance(BOX_LINE_BOTTOM));
+lcl_MergeDistance(rLinesState, BOX_LINE_LEFT,
rCellBoxItem.GetDistance(BOX_LINE_LEFT));
+lcl_MergeDistance(rLinesState, BOX_LINE_RIGHT,
rCellBoxItem.GetDistance(BOX_LINE_RIGHT));
}
}
@@ -2795,6 +2824,19 @@ void
SvxTableController::FillCommonBorderAttrFromSelectedCells( SvxBoxItem rBox
aLinesState.rBoxInfoItem.SetValid(VALID_HORI);
if (!aLinesState.aInnerLineIndeterminate[BOXINFO_LINE_VERT])
aLinesState.rBoxInfoItem.SetValid(VALID_VERT);
+
+if (!aLinesState.bDistanceIndeterminate)
+{
+if (aLinesState.aDistanceSet[BOX_LINE_TOP])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_TOP],
BOX_LINE_TOP);
+if (aLinesState.aDistanceSet[BOX_LINE_BOTTOM])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_BOTTOM],
BOX_LINE_BOTTOM);
+if (aLinesState.aDistanceSet[BOX_LINE_LEFT])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_LEFT],
BOX_LINE_LEFT);
+if (aLinesState.aDistanceSet[BOX_LINE_RIGHT])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_RIGHT],
BOX_LINE_RIGHT);
+aLinesState.rBoxInfoItem.SetValid(VALID_DISTANCE);
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 62224, which changed state. Bug 62224 Summary: Border Values changes on reopening the format cells Widget in impress https://bugs.freedesktop.org/show_bug.cgi?id=62224 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - libcmis/libcmis-0.3.0.patch
libcmis/libcmis-0.3.0.patch | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit 6b10219eefc0d6bd0e871976d6fe781a26020c8b
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jun 13 14:45:48 2013 +0200
Fixed libcmis handling of related multipart content types
Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index 37644c8..772c828 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -33,3 +33,17 @@ index 7c2a8e6..e7014cb 100644
contentLength = it-second-getLongs( ).front( );
return contentLength;
}
+diff --git src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+index ef91b4d..3a990e7 100644
+--- src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+@@ -93,6 +93,8 @@ RelatedMultipart::RelatedMultipart( const string body,
const string contentTyp
+ if ( value[0] == '' value[value.length() - 1] == '' )
+ value = value.substr( 1, value.length( ) - 2 );
+
++name = libcmis::trim( name );
++
+ if ( name == start )
+ {
+ m_startId = value;
+--
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/ooinstall |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c7157dd841c4737bfd5db5af21f093e0373a229a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jun 13 14:53:28 2013 +0200
Change the paths to ones that exist
Change-Id: I60de04bba401632b01f0da7b772a91a98de5ff07
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 59335e8..f2606f3 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -86,8 +86,8 @@ if (defined $ENV{DESTDIR}
$msi='';
if ($is_windows) {
-$msi = -msitemplate
$ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/openoffice/msi_templates .
- -msilanguage
$ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/win_ulffiles;
+$msi = -msitemplate
$ENV{SRC_ROOT}/workdir/$ENV{INPATH}/CustomTarget/instsetoo_native/install/msi_templates
.
+ -msilanguage
$ENV{SRC_ROOT}/workdir/$ENV{INPATH}/CustomTarget/instsetoo_native/install/win_ulffiles;
}
# FIXME: a better solution would be to fix installer to deal with broken
symlinks
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libcmis/libcmis-0.3.0.patch
libcmis/libcmis-0.3.0.patch | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit 6ed3ef87d2472bad71b719e9ec927e72acfd2850
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jun 13 14:45:48 2013 +0200
Fixed libcmis handling of related multipart content types
Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
(cherry picked from commit 6b10219eefc0d6bd0e871976d6fe781a26020c8b)
diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index 37644c8..772c828 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -33,3 +33,17 @@ index 7c2a8e6..e7014cb 100644
contentLength = it-second-getLongs( ).front( );
return contentLength;
}
+diff --git src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+index ef91b4d..3a990e7 100644
+--- src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+@@ -93,6 +93,8 @@ RelatedMultipart::RelatedMultipart( const string body,
const string contentTyp
+ if ( value[0] == '' value[value.length() - 1] == '' )
+ value = value.substr( 1, value.length( ) - 2 );
+
++name = libcmis::trim( name );
++
+ if ( name == start )
+ {
+ m_startId = value;
+--
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - 2 commits - chart2/source
chart2/source/view/axes/VCartesianAxis.cxx | 39 -
1 file changed, 33 insertions(+), 6 deletions(-)
New commits:
commit b0b34a50952dbbffb79ffa6cbe81dbc83743c8e9
Author: Muthu Subramanian sumu...@suse.com
Date: Thu May 2 17:06:48 2013 +0530
n#816939: Improved label overlap detection - Part 2
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 261b23e..eb7efa8 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -137,6 +137,19 @@ bool lcl_doesShapeOverlapWithTickmark( const Reference
drawing::XShape xShap
return aShapeRect.isInside(aPosition);
}
+void lcl_getRotatedPolygon( B2DPolygon aPoly, const ::basegfx::B2DRectangle
aRect, const awt::Point aPos, const double fRotationAngleDegree )
+{
+::basegfx::B2DHomMatrix aMatrix;
+
+aPoly = basegfx::tools::createPolygonFromRect( aRect );
+aMatrix.translate( -aRect.getWidth()/2, -aRect.getHeight()/2);
+aMatrix.rotate( fRotationAngleDegree*M_PI/180.0 );
+aPoly.transform( aMatrix );
+aMatrix = ::basegfx::B2DHomMatrix();
+aMatrix.translate( aRect.getWidth()/2+aPos.X, aRect.getHeight()/2+aPos.Y);
+aPoly.transform( aMatrix );
+}
+
bool doesOverlap( const Reference drawing::XShape xShape1
, const Reference drawing::XShape xShape2
, double fRotationAngleDegree )
@@ -144,15 +157,13 @@ bool doesOverlap( const Reference drawing::XShape
xShape1
if( !xShape1.is() || !xShape2.is() )
return false;
-::basegfx::B2DRectangle aRect1( BaseGFXHelper::makeRectangle(
xShape1-getPosition(), ShapeFactory::getSizeAfterRotation( xShape1, 0 ) ));
-::basegfx::B2DRectangle aRect2( BaseGFXHelper::makeRectangle(
xShape2-getPosition(), ShapeFactory::getSizeAfterRotation( xShape2, 0 ) ));
+::basegfx::B2DRectangle aRect1( BaseGFXHelper::makeRectangle(
awt::Point(0,0), xShape1-getSize()));
+::basegfx::B2DRectangle aRect2( BaseGFXHelper::makeRectangle(
awt::Point(0,0), xShape2-getSize()));
-B2DPolygon aPoly1 = basegfx::tools::createPolygonFromRect( aRect1 );
-B2DPolygon aPoly2 = basegfx::tools::createPolygonFromRect( aRect2 );
-::basegfx::B2DHomMatrix aMatrix;
-aMatrix.rotate( fRotationAngleDegree );
-aPoly1.transform( aMatrix );
-aPoly2.transform( aMatrix );
+B2DPolygon aPoly1;
+B2DPolygon aPoly2;
+lcl_getRotatedPolygon( aPoly1, aRect1, xShape1-getPosition(),
fRotationAngleDegree );
+lcl_getRotatedPolygon( aPoly2, aRect2, xShape2-getPosition(),
fRotationAngleDegree );
B2DPolyPolygon aPolyPoly1, aPolyPoly2;
aPolyPoly1.append( aPoly1 );
commit 598873a09c0cc308e6687c570ce1651da27cd47d
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Apr 30 10:14:54 2013 +0530
n#816939: Improved label overlap detection.
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 40b4886..261b23e 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -43,6 +43,11 @@
#include algorithm
#include boost/scoped_ptr.hpp
+#include basegfx/polygon/b2dpolygon.hxx
+#include basegfx/polygon/b2dpolypolygon.hxx
+#include basegfx/polygon/b2dpolygontools.hxx
+#include basegfx/polygon/b2dpolygonclipper.hxx
+#include basegfx/matrix/b2dhommatrix.hxx
//.
namespace chart
@@ -52,6 +57,8 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using namespace ::rtl::math;
using ::com::sun::star::uno::Reference;
+using ::basegfx::B2DPolygon;
+using ::basegfx::B2DPolyPolygon;
//-
//-
@@ -137,14 +144,22 @@ bool doesOverlap( const Reference drawing::XShape
xShape1
if( !xShape1.is() || !xShape2.is() )
return false;
-sal_Int32 nAngle = abs(fRotationAngleDegree);
+::basegfx::B2DRectangle aRect1( BaseGFXHelper::makeRectangle(
xShape1-getPosition(), ShapeFactory::getSizeAfterRotation( xShape1, 0 ) ));
+::basegfx::B2DRectangle aRect2( BaseGFXHelper::makeRectangle(
xShape2-getPosition(), ShapeFactory::getSizeAfterRotation( xShape2, 0 ) ));
-if( ( nAngle = 45 nAngle = 135 ) || ( nAngle = 225 nAngle = 315
) )
-return false;
+B2DPolygon aPoly1 = basegfx::tools::createPolygonFromRect( aRect1 );
+B2DPolygon aPoly2 = basegfx::tools::createPolygonFromRect( aRect2 );
+::basegfx::B2DHomMatrix aMatrix;
+aMatrix.rotate( fRotationAngleDegree );
+aPoly1.transform( aMatrix );
+aPoly2.transform( aMatrix );
+
+B2DPolyPolygon aPolyPoly1, aPolyPoly2;
+aPolyPoly1.append( aPoly1 );
+aPolyPoly2.append( aPoly2 );
+B2DPolyPolygon overlapPoly =
::basegfx::tools::clipPolyPolygonOnPolyPolygon(
[PATCH libreoffice-4-0] Fixed libcmis handling of related multipart content types
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4241
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/4241/1
Fixed libcmis handling of related multipart content types
Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
(cherry picked from commit 6b10219eefc0d6bd0e871976d6fe781a26020c8b)
(cherry picked from commit 6ed3ef87d2472bad71b719e9ec927e72acfd2850)
---
M libcmis/libcmis-0.3.0.patch
1 file changed, 14 insertions(+), 0 deletions(-)
diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index 37644c8..772c828 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -33,3 +33,17 @@
contentLength = it-second-getLongs( ).front( );
return contentLength;
}
+diff --git src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+index ef91b4d..3a990e7 100644
+--- src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+@@ -93,6 +93,8 @@ RelatedMultipart::RelatedMultipart( const string body,
const string contentTyp
+ if ( value[0] == '' value[value.length() - 1] == '' )
+ value = value.substr( 1, value.length( ) - 2 );
+
++name = libcmis::trim( name );
++
+ if ( name == start )
+ {
+ m_startId = value;
+--
--
To view, visit https://gerrit.libreoffice.org/4241
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/misc/docfnote.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit c0ec2caf1b35c5bc296f0ce86082eb0a6e2b19b2 Author: László Németh nem...@numbertext.org Date: Wed Jun 12 11:22:27 2013 +0200 fdo#65666 keep tab characters in footnote settings (Begin/After) Change-Id: I3fbd0f2dea5926981c0cd351c3235f6b61e66aaa Reviewed-on: https://gerrit.libreoffice.org/4234 Reviewed-by: Németh László nem...@numbertext.org Tested-by: Németh László nem...@numbertext.org Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 70741dd..63f1dc9 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -162,8 +162,8 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet ) // art m_pNumViewBox-SelectNumberingType( pInf-aFmt.GetNumberingType()); m_pOffsetFld-SetValue(pInf-nFtnOffset + 1); -m_pPrefixED-SetText(pInf-GetPrefix()); -m_pSuffixED-SetText(pInf-GetSuffix()); +m_pPrefixED-SetText(pInf-GetPrefix().replaceAll(\t, \\t)); // fdo#65666 +m_pSuffixED-SetText(pInf-GetSuffix().replaceAll(\t, \\t)); const SwCharFmt* pCharFmt = pInf-GetCharFmt( *pSh-GetView().GetDocShell()-GetDoc()); @@ -368,8 +368,8 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet ) pInf-nFtnOffset = static_cast sal_uInt16 (m_pOffsetFld-GetValue() -1); pInf-aFmt.SetNumberingType(m_pNumViewBox-GetSelectedNumberingType() ); -pInf-SetPrefix(m_pPrefixED-GetText()); -pInf-SetSuffix(m_pSuffixED-GetText()); +pInf-SetPrefix(m_pPrefixED-GetText().replaceAll(\\t, \t)); +pInf-SetSuffix(m_pSuffixED-GetText().replaceAll(\\t, \t)); pInf-SetCharFmt( lcl_GetCharFormat( pSh, m_pFtnCharTextTemplBox-GetSelectEntry() ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-1] fdo#65666 keep tab characters in footnote settings (Begin/Af...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4234 Approvals: Németh László: Verified; Looks good to me, but someone else must approve Andras Timar: Verified; Looks good to me, approved Objections: Miklos Vajna: This need some tweaks before it is merged -- To view, visit https://gerrit.libreoffice.org/4234 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fbd0f2dea5926981c0cd351c3235f6b61e66aaa Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Németh László nem...@numbertext.org Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Németh László nem...@numbertext.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] String-OUString unotools's pathoptions and related stuff
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4244
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/4244/1
String-OUString unotools's pathoptions and related stuff
Change-Id: Id301c9b224eaa4c7deb2532cf57ece5d876aebf5
---
M basic/source/basmgr/basmgr.cxx
M include/unotools/pathoptions.hxx
M sw/source/core/doc/tblafmt.cxx
M sw/source/filter/html/swhtml.cxx
M sw/source/ui/config/uinums.cxx
M sw/source/ui/dbui/mmlayoutpage.hxx
M sw/source/ui/inc/unotools.hxx
M sw/source/ui/index/cnttab.cxx
M sw/source/ui/utlui/unotools.cxx
M unotools/source/config/pathoptions.cxx
10 files changed, 167 insertions(+), 168 deletions(-)
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 8f52b1f..9d2fdbd 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -883,9 +883,8 @@
{
// Search lib in path
OUString aSearchFile = pInfo-GetRelStorageName();
-String aSearchFileOldFormat(aSearchFile);
SvtPathOptions aPathCFG;
-if( aPathCFG.SearchFile( aSearchFileOldFormat,
SvtPathOptions::PATH_BASIC ) )
+if( aPathCFG.SearchFile( aSearchFile,
SvtPathOptions::PATH_BASIC ) )
{
pInfo-SetStorageName( aSearchFile );
}
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index 8b5f9da..03d19d8 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -68,59 +68,59 @@
virtual ~SvtPathOptions();
// get the paths, not const because of using a mutex
-const String GetAddinPath() const;
-const String GetAutoCorrectPath() const;
-const String GetAutoTextPath() const;
-const String GetBackupPath() const;
-const String GetBasicPath() const;
-const String GetBitmapPath() const;
-const String GetConfigPath() const;
-const String GetDictionaryPath() const;
-const String GetFavoritesPath() const;
-const String GetFilterPath() const;
-const String GetGalleryPath() const;
-const String GetGraphicPath() const;
-const String GetHelpPath() const;
-const String GetLinguisticPath() const;
-const String GetModulePath() const;
-const String GetPalettePath() const;
-const String GetPluginPath() const;
-const String GetStoragePath() const;
-const String GetTempPath() const;
-const String GetTemplatePath() const;
-const String GetUserConfigPath() const;
-const String GetWorkPath() const;
-const String GetUIConfigPath() const;
-const String GetFingerprintPath() const;
+const OUString GetAddinPath() const;
+const OUString GetAutoCorrectPath() const;
+const OUString GetAutoTextPath() const;
+const OUString GetBackupPath() const;
+const OUString GetBasicPath() const;
+const OUString GetBitmapPath() const;
+const OUString GetConfigPath() const;
+const OUString GetDictionaryPath() const;
+const OUString GetFavoritesPath() const;
+const OUString GetFilterPath() const;
+const OUString GetGalleryPath() const;
+const OUString GetGraphicPath() const;
+const OUString GetHelpPath() const;
+const OUString GetLinguisticPath() const;
+const OUString GetModulePath() const;
+const OUString GetPalettePath() const;
+const OUString GetPluginPath() const;
+const OUString GetStoragePath() const;
+const OUString GetTempPath() const;
+const OUString GetTemplatePath() const;
+const OUString GetUserConfigPath() const;
+const OUString GetWorkPath() const;
+const OUString GetUIConfigPath() const;
+const OUString GetFingerprintPath() const;
// set the paths
-voidSetAddinPath( const String rPath );
-voidSetAutoCorrectPath( const String rPath );
-voidSetAutoTextPath( const String rPath );
-voidSetBackupPath( const String rPath );
-voidSetBasicPath( const String rPath );
-voidSetBitmapPath( const String rPath );
-voidSetConfigPath( const String rPath );
-voidSetDictionaryPath( const String rPath );
-voidSetFavoritesPath( const String rPath );
-voidSetFilterPath( const String rPath );
-voidSetGalleryPath( const String rPath );
-voidSetGraphicPath( const String rPath );
-voidSetHelpPath( const String rPath );
-voidSetLinguisticPath( const String rPath );
-voidSetModulePath( const String rPath );
-voidSetPalettePath( const String rPath );
-voidSetPluginPath( const String rPath );
-voidSetStoragePath( const String rPath );
-voidSetTempPath( const
[PATCH] String-OUString unotools syslocaloptions and related
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4246
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/4246/1
String-OUString unotools syslocaloptions and related
Change-Id: I9e04db9f7352e3f9c43f240390c21665f8e2e8b3
---
M cui/source/options/optgdlg.cxx
M include/unotools/defaultoptions.hxx
M include/unotools/syslocaleoptions.hxx
M svl/source/numbers/zforlist.cxx
M unotools/source/config/defaultoptions.cxx
M unotools/source/config/syslocaleoptions.cxx
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 12a46f0..e397236 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1443,7 +1443,7 @@
LocaleSettingHdl(m_pLocaleSettingLB);
// configured currency, for example, USD-en-US or EUR-de-DE, or empty for
locale default
-String aAbbrev;
+OUString aAbbrev;
LanguageType eLang;
const NfCurrencyEntry* pCurr = NULL;
sLang = pLangConfig-aSysLocaleOptions.GetCurrencyConfigString();
diff --git a/include/unotools/defaultoptions.hxx
b/include/unotools/defaultoptions.hxx
index 175fd32..b548241 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.hxx
@@ -19,11 +19,11 @@
#ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
#define INCLUDED_unotools_DEFAULTOPTIONS_HXX
+#include rtl/ustring.hxx
#include unotools/unotoolsdllapi.h
#include tools/solar.h
#include unotools/options.hxx
-class String;
class SvtDefaultOptions_Impl;
// class SvtDefaultOptions ---
@@ -39,7 +39,7 @@
SvtDefaultOptions();
virtual ~SvtDefaultOptions();
-String GetDefaultPath( sal_uInt16 nId ) const;
+OUString GetDefaultPath( sal_uInt16 nId ) const;
};
#endif // #ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
diff --git a/include/unotools/syslocaleoptions.hxx
b/include/unotools/syslocaleoptions.hxx
index 8c93789..53a5434 100644
--- a/include/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
@@ -133,17 +133,17 @@
/// Get currency abbreviation and locale from an USD-en-US or EUR-de-DE
string
static voidGetCurrencyAbbrevAndLanguage(
-String rAbbrev,
+OUString rAbbrev,
LanguageType eLang,
const OUString rConfigString );
/// Create an USD-en-US or EUR-de-DE string
static OUString CreateCurrencyConfigString(
-const String rAbbrev,
+const OUString rAbbrev,
LanguageType eLang );
voidGetCurrencyAbbrevAndLanguage(
-String rAbbrev,
+OUString rAbbrev,
LanguageType eLang ) const
{
GetCurrencyAbbrevAndLanguage( rAbbrev,
@@ -151,7 +151,7 @@
}
voidSetCurrencyAbbrevAndLanguage(
-const String rAbbrev,
+const OUString rAbbrev,
LanguageType eLang )
{
SetCurrencyConfigString(
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index ae0a163..f591e94 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3274,7 +3274,7 @@
IMPL_STATIC_LINK_NOINSTANCE( SvNumberFormatter, CurrencyChangeLink,
SAL_UNUSED_PARAMETER void*, EMPTYARG )
{
::osl::MutexGuard aGuard( GetMutex() );
-String aAbbrev;
+OUString aAbbrev;
LanguageType eLang = LANGUAGE_SYSTEM;
SvtSysLocaleOptions().GetCurrencyAbbrevAndLanguage( aAbbrev, eLang );
SetDefaultSystemCurrency( aAbbrev, eLang );
@@ -3704,7 +3704,7 @@
::comphelper::getProcessComponentContext(),
SvtSysLocale().GetLanguageTag() );
// get user configured currency
-String aConfiguredCurrencyAbbrev;
+OUString aConfiguredCurrencyAbbrev;
LanguageType eConfiguredCurrencyLanguage = LANGUAGE_SYSTEM;
SvtSysLocaleOptions().GetCurrencyAbbrevAndLanguage(
aConfiguredCurrencyAbbrev, eConfiguredCurrencyLanguage );
@@ -3755,7 +3755,7 @@
lcl_CheckCurrencySymbolPosition( *pEntry );
}
rCurrencyTable.insert( rCurrencyTable.begin() + nCurrencyPos++, pEntry
);
-if ( !nSystemCurrencyPosition (aConfiguredCurrencyAbbrev.Len() ?
+if ( !nSystemCurrencyPosition (!aConfiguredCurrencyAbbrev.isEmpty()
?
[PATCH] String-OUString unotools, ucbstreamhelper
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4245
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/4245/1
String-OUString unotools, ucbstreamhelper
Change-Id: I0e16761b2a4937df15a2746767653fd6898f2366
---
M include/tools/StringListResource.hxx
M include/unotools/ucbstreamhelper.hxx
M unotools/source/ucbhelper/ucbstreamhelper.cxx
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/include/tools/StringListResource.hxx
b/include/tools/StringListResource.hxx
index 52f22e4..e443b43 100644
--- a/include/tools/StringListResource.hxx
+++ b/include/tools/StringListResource.hxx
@@ -34,7 +34,7 @@
sal_uInt16 i = 1;
while( IsAvailableRes(ResId(i,*m_pResMgr).SetRT(RSC_STRING)) )
{
-String sStr = String(ResId(i,*m_pResMgr));
+OUString sStr = OUString(ResId(i,*m_pResMgr));
_rToFill.push_back(sStr);
++i;
}
diff --git a/include/unotools/ucbstreamhelper.hxx
b/include/unotools/ucbstreamhelper.hxx
index 85de1f3..868dd8a 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -45,7 +45,6 @@
}
}
-class String;
namespace utl
{
class UcbLockBytesHandler;
@@ -53,12 +52,12 @@
class UNOTOOLS_DLLPUBLIC UcbStreamHelper : public SvStream
{
public:
-static SvStream*CreateStream( const String rFileName, StreamMode
eOpenMode,
+static SvStream*CreateStream( const OUString rFileName,
StreamMode eOpenMode,
UcbLockBytesHandler* pHandler=0 );
-static SvStream*CreateStream( const String rFileName, StreamMode
eOpenMode,
+static SvStream*CreateStream( const OUString rFileName,
StreamMode eOpenMode,
::com::sun::star::uno::Reference
::com::sun::star::task::XInteractionHandler ,
UcbLockBytesHandler* pHandler=0 );
-static SvStream*CreateStream( const String rFileName, StreamMode
eOpenMode,
+static SvStream*CreateStream( const OUString rFileName,
StreamMode eOpenMode,
sal_Bool bFileExists,
UcbLockBytesHandler* pHandler=0 );
static SvStream*CreateStream( ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream xStream );
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx
b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 1c9e39d..996be34 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -40,7 +40,7 @@
namespace utl
{
-static SvStream* lcl_CreateStream( const String rFileName, StreamMode
eOpenMode,
+static SvStream* lcl_CreateStream( const OUString rFileName, StreamMode
eOpenMode,
Reference XInteractionHandler xInteractionHandler,
UcbLockBytesHandler* pHandler, sal_Bool bEnsureFileExists )
{
@@ -140,20 +140,20 @@
//
-SvStream* UcbStreamHelper::CreateStream( const String rFileName, StreamMode
eOpenMode,
+SvStream* UcbStreamHelper::CreateStream( const OUString rFileName, StreamMode
eOpenMode,
UcbLockBytesHandler* pHandler )
{
return lcl_CreateStream( rFileName, eOpenMode, Reference
XInteractionHandler (), pHandler, sal_True /* bEnsureFileExists */ );
}
-SvStream* UcbStreamHelper::CreateStream( const String rFileName, StreamMode
eOpenMode,
+SvStream* UcbStreamHelper::CreateStream( const OUString rFileName, StreamMode
eOpenMode,
Reference XInteractionHandler xInteractionHandler,
UcbLockBytesHandler* pHandler )
{
return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler,
pHandler, sal_True /* bEnsureFileExists */ );
}
-SvStream* UcbStreamHelper::CreateStream( const String rFileName, StreamMode
eOpenMode,
+SvStream* UcbStreamHelper::CreateStream( const OUString rFileName, StreamMode
eOpenMode,
sal_Bool bFileExists,
UcbLockBytesHandler* pHandler )
{
--
To view, visit https://gerrit.libreoffice.org/4245
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e16761b2a4937df15a2746767653fd6898f2366
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] String=OUString and sal_Bool=bool for the module sot
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4250 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/4250/1 String=OUString and sal_Bool=bool for the module sot Change-Id: Ie5a88609722fba861b52e9530e8f7e83dee57f4b --- M framework/inc/classes/droptargetlistener.hxx M include/sfx2/lnkbase.hxx M include/sfx2/objsh.hxx M include/sot/exchange.hxx M include/sot/factory.hxx M include/sot/filelist.hxx M include/sot/object.hxx M include/sot/stg.hxx M include/sot/storage.hxx M include/sot/storinfo.hxx M sfx2/source/doc/objxtor.cxx M sot/qa/cppunit/test_sot.cxx M sot/source/base/exchange.cxx M sot/source/base/factory.cxx M sot/source/base/filelist.cxx M sot/source/base/formats.cxx M sot/source/base/object.cxx M sot/source/sdstor/stg.cxx M sot/source/sdstor/stgcache.cxx M sot/source/sdstor/stgcache.hxx M sot/source/sdstor/stgdir.cxx M sot/source/sdstor/stgdir.hxx M sot/source/sdstor/stgelem.cxx M sot/source/sdstor/stgelem.hxx M sot/source/sdstor/stgio.cxx M sot/source/sdstor/stgio.hxx M sot/source/sdstor/stgole.cxx M sot/source/sdstor/stgole.hxx M sot/source/sdstor/stgstrms.hxx M sot/source/sdstor/storage.cxx M sot/source/sdstor/storinfo.cxx M sot/source/sdstor/ucbstorage.cxx 32 files changed, 1,023 insertions(+), 1,018 deletions(-) -- To view, visit https://gerrit.libreoffice.org/4250 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5a88609722fba861b52e9530e8f7e83dee57f4b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Strin-OUString unotools textsearch and dep
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4249
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/4249/1
Strin-OUString unotools textsearch and dep
Change-Id: I1934ba31b966ee79f10e200c37c8db4924272cb4
---
M editeng/source/editeng/impedit4.cxx
M include/unotools/textsearch.hxx
M reportdesign/source/ui/inspection/GeometryHandler.cxx
M sc/source/core/data/table3.cxx
M sc/source/core/data/table6.cxx
M sc/source/core/tool/interpr1.cxx
M svx/source/form/fmsrcimp.cxx
M sw/source/core/crsr/findtxt.cxx
M sw/source/core/crsr/paminit.cxx
M sw/source/core/inc/pamtyp.hxx
M unotools/source/config/fontcfg.cxx
M unotools/source/i18n/textsearch.cxx
M unotools/source/misc/fontdefs.cxx
M vcl/source/edit/xtextedt.cxx
14 files changed, 135 insertions(+), 215 deletions(-)
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 69fac7d..306f056 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -84,13 +84,6 @@
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::linguistic2;
-void Swapsal_uIt16s( sal_uInt16 rX, sal_uInt16 rY )
-{
-sal_uInt16 n = rX;
-rX = rY;
-rY = n;
-}
-
EditPaM ImpEditEngine::Read( SvStream rInput, const String rBaseURL,
EETextFormat eFormat, EditSelection aSel, SvKeyValueIterator* pHTTPHeaderAttrs )
{
sal_Bool _bUpdate = GetUpdateMode();
@@ -2611,8 +2604,8 @@
ContentNode* pNode = aEditDoc.GetObject( nNode );
-sal_uInt16 nStartPos = 0;
-sal_uInt16 nEndPos = pNode-Len();
+sal_Int32 nStartPos = 0;
+sal_Int32 nEndPos = (sal_Int32)pNode-Len();
if ( nNode == nStartNode )
{
if ( bBack )
@@ -2633,11 +2626,11 @@
bool bFound = false;
if ( bBack )
{
-Swapsal_uIt16s( nStartPos, nEndPos );
-bFound = aSearcher.SearchBkwrd( aParaStr, nStartPos, nEndPos);
+{sal_Int32 nt = nStartPos; nStartPos = nEndPos; nEndPos = nt;}
+bFound = aSearcher.SearchBackward( aParaStr, nStartPos, nEndPos);
}
else
-bFound = aSearcher.SearchFrwrd( aParaStr, nStartPos, nEndPos);
+bFound = aSearcher.SearchForward( aParaStr, nStartPos, nEndPos);
if ( bFound )
{
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 1a07e8b..31c1a0e 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -159,16 +159,9 @@
search forward: start = end
search backward: end = start
*/
-int SearchFrwrd( const String rStr,
-xub_StrLen* pStart, xub_StrLen* pEnde,
-::com::sun::star::util::SearchResult* pSrchResult = 0 );
bool SearchForward( const OUString rStr,
sal_Int32* pStart, sal_Int32* pEnd,
::com::sun::star::util::SearchResult* pRes = 0 );
-int SearchBkwrd( const String rStr,
-xub_StrLen* pStart, xub_StrLen* pEnde,
-::com::sun::star::util::SearchResult* pSrchResult = 0 );
-
bool SearchBackward( const OUString rStr,
sal_Int32* pStart, sal_Int32* pEnde,
::com::sun::star::util::SearchResult* pSrchResult = 0
);
@@ -177,7 +170,7 @@
const ::com::sun::star::lang::Locale rLocale );
/* replace back references in the replace string by the sub expressions
from the search result */
-void ReplaceBackReferences( String rReplaceStr, const String rStr, const
::com::sun::star::util::SearchResult rResult );
+void ReplaceBackReferences( OUString rReplaceStr, const OUString rStr,
const ::com::sun::star::util::SearchResult rResult );
};
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 5831490..b2bdc35 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -2088,9 +2088,9 @@
aSearchOptions.searchFlag = 0x0100;
aSearchOptions.searchString = m_aCounterFunction.m_sSearchString;
utl::TextSearch aTextSearch(aSearchOptions);
-xub_StrLen start = 0;
-xub_StrLen end = sFormula.Len();
-if ( aTextSearch.SearchFrwrd(sFormula,start,end) start == 0
end == sFormula.Len()) // counter function found
+sal_Int32 start = 0;
+sal_Int32 end = (sal_Int32)sFormula.Len();
+if ( aTextSearch.SearchForward(sFormula, start, end) start ==
0 end == (sal_Int32)sFormula.Len()) // counter function found
{
const uno::Reference report::XGroup
xGroup(aFind.first-second.second,uno::UNO_QUERY);
if ( xGroup.is() )
diff --git
[PATCH] String-OUString few more from unotools
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4247
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/4247/1
String-OUString few more from unotools
Change-Id: Iaac38fbf5158b2912aa1e6115c0fe693bdbebe48
---
M basic/source/runtime/runtime.cxx
M desktop/source/migration/migration.cxx
M desktop/source/migration/services/oo3extensionmigration.cxx
M forms/source/xforms/computedexpression.cxx
M include/unotools/fontcfg.hxx
M include/unotools/fontcvt.hxx
M include/unotools/fontdefs.hxx
M include/unotools/textsearch.hxx
M reportdesign/source/ui/inspection/GeometryHandler.cxx
M sc/source/core/data/dpcache.cxx
M svx/source/dialog/ctredlin.cxx
M sw/source/core/crsr/findtxt.cxx
M unotools/source/config/fontcfg.cxx
M unotools/source/config/securityoptions.cxx
M unotools/source/i18n/localedatawrapper.cxx
M unotools/source/misc/fontcvt.cxx
M unotools/source/misc/fontdefs.cxx
M vcl/inc/outdev.h
M vcl/source/gdi/font.cxx
M vcl/source/gdi/outdev3.cxx
20 files changed, 166 insertions(+), 171 deletions(-)
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 4c2ffa9..ed731f1 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1583,8 +1583,8 @@
}
SbxVariable* pRes = new SbxVariable;
utl::TextSearch aSearch(aSearchOpt);
-sal_uInt16 nStart=0, nEnd=value.getLength();
-int bRes = aSearch.SearchFrwrd(value, nStart, nEnd);
+sal_Int32 nStart=0, nEnd=value.getLength();
+int bRes = aSearch.SearchForward(value, nStart, nEnd);
pRes-PutBool( bRes != 0 );
PushVar( pRes );
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 2b36113..932c9fb 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -647,12 +647,12 @@
SearchParam param(*i_pat, SearchParam::SRCH_REGEXP);
TextSearch ts(param, LANGUAGE_DONTKNOW);
i_set = vSet.begin();
-xub_StrLen start = 0;
-xub_StrLen end = 0;
+sal_Int32 start = 0;
+sal_Int32 end = 0;
while (i_set != vSet.end())
{
-end = (xub_StrLen)(i_set-getLength());
-if (ts.SearchFrwrd(*i_set, start, end))
+end = i_set-getLength();
+if (ts.SearchForward(*i_set, start, end))
vrResult-push_back(*i_set);
++i_set;
}
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx
b/desktop/source/migration/services/oo3extensionmigration.cxx
index 75590a8..ff969be 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -287,9 +287,9 @@
utl::SearchParam param(m_aBlackList[i],
utl::SearchParam::SRCH_REGEXP);
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
-xub_StrLen start = 0;
-xub_StrLen end =
static_castsal_uInt16(sDescriptionXmlURL.getLength());
-if (ts.SearchFrwrd(sDescriptionXmlURL, start, end))
+sal_Int32 start = 0;
+sal_Int32 end =
static_castsal_uInt16(sDescriptionXmlURL.getLength());
+if (ts.SearchForward(sDescriptionXmlURL, start, end))
return false;
}
}
diff --git a/forms/source/xforms/computedexpression.cxx
b/forms/source/xforms/computedexpression.cxx
index 184d91c..a2b7932 100644
--- a/forms/source/xforms/computedexpression.cxx
+++ b/forms/source/xforms/computedexpression.cxx
@@ -95,11 +95,10 @@
aSearchOptions.searchString = String( pExpression,
RTL_TEXTENCODING_ASCII_US );
utl::TextSearch aTextSearch( aSearchOptions );
-xub_StrLen nLength =
-static_castxub_StrLen( msExpression.getLength() );
-xub_StrLen nStart = 0;
-xub_StrLen nEnd = nLength;
-int nSearch = aTextSearch.SearchFrwrd( msExpression, nStart, nEnd );
+sal_Int32 nLength = msExpression.getLength();
+sal_Int32 nStart = 0;
+sal_Int32 nEnd = nLength;
+int nSearch = aTextSearch.SearchForward( msExpression, nStart, nEnd );
// our expression is static only if 1) we found our regexp, and 2)
// the regexp goes from beginning to end.
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index 23ea551..ef9f6a7 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -154,11 +154,11 @@
struct UNOTOOLS_DLLPUBLIC FontNameAttr
{
-String Name;
-::std::vector String Substitutions;
-::std::vector String MSSubstitutions;
-::std::vector String PSSubstitutions;
-::std::vector String HTMLSubstitutions;
+OUStringName;
+::std::vector OUStringSubstitutions;
+::std::vector OUStringMSSubstitutions;
+::std::vector OUString
[PATCH] String - OUString of unotools Tempfile and related...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4243
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/4243/1
String - OUString of unotools Tempfile and related...
Change-Id: Iefab16211c66e25c724d5de4b565cddc418854d6
---
M connectivity/source/drivers/dbase/DTable.cxx
M desktop/source/deployment/manager/dp_manager.cxx
M desktop/source/deployment/registry/dp_backend.cxx
M filter/source/xsltdialog/xmlfiltertestdialog.cxx
M framework/source/services/autorecovery.cxx
M include/unotools/tempfile.hxx
M reportdesign/source/core/api/ReportEngineJFree.cxx
M sfx2/source/doc/docfile.cxx
M sot/source/sdstor/ucbstorage.cxx
M sw/source/core/doc/docglbl.cxx
M sw/source/ui/dbui/addresslistdialog.cxx
M sw/source/ui/dbui/dbmgr.cxx
M sw/source/ui/dbui/mmlayoutpage.cxx
M sw/source/ui/misc/glosbib.cxx
M sw/source/ui/misc/glosdoc.cxx
M unotools/source/ucbhelper/tempfile.cxx
16 files changed, 100 insertions(+), 86 deletions(-)
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index 99819f3..102fabb 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2493,12 +2493,11 @@
OUString aIdent =
m_pConnection-getContent()-getIdentifier()-getContentIdentifier();
if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
aIdent += /;
-String sTempName(aIdent);
-String sExt;
-sExt.AssignAscii(.);
+OUString sTempName(aIdent);
+OUString sExt(.);
sExt += m_pConnection-getExtension();
-String sName(m_Name);
+OUString sName(m_Name);
TempFile aTempFile(sName,sExt,sTempName);
if(!aTempFile.IsValid())
getConnection()-throwGenericSQLException(STR_COULD_NOT_ALTER_TABLE,*this);
@@ -2508,7 +2507,7 @@
aURL.SetURL(aTempFile.GetURL());
String sNewName(aURL.getName());
-sNewName.Erase(sNewName.Len() - sExt.Len());
+sNewName.Erase(sNewName.Len() - sExt.getLength());
return sNewName;
}
//
-
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 5bf0c91..a48cfe8 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -588,7 +588,7 @@
ReferenceXCommandEnvironment xCmdEnv(
sourceContent.getCommandEnvironment() );
-String baseDir(m_activePackages_expanded);
+OUString baseDir(m_activePackages_expanded);
::utl::TempFile aTemp(baseDir, sal_False);
OUString tempEntry = aTemp.GetURL();
tempEntry = tempEntry.copy(tempEntry.lastIndexOf('/') + 1);
diff --git a/desktop/source/deployment/registry/dp_backend.cxx
b/desktop/source/deployment/registry/dp_backend.cxx
index 8c6cdfa..2cc8afa 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -220,7 +220,7 @@
ucbhelper::Content dataContent;
::dp_misc::create_folder(dataContent, sDataFolder, xCmdEnv);
-const String baseDir(sDataFolder);
+const OUString baseDir(sDataFolder);
const ::utl::TempFile aTemp(baseDir, sal_True);
const OUString url = aTemp.GetURL();
return sDataFolder + url.copy(url.lastIndexOf('/'));
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 0490c3f..e5a8c82 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -433,8 +433,8 @@
Reference XStorable xStorable( xComp, UNO_QUERY );
if( xStorable.is() )
{
-String leadingChars;
-String ext(RTL_CONSTASCII_USTRINGPARAM(.xml));
+OUString leadingChars;
+OUString ext(.xml);
utl::TempFile aTempFile(leadingChars, ext);
OUString aTempFileURL( aTempFile.GetURL() );
@@ -599,8 +599,8 @@
if( m_pCBXDisplaySource-IsChecked() )
{
-String lead;
-String ext(RTL_CONSTASCII_USTRINGPARAM(.xml));
+OUString lead;
+OUString ext(.xml);
TempFile aTempFile(lead, ext);
OUString aTempFileURL( aTempFile.GetURL() );
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 9af8eb7..b429974 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2801,8 +2801,8 @@
// TODO: Must we strip some illegal signes - if we use the title?
OUString sName(sUniqueName.makeStringAndClear());
-String sExtension(rInfo.Extension);
-String sPath(sBackupPath);
+OUString sExtension(rInfo.Extension);
+OUString sPath(sBackupPath);
::utl::TempFile aTempFile(sName, sExtension, sPath);
rInfo.NewTempURL =
[PATCH] String=OUString in svl
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4251
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/4251/1
String=OUString in svl
Change-Id: Ie1cc02f168f5977b953fc13590da17f8b12513f6
---
M cui/source/inc/page.hxx
M cui/source/tabpages/numpages.cxx
M cui/source/tabpages/page.cxx
M include/svl/inethist.hxx
M include/svl/sfontitm.hxx
M include/svl/slstitm.hxx
M include/svl/srchitem.hxx
M sc/source/core/data/table6.cxx
M sc/source/ui/inc/navipi.hxx
M sc/source/ui/navipi/scenwnd.cxx
M sc/source/ui/view/cellsh.cxx
M sc/source/ui/view/tabvwshb.cxx
M sd/source/ui/view/viewshel.cxx
M sfx2/source/appl/appcfg.cxx
M svl/source/items/imageitm.cxx
M svl/source/items/macitem.cxx
M svl/source/items/slstitm.cxx
M svx/source/dialog/srchdlg.cxx
M svx/source/gallery2/galbrws2.cxx
M svx/source/tbxctrls/lboxctrl.cxx
M sw/source/ui/fmtui/tmpdlg.cxx
M sw/source/ui/misc/num.cxx
M sw/source/ui/shells/basesh.cxx
M sw/source/ui/uiview/viewsrch.cxx
24 files changed, 78 insertions(+), 77 deletions(-)
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index b61c47a..7c21e17 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -193,7 +193,7 @@
voidSetPaperFormatRanges( Paper eStart, Paper eEnd )
{ ePaperStart = eStart, ePaperEnd = eEnd; }
-voidSetCollectionList(const std::vectorString aList);
+voidSetCollectionList(const std::vectorOUString aList);
virtual voidPageCreated (SfxAllItemSet aSet);
};
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index bf3ba14..0dc32be 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3524,7 +3524,7 @@
if (pListItem)
{
ListBox myCharFmtLB = GetCharFmtListBox();
-const std::vectorString aList = (pListItem)-GetList();
+const std::vectorOUString aList = (pListItem)-GetList();
sal_uInt32 nCount = aList.size();;
for(sal_uInt32 i = 0; i nCount; i++)
myCharFmtLB.InsertEntry(aList[i]);
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index da2ac1c..2ca7a95 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1562,7 +1562,7 @@
// ---
-void SvxPageDescPage::SetCollectionList(const std::vectorString aList)
+void SvxPageDescPage::SetCollectionList(const std::vectorOUString aList)
{
OSL_ENSURE(!aList.empty(), Empty string list);
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index 4ee592f..bdf6926 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -21,7 +21,6 @@
#include svl/svldllapi.h
#include tools/solar.h
-#include tools/string.hxx
#include tools/urlobj.hxx
#include svl/brdcst.hxx
#include svl/hint.hxx
@@ -86,7 +85,7 @@
return sal_False;
}
-sal_Bool QueryUrl (const String rUrl)
+sal_Bool QueryUrl (const OUString rUrl)
{
INetProtocol eProto =
INetURLObject::CompareProtocolScheme (rUrl);
@@ -104,7 +103,7 @@
PutUrl_Impl (rUrl);
}
-void PutUrl (const String rUrl)
+void PutUrl (const OUString rUrl)
{
INetProtocol eProto =
INetURLObject::CompareProtocolScheme (rUrl);
diff --git a/include/svl/sfontitm.hxx b/include/svl/sfontitm.hxx
index f9bcbdc..188f079 100644
--- a/include/svl/sfontitm.hxx
+++ b/include/svl/sfontitm.hxx
@@ -28,8 +28,8 @@
//
class SfxFontItem: public SfxPoolItem
{
-XubString m_aName;
-XubString m_aStyleName;
+OUString m_aName;
+OUString m_aStyleName;
Size m_aSize;
Color m_aColor;
Color m_aFillColor;
@@ -68,8 +68,8 @@
sal_Bool hasColor() const { return m_bHasColor; }
sal_Bool hasFillColor() const { return m_bHasFillColor; }
-const XubString getName() const { return m_aName; }
-const XubString getStyleName() const { return m_aStyleName; }
+const OUString getName() const { return m_aName; }
+const OUString getStyleName() const { return m_aStyleName; }
const Size getSize() const { return m_aSize; }
const Color getColor() const { return m_aColor; }
@@ -92,8 +92,8 @@
sal_Bool getShadow() const { return m_bShadow; }
sal_Bool getKerning() const { return m_bKerning; }
-inline void setFont(sal_Int16 nTheFamily, const XubString rTheName,
-const XubString rTheStyleName, sal_Int16 nThePitch,
+inline void setFont(sal_Int16 nTheFamily, const OUString rTheName,
+const OUString rTheStyleName, sal_Int16 nThePitch,
rtl_TextEncoding nTheCharSet);
inline void setWeight(sal_Int16 nTheWeight);
inline void setItalic(sal_Int16
[PATCH] String-OUString more unotools
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4248
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/4248/1
String-OUString more unotools
Change-Id: I50f61d62b6b1dc348a0253e94b7e334baaec2bb0
---
M basic/source/classes/errobject.cxx
M basic/source/comp/buffer.cxx
M include/unotools/textsearch.hxx
M include/unotools/transliterationwrapper.hxx
M include/unotools/ucblockbytes.hxx
M unotools/source/i18n/textsearch.cxx
M unotools/source/i18n/transliterationwrapper.cxx
M unotools/source/ucbhelper/ucblockbytes.cxx
8 files changed, 90 insertions(+), 55 deletions(-)
diff --git a/basic/source/classes/errobject.cxx
b/basic/source/classes/errobject.cxx
index 7cfce56..c856f16 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -81,7 +81,7 @@
void SAL_CALL
ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException)
{
-GetSbData()-pInst-setErrorVB( _number, String() );
+GetSbData()-pInst-setErrorVB( _number, OUString() );
OUString _description = GetSbData()-pInst-GetErrorMsg();
setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description
), uno::Any(), uno::Any() );
}
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index b08d352..dac618d 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -17,7 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
+#include rtl/ustring.hxx
+#include osl/thread.h // osl_getThreadTextEncoding
#include buffer.hxx
#include sbcomp.hxx
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index f26d150..1a07e8b 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -162,13 +162,17 @@
int SearchFrwrd( const String rStr,
xub_StrLen* pStart, xub_StrLen* pEnde,
::com::sun::star::util::SearchResult* pSrchResult = 0 );
-sal_Bool SearchForward( const OUString rStr,
-sal_Int32* pStart, sal_Int32* pEnd,
-::com::sun::star::util::SearchResult* pRes = 0 );
+bool SearchForward( const OUString rStr,
+sal_Int32* pStart, sal_Int32* pEnd,
+::com::sun::star::util::SearchResult* pRes = 0 );
int SearchBkwrd( const String rStr,
xub_StrLen* pStart, xub_StrLen* pEnde,
::com::sun::star::util::SearchResult* pSrchResult = 0 );
+bool SearchBackward( const OUString rStr,
+ sal_Int32* pStart, sal_Int32* pEnde,
+ ::com::sun::star::util::SearchResult* pSrchResult = 0
);
+
void SetLocale( const ::com::sun::star::util::SearchOptions rOpt,
const ::com::sun::star::lang::Locale rLocale );
diff --git a/include/unotools/transliterationwrapper.hxx
b/include/unotools/transliterationwrapper.hxx
index 6d64d40..4af650d 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -20,7 +20,7 @@
#ifndef _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
#define _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
-#include tools/string.hxx
+#include rtl/ustring.hxx
#include tools/solar.h
#include i18nlangtag/languagetag.hxx
#include com/sun/star/i18n/XExtendedTransliteration.hpp
@@ -80,20 +80,20 @@
those may load a different module and overwrite this setting. Only the
transliterate() method that takes no LanguageType parameter may be used
for a specific module loaded with this method. */
-void loadModuleByImplName( const String rModuleName, sal_uInt16 nLang );
+void loadModuleByImplName( const OUString rModuleName, sal_uInt16 nLang );
/** This transliteration method corresponds with the loadModuleByImplName()
method. It relies on a module being loaded and does not try load one.
If for any reason the string can't be transliterated the original
string is returned. */
-String transliterate( const String rStr,
-xub_StrLen nStart, xub_StrLen nLen,
-::com::sun::star::uno::Sequence sal_Int32* pOffset )
const;
+OUString transliterate( const OUString rStr,
+sal_Int32 nStart, sal_Int32 nLen,
+::com::sun::star::uno::Sequence sal_Int32*
pOffset ) const;
// Wrapper implementations of class Transliteration
-String transliterate( const String rStr, sal_uInt16 nLanguage,
-xub_StrLen nStart, xub_StrLen nLen,
-::com::sun::star::uno::Sequence sal_Int32* pOffset );
+OUString transliterate( const OUString rStr, sal_uInt16 nLanguage,
+sal_Int32 nStart, sal_Int32 nLen,
+::com::sun::star::uno::Sequence sal_Int32*
pOffset );
/** If two strings are equal
[PATCH] String=OUString svtools/fileview and dep
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4255
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/4255/1
String=OUString svtools/fileview and dep
Change-Id: If813b3099df9e98c07f40aecdd23fe547cbd0f44
---
M include/svtools/fileview.hxx
M svtools/source/contnr/fileview.cxx
M svtools/source/contnr/templwin.cxx
M svtools/source/contnr/templwin.hxx
4 files changed, 91 insertions(+), 92 deletions(-)
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 917cfab..468f377 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -83,15 +83,15 @@
SvtFileView( Window* pParent, const ResId rResId, sal_uInt8 nFlags );
~SvtFileView();
-const String GetViewURL() const;
-String GetURL( SvTreeListEntry* pEntry ) const;
-String GetCurrentURL() const;
+const OUString GetViewURL() const;
+OUStringGetURL( SvTreeListEntry* pEntry ) const;
+OUStringGetCurrentURL() const;
-sal_BoolGetParentURL( String _rParentURL ) const;
-voidCreatedFolder( const String rUrl, const String
rNewFolder );
+sal_BoolGetParentURL( OUString _rParentURL ) const;
+voidCreatedFolder( const OUString rUrl, const
OUString rNewFolder );
voidSetHelpId( const OString rHelpId );
-const OString GetHelpId( ) const;
+const OString GetHelpId( ) const;
voidSetSizePixel( const Size rNewSize );
virtual voidSetPosSizePixel( const Point rNewPos, const Size
rNewSize );
voidSetSortColumn( sal_Bool bValue ) { bSortColumn =
bValue; }
@@ -108,15 +108,15 @@
action asynchronously.
*/
FileViewResult Initialize(
-const String rFolderURL,
-const String rFilter,
+const OUString rFolderURL,
+const OUString rFilter,
const FileViewAsyncAction* pAsyncDescriptor,
const ::com::sun::star::uno::Sequence
OUString rBlackList
);
FileViewResult Initialize(
-const String rFolderURL,
-const String rFilter,
+const OUString rFolderURL,
+const OUString rFilter,
const FileViewAsyncAction* pAsyncDescriptor );
/** initialze the view with a sequence of contents, which have already
been obtained elsewhere
@@ -128,7 +128,7 @@
/** initializes the view with the content of a folder given by an UCB
content
*/
sal_BoolInitialize( const
::com::sun::star::uno::Reference ::com::sun::star::ucb::XContent _xContent,
-const String rFilter );
+const OUString rFilter );
/** reads the current content of the current folder again, and applies the
given filter to it
@@ -145,7 +145,7 @@
action asynchronously.
*/
FileViewResult ExecuteFilter(
-const String rFilter,
+const OUString rFilter,
const FileViewAsyncAction* pAsyncDescriptor
);
@@ -188,8 +188,8 @@
// EnableContextMenu( sal_True
)/EnableDelete(sal_True) disable name replacing!
// save and load column size and sort order
-String GetConfigString() const;
-voidSetConfigString( const String rCfgStr );
+OUStringGetConfigString() const;
+voidSetConfigString( const OUString rCfgStr );
voidEndInplaceEditing( bool _bCancel );
@@ -242,7 +242,7 @@
public:
QueryDeleteDlg_Impl( Window* pParent,
- const String rName );
+ const OUString rName );
voidEnableAllButton() { _aAllButton.Enable( sal_True
); }
QueryDeleteResult_Impl GetResult() const { return _eResult; }
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index f8104b6..0a136cd 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -173,9 +173,9 @@
SvtFileView_Impl* mpParent;
Timer maResetQuickSearch;
OUStringmaQuickSearchText;
-String msAccessibleDescText;
-String
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/misc/docfnote.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 0d583c89697cb2349d125becc14bc8a8b56d6bc8 Author: László Németh nem...@numbertext.org Date: Wed Jun 12 11:22:27 2013 +0200 fdo#65666 keep tab characters in footnote settings (Begin/After) Change-Id: I3fbd0f2dea5926981c0cd351c3235f6b61e66aaa Reviewed-on: https://gerrit.libreoffice.org/4235 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 3a59919..4ca616d 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -170,8 +170,8 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet ) // art m_pNumViewBox-SelectNumberingType( pInf-aFmt.GetNumberingType()); m_pOffsetFld-SetValue(pInf-nFtnOffset + 1); -m_pPrefixED-SetText(pInf-GetPrefix()); -m_pSuffixED-SetText(pInf-GetSuffix()); +m_pPrefixED-SetText(pInf-GetPrefix().replaceAll(\t, \\t)); // fdo#65666 +m_pSuffixED-SetText(pInf-GetSuffix().replaceAll(\t, \\t)); const SwCharFmt* pCharFmt = pInf-GetCharFmt( *pSh-GetView().GetDocShell()-GetDoc()); @@ -376,8 +376,8 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet ) pInf-nFtnOffset = static_cast sal_uInt16 (m_pOffsetFld-GetValue() -1); pInf-aFmt.SetNumberingType(m_pNumViewBox-GetSelectedNumberingType() ); -pInf-SetPrefix(m_pPrefixED-GetText()); -pInf-SetSuffix(m_pSuffixED-GetText()); +pInf-SetPrefix(m_pPrefixED-GetText().replaceAll(\\t, \t)); +pInf-SetSuffix(m_pSuffixED-GetText().replaceAll(\\t, \t)); pInf-SetCharFmt( lcl_GetCharFormat( pSh, m_pFtnCharTextTemplBox-GetSelectEntry() ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] String=OUString another daily wack at it
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4254
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/4254/1
String=OUString another daily wack at it
Change-Id: I49f0aeb4e97718428ab0b87c659da14fe30dab2e
---
M include/sfx2/frmhtmlw.hxx
M include/svtools/htmlout.hxx
M include/svtools/rtfout.hxx
M sc/inc/filter.hxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/filter/inc/ftools.hxx
M sc/source/filter/inc/htmlexp.hxx
M sc/source/ui/docshell/docsh.cxx
M sc/source/ui/docshell/impex.cxx
M sc/source/ui/inc/impex.hxx
M sfx2/source/bastyp/frmhtmlw.cxx
M svtools/source/svhtml/htmlout.cxx
M svtools/source/svrtf/rtfout.cxx
M sw/source/filter/html/htmlbas.cxx
M sw/source/filter/html/htmlfly.cxx
M sw/source/filter/html/htmlforw.cxx
M sw/source/filter/html/wrthtml.cxx
M sw/source/filter/html/wrthtml.hxx
18 files changed, 154 insertions(+), 151 deletions(-)
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index 3abdfbe..dcea90a 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -43,35 +43,35 @@
{
SAL_DLLPRIVATE static const sal_Char sNewLine[];
SAL_DLLPRIVATE static void OutMeta( SvStream rStrm,
-const sal_Char *pIndent, const String rName,
-const String rContent, sal_Bool bHTTPEquiv,
-rtl_TextEncoding eDestEnc,
-String *pNonConvertableChars = 0 );
+const sal_Char *pIndent, const String
rName,
+const String rContent, sal_Bool
bHTTPEquiv,
+rtl_TextEncoding eDestEnc,
+OUStringBuffer* pNonConvertableChars =
0 );
SAL_DLLPRIVATE inline static void OutMeta( SvStream rStrm,
-const sal_Char *pIndent, const sal_Char *pName,
-const String rContent, sal_Bool bHTTPEquiv,
-rtl_TextEncoding eDestEnc,
-String *pNonConvertableChars = 0 );
+ const sal_Char *pIndent, const
sal_Char *pName,
+ const String rContent,
sal_Bool bHTTPEquiv,
+ rtl_TextEncoding eDestEnc,
+ OUStringBuffer*
pNonConvertableChars = 0 );
public:
static void Out_DocInfo( SvStream rStrm, const String rBaseURL,
-const ::com::sun::star::uno::Reference
-::com::sun::star::document::XDocumentProperties,
-const sal_Char *pIndent,
-rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
-String *pNonConvertableChars = 0 );
+ const ::com::sun::star::uno::Reference
+ ::com::sun::star::document::XDocumentProperties,
+ const sal_Char *pIndent,
+ rtl_TextEncoding eDestEnc =
RTL_TEXTENCODING_MS_1252,
+ OUStringBuffer* pNonConvertableChars = 0 );
static void Out_FrameDescriptor(
-SvStream, const String rBaseURL, const
com::sun::star::uno::Reference com::sun::star::beans::XPropertySet xSet,
-rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
-String *pNonConvertableChars = 0 );
+SvStream, const String rBaseURL, const
com::sun::star::uno::Reference com::sun::star::beans::XPropertySet xSet,
+rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
+OUStringBuffer* pNonConvertableChars = 0 );
};
inline void SfxFrameHTMLWriter::OutMeta( SvStream rStrm,
-const sal_Char *pIndent, const sal_Char *pName,
-const String rContent, sal_Bool bHTTPEquiv,
-rtl_TextEncoding eDestEnc,
-String *pNonConvertableChars )
+ const sal_Char *pIndent, const
sal_Char *pName,
+ const String rContent, sal_Bool
bHTTPEquiv,
+ rtl_TextEncoding eDestEnc,
+ OUStringBuffer* pNonConvertableChars )
{
String sTmp = OUString::createFromAscii(pName);
OutMeta( rStrm, pIndent, sTmp, rContent, bHTTPEquiv, eDestEnc,
pNonConvertableChars );
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 33c76fe..cee90cb 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -24,11 +24,11 @@
#include tools/solar.h
#include rtl/textenc.h
#include rtl/string.hxx
+#include rtl/ustrbuf.hxx
#include svl/macitem.hxx
class Color;
class ImageMap;
-class String;
class SvStream;
class SvxMacroTableDtor;
[PATCH] String=OUString svl ddedummy
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4252
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/4252/1
String=OUString svl ddedummy
Change-Id: If502fbf8aac64a1776a64713babf3c0549d2cf76
---
M framework/source/fwe/helper/undomanagerhelper.cxx
M include/svl/svdde.hxx
M include/svl/undo.hxx
M svl/source/svdde/ddecli.cxx
M svl/source/svdde/ddedata.cxx
M svl/source/svdde/ddeimp.hxx
M svl/source/svdde/ddesvr.cxx
M svl/source/undo/undo.cxx
M svl/unx/source/svdde/ddedummy.cxx
9 files changed, 158 insertions(+), 151 deletions(-)
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx
b/framework/source/fwe/helper/undomanagerhelper.cxx
index e3c1de4..047d2b6 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -254,14 +254,14 @@
}
// SfxUndoListener
-virtual void actionUndone( const String i_actionComment );
-virtual void actionRedone( const String i_actionComment );
-virtual void undoActionAdded( const String i_actionComment );
+virtual void actionUndone( const OUString i_actionComment );
+virtual void actionRedone( const OUString i_actionComment );
+virtual void undoActionAdded( const OUString i_actionComment );
virtual void cleared();
virtual void clearedRedo();
virtual void resetAll();
-virtual void listActionEntered( const String i_comment );
-virtual void listActionLeft( const String i_comment );
+virtual void listActionEntered( const OUString i_comment );
+virtual void listActionLeft( const OUString i_comment );
virtual void listActionLeftAndMerged();
virtual void listActionCancelled();
virtual void undoManagerDying();
@@ -800,7 +800,7 @@
}
//--
-void UndoManagerHelper_Impl::actionUndone( const String i_actionComment )
+void UndoManagerHelper_Impl::actionUndone( const OUString i_actionComment
)
{
UndoManagerEvent aEvent;
aEvent.Source = getXUndoManager();
@@ -811,7 +811,7 @@
}
//--
-void UndoManagerHelper_Impl::actionRedone( const String i_actionComment )
+void UndoManagerHelper_Impl::actionRedone( const OUString i_actionComment
)
{
UndoManagerEvent aEvent;
aEvent.Source = getXUndoManager();
@@ -822,7 +822,7 @@
}
//--
-void UndoManagerHelper_Impl::undoActionAdded( const String
i_actionComment )
+void UndoManagerHelper_Impl::undoActionAdded( const OUString
i_actionComment )
{
if ( m_bAPIActionRunning )
return;
@@ -858,7 +858,7 @@
}
//--
-void UndoManagerHelper_Impl::listActionEntered( const String i_comment )
+void UndoManagerHelper_Impl::listActionEntered( const OUString i_comment )
{
#if OSL_DEBUG_LEVEL 0
m_aContextAPIFlags.push( m_bAPIActionRunning );
@@ -871,7 +871,7 @@
}
//--
-void UndoManagerHelper_Impl::listActionLeft( const String i_comment )
+void UndoManagerHelper_Impl::listActionLeft( const OUString i_comment )
{
#if OSL_DEBUG_LEVEL 0
const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top();
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 0a1d22b..97b9679 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -67,7 +67,7 @@
public:
DdeData();
DdeData( SAL_UNUSED_PARAMETER const void*,
SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER sal_uLong = FORMAT_STRING );
-DdeData( SAL_UNUSED_PARAMETER const String );
+DdeData( SAL_UNUSED_PARAMETER const OUString );
DdeData( const DdeData );
~DdeData();
@@ -102,7 +102,7 @@
LinkaDone;
boolbBusy;
-DdeTransaction( DdeConnection, SAL_UNUSED_PARAMETER const
String, SAL_UNUSED_PARAMETER long = 0 );
+DdeTransaction( DdeConnection, SAL_UNUSED_PARAMETER const
OUString, SAL_UNUSED_PARAMETER long = 0 );
public:
virtual~DdeTransaction();
@@ -141,7 +141,7 @@
LinkaNotify;
public:
-DdeLink( DdeConnection, const String, long = 0 );
+DdeLink( DdeConnection, const OUString, long = 0 );
[PATCH] String=OUString : svtools inettbc
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4256
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/4256/1
String=OUString : svtools inettbc
Change-Id: I457834f2c7eef221db97387410115600748f1375
---
M include/svtools/helpopt.hxx
M include/svtools/inettbc.hxx
M svtools/source/config/helpopt.cxx
M svtools/source/control/inettbc.cxx
4 files changed, 167 insertions(+), 156 deletions(-)
diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
index 938bd22..36f3227 100644
--- a/include/svtools/helpopt.hxx
+++ b/include/svtools/helpopt.hxx
@@ -19,10 +19,10 @@
#ifndef INCLUDED_SVTOOLS_HELPOPT_HXX
#define INCLUDED_SVTOOLS_HELPOPT_HXX
+#include rtl/ustring.hxx
#include svtools/svtdllapi.h
#include list
-#include tools/string.hxx
#include unotools/options.hxx
typedef std::list sal_Int32 IdList;
@@ -42,13 +42,13 @@
voidSetHelpTips( sal_Bool b );
sal_BoolIsHelpTips() const;
-const String GetHelpStyleSheet()const;
-voidSetHelpStyleSheet(const String rStyleSheet);
+const OUString GetHelpStyleSheet()const;
+voidSetHelpStyleSheet(const OUString rStyleSheet);
voidSetWelcomeScreen( sal_Bool b );
sal_BoolIsWelcomeScreen() const;
-String GetSystem() const;
+OUStringGetSystem() const;
};
#endif
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 3b8dbca..5cc0c52 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -34,8 +34,8 @@
friend class SvtMatchContext_Impl;
friend class SvtURLBox_Impl;
LinkaOpenHdl;
-String aBaseURL;
-String aPlaceHolder;
+OUStringaBaseURL;
+OUStringaPlaceHolder;
rtl::Reference SvtMatchContext_Impl pCtx;
SvtURLBox_Impl* pImp;
INetProtocoleSmartProtocol;
@@ -46,10 +46,10 @@
sal_BoolbNoSelection: 1;
sal_BoolbIsAutoCompleteEnabled : 1;
-SVT_DLLPRIVATE sal_Bool ProcessKey( const KeyCode
rCode );
-SVT_DLLPRIVATE void TryAutoComplete();
-SVT_DLLPRIVATE void
UpdatePicklistForSmartProtocol_Impl();
-DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* );
+SVT_DLLPRIVATE sal_Bool ProcessKey( const KeyCode rCode );
+SVT_DLLPRIVATE void TryAutoComplete();
+SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl();
+DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* );
SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID);
protected:
@@ -64,30 +64,30 @@
SvtURLBox( Window* pParent, const ResId
_rResId, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID =
true );
~SvtURLBox();
-voidSetBaseURL( const String rURL );
-const String GetBaseURL() const { return aBaseURL; }
+voidSetBaseURL( const OUString rURL );
+const OUString GetBaseURL() const { return aBaseURL; }
voidSetOpenHdl( const Link rLink ) { aOpenHdl
= rLink; }
const Link GetOpenHdl() const { return aOpenHdl; }
voidSetOnlyDirectories( sal_Bool bDir =
sal_True );
voidSetNoURLSelection( sal_Bool bSet =
sal_True );
INetProtocolGetSmartProtocol() const { return
eSmartProtocol; }
voidSetSmartProtocol( INetProtocol eProt );
-sal_BoolIsCtrlOpen()
+sal_BoolIsCtrlOpen()
{ return bCtrlClick; }
-String GetURL();
+OUStringGetURL();
voidDisableHistory();
voidUpdatePickList( );
-static String ParseSmart( String aText, String aBaseURL,
String aWorkDir );
+static OUString ParseSmart( OUString aText, OUString
aBaseURL, OUString aWorkDir );
-voidSetFilter(const String _sFilter);
+voidSetFilter(const OUString _sFilter);
inline void EnableAutocompletion( sal_Bool _bEnable =
sal_True )
{ bIsAutoCompleteEnabled = _bEnable; }
-void SetPlaceHolder( const String sPlaceHolder ) { aPlaceHolder =
sPlaceHolder; }
-String GetPlaceHolder() { return aPlaceHolder; }
-
[PATCH] String=OUString virtual getStateDisplayName
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4257
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/4257/1
String=OUString virtual getStateDisplayName
Change-Id: I14263ef9acc64f7738e0532ed8425db30ac5e890
---
M chart2/source/controller/dialogs/dlg_CreationWizard.cxx
M chart2/source/controller/inc/dlg_CreationWizard.hxx
M dbaccess/source/ui/dlg/dbwizsetup.cxx
M dbaccess/source/ui/inc/dbwizsetup.hxx
M extensions/source/abpilot/abspilot.cxx
M extensions/source/abpilot/abspilot.hxx
M include/svtools/roadmapwizard.hxx
M svtools/source/dialogs/roadmapwizard.cxx
M svtools/source/uno/wizard/wizardshell.cxx
M svtools/source/uno/wizard/wizardshell.hxx
M sw/source/ui/dbui/mailmergewizard.cxx
M sw/source/ui/inc/mailmergewizard.hxx
12 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index fd7feb19..d3d8726 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -199,7 +199,7 @@
m_bCanTravel = true;
}
-String CreationWizard::getStateDisplayName( WizardState nState ) const
+OUString CreationWizard::getStateDisplayName( WizardState nState ) const
{
sal_uInt16 nResId = 0;
switch( nState )
@@ -219,7 +219,7 @@
default:
break;
}
-return String(SchResId(nResId));
+return OUString(SchResId(nResId));
}
//.
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx
b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index fb394ff..d77e155 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -65,7 +65,7 @@
virtual WizardState determineNextState(WizardState nCurrentState)
const;
virtual voidenterState(WizardState nState);
-virtual String getStateDisplayName( WizardState nState ) const;
+virtual OUString getStateDisplayName( WizardState nState ) const;
private:
//no default constructor
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index e14fedf..0b1b85f 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -218,7 +218,7 @@
::svt::RoadmapWizard::declarePath( _nPathId, aPath );
}
-String ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
+OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState )
const
{
String sRoadmapItem;
switch( _nState )
@@ -281,7 +281,7 @@
default:
break;
}
-return sRoadmapItem;
+return OUString(sRoadmapItem);
}
//-
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx
b/dbaccess/source/ui/inc/dbwizsetup.hxx
index f9360c8..431d1b8 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -121,7 +121,7 @@
virtual void setTitle(const OUString _sTitle);
virtual void enableConfirmSettings( bool _bEnable );
virtual sal_Bool saveDatasource();
-virtual String getStateDisplayName( WizardState _nState ) const;
+virtual OUString getStateDisplayName( WizardState _nState ) const;
/** returns TRUE/ if the database should be opened, otherwise FALSE/.
*/
diff --git a/extensions/source/abpilot/abspilot.cxx
b/extensions/source/abpilot/abspilot.cxx
index 96f1b59..298c24d 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -133,7 +133,7 @@
}
//-
-String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState )
const
+OUString OAddessBookSourcePilot::getStateDisplayName( WizardState _nState
) const
{
sal_uInt16 nResId = 0;
switch ( _nState )
@@ -146,11 +146,11 @@
}
DBG_ASSERT( nResId, OAddessBookSourcePilot::getStateDisplayName:
don't know this state! );
-String sDisplayName;
+OUString sDisplayName;
if ( nResId )
{
svt::OLocalResourceAccess aAccess( ModuleRes(
RID_DLG_ADDRESSBOOKSOURCEPILOT ), RSC_MODALDIALOG );
-sDisplayName = String( ModuleRes( nResId ) );
+sDisplayName = OUString( ModuleRes( nResId ) );
}
return sDisplayName;
diff --git a/extensions/source/abpilot/abspilot.hxx
b/extensions/source/abpilot/abspilot.hxx
index 8982e71..12bc60b 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -75,7 +75,7 @@
virtual sal_BoolonFinish();
// RoadmapWizard
-virtual String getStateDisplayName(
[PATCH] String=OUString svtools inetimg
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4259
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/4259/1
String=OUString svtools inetimg
Change-Id: Id986014e3b2897478427a072be582581d3791101
---
M include/svtools/inetimg.hxx
M svtools/source/urlobj/inetimg.cxx
M sw/source/ui/dochdl/swdtflvr.cxx
3 files changed, 45 insertions(+), 46 deletions(-)
diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index f28ac2c..ddd40a3 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
@@ -19,7 +19,6 @@
#ifndef _INETIMG_HXX
#define _INETIMG_HXX
-#include tools/string.hxx
#include tools/gen.hxx
class SvData;
@@ -29,28 +28,28 @@
class INetImage
{
-String aImageURL;
-String aTargetURL;
-String aTargetFrame;
-String aAlternateText;
+OUStringaImageURL;
+OUStringaTargetURL;
+OUStringaTargetFrame;
+OUStringaAlternateText;
SizeaSizePixel;
protected:
-String CopyExchange() const;
-voidPasteExchange( const String rString );
+OUStringCopyExchange() const;
+voidPasteExchange( const OUString rString );
-voidSetImageURL( const String rS ) { aImageURL = rS; }
-voidSetTargetURL( const String rS ){ aTargetURL = rS; }
-voidSetTargetFrame( const String rS ) { aTargetFrame = rS; }
-voidSetAlternateText( const String rS ){ aAlternateText = rS;
}
+voidSetImageURL( const OUString rS ) { aImageURL = rS; }
+voidSetTargetURL( const OUString rS ){ aTargetURL = rS; }
+voidSetTargetFrame( const OUString rS ) { aTargetFrame = rS;
}
+voidSetAlternateText( const OUString rS ){ aAlternateText =
rS; }
voidSetSizePixel( const Size rSize ) { aSizePixel = rSize; }
public:
INetImage(
-const String rImageURL,
-const String rTargetURL,
-const String rTargetFrame,
-const String rAlternateText,
+const OUString rImageURL,
+const OUString rTargetURL,
+const OUString rTargetFrame,
+const OUString rAlternateText,
const Size rSizePixel )
: aImageURL( rImageURL ),
aTargetURL( rTargetURL ),
@@ -61,10 +60,10 @@
INetImage()
{}
-const String GetImageURL() const { return aImageURL; }
-const String GetTargetURL() const { return aTargetURL; }
-const String GetTargetFrame() const { return aTargetFrame; }
-const String GetAlternateText() const { return aAlternateText; }
+const OUString GetImageURL() const { return aImageURL; }
+const OUString GetTargetURL() const { return aTargetURL; }
+const OUString GetTargetFrame() const { return aTargetFrame; }
+const OUString GetAlternateText() const { return aAlternateText; }
const Size GetSizePixel() const { return aSizePixel; }
// Im-/Export
diff --git a/svtools/source/urlobj/inetimg.cxx
b/svtools/source/urlobj/inetimg.cxx
index e57c194..c7b2c78 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -23,6 +23,7 @@
#include svtools/inetimg.hxx
#define TOKEN_SEPARATOR '\001'
+#define STR_TOKEN_SEPARATOR \001
sal_Bool INetImage::Write( SvStream rOStm, sal_uLong nFormat ) const
{
@@ -31,17 +32,14 @@
{
case SOT_FORMATSTR_ID_INET_IMAGE:
{
-String sString;
-(sString += aImageURL ) += TOKEN_SEPARATOR;
-(sString += aTargetURL ) += TOKEN_SEPARATOR;
-(sString += aTargetFrame ) += TOKEN_SEPARATOR;
-(sString += aAlternateText ) += TOKEN_SEPARATOR;
-sString += OUString::number( aSizePixel.Width() );
-sString += TOKEN_SEPARATOR;
-sString += OUString::number( aSizePixel.Height() );
+OUString sString = aImageURL + STR_TOKEN_SEPARATOR +
+aTargetURL + STR_TOKEN_SEPARATOR +
+aTargetFrame + STR_TOKEN_SEPARATOR +
+aAlternateText + STR_TOKEN_SEPARATOR +
+OUString::number( aSizePixel.Width() ) + STR_TOKEN_SEPARATOR +
+OUString::number( aSizePixel.Height() );
-OString sOut(OUStringToOString(sString,
-RTL_TEXTENCODING_UTF8));
+OString sOut(OUStringToOString(sString, RTL_TEXTENCODING_UTF8));
rOStm.Write(sOut.getStr(), sOut.getLength());
static const sal_Char aEndChar[2] = { 0 };
@@ -63,17 +61,17 @@
{
case SOT_FORMATSTR_ID_INET_IMAGE:
{
-String sINetImg
[PATCH] String=OUString svtools grfmgr + fmtfield
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4261
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/4261/1
String=OUString svtools grfmgr + fmtfield
Change-Id: Ie3d49014cb5edfbb709bea97b6f1332351fc6f3c
---
M include/svtools/fmtfield.hxx
M include/svtools/grfmgr.hxx
M svtools/source/control/fmtfield.cxx
M svtools/source/graphic/grfmgr.cxx
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 6fab7e4..df7b741 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -52,7 +52,7 @@
};
protected:
-String m_sLastValidText;
+OUString m_sLastValidText;
// hat nichts mit dem current value zu tun, ist der letzte Text, der
waehrend einer Eingabe als gueltig erkannt
// wurde (also durch CheckText geprueft, nicht durch den Formatter
gejagt)
Selection m_aLastSelection;
@@ -84,8 +84,8 @@
// ausgibt
sal_Boolm_bTreatAsNumber;
// und mit den folgenden Members koennen wir das Ganze hier auch zur
formatierten Text-Ausgabe benutzen ...
-String m_sCurrentTextValue;
-String m_sDefaultText;
+OUString m_sCurrentTextValue;
+OUString m_sDefaultText;
// die bei der letzten Ausgabe-Operation vom Formatter gelieferte Farbe
(nicht dass wir sie beachten wuerden, aber
// man kann sie von aussen abfragen)
@@ -188,10 +188,10 @@
(der Text wird einfach nur durch den Formatter gejagt und dann gesetzt)
*/
void SetTextFormatted(const OUString rText);
-String GetTextValue() const;
+OUString GetTextValue() const;
voidSetDefaultText(const OUString rDefault) { m_sDefaultText =
rDefault; }
-String GetDefaultText() const { return m_sDefaultText; }
+OUString GetDefaultText() const { return m_sDefaultText; }
// die bei der letzten Ausgabe-Operation vom Formatter gelieferte Farbe
(Ausgabe-Operationen werden getriggert durch
// SetValue, SetTextValue, SetTextFormatted, also indirekt eventuell auch
durch SetMin-/-MaxValue)
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 9a3bd8c..c479fa0 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -169,9 +169,9 @@
sal_uLong mnSizeBytes;
GraphicType meType;
GraphicManager* mpMgr;
-String* mpLink;
+OUString* mpLink;
Link* mpSwapStreamHdl;
-String* mpUserData;
+OUString* mpUserData;
Timer* mpSwapOutTimer;
GrfSimpleCacheObj* mpSimpleCache;
sal_uLong mnAnimationLoopCount;
@@ -343,7 +343,7 @@
const Graphic GetGraphic() const;
voidSetGraphic( const Graphic rGraphic, const
GraphicObject* pCopyObj = 0);
-voidSetGraphic( const Graphic rGraphic, const String
rLink );
+voidSetGraphic( const Graphic rGraphic, const
OUString rLink );
/** Get graphic transformed according to given attributes
@@ -380,15 +380,15 @@
voidSetAttr( const GraphicAttr rAttr );
const GraphicAttr GetAttr() const { return maAttr; }
-sal_BoolHasLink() const { return( mpLink != NULL
mpLink-Len() 0 ); }
+sal_BoolHasLink() const { return( mpLink != NULL
!mpLink-isEmpty()); }
voidSetLink();
-voidSetLink( const String rLink );
-String GetLink() const;
+voidSetLink( const OUString rLink );
+OUStringGetLink() const;
-sal_BoolHasUserData() const { return( mpUserData != NULL
mpUserData-Len() 0 ); }
+sal_BoolHasUserData() const { return( mpUserData != NULL
!mpUserData-isEmpty() ); }
voidSetUserData();
-voidSetUserData( const String rUserData );
-String GetUserData() const;
+voidSetUserData( const OUString rUserData );
+OUStringGetUserData() const;
OStringGetUniqueID() const;
diff --git a/svtools/source/control/fmtfield.cxx
b/svtools/source/control/fmtfield.cxx
index 7e04e8c..807ca54 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -451,7 +451,7 @@
}
//--
-String FormattedField::GetTextValue() const
+OUString FormattedField::GetTextValue() const
{
if (m_bValueDirty)
{
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 136aa57..1a25822 100644
---
[PATCH] String=OUString svtools trasnfer*
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4262
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/4262/1
String=OUString svtools trasnfer*
Change-Id: Iefa6688b91a05e248a6073c4f7216111fa4f7410
---
M cui/source/dialogs/hltpbase.cxx
M framework/source/classes/droptargetlistener.cxx
M include/svtools/transfer.hxx
M sc/source/ui/view/viewfun5.cxx
M sd/source/ui/dlg/sdtreelb.cxx
M sd/source/ui/view/sdview3.cxx
M svtools/source/misc/stringtransfer.cxx
M svtools/source/misc/transfer.cxx
M svtools/source/misc/transfer2.cxx
M svx/source/fmcomp/dbaexchange.cxx
M svx/source/gallery2/galtheme.cxx
M sw/source/ui/dochdl/swdtflvr.cxx
M sw/source/ui/inc/swdtflvr.hxx
M sw/source/ui/utlui/content.cxx
M sw/source/ui/utlui/navipi.cxx
15 files changed, 66 insertions(+), 93 deletions(-)
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 273d89e..9688a18 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -88,7 +88,7 @@
sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent rEvt )
{
TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable );
-String aString;
+OUString aString;
sal_Int8nRet = DND_ACTION_NONE;
if( aDataHelper.GetString( FORMAT_STRING, aString ) )
diff --git a/framework/source/classes/droptargetlistener.cxx
b/framework/source/classes/droptargetlistener.cxx
index 1b00c54..37c076b 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -92,7 +92,7 @@
}
// then, if necessary, the file format
-String aFilePath;
+OUString aFilePath;
if ( !bFormatFound aHelper.GetString( SOT_FORMAT_FILE,
aFilePath ) )
implts_OpenFile( aFilePath );
}
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 5d63d16..2f177f9 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -315,9 +315,6 @@
::com::sun::star::uno::Any GetAny( SotFormatStringId nFormat ) const;
::com::sun::star::uno::Any GetAny( const
::com::sun::star::datatransfer::DataFlavor rFlavor ) const;
-sal_BoolGetString( SotFormatStringId nFormat, String
rStr );
-sal_BoolGetString( const
::com::sun::star::datatransfer::DataFlavor rFlavor, String rStr );
-
sal_BoolGetString( SotFormatStringId nFormat,
OUString rStr );
sal_BoolGetString( const
::com::sun::star::datatransfer::DataFlavor rFlavor, OUString rStr );
@@ -500,8 +497,8 @@
voidCopyINetImage( const INetImage rINtImg );
voidCopyImageMap( const ImageMap rImgMap );
voidCopyGraphic( const Graphic rGrf );
-voidCopyString( const String rStr );
-voidCopyString( sal_uInt16 nFmt, const String rStr );
+voidCopyString( const OUString rStr );
+voidCopyString( sal_uInt16 nFmt, const OUString rStr );
voidCopyAny( sal_uInt16 nFmt, const
::com::sun::star::uno::Any rAny );
voidCopyByteString( sal_uLong nFormatId, const OString
rStr );
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 1611c7f..907e25a 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -583,7 +583,7 @@
}
else if ( nFormatId == SOT_FORMAT_FILE )
{
-String aFile;
+OUString aFile;
if ( aDataHelper.GetString( nFormatId, aFile ) )
bRet = PasteFile( aPos, aFile, bLink );
}
@@ -638,21 +638,21 @@
sal_uInt16 nRows = 1;
if ( aDataHelper.HasFormat( SOT_FORMAT_STRING ) )
{
-String aDataStr;
+OUString aDataStr;
if ( aDataHelper.GetString( SOT_FORMAT_STRING, aDataStr ) )
{
// get size from string the same way as in ScDdeLink::DataChanged
aDataStr = convertLineEnd(aDataStr, LINEEND_LF);
-xub_StrLen nLen = aDataStr.Len();
-if (nLen aDataStr.GetChar(nLen-1) == '\n')
-aDataStr.Erase(nLen-1);
+sal_Int32 nLen = aDataStr.getLength();
+if (nLen aDataStr[nLen-1] == '\n')
+aDataStr = aDataStr.copy(0, nLen-1);
-if (aDataStr.Len())
+if (!aDataStr.isEmpty())
{
nRows = comphelper::string::getTokenCount(aDataStr, '\n');
-String aLine = aDataStr.GetToken( 0, '\n' );
-if (aLine.Len())
+OUString aLine = aDataStr.getToken( 0, '\n' );
+if (!aLine.isEmpty())
nCols = comphelper::string::getTokenCount(aLine, '\t');
}
}
diff --git
[PATCH] rtl: add global empty oustring
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4264
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/4264/1
rtl: add global empty oustring
Change-Id: Ia5c3fcf564243dd90eb816d4ef571b3750a5ef5d
---
M include/rtl/ustring.hxx
M sal/rtl/ustring.cxx
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 112486d..49a9696 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -55,6 +55,13 @@
namespace rtl
{
+class OUString;
+}
+SAL_DLLPUBLIC rtl::OUString SAL_CALL rtl_ustr_get_empty(void);
+
+namespace rtl
+{
+
#ifdef RTL_STRING_UNITTEST
#undef rtl
#endif
@@ -2232,6 +2239,11 @@
rtl_uString_newFromAscii( pNew, value );
return OUString( pNew, SAL_NO_ACQUIRE );
}
+
+static OUString getEmptyOUString(void)
+{
+return rtl_ustr_get_empty();
+}
};
/* === */
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index bdebd89..0d045c2 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -44,6 +44,7 @@
#include rtl/math.h
#include rtl/tencinfo.h
+#include rtl/ustring.hxx
/* === */
@@ -75,6 +76,13 @@
#include strtmpl.cxx
+rtl::OUString SAL_CALL rtl_ustr_get_empty(void)
+{
+static rtl::OUString aEmpty;
+return aEmpty;
+}
+
+
sal_Int32 rtl_ustr_indexOfAscii_WithLength(
sal_Unicode const * str, sal_Int32 len,
char const * subStr, sal_Int32 subLen) SAL_THROW_EXTERN_C()
--
To view, visit https://gerrit.libreoffice.org/4264
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5c3fcf564243dd90eb816d4ef571b3750a5ef5d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] String=OUString svl touch-up
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4266
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/4266/1
String=OUString svl touch-up
Change-Id: Iaab1e0a2fdbfdac9d66fe158fca397336c6e84d1
---
M include/svl/urlbmk.hxx
M svl/source/misc/inethist.cxx
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx
index cc04b22..2f2a11b 100644
--- a/include/svl/urlbmk.hxx
+++ b/include/svl/urlbmk.hxx
@@ -21,7 +21,7 @@
#define _URLBMK_HXX
-#include tools/string.hxx
+#include rtl/ustring.hxx
//=
@@ -37,23 +37,23 @@
*/
{
-String aUrl;
-String aDescr;
+OUString aUrl;
+OUString aDescr;
protected:
-voidSetURL( const String rS ) { aUrl = rS; }
-voidSetDescription( const String rS ) { aDescr = rS; }
+voidSetURL( const OUString rS ) { aUrl = rS; }
+voidSetDescription( const OUString rS ) { aDescr = rS; }
public:
-INetBookmark( const String rUrl, const String rDescr )
+INetBookmark( const OUString rUrl, const OUString rDescr
)
: aUrl( rUrl ), aDescr( rDescr )
{}
INetBookmark()
{}
-const String GetURL() const { return aUrl; }
-const String GetDescription() const { return aDescr; }
+const OUString GetURL() const { return aUrl; }
+const OUString GetDescription() const { return aDescr; }
};
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 7eb8c6e..c846182 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -24,9 +24,9 @@
#include rtl/instance.hxx
#include rtl/crc.h
+#include rtl/ustring.hxx
#include tools/solar.h
#include tools/debug.hxx
-#include tools/string.hxx
#include tools/urlobj.hxx
/*
@@ -201,8 +201,8 @@
/** putUrl/queryUrl.
*/
-void putUrl (const String rUrl);
-sal_Bool queryUrl (const String rUrl);
+void putUrl (const OUString rUrl);
+sal_Bool queryUrl (const OUString rUrl);
};
/*
@@ -292,7 +292,7 @@
/*
* putUrl.
*/
-void INetURLHistory_Impl::putUrl (const String rUrl)
+void INetURLHistory_Impl::putUrl (const OUString rUrl)
{
sal_uInt32 h = crc32 (rUrl);
sal_uInt16 k = find (h);
@@ -349,7 +349,7 @@
/*
* queryUrl.
*/
-sal_Bool INetURLHistory_Impl::queryUrl (const String rUrl)
+sal_Bool INetURLHistory_Impl::queryUrl (const OUString rUrl)
{
sal_uInt32 h = crc32 (rUrl);
sal_uInt16 k = find (h);
@@ -417,8 +417,8 @@
case INET_PROT_FILE:
if (!rUrl.IsCaseSensitive())
{
-String aPath (rUrl.GetURLPath(INetURLObject::NO_DECODE));
-aPath.ToLowerAscii();
+OUString aPath (rUrl.GetURLPath(INetURLObject::NO_DECODE));
+aPath = aPath.toAsciiLowerCase();
rUrl.SetURLPath (aPath, INetURLObject::NOT_CANONIC);
}
break;
--
To view, visit https://gerrit.libreoffice.org/4266
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaab1e0a2fdbfdac9d66fe158fca397336c6e84d1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] String=OUString svtools imap
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4258
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/4258/1
String=OUString svtools imap
Change-Id: I56a91943080e290eabbc23575e27aab65e5d269e
---
M include/svtools/imap.hxx
M include/svtools/imapcirc.hxx
M include/svtools/imapobj.hxx
M include/svtools/imappoly.hxx
M include/svtools/imaprect.hxx
M sc/source/ui/drawfunc/fusel.cxx
M sd/source/ui/func/fusel.cxx
M svtools/source/misc/imap.cxx
M svtools/source/misc/imap2.cxx
M svtools/source/uno/unoiface.cxx
M svtools/source/uno/unoimap.cxx
M sw/source/core/frmedt/fefly1.cxx
12 files changed, 166 insertions(+), 169 deletions(-)
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 790cdeb..5f5b2e9 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -21,7 +21,6 @@
#define _IMAP_HXX
#include svtools/svtdllapi.h
-#include tools/string.hxx
#include tools/stream.hxx
#include vector
@@ -38,27 +37,27 @@
private:
IMapObjectList_impl maList;
-String aName;
+OUStringaName;
protected:
// Binaer laden/speichern
-voidImpWriteImageMap( SvStream rOStm, const String )
const ;
-voidImpReadImageMap( SvStream rIStm, size_t nCount, const
String );
+voidImpWriteImageMap( SvStream rOStm, const OUString )
const ;
+voidImpReadImageMap( SvStream rIStm, size_t nCount, const
OUString );
// Im-/Export
-voidImpWriteCERN( SvStream rOStm, const String rBaseURL
) const;
-voidImpWriteNCSA( SvStream rOStm, const String rBaseURL
) const;
-sal_uLong ImpReadCERN( SvStream rOStm, const String rBaseURL );
-sal_uLong ImpReadNCSA( SvStream rOStm, const String rBaseURL );
+voidImpWriteCERN( SvStream rOStm, const OUString
rBaseURL ) const;
+voidImpWriteNCSA( SvStream rOStm, const OUString
rBaseURL ) const;
+sal_uLong ImpReadCERN( SvStream rOStm, const OUString rBaseURL
);
+sal_uLong ImpReadNCSA( SvStream rOStm, const OUString rBaseURL
);
-voidImpReadCERNLine( const OString rLine, const String
rBaseURL );
+voidImpReadCERNLine( const OString rLine, const OUString
rBaseURL );
Point ImpReadCERNCoords( const char** ppStr );
longImpReadCERNRadius( const char** ppStr );
-String ImpReadCERNURL( const char** ppStr, const String
rBaseURL );
+OUStringImpReadCERNURL( const char** ppStr, const OUString
rBaseURL );
-voidImpReadNCSALine( const OString rLine, const String
rBaseURL );
-String ImpReadNCSAURL( const char** ppStr, const String
rBaseURL );
+voidImpReadNCSALine( const OString rLine, const OUString
rBaseURL );
+OUStringImpReadNCSAURL( const char** ppStr, const OUString
rBaseURL );
Point ImpReadNCSACoords( const char** ppStr );
sal_uLong ImpDetectFormat( SvStream rIStm );
@@ -68,7 +67,7 @@
TYPEINFO();
ImageMap() {};
-ImageMap( const String rName );
+ImageMap( const OUString rName );
ImageMap( const ImageMap rImageMap );
// Der Dtor gibt den intern belegten
@@ -114,18 +113,18 @@
sal_uInt16 GetVersion() const;
// liefert / setzt den Namen der ImageMap
-const String GetName() const { return aName; }
-voidSetName( const String rName ) { aName = rName; }
+const OUString GetName() const { return aName; }
+voidSetName( const OUString rName ) { aName = rName; }
// skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
voidScale( const Fraction rFractX, const Fraction rFracY
);
// Im-/Export
-voidWrite ( SvStream rOStm, const String rBaseURL )
const;
-voidRead( SvStream rIStm, const String rBaseURL );
+voidWrite ( SvStream rOStm, const OUString rBaseURL )
const;
+voidRead( SvStream rIStm, const OUString rBaseURL );
-voidWrite( SvStream rOStm, sal_uLong nFormat, const
String rBaseURL ) const;
-sal_uLong Read( SvStream rIStm, sal_uLong nFormat, const
String rBaseURL );
+voidWrite( SvStream rOStm, sal_uLong nFormat, const
OUString rBaseURL ) const;
+sal_uLong Read( SvStream rIStm, sal_uLong nFormat, const
OUString rBaseURL );
};
class IMapCompat
diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index 057561a..9ba93d4 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
@@ -42,11
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libcmis/libcmis-0.3.0.patch
libcmis/libcmis-0.3.0.patch | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit 18723cb22bce2e8208ff44b0100991dfac9f455d
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jun 13 14:45:48 2013 +0200
Fixed libcmis handling of related multipart content types
Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
(cherry picked from commit 6b10219eefc0d6bd0e871976d6fe781a26020c8b)
(cherry picked from commit 6ed3ef87d2472bad71b719e9ec927e72acfd2850)
Reviewed-on: https://gerrit.libreoffice.org/4241
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index 37644c8..772c828 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -33,3 +33,17 @@ index 7c2a8e6..e7014cb 100644
contentLength = it-second-getLongs( ).front( );
return contentLength;
}
+diff --git src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+index ef91b4d..3a990e7 100644
+--- src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+@@ -93,6 +93,8 @@ RelatedMultipart::RelatedMultipart( const string body,
const string contentTyp
+ if ( value[0] == '' value[value.length() - 1] == '' )
+ value = value.substr( 1, value.length( ) - 2 );
+
++name = libcmis::trim( name );
++
+ if ( name == start )
+ {
+ m_startId = value;
+--
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - libcmis/libcmis-0.3.0.patch
libcmis/libcmis-0.3.0.patch | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit cd6f1f1c238bfaea2a35785d38152990346d6a9c
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jun 13 14:45:48 2013 +0200
Fixed libcmis handling of related multipart content types
Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
(cherry picked from commit 6b10219eefc0d6bd0e871976d6fe781a26020c8b)
diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index 37644c8..772c828 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -33,3 +33,17 @@ index 7c2a8e6..e7014cb 100644
contentLength = it-second-getLongs( ).front( );
return contentLength;
}
+diff --git src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+index ef91b4d..3a990e7 100644
+--- src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+@@ -93,6 +93,8 @@ RelatedMultipart::RelatedMultipart( const string body,
const string contentTyp
+ if ( value[0] == '' value[value.length() - 1] == '' )
+ value = value.substr( 1, value.length( ) - 2 );
+
++name = libcmis::trim( name );
++
+ if ( name == start )
+ {
+ m_startId = value;
+--
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - extensions/source
extensions/source/update/check/updatecheckjob.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 32dd90d49dfcf82a04642676d8b6e60a3dca7eef
Author: Michael Meeks michael.me...@suse.com
Date: Wed Jun 5 13:03:22 2013 +0100
fdo#64962 - ignore exceptions from checking with the update service.
Change-Id: If627b303f8710b915dcbdcb899454631f607e217
Reviewed-on: https://gerrit.libreoffice.org/4164
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/extensions/source/update/check/updatecheckjob.cxx
b/extensions/source/update/check/updatecheckjob.cxx
index 2360daf..3593a38 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -133,11 +133,17 @@ void SAL_CALL InitUpdateCheckJobThread::run()
return;
}
-rtl::Reference UpdateCheck aController( UpdateCheck::get() );
-aController-initialize( m_xParameters, m_xContext );
-
-if ( m_bShowDialog )
-aController-showDialog( true );
+try {
+rtl::Reference UpdateCheck aController( UpdateCheck::get() );
+aController-initialize( m_xParameters, m_xContext );
+
+if ( m_bShowDialog )
+aController-showDialog( true );
+} catch (const uno::Exception e) {
+// fdo#64962 - don't bring the app down on some unexpected exception.
+OSL_TRACE( Caught init update exception: %s\n thread terminated.\n,
+OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
+}
}
void InitUpdateCheckJobThread::setTerminating() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] String=OUString clean-up header include in tools and misc t...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4265
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/4265/1
String=OUString clean-up header include in tools and misc touch-up
Change-Id: I8c2220e21c58739ea41702101e0d533dc56f1208
---
M include/sfx2/docfilt.hxx
M include/sot/storinfo.hxx
M include/svtools/ehdl.hxx
M include/tools/errinf.hxx
M include/tools/inetmime.hxx
M include/tools/wldcrd.hxx
M include/unotools/fontcvt.hxx
M include/unotools/fontdefs.hxx
M sfx2/source/doc/docfilt.cxx
M sot/source/sdstor/stg.cxx
M svtools/source/misc/ehdl.cxx
M tools/source/inet/inetmsg.cxx
M unotools/source/config/pathoptions.cxx
M unotools/source/misc/syslocale.cxx
14 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index cc6f6b8..b92fd0d 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -22,6 +22,7 @@
#include sal/config.h
#include sfx2/dllapi.h
#include sal/types.h
+#include tools/solar.h
#include com/sun/star/plugin/PluginDescription.hpp
#include com/sun/star/embed/XStorage.hpp
#include com/sun/star/beans/UnknownPropertyException.hpp
@@ -96,11 +97,11 @@
sal_uInt16 GetDocIconId() const { return nDocIcon; }
const OUString GetUserData() const { return aUserData; }
const OUString GetDefaultTemplate() const { return aDefaultTemplate; }
-voidSetDefaultTemplate( const String rStr ) {
aDefaultTemplate = rStr; }
+voidSetDefaultTemplate( const OUString rStr ) {
aDefaultTemplate = rStr; }
boolUsesStorage() const { return GetFormat() != 0; }
void SetURLPattern( const OUString rStr );
OUString GetURLPattern() const { return aPattern; }
-voidSetUIName( const String rName ) { aUIName = rName; }
+voidSetUIName( const OUString rName ) { aUIName = rName; }
voidSetVersion( sal_uIntPtr nVersionP ) { nVersion =
nVersionP; }
sal_uIntPtr GetVersion() const { return nVersion; }
OUString GetSuffixes() const;
@@ -108,9 +109,9 @@
const OUString GetServiceName() const { return aServiceName; }
const OUString GetProviderName() const;
-static const SfxFilter* GetDefaultFilter( const String rName );
-static const SfxFilter* GetFilterByName( const String rName );
-static const SfxFilter* GetDefaultFilterFromFactory( const String
rServiceName );
+static const SfxFilter* GetDefaultFilter( const OUString rName );
+static const SfxFilter* GetFilterByName( const OUString rName );
+static const SfxFilter* GetDefaultFilterFromFactory( const OUString
rServiceName );
static OUString GetTypeFromStorage( const SotStorage rStg );
static OUString GetTypeFromStorage(
diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx
index f9ad436..6784e04 100644
--- a/include/sot/storinfo.hxx
+++ b/include/sot/storinfo.hxx
@@ -21,6 +21,7 @@
#define _SOT_STORINFO_HXX
#include tools/globname.hxx
+#include tools/solar.h
#include vector
#include sot/sotdllapi.h
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 4b06a6e..5772edf 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -36,7 +36,7 @@
sal_uInt16 nCtxIdP, Window *pWin=0,
sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0);
SfxErrorContext(
-sal_uInt16 nCtxIdP, const String aArg1, Window *pWin=0,
+sal_uInt16 nCtxIdP, const OUString aArg1, Window *pWin=0,
sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0);
virtual sal_Bool GetString(sal_uLong nErrId, OUString rStr);
@@ -44,7 +44,7 @@
sal_uInt16 nCtxId;
sal_uInt16 nResId;
ResMgr *pMgr;
-String aArg1;
+OUString aArg1;
};
class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler
@@ -65,7 +65,7 @@
ResMgr *pMgr;
ResMgr *pFreeMgr;
-SVT_DLLPRIVATE sal_Bool GetClassString(sal_uLong lErrId,
String ) const;
+SVT_DLLPRIVATE sal_Bool GetClassString(sal_uLong lErrId,
OUString ) const;
virtual sal_Bool CreateString(
const ErrorInfo *, OUString , sal_uInt16 ) const;
};
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index 815447b..9ca3ff0 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -23,9 +23,10 @@
#define _EINF_HXX
#include limits.h
+#include rtl/ustring.hxx
+#include tools/lineend.hxx
#include tools/rtti.hxx
#include tools/errcode.hxx
-#include tools/string.hxx
#include tools/toolsdllapi.h
class EDcr_Impl;
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index afe4247..347bb78 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -26,6 +26,7 @@
#include rtl/character.hxx
#include rtl/string.hxx
#include rtl/strbuf.hxx
+#include rtl/ustring.hxx
#include rtl/tencinfo.h
[PUSHED libreoffice-4-0] fdo#65666 keep tab characters in footnote settings (Begin/Af...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4235 Approvals: Andras Timar: Verified; Looks good to me, approved Objections: Miklos Vajna: This need some tweaks before it is merged -- To view, visit https://gerrit.libreoffice.org/4235 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fbd0f2dea5926981c0cd351c3235f6b61e66aaa Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Németh László nem...@numbertext.org Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - sw/source
sw/source/core/doc/acmplwrd.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f073f36a7d58fab9e6415cf8419f8f04dc9009b2
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 4 23:32:09 2013 +0200
fdo#61923: sw: word completion: do not add trailing '.'
SwAutoCompleteWord::InsertWord(): use the computed nWrdLen to cut off
trailing periods.
(regression from d602a3b280fcc1cf16660d8719cd8eb8797dd2ad)
Change-Id: I9f4ace62f8d9e7d233e7e210f476856d7841d869
(cherry picked from commit 246d7e280ea8b7d1e27e14a6568d2a65cc8c9e7b)
Reviewed-on: https://gerrit.libreoffice.org/4159
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 3588290..d59d84f 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -265,7 +265,7 @@ bool SwAutoCompleteWord::InsertWord( const String rWord,
SwDoc rDoc )
std::pairediteng::SortedAutoCompleteStrings::const_iterator, bool
aInsPair = m_WordList.insert(pNew);
-m_LookupTree-insert( OUString(aNewWord) );
+m_LookupTree-insert( OUString(aNewWord).copy(0, nWrdLen) );
if (aInsPair.second)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - 2 commits - drawinglayer/source editeng/source sc/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |4 ++--
editeng/source/editeng/impedit3.cxx| 18 +-
sc/source/ui/view/output2.cxx |2 +-
3 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit 4fa15ad7d6d0da49210fdea44622aee28dd066e2
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 11 09:19:03 2013 +0200
Revert fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.
It caused some regressions. For example, see fdo65414 and fdo65562
This reverts commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3.
Change-Id: I0108463c78bbcb48a4c218d78e51deaa39caec0c
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 1a50490..1dfc2f4 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@ namespace drawinglayer
if(rTextCandidate.getFontAttribute().getRTL())
{
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED));
-nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
+nRTLLayoutMode |=
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
}
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 5fd8362..d56ea0e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4306,13 +4306,18 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice*
pOutDev, String* pString, x
void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16
nPara, sal_uInt16 nIndex )
{
+sal_Bool bCTL = sal_False;
sal_Bool bR2L = sal_False;
if ( nIndex == 0x )
{
+bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
bR2L = IsRightToLeft( nPara );
}
else
{
+ContentNode* pNode = GetEditDoc().GetObject( nPara );
+short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
+bCTL = nScriptType == i18n::ScriptType::COMPLEX;
// this change was discussed in issue 37190
bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
// it also works for issue 55927
@@ -4321,18 +4326,21 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice*
pOutDev, sal_uInt16 nPara,
sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
// We always use the left postion for DrawText()
-// Let VCL do CTL checking
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
-if ( !bR2L )
+if ( !bCTL !bR2L)
{
// No CTL/Bidi checking neccessary
nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
}
else
{
-//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT |
TEXT_LAYOUT_BIDI_STRONG;
+// CTL/Bidi checking neccessary
+// Don't use BIDI_STRONG, VCL must do some checks.
+nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
+
+if ( bR2L )
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
}
pOutDev-SetLayoutMode( nLayoutMode );
commit 722b109fa3cde246384230c9ee25723988083eb6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jun 7 05:28:04 2013 +0200
don't hide cell content behind pivot table buttons, fdo#60877
Change-Id: I1508aafcc7046c576a4d6de87900dc66f32b2f97
Reviewed-on: https://gerrit.libreoffice.org/4184
Reviewed-by: Kohei Yoshida kohei.yosh...@suse.de
Tested-by: Kohei Yoshida kohei.yosh...@suse.de
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 5461fec..6fa83c3 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1353,7 +1353,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY,
long nPosX, long nPosY
// (for automatic line break: only if not formatting for printer, as
in ScColumn::GetNeededSize)
if ( eType==OUTTYPE_WINDOW
- ( static_castconst
ScMergeFlagAttr(rPattern.GetItem(ATTR_MERGE_FLAG)).GetValue() SC_MF_AUTO )
+ ( static_castconst
ScMergeFlagAttr(rPattern.GetItem(ATTR_MERGE_FLAG)).GetValue()
(SC_MF_AUTO|SC_MF_BUTTON|SC_MF_BUTTON_POPUP) )
( !bBreak || mpRefDevice == pFmtDevice ) )
{
// filter drop-down width is now independent from row height
Re: LO 4.0.4 RC1 splash-screen : back to 3.6 ???
Le 13/06/2013 13:17, Caolán McNamara a écrit : On Wed, 2013-06-12 at 23:13 +0200, Jean-Baptiste Faure wrote: Hi, It's me or the splash-screen of 4.0.4.1 is the one of LO 3.6 : same size, almost same color ? Additionally I see 2 progress bars !?! Is this fixed in rc2 now ? I guess I fell asleep at the wheel and used the wrong configure line. Yes, the problem is fixed in rc2. Thank you :-) Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ef/3931ff410117e1237b3bef7bc090e8b83b9519
ef/3931ff410117e1237b3bef7bc090e8b83b9519 |1 + 1 file changed, 1 insertion(+) New commits: commit 17172d532bfe577eca1994927bfc492b26b315f9 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 13 14:55:46 2013 +0100 Notes added by 'git notes add' diff --git a/ef/3931ff410117e1237b3bef7bc090e8b83b9519 b/ef/3931ff410117e1237b3bef7bc090e8b83b9519 new file mode 100644 index 000..a6795f4 --- /dev/null +++ b/ef/3931ff410117e1237b3bef7bc090e8b83b9519 @@ -0,0 +1 @@ +merged as: e0cce521f1ad0cc384d30ce2f1077ea229fffe62 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - oox/source
oox/source/drawingml/customshapegeometry.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit f882db81d1261383fd980b6a0790ae4fd94ecd9d
Author: Petr Mladek pmla...@suse.cz
Date: Thu Jun 13 14:30:06 2013 +0200
Revert bnc#819614: Fix runaway lines.
It caused several regressions when displaying shapes; for example,
in the test document for bnc#762695:
+ missing hyperboloids on several slides, e.g. 13, 14, 15
+ broken bubles on slide 32
This reverts commit c4345bcf488d24a45a6412cda41474de6baf00da.
diff --git a/oox/source/drawingml/customshapegeometry.cxx
b/oox/source/drawingml/customshapegeometry.cxx
index 55cf132..dada581 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -407,9 +407,8 @@ static EnhancedCustomShapeParameter GetAdjCoordinate(
CustomShapeProperties rCu
n = rValue[ 1 ];
}
if ( ( n = '0' ) ( n = '9' ) )
-{
-// seems to be a ST_Coordinate - convert EMUs to 1/100th mm
-aRet.Value = Any( GetCoordinate( rValue ) );
+{ // seems to be a ST_Coordinate
+aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - svx/source
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4548ed5eef6c1d9f97c4ca2947820d44f64a4710
Author: Tor Lillqvist t...@iki.fi
Date: Wed Jun 12 17:04:49 2013 +0300
Don't display the broken OLE link icon except on Windows
Change-Id: Iede3d98ab5e5f9cd1896465e2a8c61605601999f
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 5ecedad..223ac45 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -51,7 +51,7 @@ namespace drawinglayer
bScaleContent = pSource-IsEmptyPresObj();
}
}
-
+#ifdef WNT // Little point in displaying the broken OLE graphic on OSes that
don't have real OLE, maybe?
if(GRAPHIC_NONE == aGraphic.GetType())
{
// no source, use fallback resource emty OLE graphic
@@ -59,7 +59,7 @@ namespace drawinglayer
aGraphic = Graphic(aEmptyOLEBitmap);
bScaleContent = true;
}
-
+#endif
if(GRAPHIC_NONE != aGraphic.GetType())
{
const GraphicObject aGraphicObject(aGraphic);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/ui/docvw/edtwin.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit ba9e13a1ebad1569cd5ccf65925a06329ba0d188
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Jun 13 13:53:16 2013 +
122529: only check position protection when moving a text frame, graphic or
embedded object in Writer
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index c577b21..392d982 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -977,14 +977,8 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, sal_Bool bWeb )
SwWrtShell rSh = rView.GetWrtShell();
SwRect aTmp = rSh.GetFlyRect();
if( aTmp.HasArea()
-// -- FME 2005-01-13 #i40348#
-// IsSelObjProtected() seems to be the correct condition, not
-// !HasReadonlySel(), otherwise frame is not moveable if content is
-// protected.
-!rSh.IsSelObjProtected( FLYPROTECT_POS|FLYPROTECT_SIZE ) )
-// --
+!rSh.IsSelObjProtected( FLYPROTECT_POS ) )
{
-// OD 18.09.2003 #i18732# - add item RES_FOLLOW_TEXT_FLOW
SfxItemSet aSet(rSh.GetAttrPool(),
RES_FRM_SIZE, RES_FRM_SIZE,
RES_VERT_ORIENT, RES_ANCHOR,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Fixed libcmis handling of related multipart content types
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4241 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4241 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - svx/source
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d719c3641e26de3e744f81a1a095c515b58c64ba
Author: Tor Lillqvist t...@iki.fi
Date: Wed Jun 12 17:04:49 2013 +0300
Don't display the broken OLE link icon except on Windows
Change-Id: Iede3d98ab5e5f9cd1896465e2a8c61605601999f
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 5ecedad..223ac45 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -51,7 +51,7 @@ namespace drawinglayer
bScaleContent = pSource-IsEmptyPresObj();
}
}
-
+#ifdef WNT // Little point in displaying the broken OLE graphic on OSes that
don't have real OLE, maybe?
if(GRAPHIC_NONE == aGraphic.GetType())
{
// no source, use fallback resource emty OLE graphic
@@ -59,7 +59,7 @@ namespace drawinglayer
aGraphic = Graphic(aEmptyOLEBitmap);
bScaleContent = true;
}
-
+#endif
if(GRAPHIC_NONE != aGraphic.GetType())
{
const GraphicObject aGraphicObject(aGraphic);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/customshapegeometry.cxx |5 ++---
sd/qa/unit/import-tests.cxx |2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit b0f10dd3262cd16b8a6c1bb4fbc3386330acc685
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Jun 13 16:16:58 2013 +0200
Revert bnc#819614: Fix runaway lines.
This reverts commit 5fe65c0c5e5a8d815d9d15ef192e7652726662e6.
Unfortunately this causes a regression elsewhere.
This also disables the unit test for this bug - will re-enable when I find
a fix that both fixes this, and does not regress other stuff :-)
Change-Id: Iad334e3c59c928edb78f25c0f36a33a26a7e6125
diff --git a/oox/source/drawingml/customshapegeometry.cxx
b/oox/source/drawingml/customshapegeometry.cxx
index 20458f0..3155b89 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -406,9 +406,8 @@ static EnhancedCustomShapeParameter GetAdjCoordinate(
CustomShapeProperties rCu
n = rValue[ 1 ];
}
if ( ( n = '0' ) ( n = '9' ) )
-{
-// seems to be a ST_Coordinate - convert EMUs to 1/100th mm
-aRet.Value = Any( GetCoordinate( rValue ) );
+{ // seems to be a ST_Coordinate
+aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
}
else
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 8babd50d..cd2f5ff 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -65,7 +65,7 @@ void SdFiltersTest::testDocumentLayout()
{ pptx/fdo47434-all.pptx, pptx/xml/fdo47434_page },
{ n758621.ppt, xml/n758621_ },
{ fdo64586.ppt, xml/fdo64586_ },
-{ n819614.pptx, xml/n819614_ },
+// FIXME re-enable again when a better fix is found { n819614.pptx,
xml/n819614_ },
{ n820786.pptx, xml/n820786_ },
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] String=OUString part of linguistic
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4263
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/4263/1
String=OUString part of linguistic
Change-Id: I8e566956416bb191a4d28acb6c3dc2c1e1daad62
---
M include/linguistic/misc.hxx
M linguistic/source/convdic.cxx
M linguistic/source/convdic.hxx
M linguistic/source/misc.cxx
M linguistic/source/misc2.cxx
M sfx2/source/appl/appdde.cxx
6 files changed, 72 insertions(+), 73 deletions(-)
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 8e7b4b1..f3a56c8 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -35,7 +35,6 @@
#include cppuhelper/implbase1.hxx // helper for implementations
#include unotools/pathoptions.hxx
#include i18nlangtag/lang.h
-#include tools/string.hxx
#include unotools/charclass.hxx
#include osl/thread.h
#include osl/mutex.hxx
@@ -117,10 +116,10 @@
// checks if file pointed to by rURL is readonly
// and may also check return if such a file exists or not
-sal_BoolIsReadOnly( const String rURL, sal_Bool *pbExist = 0 );
+boolIsReadOnly( const OUString rURL, bool *pbExist = 0 );
// checks if a file with the given URL exists
-sal_BoolFileExists( const String rURL );
+boolFileExists( const OUString rURL );
OUString GetDictionaryWriteablePath();
@@ -128,7 +127,7 @@
/// @returns an URL for a new and writable dictionary rDicName.
/// The URL will point to the path given by 'GetDictionaryWriteablePath'
-LNG_DLLPUBLIC String GetWritableDictionaryURL( const String rDicName );
+LNG_DLLPUBLIC OUString GetWritableDictionaryURL( const OUString rDicName );
LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const OUString rTxt, sal_Int32
nPos );
@@ -139,14 +138,14 @@
::com::sun::star::linguistic2::XHyphenatedWord
rxHyphWord );
-LNG_DLLPUBLIC sal_BoolIsUpper( const String rText, xub_StrLen nPos,
xub_StrLen nLen, sal_Int16 nLanguage );
+LNG_DLLPUBLIC boolIsUpper( const OUString rText, sal_Int32 nPos,
sal_Int32 nLen, sal_Int16 nLanguage );
-inline sal_BoolIsUpper( const String rText, sal_Int16 nLanguage )
{ return IsUpper( rText, 0, rText.Len(), nLanguage ); }
+inline boolIsUpper( const OUString rText, sal_Int16 nLanguage ) {
return IsUpper( rText, 0, rText.getLength(), nLanguage ); }
LNG_DLLPUBLIC CapType SAL_CALL capitalType(const OUString, CharClass *);
-String ToLower( const String rText, sal_Int16 nLanguage );
-LNG_DLLPUBLIC sal_Bool HasDigits( const OUString rText );
-LNG_DLLPUBLIC sal_Bool IsNumeric( const String rText );
+OUString ToLower( const OUString rText, sal_Int16 nLanguage );
+LNG_DLLPUBLIC bool HasDigits( const OUString rText );
+LNG_DLLPUBLIC bool IsNumeric( const OUString rText );
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
GetOneInstanceService( const char *pServiceName );
@@ -155,11 +154,11 @@
::com::sun::star::uno::Reference ::com::sun::star::linguistic2::XDictionary
GetIgnoreAllList();
-sal_Bool IsUseDicList( const ::com::sun::star::beans::PropertyValues
rProperties,
+bool IsUseDicList( const ::com::sun::star::beans::PropertyValues rProperties,
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rxPropSet );
-sal_Bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues
rProperties,
+bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues
rProperties,
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rxPropSet );
@@ -168,15 +167,15 @@
SearchDicList(
const ::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSearchableDictionaryList rDicList,
const OUString rWord, sal_Int16 nLanguage,
-sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry );
+bool bSearchPosDics, bool bSearchSpellEntry );
LNG_DLLPUBLIC sal_uInt8 AddEntryToDic(
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XDictionary rxDic,
-const OUString rWord, sal_Bool bIsNeg,
+const OUString rWord, bool bIsNeg,
const OUString rRplcTxt, sal_Int16 nRplcLang,
-sal_Bool bStripDot = sal_True );
+bool bStripDot = true );
-LNG_DLLPUBLIC sal_Bool SaveDictionaries( const
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSearchableDictionaryList xDicList );
+LNG_DLLPUBLIC bool SaveDictionaries( const ::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSearchableDictionaryList xDicList );
// AppExitLstnr:
// virtual base class that calls it AtExit function when the application
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index c21df30..971a2ca 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -163,12 +163,11 @@
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/misc/docfnote.cxx |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit f6cf8c5d32c44a77ee245f580c6c8721eddd8618 Author: David Tardon dtar...@redhat.com Date: Thu Jun 13 16:29:55 2013 +0200 i#1 adapt to old String API Change-Id: I52375929e149feae8bc6df0bc0938c5f8055fe5a diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 4ca616d..6cec8bf 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -376,8 +376,12 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet ) pInf-nFtnOffset = static_cast sal_uInt16 (m_pOffsetFld-GetValue() -1); pInf-aFmt.SetNumberingType(m_pNumViewBox-GetSelectedNumberingType() ); -pInf-SetPrefix(m_pPrefixED-GetText().replaceAll(\\t, \t)); -pInf-SetSuffix(m_pSuffixED-GetText().replaceAll(\\t, \t)); +String aPrefix(m_pPrefixED-GetText()); +aPrefix.SearchAndReplaceAllAscii(\\t, '\t'); +pInf-SetPrefix(aPrefix); +String aSuffix(m_pSuffixED-GetText()); +aSuffix.SearchAndReplaceAllAscii(\\t, '\t'); +pInf-SetSuffix(aSuffix); pInf-SetCharFmt( lcl_GetCharFormat( pSh, m_pFtnCharTextTemplBox-GetSelectEntry() ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - oox/source sd/qa
oox/source/drawingml/customshapegeometry.cxx |5 ++---
sd/qa/unit/import-tests.cxx |2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 8473b3b3b1768230b6604c5da2c28b804554392a
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Jun 13 16:16:58 2013 +0200
Revert bnc#819614: Fix runaway lines.
This reverts commit 5fe65c0c5e5a8d815d9d15ef192e7652726662e6.
Unfortunately this causes a regression elsewhere.
This also disables the unit test for this bug - will re-enable when I find
a fix that both fixes this, and does not regress other stuff :-)
Change-Id: Iad334e3c59c928edb78f25c0f36a33a26a7e6125
diff --git a/oox/source/drawingml/customshapegeometry.cxx
b/oox/source/drawingml/customshapegeometry.cxx
index 20458f0..3155b89 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -406,9 +406,8 @@ static EnhancedCustomShapeParameter GetAdjCoordinate(
CustomShapeProperties rCu
n = rValue[ 1 ];
}
if ( ( n = '0' ) ( n = '9' ) )
-{
-// seems to be a ST_Coordinate - convert EMUs to 1/100th mm
-aRet.Value = Any( GetCoordinate( rValue ) );
+{ // seems to be a ST_Coordinate
+aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
}
else
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 8babd50d..cd2f5ff 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -65,7 +65,7 @@ void SdFiltersTest::testDocumentLayout()
{ pptx/fdo47434-all.pptx, pptx/xml/fdo47434_page },
{ n758621.ppt, xml/n758621_ },
{ fdo64586.ppt, xml/fdo64586_ },
-{ n819614.pptx, xml/n819614_ },
+// FIXME re-enable again when a better fix is found { n819614.pptx,
xml/n819614_ },
{ n820786.pptx, xml/n820786_ },
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] gerrit daily digest active, please add yourself to watched projects, gerrit firehose ends 2013-06-17 0000UTC
Hi, so the gerrit firehose will end on Monday 2013-06-17 UTC -- plus/minus a bit for me fumbling around with it. Best, Bjoern - Forwarded message from Bjoern Michaelsen bjoern.michael...@canonical.com - Date: Fri, 7 Jun 2013 13:49:55 +0200 From: Bjoern Michaelsen bjoern.michael...@canonical.com To: Michael Meeks michael.me...@suse.com Cc: Libreoffice-qa libreoffice...@lists.freedesktop.org, libreoffice-dev libreoffice@lists.freedesktop.org Subject: [ANN] gerrit daily digest active, please add yourself to watched projects, gerrit firehose likely ends next week (was: minutes of ESC call ...) User-Agent: Mutt/1.5.21 (2010-09-15) Hi, On Thu, May 23, 2013 at 04:04:14PM +0100, Michael Meeks wrote: + Proposed compromise: (decide on it next time) + build a daily digest of submitted patches - dev list + with commit messages, authors, links etc. + turn other notifications off + better document the gerrit mail / notification settings + encourage people who want to see everything to do that. + Go with the compromise AI: + get the digest bits setup (Bjoern) + already have a script by David for that, put that into the dev-tools/ repository bikeshedding there. the digest mailer is now active, here is the first output of it: http://nabble.documentfoundation.org/LibreOffice-Gerrit-News-2013-06-07-td4060093.html It is now running on a cronjob at 0600UTC (european morning) daily on the gerrit machine. I also updated the gerrit mail notification docs at: https://wiki.documentfoundation.org/Development/GetUnrestrictedCommitAccess#keeping_up_to_speed_with_patches_to_review so if there are no issues over the next week, we should then turn off the firehose to the mailing list on Monday 2013-06-17(*) UTC -- so please prepare to add your watched projects as needed then to keep your personal firehose flushing ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice - End forwarded message - (*) fixed typo in original mail ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/source svx/source
drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx | 40 ++--- drawinglayer/source/processor2d/vclhelperbitmaprender.cxx | 78 -- drawinglayer/source/processor2d/vclhelperbitmaprender.hxx |5 drawinglayer/source/processor2d/vclprocessor2d.cxx| 16 -- svx/source/sdr/contact/viewcontactofsdrpage.cxx | 15 + 5 files changed, 35 insertions(+), 119 deletions(-) New commits: commit 45a8eaf9c55f2686f69118641d8a8992a86dfe31 Author: Armin Le Grand a...@apache.org Date: Mon Jan 14 13:02:48 2013 + Resolves: #i121534# Adapted rotated bitmap paints to use own transformer... due to bad quality of GraphicManager paints (cherry picked from commit f4887567cc71dca520d57cb6ff2b40eb49142cda) Conflicts: drawinglayer/source/processor2d/vclhelperbitmaprender.cxx Change-Id: Ie4b5873cdfb8bc7f1f4b288e1f983672343d8847 diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx index 5acebe6..a325690 100644 --- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx @@ -57,7 +57,7 @@ namespace drawinglayer const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) 2); const_cast DiscreteShadow* (this)-maTopLeft = getBitmapEx(); const_cast DiscreteShadow* (this)-maTopLeft.Crop( -Rectangle(Point(0,0),Size(nQuarter*2+1,nQuarter*2+1))); +Rectangle(Point(0, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1))); } return maTopLeft; @@ -70,7 +70,7 @@ namespace drawinglayer const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) 2); const_cast DiscreteShadow* (this)-maTop = getBitmapEx(); const_cast DiscreteShadow* (this)-maTop.Crop( -Rectangle(Point(nQuarter*2+1,0),Size(1,nQuarter+1))); +Rectangle(Point((nQuarter * 2) + 1, 0), Size(1, nQuarter))); } return maTop; @@ -83,7 +83,7 @@ namespace drawinglayer const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) 2); const_cast DiscreteShadow* (this)-maTopRight = getBitmapEx(); const_cast DiscreteShadow* (this)-maTopRight.Crop( - Rectangle(Point(nQuarter*2+2,0),Size(nQuarter*2+1,nQuarter*2+1))); +Rectangle(Point((nQuarter * 2) + 2, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1))); } return maTopRight; @@ -96,7 +96,7 @@ namespace drawinglayer const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) 2); const_cast DiscreteShadow* (this)-maRight = getBitmapEx(); const_cast DiscreteShadow* (this)-maRight.Crop( - Rectangle(Point(nQuarter*3+2,nQuarter*2+1),Size(nQuarter+1,1))); +Rectangle(Point((nQuarter * 3) + 3, (nQuarter * 2) + 1), Size(nQuarter, 1))); } return maRight; @@ -109,7 +109,7 @@ namespace drawinglayer const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) 2); const_cast DiscreteShadow* (this)-maBottomRight = getBitmapEx(); const_cast DiscreteShadow* (this)-maBottomRight.Crop( - Rectangle(Point(nQuarter*2+2,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1))); +Rectangle(Point((nQuarter * 2) + 2, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1))); } return maBottomRight; @@ -122,7 +122,7 @@ namespace drawinglayer const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) 2); const_cast DiscreteShadow* (this)-maBottom = getBitmapEx(); const_cast DiscreteShadow* (this)-maBottom.Crop( - Rectangle(Point(nQuarter*2+1,nQuarter*3+2),Size(1,nQuarter+1))); +Rectangle(Point((nQuarter * 2) + 1, (nQuarter * 3) + 3), Size(1, nQuarter))); } return maBottom; @@ -135,7 +135,7 @@ namespace drawinglayer const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) 2); const_cast DiscreteShadow* (this)-maBottomLeft = getBitmapEx(); const_cast DiscreteShadow* (this)-maBottomLeft.Crop( - Rectangle(Point(0,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1))); +Rectangle(Point(0, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1))); } return maBottomLeft; @@ -148,7 +148,7 @@ namespace drawinglayer const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) 2);
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f4/887567cc71dca520d57cb6ff2b40eb49142cda
f4/887567cc71dca520d57cb6ff2b40eb49142cda |1 + 1 file changed, 1 insertion(+) New commits: commit de4923c89d4a860ade9f9a895608964552cc0510 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 13 15:47:02 2013 +0100 Notes added by 'git notes add' diff --git a/f4/887567cc71dca520d57cb6ff2b40eb49142cda b/f4/887567cc71dca520d57cb6ff2b40eb49142cda new file mode 100644 index 000..21b6476 --- /dev/null +++ b/f4/887567cc71dca520d57cb6ff2b40eb49142cda @@ -0,0 +1 @@ +merged as: 45a8eaf9c55f2686f69118641d8a8992a86dfe31 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/data/n762695.pptx |binary sd/qa/unit/data/xml/n762695_0.xml | 243 ++ sd/qa/unit/data/xml/n762695_1.xml | 634 ++ sd/qa/unit/import-tests.cxx |1 4 files changed, 878 insertions(+) New commits: commit 90197a2375a77d02fcb70d74df318dc5f81288bb Author: Jan Holesovsky ke...@suse.cz Date: Thu Jun 13 16:27:35 2013 +0200 Unit test to avoid the regression... ...that appeared thanks to the bnc#819614 fix. Thanks Fridrich for constructing the document! Change-Id: I780f65ca436caee83094a8591dd9e36b33d921e8 diff --git a/sd/qa/unit/data/n762695.pptx b/sd/qa/unit/data/n762695.pptx new file mode 100644 index 000..cf547f3 Binary files /dev/null and b/sd/qa/unit/data/n762695.pptx differ diff --git a/sd/qa/unit/data/xml/n762695_0.xml b/sd/qa/unit/data/xml/n762695_0.xml new file mode 100644 index 000..dd0922f --- /dev/null +++ b/sd/qa/unit/data/xml/n762695_0.xml @@ -0,0 +1,243 @@ +?xml version=1.0? +XShapes + XShape positionX=5769 positionY=5160 sizeX=13390 sizeY=10855 type=com.sun.star.drawing.CustomShape name=Freeform 3 fontHeight=18.00 fontColor= textAutoGrowHeight=false textAutoGrowWidth=false textContourFrame=false textFitToSize=NONE textHorizontalAdjust=BLOCK textVerticalAdjust=CENTER textLeftDistance=250 textRightDistance=250 textUpperDistance=125 textLowerDistance=125 textMaximumFrameHeight=0 textMaximumFrameWidth=0 textMinimumFrameHeight=0 textMinimumFrameWidth=0 textAnimationAmount=0 textAnimationCount=0 textAnimationDelay=0 textAnimationDirection=LEFT textAnimationKind=NONE textAnimationStartInside=false textAnimationStopInside=false textWritingMode=LR_TB fillStyle=SOLID fillColor=c3d69b fillTransparence=0 fillTransparenceGradientName= + FillTransparenceGradient style=LINEAR startColor=00 endColor=ff angle=0 border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100 stepCount=0/ + FillGradient style=LINEAR startColor=3465af endColor=ff angle=0 border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100 stepCount=0/ + FillHatch style=SINGLE color=3465af distance=20 angle=0/ + FillBitmap width=32 height=32/ + LineDash style=RECT dots=1 dotLen=20 dashes=1 dashLen=20 distance=20/ + LineStart/ + LineEnd/ + Transformation + Line1 column1=13391.00 column2=0.00 column3=5769.00/ + Line2 column1=0.00 column2=10856.00 column3=5160.00/ + Line3 column1=0.00 column2=0.00 column3=1.00/ + /Transformation + CustomShapeGeometry + PropertyValue name=AdjustmentValues +AdjustmentValues/ + /PropertyValue + PropertyValue name=Equations handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=Handles +Handles/ + /PropertyValue + PropertyValue name=MirroredX value=false handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=MirroredY value=false handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=Path +Path + PropertyValue name=Coordinates + Coordinates + EnhancedCustomShapeParameterPair +First value=0 type=0/ +Second value=4572508 type=0/ + /EnhancedCustomShapeParameterPair + EnhancedCustomShapeParameterPair +First value=1524525 type=0/ +Second value=2755361 type=0/ + /EnhancedCustomShapeParameterPair + EnhancedCustomShapeParameterPair +First value=1521154 type=0/ +Second value=1860047 type=0/ + /EnhancedCustomShapeParameterPair + EnhancedCustomShapeParameterPair +First value=5441 type=0/ +Second value=0 type=0/ + /EnhancedCustomShapeParameterPair + EnhancedCustomShapeParameterPair +First value=4567067 type=0/ +Second value=0 type=0/ + /EnhancedCustomShapeParameterPair + EnhancedCustomShapeParameterPair +First value=3003587 type=0/ +Second value=1854731 type=0/ + /EnhancedCustomShapeParameterPair + EnhancedCustomShapeParameterPair +First value=3015827 type=0/ +Second value=2721006 type=0/ + /EnhancedCustomShapeParameterPair + EnhancedCustomShapeParameterPair +First value=4572508 type=0/ +Second value=4572508 type=0/ + /EnhancedCustomShapeParameterPair + EnhancedCustomShapeParameterPair +First value=0 type=0/ +Second value=4572508 type=0/ + /EnhancedCustomShapeParameterPair + /Coordinates + /PropertyValue + PropertyValue name=Segments + Segments + EnhancedCustomShapeSegment command=1 count=1/ + EnhancedCustomShapeSegment command=3 count=1/ + EnhancedCustomShapeSegment command=2 count=1/ + EnhancedCustomShapeSegment command=3 count=1/ + EnhancedCustomShapeSegment command=2 count=1/ + EnhancedCustomShapeSegment command=4 count=0/ + EnhancedCustomShapeSegment command=5 count=0/ + /Segments + /PropertyValue + PropertyValue name=SubViewSize handle=0
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/edtwin.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 57bf1f75942c2c9c0fc264bf0f9b84b674ea55f7
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Jun 13 13:53:16 2013 +
Resolves: #i122529# only check position protection when...
moving a text frame, graphic or embedded object in Writer
(cherry picked from commit ba9e13a1ebad1569cd5ccf65925a06329ba0d188)
Conflicts:
sw/source/ui/docvw/edtwin.cxx
Change-Id: I126165d6be7505223c4255262103cfb123ec3d55
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 80cac74..60b7c8b 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -994,10 +994,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, sal_Bool bWeb )
SwWrtShell rSh = m_rView.GetWrtShell();
SwRect aTmp = rSh.GetFlyRect();
if( aTmp.HasArea()
-// IsSelObjProtected() seems to be the correct condition, not
-// !HasReadonlySel(), otherwise frame is not moveable if content is
-// protected.
-!rSh.IsSelObjProtected( FLYPROTECT_POS|FLYPROTECT_SIZE ) )
+!rSh.IsSelObjProtected( FLYPROTECT_POS ) )
{
SfxItemSet aSet(rSh.GetAttrPool(),
RES_FRM_SIZE, RES_FRM_SIZE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ba/9e13a1ebad1569cd5ccf65925a06329ba0d188
ba/9e13a1ebad1569cd5ccf65925a06329ba0d188 |1 + 1 file changed, 1 insertion(+) New commits: commit 37caf35a89c2f904693e72cfddb92ccff001465d Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 13 15:54:54 2013 +0100 Notes added by 'git notes add' diff --git a/ba/9e13a1ebad1569cd5ccf65925a06329ba0d188 b/ba/9e13a1ebad1569cd5ccf65925a06329ba0d188 new file mode 100644 index 000..799f2a3 --- /dev/null +++ b/ba/9e13a1ebad1569cd5ccf65925a06329ba0d188 @@ -0,0 +1 @@ +merged as: 57bf1f75942c2c9c0fc264bf0f9b84b674ea55f7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
