[Libreoffice-commits] core.git: configure.ac
configure.ac |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0fddd7aa822abc86b646939e292dbcce0014db08
Author: Tor Lillqvist t...@iki.fi
Date: Sat Mar 23 08:02:33 2013 +0200
The x86 NDK toolchain uses a different naming convention for its root
Blind fix attempt for the Android-X86 tinderbox.
Change-Id: Ib7ae0d077aad149d27c19f1b0137bb87062d0f60
diff --git a/configure.ac b/configure.ac
index b9b11f6..e24efcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,21 +162,24 @@ if test -n $with_android_ndk; then
if test $host_cpu = arm; then
android_cpu=arm
+android_platform_prefix=$android_cpu-linux-androideabi
elif test $host_cpu = mips; then
android_cpu=mips
+android_platform_prefix=$android_cpu-linux-androideabi
else
# host_cpu is something like i386 or i686 I guess, NDK uses
# x86 in some contexts
android_cpu=x86
+android_platform_prefix=$android_cpu
fi
case $with_android_ndk_toolchain_version in
4.6|4.7)
-
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_cpu-linux-androideabi-$with_android_ndk_toolchain_version
+
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
;;
clang3.1|clang3.2)
-
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_cpu-linux-androideabi-4.6
+
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.6
ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
ANDROID_USING_CLANG=true
;;
___
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 | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 40fd922ecf6a9ba9cfe541975ea2fa6b711a66fd
Author: Tor Lillqvist t...@iki.fi
Date: Sat Mar 23 08:53:42 2013 +0200
Another blind fix for using the x86 NDK tool-chain
Change-Id: Id4abf40d4965c015baf7a4213cd6dde8871a2474
diff --git a/configure.ac b/configure.ac
index e24efcc..7cd27f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,14 @@ if test -n $with_android_ndk; then
fi
ANDROID_NDK_VERSION=`cut -f1 -d' ' $ANDROID_NDK_HOME/RELEASE.TXT`
+case $ANDROID_NDK_VERSION in
+r8*)
+;;
+*)
+AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r8*
versions are supported])
+;;
+esac
+
if test $host_cpu = arm; then
android_cpu=arm
android_platform_prefix=$android_cpu-linux-androideabi
@@ -179,6 +187,7 @@ if test -n $with_android_ndk; then
ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
;;
clang3.1|clang3.2)
+AC_MSG_WARN([Building with the Clang tool-chain is known to break in
the bridges module, fix that please])
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.6
ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
ANDROID_USING_CLANG=true
@@ -230,12 +239,11 @@ if test -n $with_android_ndk; then
android_gnu_prefix=arm-linux-androideabi
elif test $host_cpu = mips; then
android_gnu_prefix=mipsel-linux-android
-elif test -f $ANDROID_ABI_PREBUILT_BIN/i686-android-linux-gcc; then
+elif test $ANDROID_NDK_VERSION = r8; then
+# The prefix used for the x86 tool-chain changed between NDK r8 and r8b
android_gnu_prefix=i686-android-linux
-elif test -f $ANDROID_ABI_PREBUILT_BIN/i686-linux-android-gcc; then
-android_gnu_prefix=i686-linux-android
else
-AC_MSG_ERROR([Can't figure out the toolchain prefix])
+android_gnu_prefix=i686-linux-android
fi
test -z $SYSBASE export
SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fix fdo#62050: for impress
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2922 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/2922/1 fix fdo#62050: for impress Impress is also affected by fdo#62050. In RTL UI, comment window is RTL and editbox’s (editeng) default writing direction is LTR. I suspect, bug is result of this RTL LTR mix-up. Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf --- M sd/source/ui/annotations/annotationwindow.cxx 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 2a859f0..d03548a 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -327,14 +327,11 @@ mpOutliner-SetRefDevice( pDev ); } +mpTextWindow-EnableRTL( sal_False ); mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow ); mpOutliner-InsertView(mpOutlinerView ); mpTextWindow-SetOutlinerView(mpOutlinerView); mpOutlinerView-SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) ); - -// TODO: ?? -EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R; -mpOutliner-SetDefaultHorizontalTextDirection( aDefHoriTextDir ); //create Scrollbars mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG); -- To view, visit https://gerrit.libreoffice.org/2922 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] In writer’s RTL UI show author name and date at right side o...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2923 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/2923/1 In writer’s RTL UI show author name and date at right side of comment window Change-Id: Ie15482e9953d14927b4f918c43537100a8332689 --- M sw/source/ui/docvw/SidebarWin.cxx 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index b32fbe4..eb256d4 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -279,6 +279,7 @@ // window controls for author and date mpMetadataAuthor = new Edit( this, 0 ); mpMetadataAuthor-SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_AUTHOR_NAME ) ); +mpMetadataAuthor-EnableRTL(Application::GetSettings().GetLayoutRTL()); mpMetadataAuthor-SetReadOnly(); mpMetadataAuthor-AlwaysDisableInput(true); mpMetadataAuthor-SetCallHandlersOnInputDisabled(true); @@ -297,6 +298,7 @@ mpMetadataDate = new Edit( this, 0 ); mpMetadataDate-SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_DATE_NAME ) ); +mpMetadataDate-EnableRTL(Application::GetSettings().GetLayoutRTL()); mpMetadataDate-SetReadOnly(); mpMetadataDate-AlwaysDisableInput(true); mpMetadataDate-SetCallHandlersOnInputDisabled(true); -- To view, visit https://gerrit.libreoffice.org/2923 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie15482e9953d14927b4f918c43537100a8332689 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/annotations/annotationwindow.cxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 092bf2fb0052ca73855127dc03ff1ae3f9321506 Author: navin patidar pati...@kacst.edu.sa Date: Tue Mar 19 15:21:21 2013 +0300 fix fdo#62050: for impress Impress is also affected by fdo#62050. In RTL UI, comment window is RTL and editboxâs (editeng) default writing direction is LTR. I suspect, bug is result of this RTL LTR mix-up. Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf Reviewed-on: https://gerrit.libreoffice.org/2922 Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 2a859f0..d03548a 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -327,15 +327,12 @@ void AnnotationWindow::InitControls() mpOutliner-SetRefDevice( pDev ); } +mpTextWindow-EnableRTL( sal_False ); mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow ); mpOutliner-InsertView(mpOutlinerView ); mpTextWindow-SetOutlinerView(mpOutlinerView); mpOutlinerView-SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) ); -// TODO: ?? -EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R; -mpOutliner-SetDefaultHorizontalTextDirection( aDefHoriTextDir ); - //create Scrollbars mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG); mpVScrollbar-EnableNativeWidget(false); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/SidebarWin.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit a56a162e66269bfe39ba76bacc51efe4cff314da Author: navin patidar pati...@kacst.edu.sa Date: Sat Mar 23 09:49:46 2013 +0300 In writerâs RTL UI show author name and date at right side of comment window Change-Id: Ie15482e9953d14927b4f918c43537100a8332689 Reviewed-on: https://gerrit.libreoffice.org/2923 Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index a848fb6..45f367d 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -278,6 +278,7 @@ void SwSidebarWin::InitControls() // window controls for author and date mpMetadataAuthor = new Edit( this, 0 ); mpMetadataAuthor-SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_AUTHOR_NAME ) ); +mpMetadataAuthor-EnableRTL(Application::GetSettings().GetLayoutRTL()); mpMetadataAuthor-SetReadOnly(); mpMetadataAuthor-AlwaysDisableInput(true); mpMetadataAuthor-SetCallHandlersOnInputDisabled(true); @@ -296,6 +297,7 @@ void SwSidebarWin::InitControls() mpMetadataDate = new Edit( this, 0 ); mpMetadataDate-SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_DATE_NAME ) ); +mpMetadataDate-EnableRTL(Application::GetSettings().GetLayoutRTL()); mpMetadataDate-SetReadOnly(); mpMetadataDate-AlwaysDisableInput(true); mpMetadataDate-SetCallHandlersOnInputDisabled(true); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fix fdo#62050: for impress
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2922 Approvals: Ahmad Harthi: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2922 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa Gerrit-Reviewer: Ahmad Harthi aalhar...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] In writer’s RTL UI show author name and date at right side o...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2923 Approvals: Ahmad Harthi: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2923 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie15482e9953d14927b4f918c43537100a8332689 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa Gerrit-Reviewer: Ahmad Harthi aalhar...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - reportdesign/source svx/inc svx/Package_inc.mk svx/source
reportdesign/source/core/sdr/RptModel.cxx |1
svx/Package_inc.mk|1
svx/inc/svx/itextprovider.hxx | 42 ++
svx/inc/svx/sdr/contact/displayinfo.hxx | 14
svx/inc/svx/sdr/properties/textproperties.hxx |4 +
svx/inc/svx/svdmodel.hxx |3 -
svx/inc/svx/svdotext.hxx |3 -
svx/source/sdr/contact/displayinfo.cxx|6 --
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx |2
svx/source/sdr/properties/textproperties.cxx | 38 -
svx/source/svdraw/svdmodel.cxx| 18 +-
svx/source/table/cell.cxx | 52 ++
12 files changed, 131 insertions(+), 53 deletions(-)
New commits:
commit 91864e19c84ae9834d6e97ee5ddc4db5bf957681
Author: David Tardon dtar...@redhat.com
Date: Fri Mar 22 16:49:41 2013 +0100
rhbz#876742 speed up table manipulation in Impress
It turns out this is not actually a performance problem but an oversight
in implementation (or a bug, if you want .-)
Every manipulation with a table (e.g., move, resize; actually even a
selection of the table) leads to creation of a full copy of the table
(SdrObject::getFullDragClone()). One of the actions the table copy impl.
does is to call sdr::CellProperties::SetStyleSheet() on every cell of
the new table. CellProperties is derived from
sdr::properties::TextProperties and CellProperties::SetStyleSheet() just
passes the call to TextProperties::SetStyleSheet(). This is where the
trouble begins :-)
The SDR representation of a table, SdrTableObj, is derived from
SdrTextObj. Because of that, SdrTextObj needs to be able to contain more
than one SdrText (because a table needs one for every cell). This is
handled correctly by TextProperties. But, because there is no SDR
representation of a single cell, CellProperties uses the SdrTableObj as
the SDR object it works on. Therefore TextProperties::SetStyleSheet()
processes all SdrText objects of the _whole table_, not just a single
cell. And this is repeated for every other cell...
Change-Id: Iab2e2d0e1e8038710645c0bd24666e6032b0a003
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index e1deeab..cb54894 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -31,6 +31,7 @@ $(eval $(call
gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx))
+$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/itextprovider.hxx,svx/itextprovider.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/linkwarn.hxx,svx/linkwarn.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx))
diff --git a/svx/inc/svx/itextprovider.hxx b/svx/inc/svx/itextprovider.hxx
new file mode 100644
index 000..3202e4d
--- /dev/null
+++ b/svx/inc/svx/itextprovider.hxx
@@ -0,0 +1,42 @@
+/* -*- 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/.
+ */
+
+#if !defined SVX_ITEXTPROVIDER_HXX_INCLUDED
+#define SVX_ITEXTPROVIDER_HXX_INCLUDED
+
+#include sal/types.h
+
+#include svx/svxdllapi.h
+
+class SdrText;
+
+namespace svx
+{
+
+/** This interface provides access to text object(s) in an SdrObject.
+
+ */
+class SVX_DLLPUBLIC ITextProvider
+{
+public:
+/** Return the number of texts available for this object. */
+virtual sal_Int32 getTextCount() const = 0;
+
+/** Return the nth available text. */
+virtual SdrText* getText(sal_Int32 nIndex) const = 0;
+
+protected:
+~ITextProvider() {}
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx
b/svx/inc/svx/sdr/properties/textproperties.hxx
index ac6a613..456b104 100644
--- a/svx/inc/svx/sdr/properties/textproperties.hxx
+++ b/svx/inc/svx/sdr/properties/textproperties.hxx
@@ -20,6 +20,7 @@
#ifndef _SDR_PROPERTIES_TEXTPROPERTIES_HXX
#define _SDR_PROPERTIES_TEXTPROPERTIES_HXX
+#include svx/itextprovider.hxx
#include svx/sdr/properties/attributeproperties.hxx
#include svx/svxdllapi.h
@@ -45,6 +46,9 @@ namespace sdr
// react on ItemSet changes
virtual void
RE: LibreOffice for Android (how the overcome the problem with the 50 MB limit)
Out of curiosity isn’t there a way seeing as with gbuild we can build individual modules to where we can compile an individual aspect of LO using a single switch in autogen.sh? I am interested in this topic, question is where would I begin? -Original Message- From: Michael Meeks [mailto:michael.me...@suse.com] Sent: 22 March 2013 16:04 To: Jonathan Aquilina Subject: RE: LibreOffice for Android (how the overcome the problem with the 50 MB limit) On Fri, 2013-03-22 at 13:21 +0100, Jonathan Aquilina wrote: That is actually what I though seeing for instance the size of games and other apps. Seriously - if you have nothing technical to add on this topic - please take your comments on the subject to the discuss list :-) Otherwise you'll just de-motivate people working on the project. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: distro-configs/LibreOfficeiOS.conf distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/Libr
distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeMacOSX.conf |1 - distro-configs/LibreOfficeOpenBSD.conf |1 - distro-configs/LibreOfficeWin32.conf |1 - distro-configs/LibreOfficeiOS.conf |1 - distro-configs/OxygenOfficeLinux.conf |1 - distro-configs/OxygenOfficeWin32.conf |1 - 7 files changed, 7 deletions(-) New commits: commit 672cd6dbcf212eb8afe485e9fcfd727acef61c00 Author: Andras Timar ati...@suse.com Date: Sat Mar 23 08:30:33 2013 +0100 There is no --enable-ext-report-builder any more Change-Id: I447a2cfd0e90e61c4a3015d9ef58a78ae86eb874 diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index df55893..8219493 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -32,7 +32,6 @@ --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-wiki-publisher ---enable-ext-report-builder --enable-ext-presenter-minimizer --enable-ext-nlpsolver --enable-epm diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 23ff683..367d4c8 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -4,7 +4,6 @@ --enable-scripting-javascript --enable-ext-presenter-minimizer --enable-ext-wiki-publisher ---enable-ext-report-builder --enable-ext-nlpsolver --enable-extension-integration --enable-online-update diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index c1447b5..6a52daf 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -11,7 +11,6 @@ --enable-gstreamer-0-10 --enable-lockdown --enable-ext-presenter-minimizer ---enable-ext-report-builder --enable-ext-wiki-publisher --enable-python=system --with-alloc=system diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 30a67a2..f83712a 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -9,7 +9,6 @@ --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-wiki-publisher ---enable-ext-report-builder --enable-ext-presenter-minimizer --enable-ext-nlpsolver --enable-online-update diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf index f552e94..61a67bb 100644 --- a/distro-configs/LibreOfficeiOS.conf +++ b/distro-configs/LibreOfficeiOS.conf @@ -2,7 +2,6 @@ --host=arm-apple-darwin10 --disable-cairo-canvas --disable-ext-presenter-minimizer ---disable-ext-report-builder --disable-extension-integration --disable-gconf --disable-gnome-vfs diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index bdcaba9..91da226 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -33,7 +33,6 @@ --enable-extensions --enable-extension-integration --enable-ext-wiki-publisher ---enable-ext-report-builder --enable-ext-presenter-minimizer --enable-scripting-beanshell --enable-scripting-javascript diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index b7562ac..dafe593 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -13,7 +13,6 @@ --with-lang=hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl --enable-extension-integration --enable-ext-wiki-publisher ---enable-ext-report-builder --enable-ext-presenter-minimizer --enable-scripting-beanshell --enable-scripting-javascript ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sc/inc sc/qa sc/source
sc/inc/colorscale.hxx | 17
sc/inc/conditio.hxx| 24 +-
sc/inc/globstr.hrc |5 +
sc/qa/unit/data/ods/new_cond_format_test.ods |binary
sc/qa/unit/helper/shared_test_impl.hxx |2
sc/qa/unit/subsequent_export-test.cxx | 16
sc/qa/unit/subsequent_filters-test.cxx | 18
sc/source/core/data/colorscale.cxx | 100 -
sc/source/core/data/conditio.cxx | 30 ++-
sc/source/filter/excel/xecontent.cxx |8 +-
sc/source/filter/excel/xeextlst.cxx|2
sc/source/filter/inc/xeextlst.hxx |2
sc/source/filter/oox/condformatbuffer.cxx | 22 -
sc/source/filter/xml/xmlcondformat.cxx | 18
sc/source/filter/xml/xmlexprt.cxx | 12 +++
sc/source/ui/condformat/condformatdlgentry.cxx | 36 ++---
sc/source/ui/condformat/condformathelper.cxx | 14 ++-
sc/source/ui/src/condformatdlg.src |2
sc/source/ui/src/globstr.src |8 ++
19 files changed, 151 insertions(+), 185 deletions(-)
New commits:
commit 73e74680d8c0cbf8baf869cc8bbc58dae432a0ef
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Mar 23 08:33:22 2013 +0100
add ODS test for above/below cond format rules
Change-Id: I6ce6292a490ef39c111aa7f4c0a5ada0d45c16bc
diff --git a/sc/qa/unit/data/ods/new_cond_format_test.ods
b/sc/qa/unit/data/ods/new_cond_format_test.ods
new file mode 100644
index 000..9418c43
Binary files /dev/null and b/sc/qa/unit/data/ods/new_cond_format_test.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index c73ba31..bf0ab4a 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -45,6 +45,7 @@ public:
void test();
void testPasswordExport();
+void testConditionalFormatExportODS();
void testConditionalFormatExportXLSX();
void testColorScaleExportODS();
void testColorScaleExportXLSX();
@@ -57,6 +58,7 @@ public:
#if !defined(MACOSX) !defined(DRAGONFLY)
CPPUNIT_TEST(testPasswordExport);
#endif
+CPPUNIT_TEST(testConditionalFormatExportODS);
CPPUNIT_TEST(testConditionalFormatExportXLSX);
CPPUNIT_TEST(testColorScaleExportODS);
CPPUNIT_TEST(testColorScaleExportXLSX);
@@ -150,6 +152,20 @@ void ScExportTest::testPasswordExport()
CPPUNIT_ASSERT_DOUBLES_EQUAL(aVal, 1.0, 1e-8);
}
+void ScExportTest::testConditionalFormatExportODS()
+{
+ScDocShellRef xShell = loadDoc(new_cond_format_test., ODS);
+CPPUNIT_ASSERT(xShell.Is());
+
+ScDocShellRef xDocSh = saveAndReload((*xShell), ODS);
+CPPUNIT_ASSERT(xDocSh.Is());
+ScDocument* pDoc = xDocSh-GetDocument();
+OUString aCSVFile(new_cond_format_test.);
+OUString aCSVPath;
+createCSVPath( aCSVFile, aCSVPath );
+testCondFile(aCSVPath, pDoc, 0);
+}
+
void ScExportTest::testConditionalFormatExportXLSX()
{
ScDocShellRef xShell = loadDoc(new_cond_format_test., XLSX);
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index bdb09fd..187a81a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -127,6 +127,7 @@ public:
void testDataBarXLSX();
void testColorScaleODS();
void testColorScaleXLSX();
+void testNewCondFormatODS();
void testNewCondFormatXLSX();
//change this test file only in excel and not in calc
@@ -189,6 +190,7 @@ public:
CPPUNIT_TEST(testDataBarXLSX);
CPPUNIT_TEST(testColorScaleODS);
CPPUNIT_TEST(testColorScaleXLSX);
+CPPUNIT_TEST(testNewCondFormatODS);
CPPUNIT_TEST(testNewCondFormatXLSX);
CPPUNIT_TEST(testNumberFormatHTML);
@@ -1774,6 +1776,22 @@ void ScFiltersTest::testColorScaleXLSX()
testColorScale3Entry_Impl(pDoc);
}
+void ScFiltersTest::testNewCondFormatODS()
+{
+ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc(
new_cond_format_test., ODS );
+
+CPPUNIT_ASSERT_MESSAGE(Failed to load new_cond_format_test.xlsx,
xDocSh.Is());
+
+ScDocument* pDoc = xDocSh-GetDocument();
+
+OUString aCSVFile(new_cond_format_test.);
+OUString aCSVPath;
+createCSVPath( aCSVFile, aCSVPath );
+testCondFile(aCSVPath, pDoc, 0);
+
+xDocSh-DoClose();
+}
+
void ScFiltersTest::testNewCondFormatXLSX()
{
ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc(
new_cond_format_test., XLSX );
commit 9513e13686f011b008764b3c5f184be47b9f4f5f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Mar 23 08:34:13 2013 +0100
fix above/below equal average ods import/export
Change-Id: I1c305c67772b46cede6b4da3e79578f2f1a8ee89
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index dba9673..d5a55e3 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -62,6 +62,8 @@ enum
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/outdevgrind.cxx | 18 --
vcl/workben/svdem.cxx | 12
vcl/workben/svpclient.cxx | 18 --
vcl/workben/svptest.cxx | 15 ---
vcl/workben/vcldemo.cxx | 12
5 files changed, 75 deletions(-)
New commits:
commit 444afc083500c3a4c2d2010f4886df49e75b7773
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sat Mar 23 15:55:18 2013 +1100
General comment cleanup for demo/test vcl apps
Remove unnecessary commented out code, remove comment spacer lines,
in general tidy up this code to make it easier to read.
Change-Id: I37a19177795aa93d63f736e1933924605fbf2146
Reviewed-on: https://gerrit.libreoffice.org/2921
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index bec832a..703bb00 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -78,8 +78,6 @@ class TestWindow : public Dialog
virtual void Paint( const Rectangle rRect );
};
-//--
-
typedef boost::function1void, OutputDevice* functor_type;
typedef std::vector std::pairconst char*,
functor_type functor_vector_type;
@@ -141,17 +139,6 @@ void setupMethodStubs( functor_vector_type res )
aMtf.AddAction( new MetaFillColorAction(Color(COL_RED),sal_True) );
aMtf.AddAction( new MetaRectAction(aRect) );
-/* void DrawText( const Point rStartPt, const XubString rStr,
- xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN,
- MetricVector* pVector = NULL, String* pDisplayText = NULL );
-*/
-//add(res,
-//DrawText,
-//boost::bind(
-//OutputDevice::DrawText,
-//_1,
-//aPt1, aString, (sal_uInt16)0, aString.Len(), (MetricVector*)0,
(String*)0, (vcl::ITextLayout*)0 ));
-
/* void DrawTextArray( const Point rStartPt, const XubString rStr,
const sal_Int32* pDXAry = NULL,
xub_StrLen nIndex = 0,
@@ -792,7 +779,6 @@ void setupMethodStubs( functor_vector_type res )
}
-//--
void grindFunc( OutputDevice rTarget,
functor_vector_type::const_iterator iter,
@@ -815,7 +801,6 @@ void grindFunc( OutputDevice rTarget,
pMsg );
}
-//--
/** Call OutputDevice render methods repeatedly, and output elapsed
time to stdout
@@ -879,7 +864,6 @@ void outDevGrind( OutputDevice rTarget, sal_Int32
nTurns=100 )
}
}
-//--
void TestWindow::Paint( const Rectangle )
{
@@ -916,9 +900,7 @@ int GrindApp::Main()
return EXIT_SUCCESS;
}
-//-
// create the global service-manager
-//-
uno::Reference lang::XMultiServiceFactory xFactory;
try
{
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 58b9836..a77bcb1 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -33,12 +33,10 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-// ---
// Forward declaration
void Main();
-// ---
SAL_IMPLEMENT_MAIN()
{
@@ -56,7 +54,6 @@ SAL_IMPLEMENT_MAIN()
return 0;
}
-// ---
class MyWin : public WorkWindow
{
@@ -72,7 +69,6 @@ public:
voidResize();
};
-// ---
void Main()
{
@@ -83,56 +79,48 @@ void Main()
Application::Execute();
}
-// ---
MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
WorkWindow( pParent, nWinStyle )
{
}
-// ---
void MyWin::MouseMove( const MouseEvent rMEvt )
{
WorkWindow::MouseMove( rMEvt );
}
-// ---
void MyWin::MouseButtonDown( const MouseEvent rMEvt )
{
WorkWindow::MouseButtonDown( rMEvt );
}
-// ---
void MyWin::MouseButtonUp( const MouseEvent rMEvt )
{
WorkWindow::MouseButtonUp( rMEvt );
}
-//
[PUSHED] General comment cleanup for demo/test vcl apps
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2921 Approvals: Tor Lillqvist: Verified; Looks good to me, approved Thomas Arnhold: -- To view, visit https://gerrit.libreoffice.org/2921 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37a19177795aa93d63f736e1933924605fbf2146 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[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|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Use the make binary that configure found in PATH
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2924 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/2924/1 Use the make binary that configure found in PATH When auto-detecting the GNU make binary from PATH store its absolute path in the GNUMAKE variable to ensure to keep using exactly the same GNU make binary even when the PATH settings change. This is needed because the gbuild system relies on the GNU make features detected and reported by the configure script. Change-Id: I05916f0ad7f2e98e4e908455ed72758ebf396863 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b9b11f6..665bd2e 100644 --- a/configure.ac +++ b/configure.ac @@ -4483,7 +4483,7 @@ if test -n $a; then $a --version 2 /dev/null | grep GNU 21 /dev/null if test $? -eq 0; then -GNUMAKE=$a +GNUMAKE=`which $a` break fi fi -- To view, visit https://gerrit.libreoffice.org/2924 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05916f0ad7f2e98e4e908455ed72758ebf396863 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias Hasselmann math...@openismus.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] rhbz#876742 speed up table manipulation in Impress
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2925
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/2925/1
rhbz#876742 speed up table manipulation in Impress
It turns out this is not actually a performance problem but an oversight
in implementation (or a bug, if you want .-)
Every manipulation with a table (e.g., move, resize; actually even a
selection of the table) leads to creation of a full copy of the table
(SdrObject::getFullDragClone()). One of the actions the table copy impl.
does is to call sdr::CellProperties::SetStyleSheet() on every cell of
the new table. CellProperties is derived from
sdr::properties::TextProperties and CellProperties::SetStyleSheet() just
passes the call to TextProperties::SetStyleSheet(). This is where the
trouble begins :-)
The SDR representation of a table, SdrTableObj, is derived from
SdrTextObj. Because of that, SdrTextObj needs to be able to contain more
than one SdrText (because a table needs one for every cell). This is
handled correctly by TextProperties. But, because there is no SDR
representation of a single cell, CellProperties uses the SdrTableObj as
the SDR object it works on. Therefore TextProperties::SetStyleSheet()
processes all SdrText objects of the _whole table_, not just a single
cell. And this is repeated for every other cell...
Change-Id: Iab2e2d0e1e8038710645c0bd24666e6032b0a003
(cherry picked from commit 91864e19c84ae9834d6e97ee5ddc4db5bf957681)
---
M svx/Package_inc.mk
A svx/inc/svx/itextprovider.hxx
M svx/inc/svx/sdr/properties/textproperties.hxx
M svx/inc/svx/svdotext.hxx
M svx/source/sdr/properties/textproperties.cxx
M svx/source/table/cell.cxx
6 files changed, 125 insertions(+), 15 deletions(-)
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 3eac094..fa3313d 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -31,6 +31,7 @@
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx))
+$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/itextprovider.hxx,svx/itextprovider.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/linkwarn.hxx,svx/linkwarn.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx))
diff --git a/svx/inc/svx/itextprovider.hxx b/svx/inc/svx/itextprovider.hxx
new file mode 100644
index 000..3202e4d
--- /dev/null
+++ b/svx/inc/svx/itextprovider.hxx
@@ -0,0 +1,42 @@
+/* -*- 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/.
+ */
+
+#if !defined SVX_ITEXTPROVIDER_HXX_INCLUDED
+#define SVX_ITEXTPROVIDER_HXX_INCLUDED
+
+#include sal/types.h
+
+#include svx/svxdllapi.h
+
+class SdrText;
+
+namespace svx
+{
+
+/** This interface provides access to text object(s) in an SdrObject.
+
+ */
+class SVX_DLLPUBLIC ITextProvider
+{
+public:
+/** Return the number of texts available for this object. */
+virtual sal_Int32 getTextCount() const = 0;
+
+/** Return the nth available text. */
+virtual SdrText* getText(sal_Int32 nIndex) const = 0;
+
+protected:
+~ITextProvider() {}
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx
b/svx/inc/svx/sdr/properties/textproperties.hxx
index ac6a613..456b104 100644
--- a/svx/inc/svx/sdr/properties/textproperties.hxx
+++ b/svx/inc/svx/sdr/properties/textproperties.hxx
@@ -20,6 +20,7 @@
#ifndef _SDR_PROPERTIES_TEXTPROPERTIES_HXX
#define _SDR_PROPERTIES_TEXTPROPERTIES_HXX
+#include svx/itextprovider.hxx
#include svx/sdr/properties/attributeproperties.hxx
#include svx/svxdllapi.h
@@ -45,6 +46,9 @@
// react on ItemSet changes
virtual void ItemSetChanged(const SfxItemSet rSet);
+/// Get the TextProvider related to our SdrObject
+virtual const svx::ITextProvider getTextProvider() const;
+
public:
// basic constructor
explicit TextProperties(SdrObject rObj);
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index 5f1eeac..551cf58 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -21,6 +21,7 @@
#define _SVDOTEXT_HXX
#include vcl/field.hxx
+#include svx/itextprovider.hxx
#include svx/svdoattr.hxx
#include svx/svdtrans.hxx // GeoStat
#include tools/datetime.hxx
@@ -123,7 +124,7 @@
// SdrTextObj
Re: Build error - testFdo60915
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Same here. Em 22-03-2013 21:46, Rodolfo escreveu: I have the same issue here. Yes, timezone is America/Sao Paulo. But, aside the bug report, I'm a Debian-Wheezy user. About ./config_host.mk contains: export SYSTEM_ICU=NO =/ Att, Rodolfo 2013/3/22 Eike Rathke er...@redhat.com: Hi Marcos, On Friday, 2013-03-22 17:01:12 -0300, Marcos Souza wrote: AHuahUAHauhAUAHU Brazil makes me laught in LO too T.T Glad you had a good laugh ;-) Yes this is my timezone Ok, could you please tell me which ICU library version you use * the internally provided 49.1.1, ./config_host.mk contains SYSTEM_ICU=NO in this case * a system one, which version? ./config_host.mk contains SYSTEM_ICU=YES in this case The version numbers are in ./config_host.mk variables ICU_MAJOR, ICU_MINOR and ICU_MICRO Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Old GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJRTX46AAoJEJp3R7nH3vLxtJYH/RUDkX8DBRZDv/VozFt30Xax zo6exNIz070MzlUMpL76cn2dgjmtjHI0GAEbYQLRKq9pxo/Fj1ChVGVsXxthRssg QrP+zkw7q9lFnqVzd0bfh1/avrFnwgBytWdg+t+9jQHHPAvEg7s2dLUZhjd0fyUG WAIoub3t9meAnHH9hK7t9Yq6TlmkXIfGMJYQ24jrZ0x/1cvNNZs45ErxLk9nAmfB RLtDpztrTW0vix01P/gXOI+LzH5sEl8lL5q6bT4Mnph1j04yIpbxVs3MXyEm9hVC luv2mqXEUjWg2+sm3nKp+lJHHB2AYclAG43yOZFHu7WvL4+kgplVJYw6BcM1QRY= =Csla -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7d48d67b06f9f0c144bc84155ba0f891041d109f Author: Mathias Hasselmann math...@openismus.com Date: Sat Mar 23 10:19:18 2013 +0100 Use the make binary that configure found in PATH When auto-detecting the GNU make binary from PATH store its absolute path in the GNUMAKE variable to ensure to keep using exactly the same GNU make binary even when the PATH settings change. This is needed because the gbuild system relies on the GNU make features detected and reported by the configure script. Change-Id: I05916f0ad7f2e98e4e908455ed72758ebf396863 Reviewed-on: https://gerrit.libreoffice.org/2924 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/configure.ac b/configure.ac index 7cd27f0..ebb26a8 100644 --- a/configure.ac +++ b/configure.ac @@ -4494,7 +4494,7 @@ for a in $MAKE $GNUMAKE make gmake gnumake; do if test -n $a; then $a --version 2 /dev/null | grep GNU 21 /dev/null if test $? -eq 0; then -GNUMAKE=$a +GNUMAKE=`which $a` break fi fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Use the make binary that configure found in PATH
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2924 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2924 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05916f0ad7f2e98e4e908455ed72758ebf396863 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias Hasselmann math...@openismus.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: LibreOffice for Android (how the overcome the problem with the 50 MB limit)
Hi Jonathan, On Sat, 2013-03-23 at 08:32 +0100, Jonathan Aquilina wrote: Out of curiosity isn’t there a way seeing as with gbuild we can build individual modules to where we can compile an individual aspect of LO using a single switch in autogen.sh? ... I am interested in this topic, question is where would I begin? You should read the comments on this first: https://gerrit.libreoffice.org/#/c/2778/ In general it's not a wonderful idea - and needs some serious acknowledge you are clueless, and will not create annoying noise on our lists or report any bugs type heavy-lifting if people should choose to do that (IMNSHO) ;-) Though Lionel is right - split packaging is not a dissimilar problem. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: LibreOffice for Android (how the overcome the problem with the 50 MB limit)
Wouldn’t it also be beneficial for developers as well in the sense that the build and compile only what they need as well as for build bots too? -Original Message- From: Michael Meeks [mailto:michael.me...@suse.com] Sent: 23 March 2013 11:19 To: Jonathan Aquilina Cc: libreoffice-dev Subject: RE: LibreOffice for Android (how the overcome the problem with the 50 MB limit) Hi Jonathan, On Sat, 2013-03-23 at 08:32 +0100, Jonathan Aquilina wrote: Out of curiosity isn’t there a way seeing as with gbuild we can build individual modules to where we can compile an individual aspect of LO using a single switch in autogen.sh? ... I am interested in this topic, question is where would I begin? You should read the comments on this first: https://gerrit.libreoffice.org/#/c/2778/ In general it's not a wonderful idea - and needs some serious acknowledge you are clueless, and will not create annoying noise on our lists or report any bugs type heavy-lifting if people should choose to do that (IMNSHO) ;-) Though Lionel is right - split packaging is not a dissimilar problem. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: TemplateManager refactoring
Im working on it still, it should have something working in a couple of days. On Fri, Mar 22, 2013 at 10:07 AM, Cedric Bosdonnat cbosdon...@suse.comwrote: Hello Rafael, I just hit another problem due to the TemplateView class. Did you manage to merge this one back into the TemplateAbstractView? I'll try to workaround it for the while... but it would really be awesome to have that in ;) Regards, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - scp2/InstallModule_ooo.mk scp2/source
scp2/InstallModule_ooo.mk|2 +- scp2/source/extensions/module_extensions.ulf |8 +--- scp2/source/ooo/module_reportbuilder.scp |7 +-- scp2/source/ooo/module_reportbuilder.ulf | 13 + 4 files changed, 20 insertions(+), 10 deletions(-) New commits: commit b3644853d67872b0bb3956fb16cbaf0d0ed3c5dc Author: Andras Timar ati...@suse.com Date: Sat Mar 23 11:16:45 2013 +0100 Report Builder should be an optional component in Windows installer ... because when it is installed, it hides the original template based reporting UI, which is preferred by some users. Change-Id: Id758b664d6b06c2c12e32c428b5dbcf7bfaf045d diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 25adf4b..d4cd99e 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -249,7 +249,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ endif ifeq ($(ENABLE_REPORTBUILDER),TRUE) -$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ +$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\ scp2/source/ooo/module_reportbuilder \ )) endif diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp index 5b264e8..67ffebf 100644 --- a/scp2/source/ooo/module_reportbuilder.scp +++ b/scp2/source/ooo/module_reportbuilder.scp @@ -11,8 +11,11 @@ Module gid_Module_Reportbuilder PackageInfo = packinfo_office.txt; -ParentID = gid_Module_Root_Brand; -Styles = (HIDDEN_ROOT); +MOD_NAME_DESC(MODULE_OPTIONAL_REPORTDESIGN); +ParentID = gid_Module_Optional; +Styles = ( ); +Minimal = NO; +Default = YES; Dirs = (gid_Dir_Share_Reportbuilder); Files = ( #if !defined SYSTEM_APACHE_COMMONS diff --git a/scp2/source/ooo/module_reportbuilder.ulf b/scp2/source/ooo/module_reportbuilder.ulf new file mode 100644 index 000..626f242 --- /dev/null +++ b/scp2/source/ooo/module_reportbuilder.ulf @@ -0,0 +1,13 @@ +/* + * 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/. + */ + +[STR_NAME_MODULE_OPTIONAL_REPORTDESIGN] +en-US = Report Builder + +[STR_DESC_MODULE_OPTIONAL_REPORTDESIGN] +en-US = Report Builder helps to design database reports. It requires Java. commit 50e6c21ad80656cb3eefd1adaaaeeafa1f017473 Author: Andras Timar ati...@suse.com Date: Sat Mar 23 11:10:08 2013 +0100 add longer description in Windows installer to Numbertext extension Change-Id: I34b459c3e8b676b47f9ce0da15bfdea5f749ad20 diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index 50466f5..ac079e9 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -39,12 +39,6 @@ en-US = Presentation Minimizer [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER] en-US = Presentation Minimizer -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN] -en-US = Report Builder - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN] -en-US = Report Builder - [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI] en-US = MediaWiki Publisher @@ -55,7 +49,7 @@ en-US = MediaWiki Publisher en-US = Numbertext [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT] -en-US = Numbertext +en-US = Provides the NUMBERTEXT/MONEYTEXT spreadsheet functions which convert numbers to localized text, e.g. '100' to 'hundred'. [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_HUNART] en-US = Hungarian cross-reference toolbar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source oox/inc svl/inc svl/source
forms/source/component/DatabaseForm.cxx |2 +-
oox/inc/oox/ole/axbinaryreader.hxx |2 +-
oox/inc/oox/ole/axbinarywriter.hxx |2 +-
svl/inc/svl/undo.hxx|2 +-
svl/source/fsstor/fsstorage.cxx |4 ++--
svl/source/misc/documentlockfile.cxx|2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 9325dca98163f8fc7cfcf6a76abddfe4e902d73b
Author: Tor Lillqvist t...@iki.fi
Date: Sat Mar 23 12:30:33 2013 +0200
atomar is not a word
SCNR
Change-Id: I3aaa8d9b37423d44fe11f161cc21c0a77b466353
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 9f40e8e..dea3797 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2887,7 +2887,7 @@ void ODatabaseForm::load_impl(sal_Bool
bCausedByParentForm, sal_Bool bMoveToFirs
// if we're loaded as sub form we got a rowSetChanged from the parent
rowset _before_ we got the loaded
// so we don't need to execute the statement again, this was already done
// (and there were no relevant changes between these two listener calls,
the load of a form is quite an
-// atomar operation.)
+// atomic operation.)
sal_Bool bSuccess = sal_False;
if (bExecute)
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx
b/oox/inc/oox/ole/axbinaryreader.hxx
index d63ccb1..44003f5 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -68,7 +68,7 @@ public:
position of the wrapped stream at construction time). */
voidalign( size_t nSize );
-/** Aligns the stream according to the passed type and reads an atomar
value. */
+/** Aligns the stream according to the passed type and reads a value. */
template typename Type
inline Type readAligned() { align( sizeof( Type ) ); return
readValue Type (); }
/** Aligns the stream according to the passed type and skips the size of
the type. */
diff --git a/oox/inc/oox/ole/axbinarywriter.hxx
b/oox/inc/oox/ole/axbinarywriter.hxx
index c344285..d9a9403 100644
--- a/oox/inc/oox/ole/axbinarywriter.hxx
+++ b/oox/inc/oox/ole/axbinarywriter.hxx
@@ -73,7 +73,7 @@ public:
voidalign( size_t nSize );
void pad( sal_Int32 nBytes, size_t nAtomSize = 1);
-/** Aligns the stream according to the passed type and reads an atomar
value. */
+/** Aligns the stream according to the passed type and reads a value. */
template typename Type
inline void writeAligned( Type nVal ) { align( sizeof( Type ) );
writeValue( nVal ); }
/** Aligns the stream according to the passed type and skips the size of
the type. */
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index 7059ab8..f36cd81 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -258,7 +258,7 @@ namespace svl
Effectively, calling this method is equivalent to codewhile (
IsInListAction() ) LeaveListAction();/code,
followed by codeClear()/code. The only difference to this
calling sequence is that Reset is an
-atomar operation, also resulting in only one notification.
+atomic operation, also resulting in only one notification.
*/
virtual voidReset() = 0;
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 368ebd5..6cb798d 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -602,12 +602,12 @@ uno::Reference embed::XStorage SAL_CALL
FSStorage::openStorageElement(
{
::utl::UCBContentHelper::Kill( aFolderURL.GetMainURL(
INetURLObject::NO_DECODE ) );
bFolderExists =
-MakeFolderNoUI( aFolderURL.GetMainURL(
INetURLObject::NO_DECODE ) ); // TODO: not atomar :(
+MakeFolderNoUI( aFolderURL.GetMainURL(
INetURLObject::NO_DECODE ) ); // TODO: not atomic :(
}
else if ( !bFolderExists )
{
bFolderExists =
-MakeFolderNoUI( aFolderURL.GetMainURL(
INetURLObject::NO_DECODE ) ); // TODO: not atomar :(
+MakeFolderNoUI( aFolderURL.GetMainURL(
INetURLObject::NO_DECODE ) ); // TODO: not atomic :(
}
}
else if ( ( nStorageMode embed::ElementModes::TRUNCATE ) )
diff --git a/svl/source/misc/documentlockfile.cxx
b/svl/source/misc/documentlockfile.cxx
index 5bb2d58..6c130a8 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -199,7 +199,7 @@ void DocumentLockFile::RemoveFile()
{
::osl::MutexGuard aGuard( m_aMutex );
-// TODO/LATER: the removing is not atomar, is it possible in general to
make it atomar?
+// TODO/LATER: the removing is not atomic, is it possible in general to
make it atomic?
uno::Sequence
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a8e3639fb2c9fa5d4429b17709a8adff7ca Author: Andras Timar ati...@suse.com Date: Sat Mar 23 11:55:31 2013 +0100 Updated core Project: help 31516bbabeb16119424c371fb17975a58b74d108 diff --git a/helpcontent2 b/helpcontent2 index 7875d6d..31516bb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7875d6df2911a7caa8de1adac9b5b21026c8b9a4 +Subproject commit 31516bbabeb16119424c371fb17975a58b74d108 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 3 commits - source/text
source/text/shared/01/mediaplayer.xhp | 12 ++-- source/text/shared/explorer/database/dabawiz02jdbc.xhp |4 ++-- source/text/shared/explorer/database/rep_main.xhp |6 +++--- source/text/shared/main0650.xhp|6 +++--- 4 files changed, 10 insertions(+), 18 deletions(-) New commits: commit 31516bbabeb16119424c371fb17975a58b74d108 Author: Andras Timar ati...@suse.com Date: Sat Mar 23 11:55:31 2013 +0100 fdo#61379 Java options are under Options - LibreOffice - Advanced Change-Id: I2171d253700b78966520318efe31ef31cc77ef0a diff --git a/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/source/text/shared/explorer/database/dabawiz02jdbc.xhp index 7c7bcd5..deb326e 100644 --- a/source/text/shared/explorer/database/dabawiz02jdbc.xhp +++ b/source/text/shared/explorer/database/dabawiz02jdbc.xhp @@ -37,7 +37,7 @@ paragraph role=heading id=par_idN10623 xml-lang=en-US level=2 l10n=NEWJDBC Examples/paragraph paragraph role=paragraph id=par_idN10627 xml-lang=en-US l10n=NEW item type=productnameYou can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME/item. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL./paragraph -paragraph role=note id=par_idN1062D xml-lang=en-US l10n=CHGThe driver classes must be added to %PRODUCTNAME in switchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - %PRODUCTNAME - Java.commentUFI: #i38525#/comment/paragraph +paragraph role=note id=par_idN1062D xml-lang=en-US l10n=CHGThe driver classes must be added to %PRODUCTNAME in switchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - %PRODUCTNAME - Advanced./paragraph paragraph role=heading id=par_idN10634 xml-lang=en-US level=3 l10n=NEWOracle database/paragraph paragraph role=paragraph id=par_idN10638 xml-lang=en-US l10n=NEWYou can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver./paragraph switch select=sys @@ -83,7 +83,7 @@ paragraph role=paragraph id=par_idN106BF xml-lang=en-US l10n=NEWahelp hid=HID_DSADMIN_DRIVERCLASSEnter the name of the JDBC driver./ahelp/paragraph section id=classpath paragraph role=warning id=par_id7953733 xml-lang=en-US l10n=NEWBefore you can use a JDBC driver, you need to add its class path. Choose emphswitchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - %PRODUCTNAME/emph -emph- Java/emph, and click the emphClass Path/emph button. After you add the path information, restart item type=productname%PRODUCTNAME/item./paragraph +emph- Advanced/emph, and click the emphClass Path/emph button. After you add the path information, restart item type=productname%PRODUCTNAME/item./paragraph /section !-- removed HID 852251216 --paragraph role=heading id=par_idN106CE xml-lang=en-US level=2 l10n=NEWTest ClasscommentUFI: may be Test Connection - both strings are in spec/comment/paragraph paragraph role=paragraph id=par_idN106E4 xml-lang=en-US l10n=NEWahelp hid=.Tests the connection with the current settings./ahelp/paragraph diff --git a/source/text/shared/explorer/database/rep_main.xhp b/source/text/shared/explorer/database/rep_main.xhp index 01c2425..13e9273 100644 --- a/source/text/shared/explorer/database/rep_main.xhp +++ b/source/text/shared/explorer/database/rep_main.xhp @@ -38,7 +38,7 @@ paragraph xml-lang=en-US id=par_id4515823 role=paragraph l10n=NEWThe Report Builder requires an installed Java Runtime Environment (JRE)./paragraph list type=ordered listitem -paragraph xml-lang=en-US id=par_id4044312 role=paragraph l10n=NEWChoose switchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - %PRODUCTNAME - link href=text/shared/optionen/java.xhpJava/link./paragraph +paragraph xml-lang=en-US id=par_id4044312 role=paragraph l10n=NEWChoose switchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - %PRODUCTNAME - link href=text/shared/optionen/java.xhpAdvanced/link./paragraph /listitem listitem paragraph xml-lang=en-US id=par_id1369060 role=paragraph l10n=NEWWait up to one minute, while %PRODUCTNAME collects information on installed Java software on your system./paragraph @@ -51,7 +51,7 @@ paragraph xml-lang=en-US id=par_id7730033 role=paragraph l10n=NEWEnsure that emphUse a Java runtime environment/emph is enabled./paragraph /listitem /list - paragraph xml-lang=en-US id=par_id6317636 role=paragraph l10n=NEWIf no JRE
[Libreoffice-commits] core.git: svtools/source swext/mediawiki
svtools/source/java/javaerror.src |8
swext/mediawiki/help/wiki.xhp |2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 33a87b9339e26290f5a3c000bc5951af44e9ccf1
Author: Andras Timar ati...@suse.com
Date: Sat Mar 23 11:59:45 2013 +0100
fdo#61379 Java options are under Options - LibreOffice - Advanced
Change-Id: Ic7b262f4b75e7f2069f88f753cea5ff8f59610b7
diff --git a/svtools/source/java/javaerror.src
b/svtools/source/java/javaerror.src
index 34c2f15..c1e2da1 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -30,14 +30,14 @@ WarningBox WARNINGBOX_INVALIDJAVASETTINGS_MAC
{
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
-Message[ en-US ] =The %PRODUCTNAME configuration has been changed. Under
%PRODUCTNAME - Preferences - %PRODUCTNAME - Java, select the Java runtime
environment you want to have used by %PRODUCTNAME.;
+Message[ en-US ] =The %PRODUCTNAME configuration has been changed. Under
%PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime
environment you want to have used by %PRODUCTNAME.;
};
WarningBox WARNINGBOX_INVALIDJAVASETTINGS
{
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
-Message[ en-US ] =The %PRODUCTNAME configuration has been changed. Under
Tools - Options - %PRODUCTNAME - Java, select the Java runtime environment you
want to have used by %PRODUCTNAME.;
+Message[ en-US ] =The %PRODUCTNAME configuration has been changed. Under
Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment
you want to have used by %PRODUCTNAME.;
};
QueryBox QBX_JAVADISABLED
@@ -51,14 +51,14 @@ ErrorBox ERRORBOX_JVMCREATIONFAILED_MAC
{
Buttons = WB_OK;
DefButton = WB_DEF_OK ;
-Message[ en-US ] = %PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. The selected JRE is defective. Please select another
version or install a new JRE and select it under %PRODUCTNAME - Preferences -
%PRODUCTNAME - Java.;
+Message[ en-US ] = %PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. The selected JRE is defective. Please select another
version or install a new JRE and select it under %PRODUCTNAME - Preferences -
%PRODUCTNAME - Advanced.;
};
ErrorBox ERRORBOX_JVMCREATIONFAILED
{
Buttons = WB_OK;
DefButton = WB_DEF_OK ;
-Message[ en-US ] = %PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. The selected JRE is defective. Please select another
version or install a new JRE and select it under Tools - Options - %PRODUCTNAME
- Java.;
+Message[ en-US ] = %PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. The selected JRE is defective. Please select another
version or install a new JRE and select it under Tools - Options - %PRODUCTNAME
- Advanced.;
};
diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp
index 3cd6fac..9225a00 100644
--- a/swext/mediawiki/help/wiki.xhp
+++ b/swext/mediawiki/help/wiki.xhp
@@ -47,7 +47,7 @@
/listitem
/list
paragraph role=heading id=hd_id8047120 xml-lang=en-US level=2
l10n=NEWInstalling Wiki Publisher/paragraph
-paragraph role=paragraph id=par_id4277169 xml-lang=en-US
l10n=NEWBefore you use the Wiki Publisher, ensure that %PRODUCTNAME uses a
Java Runtime Environment (JRE). To check the status of the JRE, choose item
type=menuitemTools - Options - %PRODUCTNAME - Java/item. Ensure that Use
a Java runtime environment is marked and that a Java runtime folder is
selected in the big listbox. If no JRE was activated, then activate a JRE 1.4
or later and restart %PRODUCTNAME./paragraph
+paragraph role=paragraph id=par_id4277169 xml-lang=en-US
l10n=NEWBefore you use the Wiki Publisher, ensure that %PRODUCTNAME uses a
Java Runtime Environment (JRE). To check the status of the JRE, choose item
type=menuitemTools - Options - %PRODUCTNAME - Advanced/item. Ensure that
Use a Java runtime environment is marked and that a Java runtime folder is
selected in the big listbox. If no JRE was activated, then activate a JRE 1.4
or later and restart %PRODUCTNAME./paragraph
paragraph role=heading id=hd_id5316019 xml-lang=en-US level=2
l10n=NEWTo Connect to a Wiki/paragraph
paragraph role=paragraph id=par_id2381969 xml-lang=en-US
l10n=NEWNote: You can store your user name and password for all respective
dialogs inside %PRODUCTNAME. The password will be stored in a secure way, where
access is maintained by a master password. To enable the master password,
choose item type=menuitemTools - Options - %PRODUCTNAME -
Security/item./paragraph
paragraph role=paragraph id=par_id3751640 xml-lang=en-US
l10n=NEWNote: If you connect to the web using a proxy server, enter the
proxy information to item type=menuitemTools - Options - Internet -
Proxy/item, and restart the software./paragraph
___
Libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/headerfooterdlg.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 4934f877e020c3b8a8225316cb3388be2812d2a6
Author: Katarina Behrens bu...@bubli.org
Date: Sat Mar 23 12:27:48 2013 +0100
Add missing date formats to header-footer dlg
to have the complete set. Reported as paper cut on Impress Sprint
Change-Id: I9cc5145976c5b04d2df634106be6ef5eebb5ef56
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx
b/sd/source/ui/dlg/headerfooterdlg.cxx
index 1174f67..0f3a2b5 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -92,13 +92,15 @@ public:
namespace sd
{
-const int nDateTimeFormatsCount = 10;
+const int nDateTimeFormatsCount = 12;
int nDateTimeFormats[nDateTimeFormatsCount] =
{
SVXDATEFORMAT_A,
-SVXDATEFORMAT_F,
-SVXDATEFORMAT_D,
+SVXDATEFORMAT_B,
SVXDATEFORMAT_C,
+SVXDATEFORMAT_D,
+SVXDATEFORMAT_E,
+SVXDATEFORMAT_F,
SVXDATEFORMAT_A | (SVXTIMEFORMAT_24_HM 4),
SVXDATEFORMAT_A | (SVXTIMEFORMAT_12_HM 4),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About coverity 440107 (keyimpl.cxx in registry)
Thank you Stephan for your feedback. If I remove these cases in the switch, I've got this: /home/julien/compile-libreoffice/libo/registry/source/keyimpl.cxx: In member function ‘RegError ORegKey::getValue(const rtl::OUString, RegValue) const’: /home/julien/compile-libreoffice/libo/registry/source/keyimpl.cxx:622:12: error: enumeration value ‘RG_VALUETYPE_LONGLIST’ not handled in switch [-Werror=switch] /home/julien/compile-libreoffice/libo/registry/source/keyimpl.cxx:622:12: error: enumeration value ‘RG_VALUETYPE_STRINGLIST’ not handled in switch [-Werror=switch] /home/julien/compile-libreoffice/libo/registry/source/keyimpl.cxx:622:12: error: enumeration value ‘RG_VALUETYPE_UNICODELIST’ not handled in switch [-Werror=switch] It seems either we clean up the whole thing or we let as it is. Of course, there's also disabling warning for a specific part but I dislike doing this if it's not a strong external constraint (just personal opinion of course :-)). In brief, except if we have a go to clean up the whole thing (after all why not take advantage we're on 4.0?), I'll let as it is. Julien -- View this message in context: http://nabble.documentfoundation.org/About-coverity-440107-keyimpl-cxx-in-registry-tp4045470p4045542.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fixed the dialog because there was an overlap
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2926
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/2926/1
fixed the dialog because there was an overlap
Change-Id: I5520eed20357d493ef198a935486f45dd7181e0a
---
M sd/source/ui/animations/CustomAnimationDialog.src
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sd/source/ui/animations/CustomAnimationDialog.src
b/sd/source/ui/animations/CustomAnimationDialog.src
index f8f7afe4..2bd8664 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.src
+++ b/sd/source/ui/animations/CustomAnimationDialog.src
@@ -636,7 +636,7 @@
{
HelpID = sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO;
Pos = MAP_APPFONT ( X0 , 20 ) ;
-Size = MAP_APPFONT ( W0 , 10 ) ;
+Size = MAP_APPFONT ( W1 , 8 ) ;
TabStop = TRUE ;
Text [ en-US ] = Automatically after ;
};
--
To view, visit https://gerrit.libreoffice.org/2926
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5520eed20357d493ef198a935486f45dd7181e0a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andreas Mantke andreas.man...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationDialog.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20064583080a8622ba1b8f217cb0b9c184a3ae15
Author: Andreas Mantke ma...@gmx.de
Date: Sat Mar 23 12:36:27 2013 +0100
fixed the dialog because there was an overlap
Change-Id: I5520eed20357d493ef198a935486f45dd7181e0a
Reviewed-on: https://gerrit.libreoffice.org/2926
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/sd/source/ui/animations/CustomAnimationDialog.src
b/sd/source/ui/animations/CustomAnimationDialog.src
index f8f7afe4..2bd8664 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.src
+++ b/sd/source/ui/animations/CustomAnimationDialog.src
@@ -636,7 +636,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT
{
HelpID = sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO;
Pos = MAP_APPFONT ( X0 , 20 ) ;
-Size = MAP_APPFONT ( W0 , 10 ) ;
+Size = MAP_APPFONT ( W1 , 8 ) ;
TabStop = TRUE ;
Text [ en-US ] = Automatically after ;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fixed the dialog because there was an overlap
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2926 Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2926 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5520eed20357d493ef198a935486f45dd7181e0a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andreas Mantke andreas.man...@googlemail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1d384e7ee8e8565a21d3033d7975eceda643d68d Author: Andras Timar ati...@suse.com Date: Sat Mar 23 13:25:03 2013 +0100 Updated core Project: help 866c0eca7cda0f8f3939076e11820ebdaf4870c3 diff --git a/helpcontent2 b/helpcontent2 index 31516bb..866c0ec 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 31516bbabeb16119424c371fb17975a58b74d108 +Subproject commit 866c0eca7cda0f8f3939076e11820ebdaf4870c3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/guide/autotext.xhp |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 866c0eca7cda0f8f3939076e11820ebdaf4870c3 Author: Andras Timar ati...@suse.com Date: Sat Mar 23 13:25:03 2013 +0100 fdo#62537 To Print a List of AutoText Entries Change-Id: Ic1d8a70b84dfb7547cf75e8b8ba3fafbc06387cb diff --git a/source/text/swriter/guide/autotext.xhp b/source/text/swriter/guide/autotext.xhp index bfb68df..2832cd8 100644 --- a/source/text/swriter/guide/autotext.xhp +++ b/source/text/swriter/guide/autotext.xhp @@ -86,10 +86,10 @@ paragraph xml-lang=en-US id=par_id3155136 role=listitem l10n=CHG oldref=44Choose emphTools - Macros - Organize Macros - %PRODUCTNAME Basic/emph./paragraph /listitem listitem -paragraph xml-lang=en-US id=par_id3155160 role=listitem l10n=CHG oldref=62In the emphMacro from/emph list, double-click %PRODUCTNAME Macros - Gimmicks./paragraph +paragraph xml-lang=en-US id=par_id3155160 role=listitem l10n=CHG oldref=62In the emphMacro from/emph tree control, select %PRODUCTNAME Macros - Gimmicks - AutoText./paragraph /listitem listitem -paragraph xml-lang=en-US id=par_id3151277 role=listitem l10n=U oldref=63Select AutoText and then click emphRun/emph. A list of the current AutoText entries is generated in a separate text document./paragraph +paragraph xml-lang=en-US id=par_id3151277 role=listitem l10n=U oldref=63Select Main in the emphExisting macros in: AutoText/emph list and then click emphRun/emph. A list of the current AutoText entries is generated in a separate text document./paragraph /listitem listitem paragraph xml-lang=en-US id=par_id3151304 role=listitem l10n=U oldref=64Choose emphFile - Print/emph./paragraph @@ -106,4 +106,4 @@ paragraph xml-lang=en-US id=par_id3155012 role=paragraph l10n=U oldref=46link href=text/shared/01/06040600.xhp name=Word CompletionWord Completion/link/paragraph /section /body -/helpdocument \ No newline at end of file +/helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Give the number of slides also when more slides are selected
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2927
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/2927/1
Give the number of slides also when more slides are selected
Change-Id: I2a169831f2caada6d052edb697036a53ca67ddd0
---
M sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index a3f2ba7..6db42a0 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -814,16 +814,15 @@
// page view and layout
SdPage* pPage = NULL;
SdPage* pFirstPage = NULL;
-sal_uInt16 nFirstPage;
-sal_uInt16 nSelectedPages =
(sal_uInt16)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
-rtl::OUString aPageStr;
+sal_uInt16 nFirstPage;
+sal_uInt16 nSelectedPages =
mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
+OUStringBuffer aPageStr;
String aLayoutStr;
+//Set number of slides
if (nSelectedPages 0)
-aPageStr = SD_RESSTR(STR_SD_PAGE);
-
-if (nSelectedPages == 1)
{
+aPageStr = SD_RESSTR(STR_SLIDE_SINGULAR);
model::PageEnumeration aSelectedPages (
model::PageEnumerationProvider::CreateSelectedPagesEnumeration(
mrSlideSorter.GetModel()));
@@ -831,22 +830,20 @@
if (pDescriptor)
{
pPage = pDescriptor-GetPage();
-nFirstPage = pPage-GetPageNum()/2;
-pFirstPage = pPage;
-
-aPageStr += ;
-aPageStr += rtl::OUString::valueOf(
static_castsal_Int32(nFirstPage + 1) );
-aPageStr += / ;
-aPageStr +=
rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount());
-
-aLayoutStr = pFirstPage-GetLayoutName();
-aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
+nFirstPage = (pPage-GetPageNum()/2) + 1;
+aPageStr.append( ).append(static_castsal_Int32(nFirstPage),
10).append( / ).append(mrSlideSorter.GetModel().GetPageCount(), 10);
}
+ rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr.makeStringAndClear()
) );
}
-rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr ) );
-rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
-
+//Set layout
+if (nSelectedPages == 1 pPage != NULL)
+{
+pFirstPage = pPage;
+aLayoutStr = pFirstPage-GetLayoutName();
+aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
+rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
+}
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
{
rSet.Put( SfxVoidItem( SID_ATTR_ZOOMSLIDER ) );
--
To view, visit https://gerrit.libreoffice.org/2927
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a169831f2caada6d052edb697036a53ca67ddd0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rob Snelders libreoff...@ertai.nl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/edit.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5d02714a9dca73e606fa1f538de8a62925bc1de8
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 13:38:54 2013 +0100
Fix wrong copy paste, should be UNDERLINE_DASHDOT and not UNDERLINE_DOTTED
Change-Id: I807d88631cf35e51cd034a62eed1d4230c75d1be
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f1cbc95..bde1972 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -703,7 +703,7 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd,
bool bLayout )
else if ( nAttr EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE )
aFont.SetUnderline( UNDERLINE_DOTTED );
else if ( nAttr EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE )
-aFont.SetUnderline( UNDERLINE_DOTTED );
+aFont.SetUnderline( UNDERLINE_DASHDOT );
else if ( nAttr EXTTEXTINPUT_ATTR_GRAYWAVELINE )
{
aFont.SetUnderline( UNDERLINE_WAVE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] desktop: add --pidfile switch
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2928
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/2928/1
desktop: add --pidfile switch
Store the soffice.bin pid to a file. Useful with --headless where
you may have libreoffice supervised by another process.
Change-Id: I6a3c6cb920fc7b8e659a01975b4d457ce5525b17
---
M desktop/source/app/app.cxx
M desktop/source/app/cmdlineargs.cxx
M desktop/source/app/cmdlineargs.hxx
M desktop/source/app/cmdlinehelp.cxx
4 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d3e7b26..aef2d1f 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -124,6 +124,14 @@
#endif
#endif //WNT
+#if defined WNT
+#include process.h
+#define GETPID _getpid
+#else
+#include unistd.h
+#define GETPID getpid
+#endif
+
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
@@ -1570,6 +1578,38 @@
impl_checkRecoveryState(bCrashed, bExistsRecoveryData,
bExistsSessionData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, } impl_checkRecoveryState );
+OUString pidfileName = rCmdLineArgs.GetPidfileName();
+if ( !pidfileName.isEmpty() )
+{
+OUString pidfileURL;
+
+if ( osl_getFileURLFromSystemPath(pidfileName.pData,
pidfileURL.pData) == osl_File_E_None )
+{
+osl::File pidfile( pidfileURL );
+osl::FileBase::RC rc;
+
+osl::File::remove( pidfileURL );
+if ( (rc = pidfile.open( osl_File_OpenFlag_Write |
osl_File_OpenFlag_Create ) ) == osl::File::E_None )
+{
+OString pid( OString::valueOf( static_castsal_Int32(
GETPID() ) ) );
+sal_uInt64 written = 0;
+if ( pidfile.write(pid.getStr(), pid.getLength(), written)
!= osl::File::E_None )
+{
+SAL_WARN(desktop, cannot write pidfile
pidfile.getURL());
+}
+pidfile.close();
+}
+else
+{
+SAL_WARN(desktop, cannot open pidfile
pidfile.getURL() osl::FileBase::RC(rc));
+}
+}
+else
+{
+SAL_WARN(desktop, cannot get pidfile URL from path
pidfileName);
+}
+}
+
if ( rCmdLineArgs.IsHeadless() )
{
// Ensure that we use not the system file dialogs as
@@ -1739,6 +1779,24 @@
if ( rCmdLineArgs.IsHeadless() )
SvtMiscOptions().SetUseSystemFileDialog(
pExecGlobals-bUseSystemFileDialog );
+OUString pidfileName = rCmdLineArgs.GetPidfileName();
+if ( !pidfileName.isEmpty() )
+{
+OUString pidfileURL;
+
+if ( osl_getFileURLFromSystemPath(pidfileName.pData,
pidfileURL.pData) == osl_File_E_None )
+{
+if ( osl::File::remove( pidfileURL ) != osl::FileBase::E_None )
+{
+SAL_WARN(desktop, shutdown: cannot remove pidfile
pidfileURL);
+}
+}
+else
+{
+SAL_WARN(desktop, shutdown: cannot get pidfile URL from path
pidfileName);
+}
+}
+
// remove temp directory
RemoveTemporaryDirectory();
FlushConfiguration();
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 83a251c..24de22a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -525,6 +525,10 @@
{
m_language = oArg.copy(RTL_CONSTASCII_LENGTH(language=));
}
+else if ( oArg.matchIgnoreAsciiCase(pidfile=))
+{
+m_pidfile = oArg.copy(RTL_CONSTASCII_LENGTH(pidfile=));
+}
else if ( oArg == writer )
{
m_writer = true;
@@ -849,6 +853,11 @@
return m_bDocumentArgs;
}
+OUString CommandLineArgs::GetPidfileName() const
+{
+return m_pidfile;
+}
+
} // namespace desktop
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/cmdlineargs.hxx
b/desktop/source/app/cmdlineargs.hxx
index a9c2c48..4ea5e0d 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -105,6 +105,7 @@
std::vector rtl::OUString GetConversionList() const;
rtl::OUString GetConversionParams() const;
rtl::OUString GetConversionOut() const;
+OUString GetPidfileName() const;
// Special analyzed states (does not match directly to a command line
parameter!)
bool IsEmpty() const;
@@ -166,6 +167,7 @@
rtl::OUString m_conversionout; // contains external URIs
std::vector rtl::OUString m_infilter;
rtl::OUString m_language;
+OUString m_pidfile;
};
}
diff --git
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/ios2met/ios2met.cxx | 18 ++
1 file changed, 2 insertions(+), 16 deletions(-)
New commits:
commit ef23a1138257fe6cd53039dca40bc874a228e223
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 13:49:08 2013 +0100
coverity#441160 Logically dead code
Change-Id: I697aad17986b1cd874311716873ed75358d3cae4
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index c98011e..6f711d0 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -1682,14 +1682,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID,
sal_uInt16 nOrderLen)
else {
*pOS2MET nMix;
if (nMix==0) {
-if (nA==1) switch (nP) {
-case 1: aAttr.eLinMix=aDefAttr.eLinMix; break;
-case 2: aAttr.eChrMix=aDefAttr.eChrMix; break;
-case 3: aAttr.eMrkMix=aDefAttr.eMrkMix; break;
-case 4: aAttr.ePatMix=aDefAttr.ePatMix; break;
-case 5: aAttr.eImgMix=aDefAttr.eImgMix; break;
-}
-else switch (nP) {
+switch (nP) {
case 1: aAttr.eLinBgMix=aDefAttr.eLinBgMix; break;
case 2: aAttr.eChrBgMix=aDefAttr.eChrBgMix; break;
case 3: aAttr.eMrkBgMix=aDefAttr.eMrkBgMix; break;
@@ -1699,14 +1692,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID,
sal_uInt16 nOrderLen)
}
else {
eROP=OS2MixToRasterOp(nMix);
-if (nA==1) switch (nP) {
-case 1: aAttr.eLinMix=eROP; break;
-case 2: aAttr.eChrMix=eROP; break;
-case 3: aAttr.eMrkMix=eROP; break;
-case 4: aAttr.ePatMix=eROP; break;
-case 5: aAttr.eImgMix=eROP; break;
-}
-else switch (nP) {
+switch (nP) {
case 1: aAttr.eLinBgMix=eROP; break;
case 2: aAttr.eChrBgMix=eROP; break;
case 3: aAttr.eMrkBgMix=eROP; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RFC] add --pidfile switch to write libo pid to a file
Hi Stephan, Il 19/03/2013 11:47, Stephan Bergmann ha scritto: Setting up the listeners for the --accept arguments passed from soffice/oosplash to soffice.bin is done in Desktop::RegisterServices (desktop/source/app/appinit.cxx), so that might also be a good place to write the pid. (Setting up listeners for additional --accept arguments passed from additional soffice/oosplash/soffice.bin processes that pass their arguments to the first soffice.bin process and then terminate again are handled in desktop/source/app/officeipcthread.cxx. Arguably, you would not want to handle --pidfile arguments passed in that way, and at least in theory this situation should not arise anyway with your setup.) Documentation about command line parameters is in desktop/source/app/cmdlinehelp.cxx, btw. Thanks a lot for these pointers. Updated help, added pid removal and posted a new patch to https://gerrit.libreoffice.org/2928 thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Related coverity#441160 Logically dead code
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2929
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/2929/1
Related coverity#441160 Logically dead code
Change-Id: Ibb4cff2b9a53eb1d9f4ea6043ed2b1b2deba1e2b
---
M filter/source/graphicfilter/epict/epict.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/filter/source/graphicfilter/epict/epict.cxx
b/filter/source/graphicfilter/epict/epict.cxx
index 26a2bf3..4114cdb 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -657,7 +657,7 @@
dh = aPoint.X()-aDstTextPosition.X();
dv = aPoint.Y()-aDstTextPosition.Y();
-if (bDstTextPositionValid==sal_False || dh0 || dh255 || dv0 || dv0 ||
bDelta==sal_False)
+if (bDstTextPositionValid==sal_False || dh0 || dh255 || dv0 || dv255
|| bDelta==sal_False)
{
*pPict (sal_uInt16)0x0028;
WritePoint(rPoint);
--
To view, visit https://gerrit.libreoffice.org/2929
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb4cff2b9a53eb1d9f4ea6043ed2b1b2deba1e2b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 97fa9a882c5084383c47443ef16f97caf5f5ec8b
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 14:13:20 2013 +0100
coverity#704205/704206/704207 Logically dead code
Change-Id: Ic2cbd96f393a21cf2c6634d3c5e5a4c5a5b486ef
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 76c8dd9..fefb9d9 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -994,7 +994,7 @@ RTLFUNC(InStrRev)
bool bCompatibility = ( pInst pInst-IsCompatibility() );
if( bCompatibility )
{
-SbiRuntime* pRT = pInst ? pInst-pRun : NULL;
+SbiRuntime* pRT = pInst-pRun;
bTextMode = pRT ? pRT-GetImageFlag( SBIMG_COMPARETEXT ) :
sal_False;
}
else
@@ -1368,7 +1368,7 @@ RTLFUNC(Replace)
bool bCompatibility = ( pInst pInst-IsCompatibility() );
if( bCompatibility )
{
-SbiRuntime* pRT = pInst ? pInst-pRun : NULL;
+SbiRuntime* pRT = pInst-pRun;
bTextMode = pRT ? pRT-GetImageFlag( SBIMG_COMPARETEXT ) :
sal_False;
}
else
@@ -1629,7 +1629,7 @@ RTLFUNC(StrComp)
bool bCompatibility = ( pInst pInst-IsCompatibility() );
if( bCompatibility )
{
-SbiRuntime* pRT = pInst ? pInst-pRun : NULL;
+SbiRuntime* pRT = pInst-pRun;
nTextCompare = pRT ? pRT-GetImageFlag( SBIMG_COMPARETEXT ) :
sal_False;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Related coverity#704213/704214/704215 Logically dead code
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2930
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/2930/1
Related coverity#704213/704214/704215 Logically dead code
Change-Id: I80c119b2287ff0c4f2e467943be6a7682914934a
---
M chart2/source/controller/main/DrawCommandDispatch.cxx
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 8dbd956..57b629e 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -403,7 +403,7 @@
m_pChartController-m_aSelection.setSelection(
xShape );
m_pChartController-m_aSelection.applySelection( pDrawViewWrapper );
}
-if ( nFeatureId == SID_DRAW_TEXT )
+if ( nFeatureId == COMMAND_ID_DRAW_TEXT )
{
m_pChartController-StartTextEdit();
}
@@ -517,7 +517,7 @@
if ( pTextObj )
{
pTextObj-SetLogicRect( aRect );
-sal_Bool bVertical = ( nID ==
SID_DRAW_TEXT_VERTICAL );
+sal_Bool bVertical = ( nID ==
COMMAND_ID_DRAW_TEXT_VERTICAL );
pTextObj-SetVerticalWriting( bVertical );
if ( bVertical )
{
@@ -537,7 +537,7 @@
{
if ( pObj-ISA( SdrCaptionObj ) )
{
-sal_Bool bIsVertical(
SID_DRAW_CAPTION_VERTICAL == nID );
+sal_Bool bIsVertical(
COMMAND_ID_DRAW_CAPTION_VERTICAL == nID );
SdrTextObj* pTextObj = dynamic_cast
SdrTextObj* ( pObj );
if ( pTextObj )
{
--
To view, visit https://gerrit.libreoffice.org/2930
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80c119b2287ff0c4f2e467943be6a7682914934a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468 Translate German Comments - salframe.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2931
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/2931/1
fdo#39468 Translate German Comments - salframe.cxx
Change-Id: I0a5655ac1b1b4feca0b3a5ed3d4c37a63bce6c5a
---
M vcl/win/source/window/salframe.cxx
1 file changed, 93 insertions(+), 106 deletions(-)
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index a824564..44f299b 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -131,7 +131,7 @@
static void ImplSaveFrameState( WinSalFrame* pFrame )
{
-// Position, Groesse und Status fuer GetWindowState() merken
+// save position, size and state for GetWindowState()
if ( !pFrame-mbFullScreen )
{
sal_Bool bVisible = (GetWindowStyle( pFrame-mhWnd ) WS_VISIBLE) !=
0;
@@ -524,7 +524,7 @@
// ===
-// Uebersetzungstabelle von System-Keycodes in StarView-Keycodes
+// translation table from System keycodes into StartView keycodes
#define KEY_TAB_SIZE 146
static sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
@@ -892,7 +892,7 @@
memset( maGeometry, 0, sizeof( maGeometry ) );
-// Daten ermitteln, wenn erster Frame angelegt wird
+// get data, when making 1st frame
if ( !pSalData-mpFirstFrame )
{
if ( !aSalShlData.mnWheelMsgId )
@@ -1213,7 +1213,7 @@
pFrame-mnShowState = SW_SHOWNOACTIVATE;
else
pFrame-mnShowState = SW_SHOW;
-// Damit Taskleiste unter W98 auch gleich ausgeblendet wird
+// hide toolbar for W98
if ( pFrame-mbPresentation )
{
HWND hWndParent = ::GetParent( hWnd );
@@ -1690,9 +1690,8 @@
void WinSalFrame::SetWindowState( const SalFrameState* pState )
{
-// Wir testen, ob das Fenster ueberhaupt auf den Bildschirm passt, damit
-// nicht wenn die Bildschirm-Aufloesung geaendert wurde, das Fenster aus
-// diesem herausragt
+// Check if the window fits into the screen, in case the screen
+// resolution changed
int nX;
int nY;
int nWidth;
@@ -1724,7 +1723,7 @@
long nBottomDeco = abs( aWinRect.bottom - aRect2.bottom );
long nRightDeco = abs( aWinRect.right - aRect2.right );
-// Fenster-Position/Groesse in den Bildschirm einpassen
+// adjust window position/size to fit the screen
if ( !(pState-mnMask (SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y)) )
nPosSize |= SWP_NOMOVE;
if ( !(pState-mnMask (SAL_FRAMESTATE_MASK_WIDTH |
SAL_FRAMESTATE_MASK_HEIGHT)) )
@@ -1762,12 +1761,12 @@
if ( nY nScreenY )
nY = nScreenY;
-// Restore-Position setzen
+// set Restore-Position
WINDOWPLACEMENT aPlacement;
aPlacement.length = sizeof( aPlacement );
GetWindowPlacement( mhWnd, aPlacement );
-// Status setzen
+// set State
sal_Bool bVisible = (GetWindowStyle( mhWnd ) WS_VISIBLE) != 0;
sal_Bool bUpdateHiddenFramePos = FALSE;
if ( !bVisible )
@@ -1914,7 +1913,7 @@
if ( bFullScreen )
{
-// Damit Taskleiste von Windows ausgeblendet wird
+// to hide the Windows taskbar
DWORD nExStyle = GetWindowExStyle( mhWnd );
if ( nExStyle WS_EX_TOOLWINDOW )
{
@@ -1935,8 +1934,8 @@
}
else
{
-// wenn ShowState wieder hergestellt werden muss, hiden wir zuerst
-// das Fenster, damit es nicht so sehr flackert
+// when the ShowState has to be reset, hide the window first to
+// reduce flicker
sal_Bool bVisible = (GetWindowStyle( mhWnd ) WS_VISIBLE) != 0;
if ( bVisible (mnShowState != mnFullScreenShowState) )
ShowWindow( mhWnd, SW_HIDE );
@@ -2004,7 +2003,7 @@
pSalData-mpSageEnableProc( DISABLE_AGENT );
}
-// Bildschirmschoner ausschalten, wenn Praesentation laueft
+// turn off screen-saver when in Presentation mode
SystemParametersInfo( SPI_GETSCREENSAVEACTIVE, 0,
(pSalData-mbScrSvrEnabled), 0 );
if ( pSalData-mbScrSvrEnabled )
@@ -2012,11 +2011,11 @@
}
else
{
-// Bildschirmschoner wieder einschalten
+// turn on screen-saver
if ( pSalData-mbScrSvrEnabled )
SystemParametersInfo( SPI_SETSCREENSAVEACTIVE,
pSalData-mbScrSvrEnabled, 0, 0 );
-// Systemagenten wieder aktivieren
+// re-activate system agents
if ( pSalData-mnSageStatus == ENABLE_AGENT )
pSalData-mpSageEnableProc( pSalData-mnSageStatus );
}
@@ -2082,9 +2081,8 @@
{
SetFocus( hWnd );
-// Windows behauptet oefters mal, das man den Focus hat, obwohl
-// man diesen nicht hat. Wenn dies der Fall ist, dann versuchen
-// wir diesen auch ganz richtig zu bekommen.
+
[Libreoffice-commits] core.git: 2 commits - chart2/source connectivity/source
chart2/source/controller/main/DrawCommandDispatch.cxx |6 +++---
connectivity/source/drivers/dbase/DResultSet.cxx |1 -
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit f9122b32975bbd2aeba6e1bb9722f6140eafe8f1
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 14:52:25 2013 +0100
coverity#704216 Logically dead code
Change-Id: I83af7c87576c185b4884a2a6ceaea5274efa7c37
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx
b/connectivity/source/drivers/dbase/DResultSet.cxx
index 3bb10a5..df8bc00 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -188,7 +188,6 @@ sal_Bool ODbaseResultSet::fillIndexValues(const Reference
XColumnsSupplier _x
delete pIter;
return sal_True;
}
-delete pIter;
}
}
return sal_False;
commit bbc96d45d4435a0a938ad0b8aba89fca9ad8df06
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 14:28:52 2013 +0100
Related coverity#704213/704214/704215 Logically dead code
Change-Id: I80c119b2287ff0c4f2e467943be6a7682914934a
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 8dbd956..57b629e 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -403,7 +403,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString
rCommand, const Sequen
m_pChartController-m_aSelection.setSelection(
xShape );
m_pChartController-m_aSelection.applySelection( pDrawViewWrapper );
}
-if ( nFeatureId == SID_DRAW_TEXT )
+if ( nFeatureId == COMMAND_ID_DRAW_TEXT )
{
m_pChartController-StartTextEdit();
}
@@ -517,7 +517,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const
sal_uInt16 nID )
if ( pTextObj )
{
pTextObj-SetLogicRect( aRect );
-sal_Bool bVertical = ( nID ==
SID_DRAW_TEXT_VERTICAL );
+sal_Bool bVertical = ( nID ==
COMMAND_ID_DRAW_TEXT_VERTICAL );
pTextObj-SetVerticalWriting( bVertical );
if ( bVertical )
{
@@ -537,7 +537,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const
sal_uInt16 nID )
{
if ( pObj-ISA( SdrCaptionObj ) )
{
-sal_Bool bIsVertical(
SID_DRAW_CAPTION_VERTICAL == nID );
+sal_Bool bIsVertical(
COMMAND_ID_DRAW_CAPTION_VERTICAL == nID );
SdrTextObj* pTextObj = dynamic_cast
SdrTextObj* ( pObj );
if ( pTextObj )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Related coverity#704213/704214/704215 Logically dead code
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2930 -- To view, visit https://gerrit.libreoffice.org/2930 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80c119b2287ff0c4f2e467943be6a7682914934a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationDialog.src |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 18682c5d13be52fcdbbe4b802b874a1b83fbbd8c
Author: Xiaoli duan19002...@gmail.com
Date: Sat Mar 23 15:19:25 2013 +0100
Improve size and positions of widgets for CustomAnimationDialog
Conflicts:
sd/source/ui/animations/CustomAnimationDialog.src
Change-Id: I38a9cbd533c742657c4af6c83d146706684c1ff6
diff --git a/sd/source/ui/animations/CustomAnimationDialog.src
b/sd/source/ui/animations/CustomAnimationDialog.src
index 2bd8664..b07f147 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.src
+++ b/sd/source/ui/animations/CustomAnimationDialog.src
@@ -614,7 +614,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT
ListBox LB_GROUP_TEXT
{
HelpID = sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT;
-Pos = MAP_APPFONT ( X2 , 3 ) ;
+Pos = MAP_APPFONT ( (WIDTH-W2-65), 3 ) ;
Size = MAP_APPFONT ( W2, 48 );
TabStop = TRUE ;
Border = TRUE ;
@@ -636,7 +636,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT
{
HelpID = sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO;
Pos = MAP_APPFONT ( X0 , 20 ) ;
-Size = MAP_APPFONT ( W1 , 8 ) ;
+Size = MAP_APPFONT ( W1 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = Automatically after ;
};
@@ -645,7 +645,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT
MetricField MF_GROUP_AUTO
{
HelpID = sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO;
-Pos = MAP_APPFONT ( X2 , 18 ) ;
+Pos = MAP_APPFONT ( (WIDTH-W2-65) , 20 ) ;
Size = MAP_APPFONT ( W2, 12 );
Border = TRUE ;
TabStop = TRUE ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Improve size and positions of widgets for CustomAnimationDia...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2932 -- To view, visit https://gerrit.libreoffice.org/2932 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38a9cbd533c742657c4af6c83d146706684c1ff6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Xiaoli Duan duan19002...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Improve size and positions of widgets for CustomAnimationDia...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2932
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/2932/1
Improve size and positions of widgets for CustomAnimationDialog
Change-Id: I38a9cbd533c742657c4af6c83d146706684c1ff6
---
M sd/source/ui/animations/CustomAnimationDialog.src
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sd/source/ui/animations/CustomAnimationDialog.src
b/sd/source/ui/animations/CustomAnimationDialog.src
index 5a7ea0f..89d90db 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.src
+++ b/sd/source/ui/animations/CustomAnimationDialog.src
@@ -613,7 +613,7 @@
ListBox LB_GROUP_TEXT
{
HelpID = sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT;
-Pos = MAP_APPFONT ( X2 , 3 ) ;
+Pos = MAP_APPFONT ( (WIDTH-W2-65), 3 ) ;
Size = MAP_APPFONT ( W2, 48 );
TabStop = TRUE ;
Border = TRUE ;
@@ -635,7 +635,7 @@
{
HelpID = sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO;
Pos = MAP_APPFONT ( X0 , 20 ) ;
-Size = MAP_APPFONT ( W0 , 10 ) ;
+Size = MAP_APPFONT ( W1 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = Automatically after ;
};
@@ -644,7 +644,7 @@
MetricField MF_GROUP_AUTO
{
HelpID = sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO;
-Pos = MAP_APPFONT ( X2 , 18 ) ;
+Pos = MAP_APPFONT ( (WIDTH-W2-65) , 20 ) ;
Size = MAP_APPFONT ( W2, 12 );
Border = TRUE ;
TabStop = TRUE ;
--
To view, visit https://gerrit.libreoffice.org/2932
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38a9cbd533c742657c4af6c83d146706684c1ff6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Xiaoli Duan duan19002...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] rhbz#876742 speed up table manipulation in Impress
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2925 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2925 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab2e2d0e1e8038710645c0bd24666e6032b0a003 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/inc svx/Package_inc.mk svx/source
svx/Package_inc.mk|1
svx/inc/svx/itextprovider.hxx | 42 +
svx/inc/svx/sdr/properties/textproperties.hxx |4 ++
svx/inc/svx/svdotext.hxx |3 +
svx/source/sdr/properties/textproperties.cxx | 38 ---
svx/source/table/cell.cxx | 52 ++
6 files changed, 125 insertions(+), 15 deletions(-)
New commits:
commit ea34a742dd51dfcd83b5e821208f565715d0f3fd
Author: David Tardon dtar...@redhat.com
Date: Fri Mar 22 16:49:41 2013 +0100
rhbz#876742 speed up table manipulation in Impress
It turns out this is not actually a performance problem but an oversight
in implementation (or a bug, if you want .-)
Every manipulation with a table (e.g., move, resize; actually even a
selection of the table) leads to creation of a full copy of the table
(SdrObject::getFullDragClone()). One of the actions the table copy impl.
does is to call sdr::CellProperties::SetStyleSheet() on every cell of
the new table. CellProperties is derived from
sdr::properties::TextProperties and CellProperties::SetStyleSheet() just
passes the call to TextProperties::SetStyleSheet(). This is where the
trouble begins :-)
The SDR representation of a table, SdrTableObj, is derived from
SdrTextObj. Because of that, SdrTextObj needs to be able to contain more
than one SdrText (because a table needs one for every cell). This is
handled correctly by TextProperties. But, because there is no SDR
representation of a single cell, CellProperties uses the SdrTableObj as
the SDR object it works on. Therefore TextProperties::SetStyleSheet()
processes all SdrText objects of the _whole table_, not just a single
cell. And this is repeated for every other cell...
Change-Id: Iab2e2d0e1e8038710645c0bd24666e6032b0a003
(cherry picked from commit 91864e19c84ae9834d6e97ee5ddc4db5bf957681)
Reviewed-on: https://gerrit.libreoffice.org/2925
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 3eac094..fa3313d 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -31,6 +31,7 @@ $(eval $(call
gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx))
+$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/itextprovider.hxx,svx/itextprovider.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/linkwarn.hxx,svx/linkwarn.hxx))
$(eval $(call
gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx))
diff --git a/svx/inc/svx/itextprovider.hxx b/svx/inc/svx/itextprovider.hxx
new file mode 100644
index 000..3202e4d
--- /dev/null
+++ b/svx/inc/svx/itextprovider.hxx
@@ -0,0 +1,42 @@
+/* -*- 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/.
+ */
+
+#if !defined SVX_ITEXTPROVIDER_HXX_INCLUDED
+#define SVX_ITEXTPROVIDER_HXX_INCLUDED
+
+#include sal/types.h
+
+#include svx/svxdllapi.h
+
+class SdrText;
+
+namespace svx
+{
+
+/** This interface provides access to text object(s) in an SdrObject.
+
+ */
+class SVX_DLLPUBLIC ITextProvider
+{
+public:
+/** Return the number of texts available for this object. */
+virtual sal_Int32 getTextCount() const = 0;
+
+/** Return the nth available text. */
+virtual SdrText* getText(sal_Int32 nIndex) const = 0;
+
+protected:
+~ITextProvider() {}
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx
b/svx/inc/svx/sdr/properties/textproperties.hxx
index ac6a613..456b104 100644
--- a/svx/inc/svx/sdr/properties/textproperties.hxx
+++ b/svx/inc/svx/sdr/properties/textproperties.hxx
@@ -20,6 +20,7 @@
#ifndef _SDR_PROPERTIES_TEXTPROPERTIES_HXX
#define _SDR_PROPERTIES_TEXTPROPERTIES_HXX
+#include svx/itextprovider.hxx
#include svx/sdr/properties/attributeproperties.hxx
#include svx/svxdllapi.h
@@ -45,6 +46,9 @@ namespace sdr
// react on ItemSet changes
virtual void ItemSetChanged(const SfxItemSet rSet);
+/// Get the TextProvider related to our SdrObject
+virtual const svx::ITextProvider getTextProvider() const;
+
License statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Xiaoli Duan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 35 +++--
1 file changed, 16 insertions(+), 19 deletions(-)
New commits:
commit 015131c87e14f84040cfa579bc81419714cbe964
Author: Rob Snelders programm...@ertai.nl
Date: Sat Mar 23 13:36:00 2013 +0100
Give the number of slides also when more slides are selected
Change-Id: I2a169831f2caada6d052edb697036a53ca67ddd0
Reviewed-on: https://gerrit.libreoffice.org/2927
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index a3f2ba7..6db42a0 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -814,16 +814,15 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet)
// page view and layout
SdPage* pPage = NULL;
SdPage* pFirstPage = NULL;
-sal_uInt16 nFirstPage;
-sal_uInt16 nSelectedPages =
(sal_uInt16)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
-rtl::OUString aPageStr;
+sal_uInt16 nFirstPage;
+sal_uInt16 nSelectedPages =
mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
+OUStringBuffer aPageStr;
String aLayoutStr;
+//Set number of slides
if (nSelectedPages 0)
-aPageStr = SD_RESSTR(STR_SD_PAGE);
-
-if (nSelectedPages == 1)
{
+aPageStr = SD_RESSTR(STR_SLIDE_SINGULAR);
model::PageEnumeration aSelectedPages (
model::PageEnumerationProvider::CreateSelectedPagesEnumeration(
mrSlideSorter.GetModel()));
@@ -831,22 +830,20 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet)
if (pDescriptor)
{
pPage = pDescriptor-GetPage();
-nFirstPage = pPage-GetPageNum()/2;
-pFirstPage = pPage;
-
-aPageStr += ;
-aPageStr += rtl::OUString::valueOf(
static_castsal_Int32(nFirstPage + 1) );
-aPageStr += / ;
-aPageStr +=
rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount());
-
-aLayoutStr = pFirstPage-GetLayoutName();
-aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
+nFirstPage = (pPage-GetPageNum()/2) + 1;
+aPageStr.append( ).append(static_castsal_Int32(nFirstPage),
10).append( / ).append(mrSlideSorter.GetModel().GetPageCount(), 10);
}
+ rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr.makeStringAndClear()
) );
}
-rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr ) );
-rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
-
+//Set layout
+if (nSelectedPages == 1 pPage != NULL)
+{
+pFirstPage = pPage;
+aLayoutStr = pFirstPage-GetLayoutName();
+aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
+rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
+}
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
{
rSet.Put( SfxVoidItem( SID_ATTR_ZOOMSLIDER ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Give the number of slides also when more slides are selected
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2927 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2927 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a169831f2caada6d052edb697036a53ca67ddd0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] After presentation is finished always have previous go to la...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2933
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/2933/1
After presentation is finished always have previous go to last shown slide
Change-Id: Ibb9db34523731f363612bd5f2306372380bb2fae
---
M sd/source/ui/slideshow/slideshowimpl.cxx
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 88f282a..7881730 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3266,9 +3266,7 @@
const ShowWindowMode eMode = mpShowWindow-GetShowWindowMode();
if( eMode == SHOWWINDOWMODE_END )
{
-const sal_Int32 nLastSlideIndex =
mpSlideController-getSlideIndexCount() - 1;
-if( nLastSlideIndex = 0 )
-mpShowWindow-RestartShow( nLastSlideIndex );
+mpShowWindow-RestartShow(
mpSlideController-getCurrentSlideIndex() );
}
else if( (eMode == SHOWWINDOWMODE_PAUSE) || (eMode ==
SHOWWINDOWMODE_BLANK) )
{
--
To view, visit https://gerrit.libreoffice.org/2933
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb9db34523731f363612bd5f2306372380bb2fae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rob Snelders libreoff...@ertai.nl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/dociter.hxx | 10 ++---
sc/source/core/data/dociter.cxx | 74
2 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 9da876bcef9d7a0bb5f55d5a52bab6ffc0baad30
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Sat Mar 23 11:29:15 2013 -0400
Put 'm' prefix for data members.
Change-Id: I35de864a36c350f9b92d1e43208c8d0d37fd874a
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 1a6d3e7..c490a9d 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -214,12 +214,12 @@ public:
class ScCellIterator// walk through all cells in an area
{ // for SubTotal no hidden and no sub-total
lines
private:
-ScDocument* pDoc;
+ScDocument* mpDoc;
ScAddress maStartPos;
ScAddress maEndPos;
ScAddress maCurPos;
-SCSIZE nColRow;
-boolbSubTotal;
+SCSIZE mnIndex;
+bool mbSubTotal;
CellType meCurType;
OUString maCurString;
@@ -233,11 +233,11 @@ private:
void init();
bool getCurrent();
public:
-ScCellIterator(ScDocument* pDocument,
+ScCellIterator(ScDocument* pDoc,
SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
SCCOL nECol, SCROW nERow, SCTAB nETab,
bool bSTotal = false);
-ScCellIterator(ScDocument* pDocument,
+ScCellIterator(ScDocument* pDoc,
const ScRange rRange, bool bSTotal =
false);
ScBaseCell* GetFirst();
ScBaseCell* GetNext();
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index a280555..8e503b8 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -938,26 +938,26 @@ bool ScDBQueryDataIterator::GetNext(Value rValue)
//
-ScCellIterator::ScCellIterator( ScDocument* pDocument,
+ScCellIterator::ScCellIterator( ScDocument* pDoc,
SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
SCCOL nECol, SCROW nERow, SCTAB nETab, bool
bSTotal ) :
-pDoc( pDocument ),
+mpDoc(pDoc),
maStartPos(nSCol, nSRow, nSTab),
maEndPos(nECol, nERow, nETab),
-nColRow(0),
-bSubTotal(bSTotal),
+mnIndex(0),
+mbSubTotal(bSTotal),
meCurType(CELLTYPE_NONE),
mfCurValue(0.0)
{
init();
}
-ScCellIterator::ScCellIterator( ScDocument* pDocument, const ScRange rRange,
bool bSTotal ) :
-pDoc( pDocument ),
+ScCellIterator::ScCellIterator( ScDocument* pDoc, const ScRange rRange, bool
bSTotal ) :
+mpDoc(pDoc),
maStartPos(rRange.aStart),
maEndPos(rRange.aEnd),
-nColRow(0),
-bSubTotal(bSTotal),
+mnIndex(0),
+mbSubTotal(bSTotal),
meCurType(CELLTYPE_NONE),
mfCurValue(0.0)
{
@@ -966,7 +966,7 @@ ScCellIterator::ScCellIterator( ScDocument* pDocument,
const ScRange rRange, bo
void ScCellIterator::init()
{
-SCTAB nDocMaxTab = pDoc-GetTableCount() - 1;
+SCTAB nDocMaxTab = mpDoc-GetTableCount() - 1;
PutInOrder(maStartPos, maEndPos);
@@ -977,7 +977,7 @@ void ScCellIterator::init()
if (!ValidTab(maStartPos.Tab(), nDocMaxTab)) maStartPos.SetTab(nDocMaxTab);
if (!ValidTab(maEndPos.Tab(), nDocMaxTab)) maEndPos.SetTab(nDocMaxTab);
-while (maEndPos.Tab() 0 !pDoc-maTabs[maEndPos.Tab()])
+while (maEndPos.Tab() 0 !mpDoc-maTabs[maEndPos.Tab()])
maEndPos.IncTab(-1); // Only the tables in use
if (maStartPos.Tab() maEndPos.Tab())
@@ -985,7 +985,7 @@ void ScCellIterator::init()
maCurPos = maStartPos;
-if (!pDoc-maTabs[maCurPos.Tab()])
+if (!mpDoc-maTabs[maCurPos.Tab()])
{
OSL_FAIL(Table not found);
maStartPos = ScAddress(MAXCOL+1, MAXROW+1, MAXTAB+1); // - Abort on
GetFirst.
@@ -995,7 +995,7 @@ void ScCellIterator::init()
ScBaseCell* ScCellIterator::GetThis()
{
-ScColumn* pCol = (pDoc-maTabs[maCurPos.Tab()])-aCol[maCurPos.Col()];
+ScColumn* pCol = (mpDoc-maTabs[maCurPos.Tab()])-aCol[maCurPos.Col()];
for ( ;; )
{
if (maCurPos.Row() maEndPos.Row())
@@ -1011,22 +1011,22 @@ ScBaseCell* ScCellIterator::GetThis()
if (maCurPos.Tab() maEndPos.Tab())
return NULL; // Over and out
}
-pCol = (pDoc-maTabs[maCurPos.Tab()])-aCol[maCurPos.Col()];
+pCol = (mpDoc-maTabs[maCurPos.Tab()])-aCol[maCurPos.Col()];
} while ( pCol-maItems.empty() );
-pCol-Search(maCurPos.Row(), nColRow);
+pCol-Search(maCurPos.Row(), mnIndex);
}
-while ( (nColRow pCol-maItems.size())
(pCol-maItems[nColRow].nRow maCurPos.Row()) )
-++nColRow;
+while ( (mnIndex
[PATCH] Translations of comments from German into English
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2934
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/2934/1
Translations of comments from German into English
Change-Id: I0a1421e5b7149c060e8603a13e82a80c7d4d5bd5
---
M sc/source/ui/view/prevwsh.cxx
M sc/source/ui/view/printfun.cxx
2 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 42b4fb4..5358705 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -919,7 +919,7 @@
else
rData.nTotalPages = 99;
-// eNumType kennt der Dialog selber
+// the dialog knows eNumType
}
void ScPreviewShell::WriteUserData(String rData, sal_Bool /* bBrowse */)
@@ -1134,7 +1134,7 @@
break;
}
-// nHRange-nHPage kann negativ sein, deshalb Abfrage auf 0 hinterher
+// nHRange-nHPage might be negative, that's why we check for 0
afterwards
if( aCurPos.Y() (nVRange-nVPage) )
aCurPos.Y() = (nVRange-nVPage);
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 6244940..60bbe68 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -128,7 +128,7 @@
{
if ( nX nPagesX )
{
-if ( nX+1 == nPagesX ) // letzte Seite?
+if ( nX+1 == nPagesX ) // last page?
--nPagesX;
else
{
@@ -173,12 +173,12 @@
pDocShell-UpdatePendingRowHeights( nPrintTab );
pDoc = pDocShell-GetDocument();
-SfxPrinter* pDocPrinter = pDoc-GetPrinter(); // auch fuer Preview den
Drucker nehmen
+SfxPrinter* pDocPrinter = pDoc-GetPrinter(); // use the printer, even
for preview
if (pDocPrinter)
aOldPrinterMode = pDocPrinter-GetMapMode();
-// einheitlicher MapMode ueber alle Aufrufe (z.B. Repaint !!!),
-// weil die EditEngine sonst unterschiedliche Texthoehen liefert
+// unified MapMode for all calls (e.g. Repaint!!!)
+// else, EditEngine outputs different text heights
pDev-SetMapMode(MAP_PIXEL);
pPageEndX = NULL;
@@ -327,14 +327,14 @@
if (pPageData)
{
sal_uInt16 nCount = sal::static_int_castsal_uInt16(
pPageData-GetCount() );
-ScPrintRangeData rData = pPageData-GetData(nCount); //
hochzaehlen
+ScPrintRangeData rData = pPageData-GetData(nCount); // count up
rData.SetPrintRange( ScRange( nStartCol, nStartRow, nPrintTab,
nEndCol, nEndRow, nPrintTab ) );
rData.SetPagesX( nPagesX, pPageEndX );
rData.SetPagesY( nTotalY, pPageEndY );
-// Einstellungen
+// Settings
rData.SetTopDown( aTableParam.bTopDown );
rData.SetAutomatic( !aAreaParam.bPrintArea );
}
@@ -348,10 +348,10 @@
delete pEditDefaults;
delete pEditEngine;
-// Druckereinstellungen werden jetzt von aussen wiederhergestellt
+// Printer settings are now restored from outside
-// Fuer DrawingLayer/Charts muss der MapMode am Drucker (RefDevice) immer
stimmen
-SfxPrinter* pDocPrinter = pDoc-GetPrinter(); // auch fuer Preview den
Drucker nehmen
+// For DrawingLayer/Charts, the MapMode of the printer (RefDevice) must
always be correct
+SfxPrinter* pDocPrinter = pDoc-GetPrinter(); // use Preview also for
the printer
if (pDocPrinter)
pDocPrinter-SetMapMode(aOldPrinterMode);
}
@@ -381,17 +381,17 @@
}
//
-// Ausgabe auf Device (static)
+// output to Device (static)
//
-// wird benutzt fuer:
+// us used for:
// - Clipboard/Bitmap
// - Ole-Object (DocShell::Draw)
-// - Vorschau bei Vorlagen
+// - Preview of templates
void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /*
nPrintFactor */,
const Rectangle rBound, ScViewData* pViewData,
sal_Bool bMetaFile )
{
-//! nPrintFactor auswerten !!!
+//! evaluate nPrintFactor !!!
SCTAB nTab = 0;
if (pViewData)
@@ -463,15 +463,15 @@
nTwipsSizeX += pDoc-GetColWidth( i, nTab );
long nTwipsSizeY = (long) pDoc-GetRowHeight( nY1, nY2, nTab );
-// wenn keine Linien, dann trotzdem Platz fuer den Aussenrahmen (20 Twips
= 1pt)
-// (HasLines initalisiert aLines auf 0,0,0,0)
+// if no lines, still space for the outline frame (20 Twips = 1pt)
+// (HasLines initalizes aLines to 0,0,0,0)
nTwipsSizeX += aLines.Left() + Max( aLines.Right(), 20L );
nTwipsSizeY += aLines.Top() + Max( aLines.Bottom(), 20L );
double nScaleX = (double) nDevSizeX / nTwipsSizeX;
double nScaleY = (double) nDevSizeY / nTwipsSizeY;
-//! Flag bei FillInfo uebergeben !
+//! hand over Flag at FillInfo !
ScRange aERange;
sal_Bool bEmbed =
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/extensions/pre_MergedLibsList.mk | 11 ++- solenv/gbuild/gbuild.mk|3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) New commits: commit c52ceef8395a3b4c59bf6e139e126b57c77d2d92 Author: Peter Foley pefol...@verizon.net Date: Sat Mar 23 11:42:11 2013 -0400 add dba dbu and dbtools to Library_merged Change-Id: I2a686cc18e0e965124e886901d852daf2d607b9b diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 6af96e0..e2167bc 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -33,6 +33,9 @@ gb_MERGEDLIBS := \ canvastools \ configmgr \ cppcanvas \ + $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ deploymentmisc \ desktopbe1 \ drawinglayer \ @@ -73,13 +76,11 @@ gb_MERGEDLIBS := \ uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ - $(if $(filter-out IOS,$(OS)), \ - wpftdraw \ - wpftwriter) \ + $(if $(filter-out IOS,$(OS)),wpftdraw) \ + $(if $(filter-out IOS,$(OS)),wpftwriter) \ xmlscript \ xmlsecurity \ - xo \ - + xo ifeq ($(OS),ANDROID) gb_MERGEDLIBS += \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index aff848b..f914c00 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -82,6 +82,8 @@ COMMA :=, CLOSE_PAREN :=) +include $(GBUILDDIR)/Helper.mk + # optional extensions that should never be essential ifneq ($(wildcard $(GBUILDDIR)/extensions/pre_*.mk),) include $(wildcard $(GBUILDDIR)/extensions/pre_*.mk) @@ -180,7 +182,6 @@ gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX) endif include $(GBUILDDIR)/ExternalExecutable.mk -include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk include $(GBUILDDIR)/Tempfile.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#39445 writing out tools/fsys.hxx (idl)
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2935
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2935/1
fdo#39445 writing out tools/fsys.hxx (idl)
Removed uses of fsys from database.cxx, command.cxx, module.cxx, svidl.cxx.
Also removed a lot of cruft from svidl.cxx and command.hxx; unused variables
and code relating to them, eg. variables aCxxFile, aHxxFile, aSrcFile, aODLFile.
Changed some Strings to OUStrings in svidl.cxx and command.hxx.
Someone please test this patch under Windows.
Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d
---
M idl/inc/command.hxx
M idl/source/objects/module.cxx
M idl/source/prj/command.cxx
M idl/source/prj/database.cxx
M idl/source/prj/svidl.cxx
5 files changed, 138 insertions(+), 159 deletions(-)
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 5ca38db..b77ab2f 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -30,25 +30,18 @@
class SvCommand
{
public:
-String aDataBaseFile;
+OUStringaDataBaseFile;
StringList aInFileList;
-String aListFile;
-String aSlotMapFile;
-String aSfxItemFile;
-String aODLFile;
-String aCallingFile;
-String aCxxFile;
-String aHxxFile;
-String aSrcFile;
+OUStringaListFile;
+OUStringaSlotMapFile;
+OUStringaSfxItemFile;
String aPath;
-String aCHeaderFile;
-String aCSourceFile;
String aTargetFile;
-String aHelpIdFile;
-String aCSVFile;
-String aExportFile;
-String aDocuFile;
-::rtl::OUString m_DepFile;
+OUStringaHelpIdFile;
+OUStringaCSVFile;
+OUStringaExportFile;
+OUStringaDocuFile;
+OUStringm_DepFile;
sal_uInt32 nVerbosity;
sal_uInt32 nFlags;
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 4b97510..e83c23b 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -24,8 +24,8 @@
#include module.hxx
#include globals.hxx
#include database.hxx
-#include tools/fsys.hxx
#include tools/debug.hxx
+#include osl/file.hxx
SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern );
@@ -222,12 +222,16 @@
SvToken * pTok = rInStm.GetToken_Next();
if( pTok-IsString() )
{
-DirEntry aFullName( rtl::OStringToOUString(pTok-GetString(),
RTL_TEXTENCODING_ASCII_US) );
-rBase.StartNewFile( aFullName.GetFull() );
-if( aFullName.Find( rBase.GetPath() ) )
+OUString aFullName(rtl::OStringToOUString(pTok-GetString(),
RTL_TEXTENCODING_ASCII_US));
+rBase.StartNewFile( aFullName );
+osl::FileBase::RC searchError =
osl::File::searchFileURL(aFullName, rBase.GetPath(), aFullName);
+osl::FileBase::getSystemPathFromFileURL( aFullName, aFullName );
+
+if( osl::FileBase::E_None == searchError )
{
-rBase.AddDepFile(aFullName.GetFull());
-SvTokenStream aTokStm( aFullName.GetFull() );
+rBase.AddDepFile( aFullName );
+SvTokenStream aTokStm( aFullName );
+
if( SVSTREAM_OK == aTokStm.GetStream().GetError() )
{
// rescue error from old file
@@ -252,19 +256,15 @@
}
else
{
-rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
-cannot open file: ));
-aStr.append(rtl::OUStringToOString(aFullName.GetFull(),
-RTL_TEXTENCODING_UTF8));
+rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(cannot
open file: ));
+aStr.append(rtl::OUStringToOString(aFullName,
RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
else
{
-rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
-cannot find file:));
-aStr.append(rtl::OUStringToOString(aFullName.GetFull(),
-RTL_TEXTENCODING_UTF8));
+rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(cannot
find file:));
+aStr.append(rtl::OUStringToOString(aFullName,
RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index a61804f..f538bec 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -26,7 +26,7 @@
#include command.hxx
#include globals.hxx
#include database.hxx
-#include tools/fsys.hxx
+#include sal/config.h
char const * SyntaxStrings[] = {
basic-type:,
@@ -320,7 +320,7 @@
{ // define include paths
String aName(
[Libreoffice-commits] core.git: editeng/source
editeng/source/outliner/outliner.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit 6408f363bf77319228739cba69ab1bd08499e380
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 16:50:30 2013 +0100
coverity#704225 Logically dead code
Change-Id: I9aa41653b9622245de8084443ef3e0b74f720571
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 3976d1b..f2217eb 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1917,7 +1917,6 @@ void Outliner::ImplCalcBulletText( sal_uInt16 nPara,
sal_Bool bRecalcLevel, sal_
DBG_CHKTHIS(Outliner,0);
Paragraph* pPara = pParaList-GetParagraph( nPara );
-sal_uInt16 nRelPos = 0x;
while ( pPara )
{
@@ -1944,9 +1943,6 @@ void Outliner::ImplCalcBulletText( sal_uInt16 nPara,
sal_Bool bRecalcLevel, sal_
if ( bRecalcLevel )
{
-if ( nRelPos != 0x )
-nRelPos++;
-
sal_Int16 nDepth = pPara-GetDepth();
pPara = pParaList-GetParagraph( ++nPara );
if ( !bRecalcChildren )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/prevwsh.cxx |4
sc/source/ui/view/printfun.cxx | 274 -
2 files changed, 139 insertions(+), 139 deletions(-)
New commits:
commit c088ec0bdb6245c472f79417d14d487e5c5e0d09
Author: Johannes Widmer jowi...@gmx.eu
Date: Sat Mar 23 16:26:00 2013 +0100
Translations of comments from German into English
Change-Id: I0a1421e5b7149c060e8603a13e82a80c7d4d5bd5
Reviewed-on: https://gerrit.libreoffice.org/2934
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 42b4fb4..5358705 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -919,7 +919,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData
rData )
else
rData.nTotalPages = 99;
-// eNumType kennt der Dialog selber
+// the dialog knows eNumType
}
void ScPreviewShell::WriteUserData(String rData, sal_Bool /* bBrowse */)
@@ -1134,7 +1134,7 @@ void ScPreviewShell::DoScroll( sal_uInt16 nMode )
break;
}
-// nHRange-nHPage kann negativ sein, deshalb Abfrage auf 0 hinterher
+// nHRange-nHPage might be negative, that's why we check for 0
afterwards
if( aCurPos.Y() (nVRange-nVPage) )
aCurPos.Y() = (nVRange-nVPage);
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 6244940..60bbe68 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -128,7 +128,7 @@ void ScPageRowEntry::SetHidden(size_t nX)
{
if ( nX nPagesX )
{
-if ( nX+1 == nPagesX ) // letzte Seite?
+if ( nX+1 == nPagesX ) // last page?
--nPagesX;
else
{
@@ -173,12 +173,12 @@ void ScPrintFunc::Construct( const ScPrintOptions*
pOptions )
pDocShell-UpdatePendingRowHeights( nPrintTab );
pDoc = pDocShell-GetDocument();
-SfxPrinter* pDocPrinter = pDoc-GetPrinter(); // auch fuer Preview den
Drucker nehmen
+SfxPrinter* pDocPrinter = pDoc-GetPrinter(); // use the printer, even
for preview
if (pDocPrinter)
aOldPrinterMode = pDocPrinter-GetMapMode();
-// einheitlicher MapMode ueber alle Aufrufe (z.B. Repaint !!!),
-// weil die EditEngine sonst unterschiedliche Texthoehen liefert
+// unified MapMode for all calls (e.g. Repaint!!!)
+// else, EditEngine outputs different text heights
pDev-SetMapMode(MAP_PIXEL);
pPageEndX = NULL;
@@ -327,14 +327,14 @@ void ScPrintFunc::FillPageData()
if (pPageData)
{
sal_uInt16 nCount = sal::static_int_castsal_uInt16(
pPageData-GetCount() );
-ScPrintRangeData rData = pPageData-GetData(nCount); //
hochzaehlen
+ScPrintRangeData rData = pPageData-GetData(nCount); // count up
rData.SetPrintRange( ScRange( nStartCol, nStartRow, nPrintTab,
nEndCol, nEndRow, nPrintTab ) );
rData.SetPagesX( nPagesX, pPageEndX );
rData.SetPagesY( nTotalY, pPageEndY );
-// Einstellungen
+// Settings
rData.SetTopDown( aTableParam.bTopDown );
rData.SetAutomatic( !aAreaParam.bPrintArea );
}
@@ -348,10 +348,10 @@ ScPrintFunc::~ScPrintFunc()
delete pEditDefaults;
delete pEditEngine;
-// Druckereinstellungen werden jetzt von aussen wiederhergestellt
+// Printer settings are now restored from outside
-// Fuer DrawingLayer/Charts muss der MapMode am Drucker (RefDevice) immer
stimmen
-SfxPrinter* pDocPrinter = pDoc-GetPrinter(); // auch fuer Preview den
Drucker nehmen
+// For DrawingLayer/Charts, the MapMode of the printer (RefDevice) must
always be correct
+SfxPrinter* pDocPrinter = pDoc-GetPrinter(); // use Preview also for
the printer
if (pDocPrinter)
pDocPrinter-SetMapMode(aOldPrinterMode);
}
@@ -381,17 +381,17 @@ static void lcl_HidePrint( ScTableInfo rTabInfo, SCCOL
nX1, SCCOL nX2 )
}
//
-// Ausgabe auf Device (static)
+// output to Device (static)
//
-// wird benutzt fuer:
+// us used for:
// - Clipboard/Bitmap
// - Ole-Object (DocShell::Draw)
-// - Vorschau bei Vorlagen
+// - Preview of templates
void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /*
nPrintFactor */,
const Rectangle rBound, ScViewData* pViewData,
sal_Bool bMetaFile )
{
-//! nPrintFactor auswerten !!!
+//! evaluate nPrintFactor !!!
SCTAB nTab = 0;
if (pViewData)
@@ -463,15 +463,15 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc,
OutputDevice* pDev, double /* nPr
nTwipsSizeX += pDoc-GetColWidth( i, nTab );
long nTwipsSizeY = (long) pDoc-GetRowHeight( nY1, nY2, nTab );
-// wenn keine Linien, dann trotzdem Platz fuer den
[PUSHED] Translations of comments from German into English
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2934 Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2934 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a1421e5b7149c060e8603a13e82a80c7d4d5bd5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Johannes Widmer jowi...@gmx.eu Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source
editeng/source/outliner/outliner.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 549030d96add56117bc35198d1303c059a8da21b
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 16:58:37 2013 +0100
coverity#704226 Logically dead code
Change-Id: I24e55bea6070ce1113c5b64902dbd41c7827f91d
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index f2217eb..f76a5f8 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1438,10 +1438,10 @@ const SvxNumberFormat* Outliner::GetNumberFormat(
sal_uInt16 nPara ) const
const SvxNumberFormat* pFmt = NULL;
Paragraph* pPara = pParaList-GetParagraph( nPara );
-if (pPara == NULL)
+if (!pPara)
return NULL;
-sal_Int16 nDepth = pPara? pPara-GetDepth() : -1;
+sal_Int16 nDepth = pPara-GetDepth();
if( nDepth = 0 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slideshow/slideshowimpl.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit f804c72a090f8d5f170fed700ba7cf1826e5b3a2
Author: Rob Snelders programm...@ertai.nl
Date: Sat Mar 23 16:11:25 2013 +0100
After presentation is finished always have previous go to last shown slide
Change-Id: Ibb9db34523731f363612bd5f2306372380bb2fae
Reviewed-on: https://gerrit.libreoffice.org/2933
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 825bdf0..6737f63 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3266,9 +3266,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool
bSkipAllMainSequenceEffects)
const ShowWindowMode eMode = mpShowWindow-GetShowWindowMode();
if( eMode == SHOWWINDOWMODE_END )
{
-const sal_Int32 nLastSlideIndex =
mpSlideController-getSlideIndexCount() - 1;
-if( nLastSlideIndex = 0 )
-mpShowWindow-RestartShow( nLastSlideIndex );
+mpShowWindow-RestartShow(
mpSlideController-getCurrentSlideIndex() );
}
else if( (eMode == SHOWWINDOWMODE_PAUSE) || (eMode ==
SHOWWINDOWMODE_BLANK) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] After presentation is finished always have previous go to la...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2933 Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2933 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb9db34523731f363612bd5f2306372380bb2fae Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/svdfppt.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 165ef402c07cfcec87c41bca67faa795580cf2ea
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 17:08:10 2013 +0100
Related coverity#704229 Logically dead code
pVDev not used since ad3ccbb2192c96bdcc268fcf0c322c693275eeb0 (09/02/2011)
Change-Id: I210b91abc4ac883272119c88a437f9d60781667a
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index db41aed..943bcae 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2115,7 +2115,6 @@ sal_Bool SdrPowerPointImport::ReadFontCollection()
if ( SeekToRec( rStCtrl, PPT_PST_FontCollection,
pEnvHd-GetRecEndFilePos(), aListHd ) )
{
sal_uInt16 nCount2 = 0;
-VirtualDevice* pVDev = NULL;
while ( SeekToRec( rStCtrl, PPT_PST_FontEntityAtom,
aListHd.GetRecEndFilePos() ) )
{
bRet = sal_True;
@@ -2147,7 +2146,6 @@ sal_Bool SdrPowerPointImport::ReadFontCollection()
};
pFonts-insert( pFonts-begin() + nCount2++, pFont );
}
-delete pVDev;
}
rStCtrl.Seek( nFPosMerk ); // restore FilePos
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idlc/source
idlc/source/astexpression.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 0ed451e338d2c211acf5b311860c468e335d6d31 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Mar 23 17:28:48 2013 +0100 coverity#704237 Logically dead code Change-Id: I7a5087b2ac89ee2839f0e0d8450efc7fca1dd68b diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 61f2d7f..cff33d1 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -1136,8 +1136,6 @@ AstExprValue* AstExpression::eval_symbol(EvalKind ek) * OK, now evaluate the constant we just got, to produce its value */ pConst = static_cast AstConstant* (pDecl); -if (pConst == NULL) -return NULL; return pConst-getConstValue()-eval_internal(ek); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#47576: Support for textual links added (SVG Export)
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2936
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/2936/1
fdo#47576: Support for textual links added (SVG Export)
Added Support to export textual links in SVG files, images still do not work
Change-Id: Id230618d2cc068b94eb0f0051d5db249a88a42f2
---
M filter/source/svg/svgwriter.cxx
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 2f269ba..21bb701 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -36,6 +36,7 @@
// ---
static const char aXMLElemG[] = g;
+static const char aXMLElemA[] = a;
static const char aXMLElemDefs[] = defs;
static const char aXMLElemLine[] = line;
static const char aXMLElemRect[] = rect;
@@ -1913,20 +1914,38 @@
mrExport.AddAttribute( XML_NAMESPACE_NONE, class, B2UCONST(
PlaceholderText ) );
mbIsPlacehlolderShape = sal_False;
}
-else if( mbIsURLField !msUrl.isEmpty() )
+/*else if( mbIsURLField !msUrl.isEmpty() )
{
mrExport.AddAttribute( XML_NAMESPACE_NONE, class, B2UCONST(
UrlField ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl );
-mbIsURLField = sal_False;
-}
+//mbIsURLField = sal_False;
+}*/
addFontAttributes( /* isTexTContainer: */ false );
mpContext-AddPaintAttr( COL_TRANSPARENT, aTextColor );
-SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemTspan, mbIWS, mbIWS );
OUString sTextContent = rText;
-mrExport.GetDocHandler()-characters( sTextContent );
+
+// a tag for link should be the innermost tag, inside tspan
+if( !mbIsPlacehlolderShape mbIsURLField !msUrl.isEmpty() )
+{
+mrExport.AddAttribute( XML_NAMESPACE_NONE, class, B2UCONST(
UrlField ) );
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl );
+
+SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemTspan, mbIWS, mbIWS );
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl );
+{
+SvXMLElementExport aSVGAElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemA, mbIWS, mbIWS );
+mrExport.GetDocHandler()-characters( sTextContent );
+}
+}
+else
+{
+SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemTspan, mbIWS, mbIWS );
+mrExport.GetDocHandler()-characters( sTextContent );
+}
+
mnTextWidth += mpVDev-GetTextWidth( sTextContent );
}
--
To view, visit https://gerrit.libreoffice.org/2936
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id230618d2cc068b94eb0f0051d5db249a88a42f2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Moritz Kütt moritz.ku...@web.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468 Translate German comments - vcl/win/source/gdi/
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2937
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/2937/1
fdo#39468 Translate German comments - vcl/win/source/gdi/
Change-Id: I273bab015f96128ab5128ade3b8e0c69b0ef730e
---
M vcl/win/source/gdi/salgdi.cxx
M vcl/win/source/gdi/salgdi2.cxx
M vcl/win/source/gdi/salgdi3.cxx
M vcl/win/source/gdi/salprn.cxx
4 files changed, 47 insertions(+), 54 deletions(-)
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 80bf5ab..08c7de4 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -125,9 +125,9 @@
// ===
-// Pens muessen wir mit 1 Pixel-Breite erzeugen, da ansonsten die S3-Karte
-// viele Paintprobleme hat, wenn Polygone/PolyLines gezeichnet werden und
-// eine komplexe ClipRegion gesetzt ist
+// we must create pens with 1-pixel width; otherwise the S3 map has many
+// paint problems when drawing polygons/polyLines and a complex CipRegion
+// is set
#define GSL_PEN_WIDTH 1
// ===
@@ -327,14 +327,14 @@
for ( i = 0; i pSalData-mnStockBrushCount; i++ )
DeleteBrush( pSalData-mhStockBrushAry[i] );
-// 50% Brush loeschen
+// delete 50% Brush
if ( pSalData-mh50Brush )
{
DeleteBrush( pSalData-mh50Brush );
pSalData-mh50Brush = 0;
}
-// 50% Bitmap loeschen
+// delete 50% Bitmap
if ( pSalData-mh50Bmp )
{
DeleteBitmap( pSalData-mh50Bmp );
@@ -344,7 +344,7 @@
ImplClearHDCCache( pSalData );
delete[] pSalData-mpHDCCache;
-// Ditherpalette loeschen, wenn vorhanden
+// delete Ditherpalette, if existing
if ( pSalData-mhDitherPal )
{
DeleteObject( pSalData-mhDitherPal );
@@ -513,7 +513,7 @@
void ImplSalInitGraphics( WinSalGraphics* pData )
{
-// Beim Printer berechnen wir die minimale Linienstaerke
+// calculate the minimal line width for the printer
if ( pData-mbPrinter )
{
int nDPIX = GetDeviceCaps( pData-mhDC, LOGPIXELSX );
@@ -554,7 +554,7 @@
{
HDC hDC = GetDC( 0 );
-// neuen DC mit DefaultBitmap anlegen
+// create new DC sith DefaultBitmap
pC-mhDC = CreateCompatibleDC( hDC );
if( pSalData-mhDitherPal )
@@ -750,7 +750,7 @@
WinSalGraphics::~WinSalGraphics()
{
-// free obsolete GDI objekts
+// free obsolete GDI objects
ReleaseFonts();
if ( mhPen )
@@ -770,7 +770,7 @@
mhRegion = 0;
}
-// Cache-Daten zerstoeren
+// delete cache data
if ( mpStdClipRgnData )
delete [] mpStdClipRgnData;
@@ -996,7 +996,7 @@
HPEN hNewPen = GetStockPen( NULL_PEN );
HPEN hOldPen = SelectPen( mhDC, hNewPen );
-// destory or save old pen
+// destroy or save old pen
if ( mhPen )
{
if ( !mbStockPen )
@@ -1054,7 +1054,7 @@
// select new pen
HPEN hOldPen = SelectPen( mhDC, hNewPen );
-// destory or save old pen
+// destroy or save old pen
if ( mhPen )
{
if ( !mbStockPen )
@@ -1078,7 +1078,7 @@
HBRUSH hNewBrush = GetStockBrush( NULL_BRUSH );
HBRUSH hOldBrush = SelectBrush( mhDC, hNewBrush );
-// destory or save old brush
+// destroy or save old brush
if ( mhBrush )
{
if ( !mbStockBrush )
@@ -1182,7 +1182,7 @@
// select new brush
HBRUSH hOldBrush = SelectBrush( mhDC, hNewBrush );
-// destory or save old brush
+// destroy or save old brush
if ( mhBrush )
{
if ( !mbStockBrush )
@@ -1332,7 +1332,7 @@
void WinSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
{
-// Unter NT koennen wir das Array direkt weiterreichen
+// for NT, we can handover the array directly
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
WinSalGraphics::DrawPolyLine(): POINT != SalPoint );
@@ -1358,8 +1358,7 @@
pWinPtAry[nPoints-1].x--;
}
-// Wegen Windows 95 und der Beschraenkung auf eine maximale Anzahl
-// von Punkten
+// for Windows 95 and its maximum number of points
if ( !Polyline( mhDC, pWinPtAry, (int)nPoints ) (nPoints
MAX_64KSALPOINTS) )
Polyline( mhDC, pWinPtAry, MAX_64KSALPOINTS );
@@ -1382,13 +1381,12 @@
void WinSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
{
-// Unter NT koennen wir das Array direkt weiterreichen
+// for NT, we can handover the array directly
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
WinSalGraphics::DrawPolygon(): POINT != SalPoint );
POINT* pWinPtAry = (POINT*)pPtAry;
-// Wegen Windows 95 und der Beschraenkung auf eine maximale Anzahl
-// von Punkten
+// for Windows 95 and its maximum number of points
[Libreoffice-commits] core.git: configure.ac
configure.ac | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-) New commits: commit 43fe205a77f8e9f0bd36dc25dd14eaf433488621 Author: Tor Lillqvist t...@iki.fi Date: Sat Mar 23 18:49:16 2013 +0200 Don't turn on DISABLE_EXPORT automatically for Android and iOS Eventually we want to be able to save documents, too. Change-Id: Ib971163163f78d304deaac2d87db40c8438a34e9 diff --git a/configure.ac b/configure.ac index ebb26a8..6a31c89 100644 --- a/configure.ac +++ b/configure.ac @@ -2103,20 +2103,8 @@ if test $_os != iOS -a $_os != Android; then BUILD_TYPE=$BUILD_TYPE DESKTOP fi -# Currently we build only viewer apps for Android (and for iOS not even that yet), so to avoid getting -# some pathological export-related code and data linked in, we will add some judicious #ifndef -# DISABLE_EXPORT in the code in places where the linker map shows it has a big impact. Places that -# generate large amounts of code or data related to export only but still gets linked in. At least -# that is the theory, let's see... - -if test -z $enable_export; then -if test $_os != Android -a $_os != iOS; then -enable_export=yes -fi -fi - DISABLE_EXPORT='' -if test $enable_export = yes; then +if test $enable_export != no; then BUILD_TYPE=$BUILD_TYPE EXPORT else DISABLE_EXPORT='TRUE' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/app/saldata.cxx |2 +-
vcl/win/source/app/salinst.cxx | 15 +++
vcl/win/source/app/saltimer.cxx |4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 275dbf60e9a3ea47656dfef0928e5cc83df4762e
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Mar 23 13:09:25 2013 -0400
fdo#39468 Translate German comments - vcl/win/source/app
Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2
Reviewed-on: https://gerrit.libreoffice.org/2938
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index ff5a10f..2a3ea09 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -61,7 +61,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char*
pStr2 )
char c2;
do
{
-// Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
+// change to LowerCase if the char is between 'A' and 'Z'
c1 = *pStr1;
c2 = *pStr2;
if ( (c1 = 65) (c1 = 90) )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 9f30139..021ebc7 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -212,8 +212,7 @@ void ImplSalYieldMutexAcquireWithWait()
SalData* pSalData = GetSalData();
if ( pSalData-mnAppThreadId == nThreadId )
{
-// Wenn wir den Mutex nicht bekommen, muessen wir solange
-// warten, bis wir Ihn bekommen
+// wait till we get the Mutex
sal_Bool bAcquire = FALSE;
do
{
@@ -399,13 +398,13 @@ SalData::SalData()
}
mnStockPenCount = 0;// count of static pens
mnStockBrushCount = 0; // count of static brushes
-mnSalObjWantKeyEvt = 0; // KeyEvent, welcher vom SalObj-Hook
verarbeitet werden soll
+mnSalObjWantKeyEvt = 0; // KeyEvent for the SalObj hook
mnCacheDCInUse = 0; // count of CacheDC in use
mbObjClassInit = FALSE; // is SALOBJECTCLASS initialised
mbInPalChange = FALSE; // is in WM_QUERYNEWPALETTE
mnAppThreadId = 0; // Id from Applikation-Thread
mbScrSvrEnabled = FALSE;// ScreenSaver enabled
-mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == nicht
vorhanden)
+mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == not
available)
mpSageEnableProc = 0; // funktion to deactivate the system agent
mpFirstIcon = 0;// icon cache, points to first icon, NULL if
none
mpTempFontItem = 0;
@@ -940,7 +939,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
void SalTimer::Start( sal_uLong nMS )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
SalData* pSalData = GetSalData();
if ( pSalData-mpFirstInstance )
{
@@ -957,7 +956,7 @@ void SalTimer::Start( sal_uLong nMS )
SalFrame* WinSalInstance::CreateChildFrame( SystemParentData*
pSystemParentData, sal_uLong nSalFrameStyle )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
return (SalFrame*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME,
nSalFrameStyle, (LPARAM)pSystemParentData-hWnd );
}
@@ -965,7 +964,7 @@ SalFrame* WinSalInstance::CreateChildFrame(
SystemParentData* pSystemParentData,
SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong
nSalFrameStyle )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
HWND hWndParent;
if ( pParent )
hWndParent = static_castWinSalFrame*(pParent)-mhWnd;
@@ -987,7 +986,7 @@ SalObject* WinSalInstance::CreateObject( SalFrame* pParent,
SystemWindowData* /*pWindowData*/, //
SystemWindowData meaningless on Windows
sal_Bool /*bShow*/ )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
return (SalObject*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0,
(LPARAM)static_castWinSalFrame*(pParent) );
}
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index c042c2f..dbe4ddc 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -42,11 +42,11 @@ void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex )
if ( !bMutex )
pSalData-mnTimerOrgMS = nMS;
-// Periode darf nicht zu gross sein, da Windows mit sal_uInt16 arbeitet
+// duration has to fit into Window's sal_uInt16
if ( nMS MAX_SYSPERIOD )
nMS = MAX_SYSPERIOD;
-// Gibt es einen Timer, dann zerstoren
+// kill timer if it exists
if ( pSalData-mnTimerId )
KillTimer( 0, pSalData-mnTimerId );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[PUSHED] fdo#39468 Translate German comments - vcl/win/source/app
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2938 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2938 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468 Translate German comments - vcl/win/source/app
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2938
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/2938/1
fdo#39468 Translate German comments - vcl/win/source/app
Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2
---
M vcl/win/source/app/saldata.cxx
M vcl/win/source/app/salinst.cxx
M vcl/win/source/app/saltimer.cxx
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index ff5a10f..2a3ea09 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -61,7 +61,7 @@
char c2;
do
{
-// Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
+// change to LowerCase if the char is between 'A' and 'Z'
c1 = *pStr1;
c2 = *pStr2;
if ( (c1 = 65) (c1 = 90) )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 9f30139..021ebc7 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -212,8 +212,7 @@
SalData* pSalData = GetSalData();
if ( pSalData-mnAppThreadId == nThreadId )
{
-// Wenn wir den Mutex nicht bekommen, muessen wir solange
-// warten, bis wir Ihn bekommen
+// wait till we get the Mutex
sal_Bool bAcquire = FALSE;
do
{
@@ -399,13 +398,13 @@
}
mnStockPenCount = 0;// count of static pens
mnStockBrushCount = 0; // count of static brushes
-mnSalObjWantKeyEvt = 0; // KeyEvent, welcher vom SalObj-Hook
verarbeitet werden soll
+mnSalObjWantKeyEvt = 0; // KeyEvent for the SalObj hook
mnCacheDCInUse = 0; // count of CacheDC in use
mbObjClassInit = FALSE; // is SALOBJECTCLASS initialised
mbInPalChange = FALSE; // is in WM_QUERYNEWPALETTE
mnAppThreadId = 0; // Id from Applikation-Thread
mbScrSvrEnabled = FALSE;// ScreenSaver enabled
-mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == nicht
vorhanden)
+mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == not
available)
mpSageEnableProc = 0; // funktion to deactivate the system agent
mpFirstIcon = 0;// icon cache, points to first icon, NULL if
none
mpTempFontItem = 0;
@@ -940,7 +939,7 @@
void SalTimer::Start( sal_uLong nMS )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
SalData* pSalData = GetSalData();
if ( pSalData-mpFirstInstance )
{
@@ -957,7 +956,7 @@
SalFrame* WinSalInstance::CreateChildFrame( SystemParentData*
pSystemParentData, sal_uLong nSalFrameStyle )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
return (SalFrame*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME,
nSalFrameStyle, (LPARAM)pSystemParentData-hWnd );
}
@@ -965,7 +964,7 @@
SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong
nSalFrameStyle )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
HWND hWndParent;
if ( pParent )
hWndParent = static_castWinSalFrame*(pParent)-mhWnd;
@@ -987,7 +986,7 @@
SystemWindowData* /*pWindowData*/, //
SystemWindowData meaningless on Windows
sal_Bool /*bShow*/ )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
return (SalObject*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0,
(LPARAM)static_castWinSalFrame*(pParent) );
}
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index c042c2f..dbe4ddc 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -42,11 +42,11 @@
if ( !bMutex )
pSalData-mnTimerOrgMS = nMS;
-// Periode darf nicht zu gross sein, da Windows mit sal_uInt16 arbeitet
+// duration has to fit into Window's sal_uInt16
if ( nMS MAX_SYSPERIOD )
nMS = MAX_SYSPERIOD;
-// Gibt es einen Timer, dann zerstoren
+// kill timer if it exists
if ( pSalData-mnTimerId )
KillTimer( 0, pSalData-mnTimerId );
--
To view, visit https://gerrit.libreoffice.org/2938
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fixed templates notes view and master pages
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2939 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/2939/1 Fixed templates notes view and master pages Change-Id: I4aa8d86943ffb6bc1300c5c78ca99d5e2f89f0d0 --- M extras/source/templates/layout/AbstractGreen.otp M extras/source/templates/layout/AbstractRed.otp M extras/source/templates/layout/AbstractYellow.otp M extras/source/templates/layout/BrightBlue.otp M extras/source/templates/layout/DNA.otp M extras/source/templates/layout/Inspiration.otp M extras/source/templates/layout/LushGreen.otp M extras/source/templates/layout/Metropolis.otp M extras/source/templates/layout/Sunset.otp M extras/source/templates/layout/Vintage.otp 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/extras/source/templates/layout/AbstractGreen.otp b/extras/source/templates/layout/AbstractGreen.otp index 28ff10e6..b74f98c 100644 --- a/extras/source/templates/layout/AbstractGreen.otp +++ b/extras/source/templates/layout/AbstractGreen.otp Binary files differ diff --git a/extras/source/templates/layout/AbstractRed.otp b/extras/source/templates/layout/AbstractRed.otp index 3eafab4..500251b 100644 --- a/extras/source/templates/layout/AbstractRed.otp +++ b/extras/source/templates/layout/AbstractRed.otp Binary files differ diff --git a/extras/source/templates/layout/AbstractYellow.otp b/extras/source/templates/layout/AbstractYellow.otp index e3294ce..1d29fa0 100644 --- a/extras/source/templates/layout/AbstractYellow.otp +++ b/extras/source/templates/layout/AbstractYellow.otp Binary files differ diff --git a/extras/source/templates/layout/BrightBlue.otp b/extras/source/templates/layout/BrightBlue.otp index 2366b03..fd223cf 100644 --- a/extras/source/templates/layout/BrightBlue.otp +++ b/extras/source/templates/layout/BrightBlue.otp Binary files differ diff --git a/extras/source/templates/layout/DNA.otp b/extras/source/templates/layout/DNA.otp index ec246d5..9c07855 100644 --- a/extras/source/templates/layout/DNA.otp +++ b/extras/source/templates/layout/DNA.otp Binary files differ diff --git a/extras/source/templates/layout/Inspiration.otp b/extras/source/templates/layout/Inspiration.otp index d0a4ecf..8fbe822 100644 --- a/extras/source/templates/layout/Inspiration.otp +++ b/extras/source/templates/layout/Inspiration.otp Binary files differ diff --git a/extras/source/templates/layout/LushGreen.otp b/extras/source/templates/layout/LushGreen.otp index 83d977a..991bad9 100644 --- a/extras/source/templates/layout/LushGreen.otp +++ b/extras/source/templates/layout/LushGreen.otp Binary files differ diff --git a/extras/source/templates/layout/Metropolis.otp b/extras/source/templates/layout/Metropolis.otp index ba7ccc5..d84cbc6 100644 --- a/extras/source/templates/layout/Metropolis.otp +++ b/extras/source/templates/layout/Metropolis.otp Binary files differ diff --git a/extras/source/templates/layout/Sunset.otp b/extras/source/templates/layout/Sunset.otp index 0e64281..183165b 100644 --- a/extras/source/templates/layout/Sunset.otp +++ b/extras/source/templates/layout/Sunset.otp Binary files differ diff --git a/extras/source/templates/layout/Vintage.otp b/extras/source/templates/layout/Vintage.otp index 5985ae9..0ce4d52 100644 --- a/extras/source/templates/layout/Vintage.otp +++ b/extras/source/templates/layout/Vintage.otp Binary files differ -- To view, visit https://gerrit.libreoffice.org/2939 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4aa8d86943ffb6bc1300c5c78ca99d5e2f89f0d0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jacqueline Rahemipour j...@natural-computing.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/svg/svgwriter.cxx | 30 +-
1 file changed, 21 insertions(+), 9 deletions(-)
New commits:
commit 5dd259cbd01dfb71288bcea7837a2d30d9d7d4e7
Author: Moritz Kuett moritz.ku...@web.de
Date: Sat Mar 23 17:32:46 2013 +0100
fdo#47576: Support for textual links added (SVG Export)
Added Support to export textual links in SVG files, images still do not work
Change-Id: Id230618d2cc068b94eb0f0051d5db249a88a42f2
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index f9039b2..55a1985 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -32,6 +32,7 @@
using ::rtl::OUString;
static const char aXMLElemG[] = g;
+static const char aXMLElemA[] = a;
static const char aXMLElemDefs[] = defs;
static const char aXMLElemLine[] = line;
static const char aXMLElemRect[] = rect;
@@ -1795,20 +1796,31 @@ void SVGTextWriter::implWriteTextPortion( const Point
rPos,
mrExport.AddAttribute( XML_NAMESPACE_NONE, class, PlaceholderText
);
mbIsPlacehlolderShape = sal_False;
}
-else if( mbIsURLField !msUrl.isEmpty() )
-{
-mrExport.AddAttribute( XML_NAMESPACE_NONE, class, UrlField );
-mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl );
-mbIsURLField = sal_False;
-}
-
addFontAttributes( /* isTexTContainer: */ false );
mpContext-AddPaintAttr( COL_TRANSPARENT, aTextColor );
-SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemTspan, mbIWS, mbIWS );
OUString sTextContent = rText;
-mrExport.GetDocHandler()-characters( sTextContent );
+
+// a tag for link should be the innermost tag, inside tspan
+if( !mbIsPlacehlolderShape mbIsURLField !msUrl.isEmpty() )
+{
+mrExport.AddAttribute( XML_NAMESPACE_NONE, class, UrlField );
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl );
+
+SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemTspan, mbIWS, mbIWS );
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl );
+{
+SvXMLElementExport aSVGAElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemA, mbIWS, mbIWS );
+mrExport.GetDocHandler()-characters( sTextContent );
+}
+}
+else
+{
+SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemTspan, mbIWS, mbIWS );
+mrExport.GetDocHandler()-characters( sTextContent );
+}
+
mnTextWidth += mpVDev-GetTextWidth( sTextContent );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#47576: Support for textual links added (SVG Export)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2936 -- To view, visit https://gerrit.libreoffice.org/2936 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id230618d2cc068b94eb0f0051d5db249a88a42f2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Moritz Kütt moritz.ku...@web.de Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source
extras/source/templates/layout/AbstractGreen.otp |binary extras/source/templates/layout/AbstractRed.otp|binary extras/source/templates/layout/AbstractYellow.otp |binary extras/source/templates/layout/BrightBlue.otp |binary extras/source/templates/layout/DNA.otp|binary extras/source/templates/layout/Inspiration.otp|binary extras/source/templates/layout/LushGreen.otp |binary extras/source/templates/layout/Metropolis.otp |binary extras/source/templates/layout/Sunset.otp |binary extras/source/templates/layout/Vintage.otp|binary 10 files changed New commits: commit 85889e690963b2f39bad6c6cc22853bc51767a3e Author: Jacqueline Rahemipour j...@natural-computing.de Date: Sat Mar 23 18:17:50 2013 +0100 Fixed templates notes view and master pages Change-Id: I4aa8d86943ffb6bc1300c5c78ca99d5e2f89f0d0 Reviewed-on: https://gerrit.libreoffice.org/2939 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/extras/source/templates/layout/AbstractGreen.otp b/extras/source/templates/layout/AbstractGreen.otp index 28ff10e6..b74f98c 100644 Binary files a/extras/source/templates/layout/AbstractGreen.otp and b/extras/source/templates/layout/AbstractGreen.otp differ diff --git a/extras/source/templates/layout/AbstractRed.otp b/extras/source/templates/layout/AbstractRed.otp index 3eafab4..500251b 100644 Binary files a/extras/source/templates/layout/AbstractRed.otp and b/extras/source/templates/layout/AbstractRed.otp differ diff --git a/extras/source/templates/layout/AbstractYellow.otp b/extras/source/templates/layout/AbstractYellow.otp index e3294ce..1d29fa0 100644 Binary files a/extras/source/templates/layout/AbstractYellow.otp and b/extras/source/templates/layout/AbstractYellow.otp differ diff --git a/extras/source/templates/layout/BrightBlue.otp b/extras/source/templates/layout/BrightBlue.otp index 2366b03..fd223cf 100644 Binary files a/extras/source/templates/layout/BrightBlue.otp and b/extras/source/templates/layout/BrightBlue.otp differ diff --git a/extras/source/templates/layout/DNA.otp b/extras/source/templates/layout/DNA.otp index ec246d5..9c07855 100644 Binary files a/extras/source/templates/layout/DNA.otp and b/extras/source/templates/layout/DNA.otp differ diff --git a/extras/source/templates/layout/Inspiration.otp b/extras/source/templates/layout/Inspiration.otp index d0a4ecf..8fbe822 100644 Binary files a/extras/source/templates/layout/Inspiration.otp and b/extras/source/templates/layout/Inspiration.otp differ diff --git a/extras/source/templates/layout/LushGreen.otp b/extras/source/templates/layout/LushGreen.otp index 83d977a..991bad9 100644 Binary files a/extras/source/templates/layout/LushGreen.otp and b/extras/source/templates/layout/LushGreen.otp differ diff --git a/extras/source/templates/layout/Metropolis.otp b/extras/source/templates/layout/Metropolis.otp index ba7ccc5..d84cbc6 100644 Binary files a/extras/source/templates/layout/Metropolis.otp and b/extras/source/templates/layout/Metropolis.otp differ diff --git a/extras/source/templates/layout/Sunset.otp b/extras/source/templates/layout/Sunset.otp index 0e64281..183165b 100644 Binary files a/extras/source/templates/layout/Sunset.otp and b/extras/source/templates/layout/Sunset.otp differ diff --git a/extras/source/templates/layout/Vintage.otp b/extras/source/templates/layout/Vintage.otp index 5985ae9..0ce4d52 100644 Binary files a/extras/source/templates/layout/Vintage.otp and b/extras/source/templates/layout/Vintage.otp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Fixed templates notes view and master pages
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2939 Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2939 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4aa8d86943ffb6bc1300c5c78ca99d5e2f89f0d0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jacqueline Rahemipour j...@natural-computing.de Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 8559269f6a298f0fc0ca2be9c8bfdadba89db1f1 Author: Tor Lillqvist t...@iki.fi Date: Sat Mar 23 20:32:20 2013 +0200 Allow installation on external storage (SD card) Change-Id: Ied56bfe26ebf0082aab91ff823da732f26ab5702 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index f8729c0..d1d53df 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -2,7 +2,8 @@ manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote android:versionCode=7 -android:versionName=1.0.5+ Impress Remote +android:versionName=1.0.5+ Impress Remote +android:installLocation=auto uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] Allow installation on external storage (SD card)
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2940 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/2940/1 Allow installation on external storage (SD card) Change-Id: I532f27aee60a2e60110e9edea75e7cbe7d614b1e --- M android/sdremote/AndroidManifest.xml 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 572c5abb9..0efbc23 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -2,7 +2,8 @@ manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote android:versionCode=7 -android:versionName=1.0.5+ Impress Remote +android:versionName=1.0.5+ Impress Remote +android:installLocation=auto uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / -- To view, visit https://gerrit.libreoffice.org/2940 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I532f27aee60a2e60110e9edea75e7cbe7d614b1e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Display the number of active slides in the statusbar
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2941
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/2941/1
Display the number of active slides in the statusbar
Change-Id: I788070fdf093ec8b9f875ea5e8190cd04501
---
M sd/inc/drawdoc.hxx
M sd/source/core/PageListWatcher.cxx
M sd/source/core/PageListWatcher.hxx
M sd/source/core/drawdoc2.cxx
M sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
M sd/source/ui/view/drviews4.cxx
M sd/source/ui/view/drviewsa.cxx
7 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 3d89978..d9b9679 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -343,6 +343,8 @@
SD_DLLPUBLIC SdPage*GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind);
SD_DLLPUBLIC sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const;
+SD_DLLPUBLIC sal_uInt16 GetActiveSdPageCount() const;
+
sal_uInt16 GetMasterPageUserCount(SdrPage* pMaster) const;
const sd::PresentationSettings getPresentationSettings() const { return
maPresentationSettings; }
diff --git a/sd/source/core/PageListWatcher.cxx
b/sd/source/core/PageListWatcher.cxx
index 6efa75b..cd4f9ff 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -32,6 +32,7 @@
maPageVectorStandard.clear();
maPageVectorNotes.clear();
mpHandoutPage = 0L;
+mnVisiblePageCount = -1;
// build up vectors again
const sal_uInt32 nPageCount(ImpGetPageCount());
@@ -46,6 +47,7 @@
case PK_STANDARD:
{
maPageVectorStandard.push_back(pCandidate);
+if (!pCandidate-IsExcluded()) mnVisiblePageCount++;
break;
}
case PK_NOTES:
@@ -167,6 +169,22 @@
return nRetval;
}
+
+sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount()
+{
+sal_uInt32 nVisiblePageCount = 0;
+
+// build up vectors again
+const sal_uInt32 nPageCount(ImpGetPageCount());
+
+for(sal_uInt32 a(0L); a nPageCount; a++)
+{
+SdPage* pCandidate = ImpGetPage(a);
+if ((pCandidate-GetPageKind() ==
PK_STANDARD)(!pCandidate-IsExcluded())) nVisiblePageCount++;
+}
+return nVisiblePageCount;
+}
+
//
sal_uInt32 ImpDrawPageListWatcher::ImpGetPageCount() const
diff --git a/sd/source/core/PageListWatcher.hxx
b/sd/source/core/PageListWatcher.hxx
index 177acd2..fd81645 100644
--- a/sd/source/core/PageListWatcher.hxx
+++ b/sd/source/core/PageListWatcher.hxx
@@ -43,6 +43,7 @@
SdPage* mpHandoutPage;
sal_BoolmbPageListValid;
+sal_uInt32 mnVisiblePageCount;
void ImpRecreateSortedPageListOnDemand();
virtual sal_uInt32 ImpGetPageCount() const = 0;
@@ -60,6 +61,7 @@
void Invalidate() { mbPageListValid = sal_False; }
SdPage* GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum = 0L);
sal_uInt32 GetSdPageCount(PageKind ePgKind);
+sal_uInt32 GetVisibleSdPageCount();
};
//
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index fd36dd4..0e8f5d6 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -66,6 +66,7 @@
#include PageListWatcher.hxx
#include vcl/virdev.hxx
+#include customshowlist.hxx
using namespace ::sd;
@@ -202,6 +203,11 @@
return (sal_uInt16)mpMasterPageListWatcher-GetSdPageCount(ePgKind);
}
+sal_uInt16 SdDrawDocument::GetActiveSdPageCount() const
+{
+return (sal_uInt16)mpDrawPageListWatcher-GetVisibleSdPageCount();
+}
+
// Adapt the page numbers that are registered in the page objects of the notes
// pages
void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos)
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 6db42a0..bdf802b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -815,6 +815,8 @@
SdPage* pPage = NULL;
SdPage* pFirstPage = NULL;
sal_uInt16 nFirstPage;
+sal_Int32 nPageCount;
+sal_Int32 nActivePageCount;
sal_uInt16 nSelectedPages =
mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
OUStringBuffer aPageStr;
String aLayoutStr;
@@ -831,7 +833,14 @@
{
pPage = pDescriptor-GetPage();
nFirstPage = (pPage-GetPageNum()/2) + 1;
-aPageStr.append( ).append(static_castsal_Int32(nFirstPage),
10).append( / ).append(mrSlideSorter.GetModel().GetPageCount(), 10);
+nPageCount = mrSlideSorter.GetModel().GetPageCount();
+nActivePageCount =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote
android/sdremote/AndroidManifest.xml |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 5f0d6ff97e216564ef8d8c555b698d2dcc61788d Author: Tor Lillqvist t...@iki.fi Date: Sat Mar 23 20:34:08 2013 +0200 Allow installation on external storage (SD card) Change-Id: I532f27aee60a2e60110e9edea75e7cbe7d614b1e Reviewed-on: https://gerrit.libreoffice.org/2940 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 572c5abb9..0efbc23 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -2,7 +2,8 @@ manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote android:versionCode=7 -android:versionName=1.0.5+ Impress Remote +android:versionName=1.0.5+ Impress Remote +android:installLocation=auto uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Allow installation on external storage (SD card)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2940 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2940 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I532f27aee60a2e60110e9edea75e7cbe7d614b1e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/print/genpspgraphics.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit f4cde665813acef95228a7dd14bb7411baa844a4
Author: Thorsten Behrens tbehr...@suse.com
Date: Sat Mar 23 20:01:39 2013 +0100
Fix dbglevel=2 build
Change-Id: Ib3b7892225a9488c220133f05f127d746f7be461
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index 4149e41..ec48150 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -1171,10 +1171,9 @@ ImplDevFontAttributes
GenPspGraphics::Info2DevFontAttributes( const psp::FastPri
#if OSL_DEBUG_LEVEL 2
if( bHasMapNames )
{
-rtl::OString aOrigName(rtl::OUStringToOString(aDFA.maName,
osl_getThreadTextEncoding()));
-rtl::OString aAliasNames(rtl::OUStringToOString(aDFA.maMapNames,
osl_getThreadTextEncoding()));
-fprintf( stderr, using alias names \%s\ for font family \%s\\n,
-aAliasNames.getStr(), aOrigName.getStr() );
+rtl::OString aOrigName(rtl::OUStringToOString(aDFA.GetFamilyName(),
osl_getThreadTextEncoding()));
+rtl::OString aAliasNames(rtl::OUStringToOString(aDFA.GetAliasNames(),
osl_getThreadTextEncoding()));
+SAL_INFO( vcl.fonts, using alias names aAliasNames.getStr()
for font family aOrigName.getStr() );
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] coverity#704243 Logically dead code
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2942
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2942/1
coverity#704243 Logically dead code
Change-Id: Ie1140a90a6c9723582fa5e18ca0cf1dc1f918742
---
M package/source/zipapi/blowfishcontext.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/source/zipapi/blowfishcontext.cxx
b/package/source/zipapi/blowfishcontext.cxx
index 6f43d54..0d6bd2c 100644
--- a/package/source/zipapi/blowfishcontext.cxx
+++ b/package/source/zipapi/blowfishcontext.cxx
@@ -72,7 +72,7 @@
if ( m_bEncrypt )
{
-rtl_cipher_encode( m_pCipher,
+nError = rtl_cipher_encode( m_pCipher,
aData.getConstArray(),
aData.getLength(),
reinterpret_cast sal_uInt8* ( aResult.getArray() ),
@@ -80,7 +80,7 @@
}
else
{
-rtl_cipher_decode( m_pCipher,
+nError = rtl_cipher_decode( m_pCipher,
aData.getConstArray(),
aData.getLength(),
reinterpret_cast sal_uInt8* ( aResult.getArray() ),
--
To view, visit https://gerrit.libreoffice.org/2942
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1140a90a6c9723582fa5e18ca0cf1dc1f918742
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change duplicate short-cut Alt-I-U
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2943 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/2943/1 Change duplicate short-cut Alt-I-U Change-Id: I0cabf39b3844a056a6c1d83a7941715435fb6307 --- M officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index d52bafc..e67cdb0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -429,7 +429,7 @@ node oor:name=.uno:DuplicatePage oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USD~uplicate Slide/value + value xml:lang=en-USDuplicate ~Slide/value /prop prop oor:name=Properties oor:type=xs:int value1/value -- To view, visit https://gerrit.libreoffice.org/2943 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cabf39b3844a056a6c1d83a7941715435fb6307 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] wip
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2944
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/2944/1
wip
Change-Id: I23427e1e3bfb583ef10123577ebec76af617f917
---
M vcl/inc/vcl/bitmap.hxx
M vcl/source/gdi/bitmap.cxx
M vcl/source/gdi/bmpacc.cxx
3 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 7753083..d25a0ce 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -20,6 +20,7 @@
#ifndef _SV_BITMAP_HXX
#define _SV_BITMAP_HXX
+#include o3tl/cow_wrapper.hxx
#include tools/link.hxx
#include tools/solar.h
#include vcl/dllapi.h
@@ -302,7 +303,7 @@
{
private:
-ImpBitmap* mpImpBmp;
+o3tl::cow_wrapper ImpBitmap mpImpBmp;
MapMode maPrefMapMode;
SizemaPrefSize;
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 64d8f4e..6cf0cac 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -52,9 +52,6 @@
maPrefSize ( rBitmap.maPrefSize )
{
mpImpBmp = rBitmap.mpImpBmp;
-
-if ( mpImpBmp )
-mpImpBmp-ImplIncRefCount();
}
Bitmap::Bitmap( SalBitmap* pSalBitmap )
@@ -121,7 +118,7 @@
pRealPal = (BitmapPalette*) pPal;
}
-mpImpBmp = new ImpBitmap;
+mpImpBmp = ImpBitmap;
mpImpBmp-ImplCreate( rSizePixel, nBitCount, pRealPal ? *pRealPal :
aPal );
}
else
@@ -231,10 +228,6 @@
maPrefSize = rBitmap.maPrefSize;
maPrefMapMode = rBitmap.maPrefMapMode;
-if ( rBitmap.mpImpBmp )
-rBitmap.mpImpBmp-ImplIncRefCount();
-
-ImplReleaseRef();
mpImpBmp = rBitmap.mpImpBmp;
return *this;
@@ -253,7 +246,6 @@
maPrefMapMode = MapMode();
maPrefSize = Size();
-ImplReleaseRef();
mpImpBmp = NULL;
}
@@ -342,33 +334,6 @@
}
return nRet;
-}
-
-void Bitmap::ImplReleaseRef()
-{
-if( mpImpBmp )
-{
-if( mpImpBmp-ImplGetRefCount() 1UL )
-mpImpBmp-ImplDecRefCount();
-else
-{
-delete mpImpBmp;
-mpImpBmp = NULL;
-}
-}
-}
-
-void Bitmap::ImplMakeUnique()
-{
-if( mpImpBmp mpImpBmp-ImplGetRefCount() 1UL )
-{
-ImpBitmap* pOldImpBmp = mpImpBmp;
-
-pOldImpBmp-ImplDecRefCount();
-
-mpImpBmp = new ImpBitmap;
-mpImpBmp-ImplCreate( *pOldImpBmp );
-}
}
void Bitmap::ImplAssignWithSize( const Bitmap rBitmap )
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index b9d970c..48fd1e0 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -71,7 +71,6 @@
{
if( mbModify !maBitmap.ImplGetImpBitmap() )
{
-rBitmap.ImplMakeUnique();
pImpBmp = rBitmap.ImplGetImpBitmap();
}
else
--
To view, visit https://gerrit.libreoffice.org/2944
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23427e1e3bfb583ef10123577ebec76af617f917
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for SdrShadowAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2945
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/2945/1
fdo#62525: use cow_wrapper for SdrShadowAttribute
Thanks to Thorsten.
Change-Id: I2713bacd10538dfe177cb975a9633dd65285c6fa
---
M drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
M drawinglayer/source/attribute/sdrshadowattribute.cxx
2 files changed, 26 insertions(+), 63 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
index 91657cd..ee1f362 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -42,8 +43,11 @@
{
class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpSdrShadowAttribute ImplType;
+
private:
-ImpSdrShadowAttribute* mpSdrShadowAttribute;
+ImplType mpSdrShadowAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx
b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index f6b5e49..9705f6a 100644
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
@@ -20,6 +20,7 @@
#include drawinglayer/attribute/sdrshadowattribute.hxx
#include basegfx/vector/b2dvector.hxx
#include basegfx/color/bcolor.hxx
+#include rtl/instance.hxx
//
@@ -30,9 +31,6 @@
class ImpSdrShadowAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// shadow definitions
basegfx::B2DVector maOffset; //
shadow offset 1/100th mm
double mfTransparence; //
[0.0 .. 1.0], 0.0==no transp.
@@ -42,10 +40,16 @@
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mnRefCount(0),
-maOffset(rOffset),
+: maOffset(rOffset),
mfTransparence(fTransparence),
maColor(rColor)
+{
+}
+
+ImpSdrShadowAttribute()
+: maOffset(basegfx::B2DVector()),
+mfTransparence(0.0),
+maColor(basegfx::BColor())
{
}
@@ -60,97 +64,52 @@
getTransparence() == rCandidate.getTransparence()
getColor() == rCandidate.getColor());
}
-
-static ImpSdrShadowAttribute* get_global_default()
-{
-static ImpSdrShadowAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpSdrShadowAttribute(
-basegfx::B2DVector(),
-0.0,
-basegfx::BColor());
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static SdrShadowAttribute::ImplType,
theGlobalDefault {};
+}
+
SdrShadowAttribute::SdrShadowAttribute(
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mpSdrShadowAttribute(new ImpSdrShadowAttribute(
+: mpSdrShadowAttribute(ImpSdrShadowAttribute(
rOffset, fTransparence, rColor))
{
}
SdrShadowAttribute::SdrShadowAttribute()
-: mpSdrShadowAttribute(ImpSdrShadowAttribute::get_global_default())
+: mpSdrShadowAttribute(theGlobalDefault::get())
{
-mpSdrShadowAttribute-mnRefCount++;
}
SdrShadowAttribute::SdrShadowAttribute(const SdrShadowAttribute
rCandidate)
: mpSdrShadowAttribute(rCandidate.mpSdrShadowAttribute)
{
-mpSdrShadowAttribute-mnRefCount++;
}
SdrShadowAttribute::~SdrShadowAttribute()
{
-if(mpSdrShadowAttribute-mnRefCount)
-{
-mpSdrShadowAttribute-mnRefCount--;
-}
-else
-{
-delete
[ABANDONED] wip
Thomas Arnhold has abandoned this change. Change subject: wip .. Patch Set 1: Abandoned ... -- To view, visit https://gerrit.libreoffice.org/2944 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I23427e1e3bfb583ef10123577ebec76af617f917 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for SdrShadowAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2946
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/2946/1
fdo#62525: use cow_wrapper for SdrShadowAttribute
Thanks to Thorsten.
Change-Id: I9b5435d2326e9ebf340e88025eeea25ff6388ea2
---
M drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
M drawinglayer/source/attribute/sdrshadowattribute.cxx
2 files changed, 26 insertions(+), 63 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
index 91657cd..ee1f362 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -42,8 +43,11 @@
{
class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpSdrShadowAttribute ImplType;
+
private:
-ImpSdrShadowAttribute* mpSdrShadowAttribute;
+ImplType mpSdrShadowAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx
b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index f6b5e49..9705f6a 100644
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
@@ -20,6 +20,7 @@
#include drawinglayer/attribute/sdrshadowattribute.hxx
#include basegfx/vector/b2dvector.hxx
#include basegfx/color/bcolor.hxx
+#include rtl/instance.hxx
//
@@ -30,9 +31,6 @@
class ImpSdrShadowAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// shadow definitions
basegfx::B2DVector maOffset; //
shadow offset 1/100th mm
double mfTransparence; //
[0.0 .. 1.0], 0.0==no transp.
@@ -42,10 +40,16 @@
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mnRefCount(0),
-maOffset(rOffset),
+: maOffset(rOffset),
mfTransparence(fTransparence),
maColor(rColor)
+{
+}
+
+ImpSdrShadowAttribute()
+: maOffset(basegfx::B2DVector()),
+mfTransparence(0.0),
+maColor(basegfx::BColor())
{
}
@@ -60,97 +64,52 @@
getTransparence() == rCandidate.getTransparence()
getColor() == rCandidate.getColor());
}
-
-static ImpSdrShadowAttribute* get_global_default()
-{
-static ImpSdrShadowAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpSdrShadowAttribute(
-basegfx::B2DVector(),
-0.0,
-basegfx::BColor());
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static SdrShadowAttribute::ImplType,
theGlobalDefault {};
+}
+
SdrShadowAttribute::SdrShadowAttribute(
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mpSdrShadowAttribute(new ImpSdrShadowAttribute(
+: mpSdrShadowAttribute(ImpSdrShadowAttribute(
rOffset, fTransparence, rColor))
{
}
SdrShadowAttribute::SdrShadowAttribute()
-: mpSdrShadowAttribute(ImpSdrShadowAttribute::get_global_default())
+: mpSdrShadowAttribute(theGlobalDefault::get())
{
-mpSdrShadowAttribute-mnRefCount++;
}
SdrShadowAttribute::SdrShadowAttribute(const SdrShadowAttribute
rCandidate)
: mpSdrShadowAttribute(rCandidate.mpSdrShadowAttribute)
{
-mpSdrShadowAttribute-mnRefCount++;
}
SdrShadowAttribute::~SdrShadowAttribute()
{
-if(mpSdrShadowAttribute-mnRefCount)
-{
-mpSdrShadowAttribute-mnRefCount--;
-}
-else
-{
-delete
[ABANDONED] fdo#62525: use cow_wrapper for SdrShadowAttribute
Thomas Arnhold has abandoned this change. Change subject: fdo#62525: use cow_wrapper for SdrShadowAttribute .. Patch Set 1: Abandoned bla -- To view, visit https://gerrit.libreoffice.org/2945 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2713bacd10538dfe177cb975a9633dd65285c6fa Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62665 always consider slide show settings
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2947
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/2947/1
fdo#62665 always consider slide show settings
Change-Id: I710e17a36d43dffc6b625ab0f6b2156e498d3d8c
---
M sd/source/ui/slideshow/slideshowimpl.cxx
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 825bdf0..8119707 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -968,11 +968,9 @@
if( bStartWithActualSlide )
{
-sal_Int32 nSlideNum = ( pStartPage-GetPageNum() - 1 ) 1;
-
if( !maPresSettings.mbAll !maPresSettings.mbCustomShow )
{
-// its start from dia, find out if it is located before our
current Slide
+// determine number of first presentation slide
const sal_Int32 nSlideCount = mpDoc-GetSdPageCount(
PK_STANDARD );
sal_Int32 nSlide;
for( nSlide = 0; (nSlide nSlideCount); nSlide++ )
@@ -981,12 +979,8 @@
break;
}
-if( nSlide nSlideNum )
-nSlideNum = -1;
+mpSlideController-setStartSlideNumber( nSlide );
}
-
-if( nSlideNum != -1 )
-mpSlideController-setStartSlideNumber( nSlideNum );
}
// remember Slide number from where the show was started
--
To view, visit https://gerrit.libreoffice.org/2947
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I710e17a36d43dffc6b625ab0f6b2156e498d3d8c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Borim bor...@web.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slideshow/slideshowimpl.cxx | 74 +++
sd/source/ui/slideshow/slideshowimpl.hxx |2
2 files changed, 28 insertions(+), 48 deletions(-)
New commits:
commit 45e4a5ef5347f7e2fe90a0d411e3749f24008c3a
Author: Katarina Behrens bu...@bubli.org
Date: Sat Mar 23 20:32:40 2013 +0100
Start slideshow with the next visible slide
if current slide happens to be hidden + feeble attempt to untangle
spaghetti code in slideshowimpl *sigh*
Fixed within Impress Sprint
Change-Id: I120f72307ff5ec4d573845bf480a18ac4ce9212d
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 6737f63..6ba66de 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -942,11 +942,14 @@ bool SlideshowImpl::startShow( PresentationSettingsEx*
pPresSettings )
if( bStartWithActualSlide )
{
+aPresSlide = pStartPage-GetName();
+// if the starting slide is hidden, we can't set slide controller
to ALL mode
+maPresSettings.mbAll = !pStartPage-IsExcluded();
+
if( meAnimationMode != ANIMATIONMODE_SHOW )
{
if( pStartPage-GetPageKind() == PK_STANDARD )
{
-aPresSlide = pStartPage-GetName();
maPresSettings.mbAll = false;
}
else
@@ -963,31 +966,9 @@ bool SlideshowImpl::startShow( PresentationSettingsEx*
pPresSettings )
}
}
+sal_Int32 nSlideNum = ( pStartPage-GetPageNum() - 1 ) 1;
// build page list
-createSlideList( maPresSettings.mbAll, false, aPresSlide );
-
-if( bStartWithActualSlide )
-{
-sal_Int32 nSlideNum = ( pStartPage-GetPageNum() - 1 ) 1;
-
-if( !maPresSettings.mbAll !maPresSettings.mbCustomShow )
-{
-// its start from dia, find out if it is located before our
current Slide
-const sal_Int32 nSlideCount = mpDoc-GetSdPageCount(
PK_STANDARD );
-sal_Int32 nSlide;
-for( nSlide = 0; (nSlide nSlideCount); nSlide++ )
-{
-if( mpDoc-GetSdPage( (sal_uInt16) nSlide, PK_STANDARD
)-GetName() == aPresSlide )
-break;
-}
-
-if( nSlide nSlideNum )
-nSlideNum = -1;
-}
-
-if( nSlideNum != -1 )
-mpSlideController-setStartSlideNumber( nSlideNum );
-}
+createSlideList( maPresSettings.mbAll, false, aPresSlide, nSlideNum );
// remember Slide number from where the show was started
if( pStartPage )
@@ -2448,7 +2429,7 @@ Reference XSlideShow SlideshowImpl::createSlideShow()
const
// -
-void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide,
const String rPresSlide )
+void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide,
const String rPresSlide, sal_Int32 nStartSlide )
{
const long nSlideCount = mpDoc-GetSdPageCount( PK_STANDARD );
@@ -2472,34 +2453,33 @@ void SlideshowImpl::createSlideList( bool bAll, bool
bStartWithActualSlide, cons
if( eMode != AnimationSlideController::CUSTOM )
{
-sal_Int32 nFirstSlide = 0;
+sal_Int32 nFirstVisibleSlide = 0;
+
// normal presentation
-if( eMode == AnimationSlideController::FROM )
+if( rPresSlide.Len() )
{
-if( rPresSlide.Len() )
+sal_Int32 nSlide;
+sal_Bool bTakeNextAvailable = sal_False;
+
+for( nSlide = nStartSlide, nFirstVisibleSlide = -1;
+( nSlide nSlideCount ) ( -1 == nFirstVisibleSlide );
nSlide++ )
{
-sal_Int32 nSlide;
-sal_Bool bTakeNextAvailable = sal_False;
+SdPage* pTestSlide = mpDoc-GetSdPage( (sal_uInt16)nSlide,
PK_STANDARD );
-for( nSlide = 0, nFirstSlide = -1; ( nSlide nSlideCount
) ( -1 == nFirstSlide ); nSlide++ )
+if( pTestSlide-GetName() == rPresSlide )
{
-SdPage* pTestSlide = mpDoc-GetSdPage(
(sal_uInt16)nSlide, PK_STANDARD );
-
-if( pTestSlide-GetName() == rPresSlide )
-{
-if( pTestSlide-IsExcluded() )
-bTakeNextAvailable = sal_True;
-else
-nFirstSlide = nSlide;
-}
-else if( bTakeNextAvailable
!pTestSlide-IsExcluded() )
-nFirstSlide = nSlide;
+if( pTestSlide-IsExcluded() )
+
[Libreoffice-commits] core.git: o3tl/qa
o3tl/qa/cow_wrapper_clients.cxx | 50
o3tl/qa/cow_wrapper_clients.hxx | 24 +++
o3tl/qa/test-cow_wrapper.cxx| 23 ++
3 files changed, 97 insertions(+)
New commits:
commit fb8dd00d597495e8622a54dfd724ccc99d1fe999
Author: Thorsten Behrens tbehr...@suse.com
Date: Sat Mar 23 20:44:26 2013 +0100
Validate cow_wrapper static default pattern.
A bunch of objects use the optimization to assign one single,
unique default object to default-ctored instances, and decide
on whether any given object is in 'default' state by ptr-comparing
against this one unique instance. Simulating that pattern here.
Change-Id: I88f7d8488d81bcf1a01ab6b63121e003b8f0ade9
diff --git a/o3tl/qa/cow_wrapper_clients.cxx b/o3tl/qa/cow_wrapper_clients.cxx
index f468d43..bfb53f2 100644
--- a/o3tl/qa/cow_wrapper_clients.cxx
+++ b/o3tl/qa/cow_wrapper_clients.cxx
@@ -18,6 +18,7 @@
*/
#include cow_wrapper_clients.hxx
+#include rtl/instance.hxx
namespace o3tltests {
@@ -169,6 +170,55 @@ bool cow_wrapper_client3::operator( const
cow_wrapper_client3 rRHS ) const
return maImpl rRHS.maImpl;
}
+// ---
+
+namespace { struct theDefaultClient4 : public rtl::Static o3tl::cow_wrapper
int ,
+theDefaultClient4
{}; }
+
+cow_wrapper_client4::cow_wrapper_client4() :
+maImpl(theDefaultClient4::get())
+{
+}
+
+cow_wrapper_client4::cow_wrapper_client4( int nVal ) :
+maImpl( nVal )
+{
+}
+
+cow_wrapper_client4::~cow_wrapper_client4()
+{
+}
+
+cow_wrapper_client4::cow_wrapper_client4( const cow_wrapper_client4 rSrc ) :
+maImpl(rSrc.maImpl)
+{
+}
+
+cow_wrapper_client4 cow_wrapper_client4::operator=( const
cow_wrapper_client4 rSrc )
+{
+maImpl = rSrc.maImpl;
+
+return *this;
+}
+
+bool cow_wrapper_client4::is_default() const
+{
+return maImpl.same_object(theDefaultClient4::get());
+}
+
+bool cow_wrapper_client4::operator==( const cow_wrapper_client4 rRHS ) const
+{
+return maImpl == rRHS.maImpl;
+}
+bool cow_wrapper_client4::operator!=( const cow_wrapper_client4 rRHS ) const
+{
+return maImpl != rRHS.maImpl;
+}
+bool cow_wrapper_client4::operator( const cow_wrapper_client4 rRHS ) const
+{
+return maImpl rRHS.maImpl;
+}
+
} // namespace o3tltests
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/o3tl/qa/cow_wrapper_clients.hxx b/o3tl/qa/cow_wrapper_clients.hxx
index 23ab578..e2dad61 100644
--- a/o3tl/qa/cow_wrapper_clients.hxx
+++ b/o3tl/qa/cow_wrapper_clients.hxx
@@ -115,6 +115,30 @@ private:
o3tl::cow_wrapper cow_wrapper_client2_impl,
o3tl::ThreadSafeRefCountingPolicy maImpl;
};
+/** test default-object comparison - have default-ctored-client4 share
+the same static impl instance, check if isDefault does the right
+thing
+ */
+class cow_wrapper_client4
+{
+public:
+cow_wrapper_client4();
+explicit cow_wrapper_client4(int);
+~cow_wrapper_client4();
+
+cow_wrapper_client4( const cow_wrapper_client4 );
+cow_wrapper_client4 operator=( const cow_wrapper_client4 );
+
+bool is_default() const;
+
+bool operator==( const cow_wrapper_client4 rRHS ) const;
+bool operator!=( const cow_wrapper_client4 rRHS ) const;
+bool operator( const cow_wrapper_client4 rRHS ) const;
+
+private:
+o3tl::cow_wrapper int maImpl;
+};
+
} // namespace o3tltests
#endif /* INCLUDED_COW_WRAPPER_CLIENTS_HXX */
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx
index ba261fa..e368206 100644
--- a/o3tl/qa/test-cow_wrapper.cxx
+++ b/o3tl/qa/test-cow_wrapper.cxx
@@ -139,12 +139,35 @@ public:
test( aTestObj7, aTestObj8, aTestObj9 );
}
+void testStaticDefault()
+{
+cow_wrapper_client4 aTestObj1;
+cow_wrapper_client4 aTestObj2;
+cow_wrapper_client4 aTestObj3(4);
+
+CPPUNIT_ASSERT_MESSAGE(aTestObj1.is_default(),
+ aTestObj1.is_default() );
+CPPUNIT_ASSERT_MESSAGE(aTestObj2.is_default(),
+ aTestObj2.is_default() );
+CPPUNIT_ASSERT_MESSAGE(!aTestObj3.is_default(),
+ !aTestObj3.is_default() );
+aTestObj1 = aTestObj2;
+CPPUNIT_ASSERT_MESSAGE(aTestObj1.is_default() #2,
+ aTestObj1.is_default() );
+CPPUNIT_ASSERT_MESSAGE(aTestObj2.is_default() #2,
+ aTestObj2.is_default() );
+aTestObj1 = aTestObj3;
+CPPUNIT_ASSERT_MESSAGE(!aTestObj1.is_default(),
+ !aTestObj1.is_default() );
+}
+
// Change the following lines only, if you add, remove or rename
// member functions of the current class,
// because these macros are need by auto register mechanism.
CPPUNIT_TEST_SUITE(cow_wrapper_test);
[PATCH] fdo#51296:UI: Calc doesn't take care of security setting Ctrl-click required to follow hyperlinks
Hi all, The patch takes the hyperlink security feature of SvtSecurityOptions into account while executing the ScGlobal::OpenURL method of calc to open URL in system browser. Because this is my first patch, I have put it on the mailing list, any suggestions are appreciated. Thank you. she1991. 0001-fdo-51296-Patch-accounts-security-setting-requiring-.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source
drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx |6
drawinglayer/source/attribute/sdrshadowattribute.cxx | 81
++
2 files changed, 25 insertions(+), 62 deletions(-)
New commits:
commit 62fca307fc0fc775234572c79a1237494c2d72a7
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Mar 23 05:40:32 2013 +0100
fdo#62525: use cow_wrapper for SdrShadowAttribute
Thanks to Thorsten.
Change-Id: I9b5435d2326e9ebf340e88025eeea25ff6388ea2
Reviewed-on: https://gerrit.libreoffice.org/2946
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
index 91657cd..ee1f362 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -42,8 +43,11 @@ namespace drawinglayer
{
class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpSdrShadowAttribute ImplType;
+
private:
-ImpSdrShadowAttribute* mpSdrShadowAttribute;
+ImplType mpSdrShadowAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx
b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index f6b5e49..9705f6a 100644
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
@@ -20,6 +20,7 @@
#include drawinglayer/attribute/sdrshadowattribute.hxx
#include basegfx/vector/b2dvector.hxx
#include basegfx/color/bcolor.hxx
+#include rtl/instance.hxx
//
@@ -30,9 +31,6 @@ namespace drawinglayer
class ImpSdrShadowAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// shadow definitions
basegfx::B2DVector maOffset; //
shadow offset 1/100th mm
double mfTransparence; //
[0.0 .. 1.0], 0.0==no transp.
@@ -42,13 +40,19 @@ namespace drawinglayer
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mnRefCount(0),
-maOffset(rOffset),
+: maOffset(rOffset),
mfTransparence(fTransparence),
maColor(rColor)
{
}
+ImpSdrShadowAttribute()
+: maOffset(basegfx::B2DVector()),
+mfTransparence(0.0),
+maColor(basegfx::BColor())
+{
+}
+
// data read access
const basegfx::B2DVector getOffset() const { return maOffset; }
double getTransparence() const { return mfTransparence; }
@@ -60,97 +64,52 @@ namespace drawinglayer
getTransparence() == rCandidate.getTransparence()
getColor() == rCandidate.getColor());
}
+};
-static ImpSdrShadowAttribute* get_global_default()
-{
-static ImpSdrShadowAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpSdrShadowAttribute(
-basegfx::B2DVector(),
-0.0,
-basegfx::BColor());
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static SdrShadowAttribute::ImplType,
theGlobalDefault {};
+}
-return pDefault;
-}
-};
SdrShadowAttribute::SdrShadowAttribute(
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mpSdrShadowAttribute(new ImpSdrShadowAttribute(
+: mpSdrShadowAttribute(ImpSdrShadowAttribute(
rOffset, fTransparence, rColor))
{
}
SdrShadowAttribute::SdrShadowAttribute()
-: mpSdrShadowAttribute(ImpSdrShadowAttribute::get_global_default())
+: mpSdrShadowAttribute(theGlobalDefault::get())
{
-mpSdrShadowAttribute-mnRefCount++;
}
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/filter/xml/xmlControlProperty.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4eda900b8391c691445ab460ffad196132bc394e
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 23 21:03:44 2013 +0100
Related coverity#704244 Logically dead code
Change-Id: I5a008c56c1318c9271d4487b2b7ad3c4a80c02a6
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx
b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index f3fbc12..b5a021c 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -265,7 +265,7 @@ Any OXMLControlProperty::convertString(const
::com::sun::star::uno::Type _rExpe
nType = TYPE_TIME;
else if ( _rExpectedType.equals(s_aDateTimeType) )
nType = TYPE_DATETIME;
-if ( !nType )
+if ( nType )
{
// first extract the double
double nValue = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] WIP: date/time IDL datatypes incompatible change
Hello LibreOffice gerrit bot, Eike Rathke, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2783 to look at the new patch set (#10). Change subject: WIP: date/time IDL datatypes incompatible change .. WIP: date/time IDL datatypes incompatible change Done: - nanosecond precision - signed (allowed negative) year TODO: timezone Also: assorted improvements / bugfixes in date/time handling code. Some factorisation of copy/pasted code. Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6 --- M basic/source/runtime/methods.cxx M comphelper/source/misc/anycompare.cxx M comphelper/source/misc/types.cxx M connectivity/inc/connectivity/dbconversion.hxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/drivers/calc/CTable.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FDateFunctions.cxx M connectivity/source/drivers/jdbc/ConnectionLog.cxx M connectivity/source/drivers/kab/KResultSet.cxx M connectivity/source/drivers/macab/macabutilities.hxx M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx M connectivity/source/drivers/odbcbase/OResultSet.cxx M connectivity/source/drivers/postgresql/pq_tools.cxx M connectivity/source/inc/odbc/OTools.hxx M editeng/source/items/flditem.cxx M editeng/source/uno/unofield.cxx M extensions/source/logging/csvformatter.cxx M extensions/source/logging/logrecord.cxx M extensions/source/logging/plaintextformatter.cxx M extensions/source/propctrlr/standardcontrol.cxx M filter/source/msfilter/svdfppt.cxx M forms/qa/integration/forms/TimeValidator.java M forms/source/component/Time.cxx M forms/source/xforms/convert.cxx M forms/source/xforms/datatypes.cxx M framework/source/jobs/jobdata.cxx M odk/examples/DevelopersGuide/Forms/TimeValidator.java M offapi/com/sun/star/util/Date.idl M offapi/com/sun/star/util/DateTime.idl M offapi/com/sun/star/util/DateTimeRange.idl M offapi/com/sun/star/util/Duration.idl M offapi/com/sun/star/util/Time.idl M offapi/type_reference/types.rdb M oox/source/core/xmlfilterbase.cxx M oox/source/dump/dumperbase.cxx M oox/source/ppt/comments.cxx M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java M reportbuilder/java/org/libreoffice/report/SDBCReportData.java M reportdesign/source/filter/xml/xmlControlProperty.cxx M sax/qa/cppunit/test_converter.cxx M sax/source/tools/converter.cxx M sc/source/core/data/dbdocutl.cxx M sc/source/core/data/dpobject.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/xcl97/XclExpChangeTrack.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLConverter.cxx M sc/source/ui/miscdlgs/sharedocdlg.cxx M sc/source/ui/unoobj/fielduno.cxx M sc/source/ui/view/viewfun6.cxx M scripting/source/pyprov/pythonscript.py M sd/source/filter/eppt/eppt.cxx M sd/source/filter/eppt/pptx-epptooxml.cxx M sd/source/ui/annotations/annotationmanager.cxx M sd/source/ui/dlg/animobjs.cxx M sfx2/qa/complex/sfx2/DocumentProperties.java M sfx2/source/appl/sfxpicklist.cxx M sfx2/source/bastyp/frmhtmlw.cxx M sfx2/source/bastyp/helper.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/versdlg.cxx M sfx2/source/doc/SfxDocumentMetaData.cxx M sfx2/source/doc/objcont.cxx M sfx2/source/doc/oleprops.cxx M sfx2/source/view/viewprn.cxx M svl/source/items/dateitem.cxx M svl/source/misc/fstathelper.cxx M svtools/source/contnr/DocumentInfoPreview.cxx M svtools/source/contnr/contentenumeration.cxx M svtools/source/misc/templatefoldercache.cxx M svtools/source/svhtml/parhtml.cxx M svtools/source/table/cellvalueconversion.cxx M svx/source/fmcomp/gridcell.cxx M sw/source/core/doc/doccomp.cxx M sw/source/core/doc/docglbl.cxx M sw/source/core/fields/docufld.cxx M sw/source/core/fields/flddat.cxx M sw/source/core/unocore/swunohelper.cxx M sw/source/core/unocore/unoredline.cxx M sw/source/filter/ww8/wrtww8.cxx M sw/source/filter/ww8/ww8par.cxx M sw/source/filter/xml/XMLRedlineImportHelper.cxx M tools/inc/tools/datetime.hxx M tools/inc/tools/time.hxx M tools/source/datetime/datetime.cxx M tools/source/datetime/ttime.cxx M tools/source/inet/inetmsg.cxx M tools/source/rc/rc.cxx M ucb/source/sorter/sortresult.cxx M ucb/source/ucp/cmis/cmis_content.cxx M ucb/source/ucp/file/shell.cxx M ucb/source/ucp/ftp/ftpdirp.cxx M ucb/source/ucp/ftp/ftpdirp.hxx M unotools/inc/unotools/datetime.hxx M unotools/source/i18n/localedatawrapper.cxx M unotools/source/misc/datetime.cxx M unotools/source/ucbhelper/ucbhelper.cxx M vcl/source/control/field2.cxx M wizards/com/sun/star/wizards/common/JavaTools.java M xmloff/source/core/xmluconv.cxx M xmloff/source/draw/animationimport.cxx M xmloff/source/forms/elementexport.cxx M xmloff/source/forms/elementimport.cxx M xmloff/source/forms/handler/vcl_time_handler.cxx M
[PUSHED] fdo#62525: use cow_wrapper for SdrShadowAttribute
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2946 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2946 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b5435d2326e9ebf340e88025eeea25ff6388ea2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for FillBitmapAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2948
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/2948/1
fdo#62525: use cow_wrapper for FillBitmapAttribute
Change-Id: I0f666d4baaf6dc4e9f7ea30a518a8904f01d749f
---
M drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
M drawinglayer/source/attribute/fillbitmapattribute.cxx
2 files changed, 24 insertions(+), 62 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
index ced46b3..851dc5e 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -44,8 +45,11 @@
{
class DRAWINGLAYER_DLLPUBLIC FillBitmapAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpFillBitmapAttribute ImplType;
+
private:
-ImpFillBitmapAttribute* mpFillBitmapAttribute;
+ImplType mpFillBitmapAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/fillbitmapattribute.cxx
b/drawinglayer/source/attribute/fillbitmapattribute.cxx
index b315178..e2bedb4 100644
--- a/drawinglayer/source/attribute/fillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/fillbitmapattribute.cxx
@@ -29,9 +29,6 @@
class ImpFillBitmapAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// data definitions
BitmapExmaBitmapEx;
basegfx::B2DPoint maTopLeft;
@@ -45,11 +42,18 @@
const basegfx::B2DPoint rTopLeft,
const basegfx::B2DVector rSize,
bool bTiling)
-: mnRefCount(0),
-maBitmapEx(rBitmapEx),
+: maBitmapEx(rBitmapEx),
maTopLeft(rTopLeft),
maSize(rSize),
mbTiling(bTiling)
+{
+}
+
+ImpFillBitmapAttribute()
+: maBitmapEx(BitmapEx()),
+maTopLeft(basegfx::B2DPoint()),
+maSize(basegfx::B2DVector()),
+mbTiling(false)
{
}
@@ -66,33 +70,20 @@
const basegfx::B2DPoint getTopLeft() const { return maTopLeft; }
const basegfx::B2DVector getSize() const { return maSize; }
bool getTiling() const { return mbTiling; }
-
-static ImpFillBitmapAttribute* get_global_default()
-{
-static ImpFillBitmapAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpFillBitmapAttribute(
-BitmapEx(),
-basegfx::B2DPoint(),
-basegfx::B2DVector(),
-false);
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static FillBitmapAttribute::ImplType,
theGlobalDefault {};
+}
FillBitmapAttribute::FillBitmapAttribute(
const BitmapEx rBitmapEx,
const basegfx::B2DPoint rTopLeft,
const basegfx::B2DVector rSize,
bool bTiling)
-: mpFillBitmapAttribute(new ImpFillBitmapAttribute(
+: mpFillBitmapAttribute(ImpFillBitmapAttribute(
rBitmapEx, rTopLeft, rSize, bTiling))
{
}
@@ -100,59 +91,26 @@
FillBitmapAttribute::FillBitmapAttribute(const FillBitmapAttribute
rCandidate)
: mpFillBitmapAttribute(rCandidate.mpFillBitmapAttribute)
{
-mpFillBitmapAttribute-mnRefCount++;
}
FillBitmapAttribute::~FillBitmapAttribute()
{
-if(mpFillBitmapAttribute-mnRefCount)
-{
-mpFillBitmapAttribute-mnRefCount--;
-}
-else
-{
-delete mpFillBitmapAttribute;
-}
}
bool FillBitmapAttribute::isDefault() const
{
-return mpFillBitmapAttribute ==
ImpFillBitmapAttribute::get_global_default();
+return mpFillBitmapAttribute.same_object(theGlobalDefault::get());
}
FillBitmapAttribute FillBitmapAttribute::operator=(const
