Re: building headless on master
On 2013-02-19 09:45, Jonathan Aquilina wrote: Hey guys I have a server im using as a build machine for the master branch, it always seems to fail for me in tail_build is anyone else experiencing this? what do the logs say? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: using backtrace() in exception throwing?
On 2013-02-18 19:30, Tom Tromey wrote: Noel == Noel Grandin noelgran...@gmail.com writes: Noel Would be nice if gdb could actually do catch throw XXXException like Noel the documentation says - perhaps the documentation was modified Noel prematurely? Yeah, I think it was. The docs have been changed to reflect reality. Actually implementing the feature is on our to-do list: http://sourceware.org/bugzilla/show_bug.cgi?id=13588 Cool. While we're on the subject of GDB improvements, I personally would find a step return command very useful. i.e. continue until we leave the current stack frame very useful when you've stepped into something and you realise this method is useless, and you just want to continue until you're one method up again. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: using backtrace() in exception throwing?
On Tue, Feb 19, 2013 at 10:13:15AM +0200, Noel Grandin n...@peralex.com wrote: While we're on the subject of GDB improvements, I personally would find a step return command very useful. i.e. continue until we leave the current stack frame very useful when you've stepped into something and you realise this method is useless, and you just want to continue until you're one method up again. Are you speaking about 'finish'? signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svtools/source
svtools/source/graphic/grfmgr2.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6475609e882c16c7536bbfa502e2f8341abfea6e
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 19 10:31:20 2013 +0200
WaE: implicit conversion from 'double' to 'long' changes value from 0.5 to 0
Change-Id: Ib927d2f59e8b37fbddf3d3ccc78b3986e28b7b29
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index 365a8b1..fd8679e 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -306,7 +306,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx rBmpEx,
const GraphicAttr rAt
for ( x = 0; x aUnrotatedWidth ; x++)
{
pMapIX[x] = 0;
-pMapFX[x] = 0.5;
+pMapFX[x] = 0;
}
scaleByAveraging = true;
}
@@ -344,7 +344,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx rBmpEx,
const GraphicAttr rAt
for (y = 0; y aUnrotatedHeight; ++y)
{
pMapIY[y] = 0;
-pMapFY[y] = 0.5;
+pMapFY[y] = 0;
}
scaleByAveraging = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LO not launched successfully after git pull
Hi , I did 'git pull' then 'make', followed by 'make dev-install -o build' and finally './install/program/soffice'. LibreOffice main screen comes up, but as soon as i select any one feature : Spreadsheet, Text Document, etc. The LO screen crashes and error on terminal is : /home/elixir/lo/solver/unxlngx6.pro/installation/opt/program/soffice.bin: symbol lookup error: /home/elixir/lo/solver/ unxlngx6.pro/installation/opt/program/../program/libfwklo.so: undefined symbol: _ZN3svt19FrameStatusListenerC2ERKN3com3sun4star3uno9ReferenceINS3_4lang20XMultiServiceFactoryEEERKNS5_INS3_5frame6XFrameEEE Please help ! Thanks Prashant Pandey ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - fpicker/source writerfilter/source
fpicker/source/aqua/SalAquaFilePicker.hxx|5 +++--
fpicker/source/win32/filepicker/FilePicker.hxx |5 +++--
writerfilter/source/dmapper/NumberingManager.cxx | 12 +++-
3 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 503ee06fb843ac4ace017fde1b8a10c3c0501bc6
Author: Noel Grandin n...@peralex.com
Date: Tue Feb 19 10:34:46 2013 +0200
fix up some of my fdo#46808 changes
... It turns out removing XInitialisation was a bad idea.
Change-Id: I6a08f3f769ffc9017e94e8463a97cb18d39aa677
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx
b/fpicker/source/aqua/SalAquaFilePicker.hxx
index f1e4f23..d38a0a2 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -20,7 +20,7 @@
#ifndef _SALAQUAFILEPICKER_HXX_
#define _SALAQUAFILEPICKER_HXX_
-#include cppuhelper/compbase3.hxx
+#include cppuhelper/compbase4.hxx
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/ui/dialogs/XFilePicker3.hpp
#include com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp
@@ -47,9 +47,10 @@
// class declaration
//--
-typedef ::cppu::WeakComponentImplHelper3
+typedef ::cppu::WeakComponentImplHelper4
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
+::com::sun::star::lang::XInitialization,
::com::sun::star::lang::XServiceInfo SalAquaFilePicker_Base;
class SalAquaFilePicker :
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx
b/fpicker/source/win32/filepicker/FilePicker.hxx
index 83b7ecd..73bc3d5 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -20,7 +20,7 @@
#ifndef _FILEPICKER_HXX_
#define _FILEPICKER_HXX_
-#include cppuhelper/compbase5.hxx
+#include cppuhelper/compbase6.hxx
#include osl/mutex.hxx
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/ui/dialogs/XFilePicker2.hpp
@@ -52,11 +52,12 @@ protected:
osl::Mutex m_rbHelperMtx;
};
-typedef ::cppu::WeakComponentImplHelper5
+typedef ::cppu::WeakComponentImplHelper6
::com::sun::star::ui::dialogs::XFilePicker2,
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
::com::sun::star::ui::dialogs::XFilePreview,
+::com::sun::star::lang::XInitialization,
::com::sun::star::lang::XServiceInfoCFilePicker_Base;
class CFilePicker :
commit a00f11b97b9fca70e6ed50fdc82ac731f4c47c90
Author: Noel Grandin n...@peralex.com
Date: Tue Feb 19 10:34:18 2013 +0200
log the exception here instead of just asserting
.. to make future debugging easier.
Change-Id: I8efc8d8d6f228d9a36d8bb0aebe57913f2af5637
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 23b7225..0f74fa7 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -511,7 +511,7 @@ uno::Reference container::XNameContainer
lcl_getUnoNumberingStyles(
oFamily = xStyles;
}
-catch ( const uno::Exception )
+catch ( const uno::Exception )
{
}
@@ -645,13 +645,15 @@ void ListDef::CreateNumberingRules( DomainMapper
rDMapper,
OUString sNumRulesName = aPropNameSupplier.GetName(
PROP_NUMBERING_RULES );
xStyle-setPropertyValue( sNumRulesName, uno::makeAny( m_xNumRules
) );
}
-catch( const lang::IllegalArgumentException )
+catch( const lang::IllegalArgumentException e )
{
-assert( !Incorrect argument to UNO call );
+SAL_WARN( writerfilter, Exception: e.Message );
+ assert( !Incorrect argument to UNO call );
}
-catch( const uno::RuntimeException )
+catch( const uno::RuntimeException e )
{
-assert( !Incorrect argument to UNO call );
+SAL_WARN( writerfilter, Exception: e.Message );
+ assert( !Incorrect argument to UNO call );
}
catch( const uno::Exception e )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: using backtrace() in exception throwing?
On 2013-02-19 10:23, Miklos Vajna wrote: On Tue, Feb 19, 2013 at 10:13:15AM +0200, Noel Grandin n...@peralex.com wrote: While we're on the subject of GDB improvements, I personally would find a step return command very useful. i.e. continue until we leave the current stack frame very useful when you've stepped into something and you realise this method is useless, and you just want to continue until you're one method up again. Are you speaking about 'finish'? Ah, indeed. Thanks. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk sd/source
configure.ac|2 sd/CppunitTest_sd_uimpress.mk | 11 sd/Library_sd.mk| 22 + sd/source/ui/remotecontrol/BluetoothServer.cxx | 299 +++- sd/source/ui/remotecontrol/BluetoothServer.hxx |2 sd/source/ui/remotecontrol/BluetoothServer.mm |1 sd/source/ui/remotecontrol/BufferedStreamSocket.hxx | 12 sd/source/ui/remotecontrol/Communicator.cxx |2 sd/source/ui/remotecontrol/Communicator.hxx | 10 sd/source/ui/remotecontrol/IBluetoothSocket.hxx | 41 ++ sd/source/ui/remotecontrol/OSXBluetooth.h | 33 ++ sd/source/ui/remotecontrol/OSXBluetooth.mm | 52 +++ sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx | 41 ++ sd/source/ui/remotecontrol/Server.cxx |1 sd/source/ui/remotecontrol/Transmitter.cxx |2 sd/source/ui/remotecontrol/Transmitter.hxx |8 16 files changed, 515 insertions(+), 24 deletions(-) New commits: commit c56593f029b17f35672b0b01b269e6914f80cbdf Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 12:00:11 2013 +0200 Merge in Bluetooth code for the Impress Remote for OS X Thirteen commits from master squashed into one commit. Original commit messages in order below, so note that claims are in many cases overridden by later commits. === This is the 1st commit message: Work in progress. It sets up the SDP service record and registers it, and that seems to work. Does not do anything with it yet. I wonder if the current approach to use the standard SerialPort service class will work for Macs, as they by default have one SerialPort service running, Bluetooth-PDA-Sync, whatever that is. There is no code in the Android app to handle the case of there being several Serial Port services on the computer it wants to connect to, so what happens then when there are two will be interesting to see. (I can't find in the Android API any way to enumerate services that use the same service class. If there was, the app could choose the correct one based on its name.) So probably we should pretty soon switch to using a dedicated service class UUID instead of using the standard serial port one. As we already have the app out in the wild it will probably have to be modified to look for both Serial Port and our own service then? Sigh. === This is the 2nd commit message: Add this single-line file === This is the 3rd commit message: Fix build against Mac OS X SDK 10.4 === This is the 4th commit message: More work on the Impress Remote Control Bluetooth code for OS X Mostly the work of Thorsten, from December, adapted to compile against the current remote control code, and with one or two crucial things added. Plus lots of SAL_INFO calls added; once it works well many of them can be dropped. Does not work properly yet, do not cherry-pick just this to 4.0. === This is the 5th commit message: Nothing in the C standard about sockets === This is the 6th commit message: Fix compilation for Linux and hopefully Windows, too === This is the 7th commit message: Blind fix for WaE: class does not fully implement protocol The Xcode 3 compiler warns: class 'ChannelDelegate' does not fully implement the 'IOBluetoothRFCOMMChannelDelegate' protocol. === This is the 8th commit message: pragma GCC diagnostic is not available for 4.0.1 === This is the 9th commit message: std::vector::data() is C++11 === This is the 10th commit message: WaE: comparison is always true due to limited range of data type === This is the 11th commit message: Be specific in the logging as multiple threads involved Sure, each SAL_INFO output line includes the thread ID, but still, good to avoid confusion from where this line is coming. === This is the 12th commit message: Plug autorelease leak === This is the 13th commit message: Handle gracefully the remote end closing the RFCOMM channel Avoids a crash if one presses the back key on the Android remote control. (cherry picked from commit 100ac0876f1038aea7e7ef56f95d008ecc6aea3d) (cherry picked from commit c30e94a9cfc05ca8882fe78749b41207611910fb) (cherry picked from commit bc96a84370fb167ab2c63582c10535992f31768c) (cherry picked from commit f9685dc555cc79fe3a52caf9da39df37da750cd4) (cherry picked from commit dca5d2b1677ebffd1a4ff791c47b33a6252210b2) (cherry picked from commit bd6201ee4df1b7f54b1e768167a88ea5faa38fcc) (cherry picked from commit 05dbe2dda095aee2b595a29b95b5952acbe55e67) (cherry picked from commit
Re: Regression - LO Writer 4.0
Hi Raymond, On Mon, Feb 18, 2013 at 10:07:29AM -0800, r_ouellette ray.ouelle...@sympatico.ca wrote: Up to version 3.6.x, Writer was fast and usable with close to 270 pages. Since 4.0, I think a redraw algorithm was introduced that slowed Writer, making it almost unusable. Do you intend to debug this yourself? Then the first step would be https://wiki.documentfoundation.org/Bibisect to see what commit caused this problem. If you have further questions regarding code pointers, we're happy to help here. Or, if you are not about to hack on this, report it to the bugzilla: https://www.libreoffice.org/get-help/bug/ Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO not launched successfully after git pull
On 2013-02-19 10:33, Prashant Pandey wrote: Hi , I did 'git pull' then 'make', followed by 'make dev-install -o build' and finally './install/program/soffice'. LibreOffice main screen comes up, but as soon as i select any one feature : Spreadsheet, Text Document, etc. The LO screen crashes and error on terminal is : /home/elixir/lo/solver/unxlngx6.pro/installation/opt/program/soffice.bin http://unxlngx6.pro/installation/opt/program/soffice.bin: symbol lookup error: /home/elixir/lo/solver/unxlngx6.pro/installation/opt/program/../program/libfwklo.so http://unxlngx6.pro/installation/opt/program/../program/libfwklo.so: undefined symbol: _ZN3svt19FrameStatusListenerC2ERKN3com3sun4star3uno9ReferenceINS3_4lang20XMultiServiceFactoryEEERKNS5_INS3_5frame6XFrameEEE Looks like something didn't rebuild cleanly. Try doing make again, and if that doesn't work, make tail_build.clean make Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - distro-configs/LibreOfficeLinux.conf
distro-configs/LibreOfficeLinux.conf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 847371bdd92f90b74f33f226f9487d5dbff249b4 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Feb 8 16:40:54 2013 +0100 Enable dbus in LibreOfficeLinux configuration Change-Id: I959437dd440c0eec4fdfa75498a95295bb85cda0 (cherry picked from commit 706d193698eda2ef81ab7b9301d3b0240bc588b9) Reviewed-on: https://gerrit.libreoffice.org/2251 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 46bad19..5bf8cd0 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -20,6 +20,7 @@ --with-external-thes-dir=/usr/share/mythes --with-external-hyph-dir=/usr/share/hyphen --with-external-dict-dir=/usr/share/hunspell +--enable-dbus --enable-extension-integration --enable-opengl --enable-odk @@ -40,4 +41,3 @@ --disable-unix-qstart-libpng --disable-randr-link --disable-kde4 ---disable-dbus ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - fpicker/source Makefile.in
Makefile.in| 10 +- fpicker/source/aqua/SalAquaFilePicker.hxx |1 + fpicker/source/win32/filepicker/FilePicker.hxx |1 + 3 files changed, 11 insertions(+), 1 deletion(-) New commits: commit 648d6e516251318e8bd56f088277a08ff775fb9a Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 19 10:44:19 2013 +0200 Include the XInitialization header Change-Id: I662dc0615d6fae752a22000bea750e7d59f98472 diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index d38a0a2..50c5aa8 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -21,6 +21,7 @@ #define _SALAQUAFILEPICKER_HXX_ #include cppuhelper/compbase4.hxx +#include com/sun/star/lang/XInitialization.hpp #include com/sun/star/lang/XServiceInfo.hpp #include com/sun/star/ui/dialogs/XFilePicker3.hpp #include com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx index 73bc3d5..8791661 100644 --- a/fpicker/source/win32/filepicker/FilePicker.hxx +++ b/fpicker/source/win32/filepicker/FilePicker.hxx @@ -22,6 +22,7 @@ #include cppuhelper/compbase6.hxx #include osl/mutex.hxx +#include com/sun/star/lang/XInitialization.hpp #include com/sun/star/lang/XServiceInfo.hpp #include com/sun/star/ui/dialogs/XFilePicker2.hpp #include com/sun/star/ui/dialogs/XFilePicker3.hpp commit 95e2c26a08fa22dba7333774ebb1899539213c57 Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 19 10:38:12 2013 +0200 How to run the make dev-install result is platform-specific Change-Id: I48353df6fbcb960e660202392107432654207e39 diff --git a/Makefile.in b/Makefile.in index e7c47f1..0eedd22 100644 --- a/Makefile.in +++ b/Makefile.in @@ -382,13 +382,21 @@ else endif endif @rm -f $(SRCDIR)/install ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install +ifeq ($(OS),LINUX) @echo @echo Developer installation finished, you can now execute: @echo @echo cd $(SRCDIR)/install/program @echo . ./ooenv @echo ./soffice.bin - +else ifeq ($(OS),MACOSX) + @echo + @echo Developer installation finished, you can now run: + @echo + @echo open $(SRCDIR)/install/LibreOffice.app + @echo + @echo To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice +endif dev-install-nocheck : export SKIP_TESTS := YES dev-install-nocheck : dev-install ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/SalAquaFilePicker.hxx |1 + fpicker/source/win32/filepicker/FilePicker.hxx |1 + 2 files changed, 2 insertions(+) New commits: commit a413832fe2df559df589760e687e8352ffc1bddb Author: Noel Grandin n...@peralex.com Date: Tue Feb 19 10:44:12 2013 +0200 and let's try actually including the relevant headers... Change-Id: I38733bb04013250290b00ec99f358403060d1a89 diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index 50c5aa8..a19d9bb 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -23,6 +23,7 @@ #include cppuhelper/compbase4.hxx #include com/sun/star/lang/XInitialization.hpp #include com/sun/star/lang/XServiceInfo.hpp +#include com/sun/star/lang/XInitialization.hpp #include com/sun/star/ui/dialogs/XFilePicker3.hpp #include com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp #include com/sun/star/beans/StringPair.hpp diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx index 8791661..bc2eef3 100644 --- a/fpicker/source/win32/filepicker/FilePicker.hxx +++ b/fpicker/source/win32/filepicker/FilePicker.hxx @@ -24,6 +24,7 @@ #include osl/mutex.hxx #include com/sun/star/lang/XInitialization.hpp #include com/sun/star/lang/XServiceInfo.hpp +#include com/sun/star/lang/XInitialization.hpp #include com/sun/star/ui/dialogs/XFilePicker2.hpp #include com/sun/star/ui/dialogs/XFilePicker3.hpp #include com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source
sw/inc/ndtxt.hxx |5 +
sw/source/core/docnode/node.cxx | 36
sw/source/core/txtnode/ndtxt.cxx |6 +-
3 files changed, 34 insertions(+), 13 deletions(-)
New commits:
commit 81e283a8e5039ab7cd4d3f2ff9c520577a97ac03
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 14 19:27:28 2013 +0100
fdo#60732: SwTxtNode: limit to less than STRING_LEN chars
It's not a good idea to have STRING_LEN characters in a SwTxtNode
because then there is no valid SwPosition at the end of the paragraph.
Also it turns out that LO 3.6 and 4.0 do rather stupid things with a
full SwTxtNode. So enforce a limit, at first in the usual places that
are used during file import, SwTxtNode::InsertText() and
SwCntntNode::CanJoinPrev()/CanJoinNext().
Change-Id: Icb0f44acd20aa81635d42b84d4ae0f9b693a661c
(cherry picked from commit 549c0f785d4b6d4bc1b39b22827d77d66f48430a)
Reviewed-on: https://gerrit.libreoffice.org/2179
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 2b0d8cd..0865fa3 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -70,6 +70,11 @@ namespace com { namespace sun { namespace star {
typedef std::set xub_StrLen SwSoftPageBreakList;
+// do not fill the String up to the max - need to be able to have a
+// SwPosition behind the last character, i.e., at index TXTNODE_MAX + 1
+// (also STRING_LEN is often used for not found)
+const xub_StrLen TXTNODE_MAX = STRING_LEN - 2;
+
/// SwTxtNode is a paragraph in the document model.
class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
{
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 132282f..b1b19d3 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1623,12 +1623,26 @@ const SfxPoolItem* SwCntntNode::GetNoCondAttr(
sal_uInt16 nWhich,
return pFnd;
}
+static bool lcl_CheckMaxLength(SwNode const rPrev, SwNode const rNext)
+{
+if (rPrev.GetNodeType() != rNext.GetNodeType())
+{
+return false;
+}
+if (!rPrev.IsTxtNode())
+{
+return true;
+}
+size_t const nSum( static_castconst SwTxtNode(rPrev).GetTxt().Len()
+ + static_castconst SwTxtNode(rNext).GetTxt().Len());
+return (nSum = TXTNODE_MAX);
+}
+
// Can we join two Nodes?
// We can return the 2nd position in pIdx.
int SwCntntNode::CanJoinNext( SwNodeIndex* pIdx ) const
{
const SwNodes rNds = GetNodes();
-sal_uInt8 nNdType = GetNodeType();
SwNodeIndex aIdx( *this, 1 );
const SwNode* pNd = this;
@@ -1637,16 +1651,11 @@ int SwCntntNode::CanJoinNext( SwNodeIndex* pIdx ) const
( pNd-IsEndNode() pNd-StartOfSectionNode()-IsSectionNode()
)))
++aIdx;
-if( pNd-GetNodeType() != nNdType || rNds.Count()-1 == aIdx.GetIndex() )
+if (rNds.Count()-1 == aIdx.GetIndex())
return sal_False;
-if( IsTxtNode() )
-{ // Do not merge strings if the result exceeds the allowed string length
-const SwTxtNode* pTxtNd = static_castconst SwTxtNode*(this);
-sal_uInt64 nSum = pTxtNd-GetTxt().Len();
-pTxtNd = static_castconst SwTxtNode*(pNd);
-nSum += pTxtNd-GetTxt().Len();
-if( nSum STRING_LEN )
-return sal_False;
+if (!lcl_CheckMaxLength(*this, *pNd))
+{
+return false;
}
if( pIdx )
*pIdx = aIdx;
@@ -1657,7 +1666,6 @@ int SwCntntNode::CanJoinNext( SwNodeIndex* pIdx ) const
// We can return the 2nd position in pIdx.
int SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
{
-sal_uInt8 nNdType = GetNodeType();
SwNodeIndex aIdx( *this, -1 );
const SwNode* pNd = this;
@@ -1666,8 +1674,12 @@ int SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
( pNd-IsEndNode() pNd-StartOfSectionNode()-IsSectionNode()
)))
aIdx--;
-if( pNd-GetNodeType() != nNdType || 0 == aIdx.GetIndex() )
+if (0 == aIdx.GetIndex())
return sal_False;
+if (!lcl_CheckMaxLength(*pNd, *this))
+{
+return false;
+}
if( pIdx )
*pIdx = aIdx;
return sal_True;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index eb2dd25..f634571 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1713,7 +1713,11 @@ void SwTxtNode::InsertText( const XubString rStr,
const SwIndex rIdx,
xub_StrLen aPos = rIdx.GetIndex();
xub_StrLen nLen = m_Text.Len() - aPos;
-m_Text.Insert( rStr, aPos );
+ssize_t const nOverflow(static_castssize_t(m_Text.Len())
++ static_castssize_t(rStr.Len()) - TXTNODE_MAX);
+m_Text.Insert((nOverflow 0) ? rStr.Copy(0, rStr.Len() - nOverflow) :
rStr,
+aPos);
+assert(m_Text.Len() = TXTNODE_MAX);
nLen = m_Text.Len() - aPos - nLen;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source
sw/inc/ndtxt.hxx |5 -
sw/source/core/doc/doc.cxx| 19 +--
sw/source/core/doc/docedt.cxx |5 -
sw/source/core/txtnode/ndtxt.cxx | 35 +++
sw/source/core/txtnode/thints.cxx | 25 ++---
sw/source/core/undo/undel.cxx | 10 ++
sw/source/core/undo/unins.cxx |9 ++---
sw/source/core/undo/unovwr.cxx| 14 +-
8 files changed, 83 insertions(+), 39 deletions(-)
New commits:
commit bfd73a7c7b8c7e87f1edafa9d8ec257bfae26a0f
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 15 13:29:04 2013 +0100
fdo#60732: make callers of SwTxtNode::InsertText more robust:
Return the actually inserted string from InsertText(), so callers can
check if the insertion was actually successful.
Especially InsertHint() will likely cause problems if it cannot insert
its CH_TXTATR; also Undo objects should not Undo more than was actually
inserted.
Change-Id: I87c9ea8b226ae4a2a6c20c112da76db07051a1bf
(cherry picked from commit d47218d79a2440e71efb66b2224063801ba6623b)
Reviewed-on: https://gerrit.libreoffice.org/2180
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 0865fa3..57bca6b 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -244,7 +244,10 @@ public:
virtual sal_uInt16 ResetAllAttr();
/// insert text content
-void InsertText( const XubString rStr, const SwIndex rIdx,
+/// @param rStr text to insert; in case it does not fit into the limit of
+/// TXTNODE_MAX, the longest prefix that fits is inserted
+/// @return the prefix of rStr that was actually inserted
+OUString InsertText( const XubString rStr, const SwIndex rIdx,
const enum IDocumentContentOperations::InsertFlags nMode
= IDocumentContentOperations::INS_DEFAULT );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 7a27c23..b71288c 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -945,12 +945,11 @@ bool SwDoc::InsertString( const SwPaM rRg, const String
rStr,
if (!bDoesUndo || !GetIDocumentUndoRedo().DoesGroupUndo())
{
-pNode-InsertText( rStr, rPos.nContent, nInsertMode );
-
+OUString const ins(pNode-InsertText(rStr, rPos.nContent,
nInsertMode));
if (bDoesUndo)
{
-SwUndoInsert * const pUndo( new SwUndoInsert(
-rPos.nNode, rPos.nContent.GetIndex(), rStr.Len(),
nInsertMode));
+SwUndoInsert * const pUndo( new SwUndoInsert(rPos.nNode,
+rPos.nContent.GetIndex(), ins.getLength(), nInsertMode));
GetIDocumentUndoRedo().AppendUndo(pUndo);
}
}
@@ -980,16 +979,16 @@ bool SwDoc::InsertString( const SwPaM rRg, const String
rStr,
GetIDocumentUndoRedo().AppendUndo( pUndo );
}
-pNode-InsertText( rStr, rPos.nContent, nInsertMode );
+OUString const ins(pNode-InsertText(rStr, rPos.nContent,
nInsertMode));
-for( xub_StrLen i = 0; i rStr.Len(); ++i )
+for (sal_Int32 i = 0; i ins.getLength(); ++i)
{
nInsPos++;
-// if CanGrouping() returns sal_True, everything has already been
done
-if( !pUndo-CanGrouping( rStr.GetChar( i ) ))
+// if CanGrouping() returns true, everything has already been done
+if (!pUndo-CanGrouping(ins[i]))
{
-pUndo = new SwUndoInsert( rPos.nNode, nInsPos, 1, nInsertMode,
-!rCC.isLetterNumeric( rStr, i ) );
+pUndo = new SwUndoInsert(rPos.nNode, nInsPos, 1, nInsertMode,
+!rCC.isLetterNumeric(ins, i));
GetIDocumentUndoRedo().AppendUndo( pUndo );
}
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 47829ea..6d34685 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -744,8 +744,11 @@ bool SwDoc::Overwrite( const SwPaM rRg, const String
rStr )
}
SwTxtNode *pNode = rPt.nNode.GetNode().GetTxtNode();
-if(!pNode)
+if (!pNode || ( static_castsize_t(rStr.Len()) // worst case: no erase
+ + static_castsize_t(pNode-GetTxt().Len()) TXTNODE_MAX))
+{
return sal_False;
+}
if (GetIDocumentUndoRedo().DoesUndo())
{
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index f634571..db87a6a 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1704,23 +1704,27 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
}
-void SwTxtNode::InsertText( const XubString rStr, const SwIndex rIdx,
+OUString SwTxtNode::InsertText( const XubString rStr, const SwIndex
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source
sw/inc/ndtxt.hxx |2 ++
sw/source/core/txtnode/ndtxt.cxx | 26 +++---
sw/source/core/undo/unins.cxx| 16
3 files changed, 25 insertions(+), 19 deletions(-)
New commits:
commit 6b08fe833186a04f9aef698a540d3a7493ac4519
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 15 15:28:24 2013 +0100
fdo#60732: check max size in SwTxtNode::ReplaceText
Also adjust SwUndoReplace to not assume that everything was inserted and
use the stored indexes instead in Undo.
Change-Id: I52f3aaf063c2b1bd52381bdc19e29a41a12c3847
(cherry picked from commit b6d45f26ea5bcc848737921b59a16253eb1d8587)
Reviewed-on: https://gerrit.libreoffice.org/2181
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 57bca6b..985e6e8 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -333,6 +333,8 @@ public:
const SwIndex rStart, const xub_StrLen nLen);
/// replace nDelLen characters at rStart with rText
+/// in case the replacement does not fit, it is partially inserted up to
+/// TXTNODE_MAX
void ReplaceText( const SwIndex rStart, const xub_StrLen nDelLen,
const XubString rText );
void ReplaceTextOnly( xub_StrLen nPos, xub_StrLen nLen, const XubString
rText,
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index db87a6a..c8182b6 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3325,11 +3325,23 @@ XubString SwTxtNode::GetRedlineTxt( xub_StrLen nIdx,
xub_StrLen nLen,
*/
void SwTxtNode::ReplaceText( const SwIndex rStart, const xub_StrLen nDelLen,
- const XubString rText )
+ const XubString rStr)
{
OSL_ENSURE( rStart.GetIndex() m_Text.Len()
rStart.GetIndex() + nDelLen = m_Text.Len(),
SwTxtNode::ReplaceText: index out of bounds );
+
+ssize_t const nOverflow(static_castssize_t(m_Text.Len())
++ static_castssize_t(rStr.Len()) - nDelLen - TXTNODE_MAX);
+SAL_WARN_IF(nOverflow 0, sw.core,
+SwTxtNode::ReplaceText: node text with insertion TXTNODE_MAX.);
+OUString const sInserted(
+(nOverflow 0) ? rStr.Copy(0, rStr.Len() - nOverflow) : rStr);
+if (sInserted.isEmpty())
+{
+return;
+}
+
const xub_StrLen nStartPos = rStart.GetIndex();
xub_StrLen nEndPos = nStartPos + nDelLen;
xub_StrLen nLen = nDelLen;
@@ -3356,17 +3368,17 @@ void SwTxtNode::ReplaceText( const SwIndex rStart,
const xub_StrLen nDelLen,
bool bOldExpFlg = IsIgnoreDontExpand();
SetIgnoreDontExpand( true );
-if( nLen rText.Len() )
+if (nLen sInserted.getLength())
{
// dann das 1. Zeichen ersetzen den Rest loschen und einfuegen
// Dadurch wird die Attributierung des 1. Zeichen expandiert!
-m_Text.SetChar( nStartPos, rText.GetChar( 0 ) );
+m_Text.SetChar( nStartPos, sInserted[0] );
++((SwIndex)rStart);
m_Text.Erase( rStart.GetIndex(), nLen - 1 );
Update( rStart, nLen - 1, true );
-XubString aTmpTxt( rText ); aTmpTxt.Erase( 0, 1 );
+XubString aTmpTxt(sInserted); aTmpTxt.Erase( 0, 1 );
m_Text.Insert( aTmpTxt, rStart.GetIndex() );
Update( rStart, aTmpTxt.Len(), false );
}
@@ -3375,15 +3387,15 @@ void SwTxtNode::ReplaceText( const SwIndex rStart,
const xub_StrLen nDelLen,
m_Text.Erase( nStartPos, nLen );
Update( rStart, nLen, true );
-m_Text.Insert( rText, nStartPos );
-Update( rStart, rText.Len(), false );
+m_Text.Insert( sInserted, nStartPos );
+Update( rStart, sInserted.getLength(), false );
}
SetIgnoreDontExpand( bOldExpFlg );
SwDelTxt aDelHint( nStartPos, nDelLen );
NotifyClients( 0, aDelHint );
-SwInsTxt aHint( nStartPos, rText.Len() );
+SwInsTxt aHint( nStartPos, sInserted.getLength() );
NotifyClients( 0, aHint );
}
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 7018dd1..745d6ce 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -680,11 +680,7 @@ void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext
rContext)
}
SwIndex aIdx( pNd, m_nSttCnt );
-if( m_nSttNd == m_nEndNd )
-{
-pNd-EraseText( aIdx, sal_uInt16( m_sIns.getLength() ) );
-}
-else
+// don't look at m_sIns for deletion, maybe it was not completely inserted
{
rPam.GetPoint()-nNode = *pNd;
rPam.GetPoint()-nContent.Assign( pNd, m_nSttCnt );
@@ -791,13 +787,9 @@ void SwUndoReplace::Impl::RedoImpl(::sw::UndoRedoContext
rContext)
void SwUndoReplace::Impl::SetEnd(SwPaM const rPam)
{
-if( rPam.GetPoint()-nNode !=
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/txtnode/txtedt.cxx | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 47211c07ebb9e56caeb57e4d879da6e67a1119df
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 15 16:27:34 2013 +0100
fdo#60732: check max size in SwTxtNode::ReplaceTextOnly
Change-Id: I1ca2075ab99fe1b09df700f55645b44f38cf5bcc
(cherry picked from commit 0e49d87d92a3f1aeeeda547f1a7e710dcd4fee95)
Reviewed-on: https://gerrit.libreoffice.org/2182
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index a538701..0cdacdb 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1787,9 +1787,19 @@ void SwTxtNode::TransliterateText(
{
// now apply the changes from end to start to leave the offsets of
the
// yet unchanged text parts remain the same.
+size_t nSum(m_Text.Len());
for (size_t i = 0; i aChanges.size(); ++i)
-{
-swTransliterationChgData rData = aChanges[ aChanges.size() -
1 - i ];
+{ // check this here since AddChanges cannot be moved below
+// call to ReplaceTextOnly
+swTransliterationChgData rData =
+aChanges[ aChanges.size() - 1 - i ];
+nSum = nSum + rData.sChanged.Len() - rData.nLen;
+if (nSum TXTNODE_MAX)
+{
+SAL_WARN(sw.core, SwTxtNode::ReplaceTextOnly:
+node text with insertion TXTNODE_MAX.);
+return;
+}
if (pUndo)
pUndo-AddChanges( *this, rData.nStart, rData.nLen,
rData.aOffsets );
ReplaceTextOnly( rData.nStart, rData.nLen, rData.sChanged,
rData.aOffsets );
@@ -1802,6 +1812,9 @@ void SwTxtNode::ReplaceTextOnly( xub_StrLen nPos,
xub_StrLen nLen,
const XubString rText,
const Sequencesal_Int32 rOffsets )
{
+assert(static_castsize_t(m_Text.Len()) +
+static_castsize_t(rText.Len()) - nLen = TXTNODE_MAX);
+
m_Text.Replace( nPos, nLen, rText );
xub_StrLen nTLen = rText.Len();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/SalAquaFilePicker.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit d7f9b7693968f2e2ff7a8d15830a5633d5999ee0 Author: Noel Grandin n...@peralex.com Date: Tue Feb 19 11:02:08 2013 +0200 fix mid-air collision of commits Change-Id: I72a267045dd532a341d062cf13b7393779f579c6 diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index a19d9bb..50c5aa8 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -23,7 +23,6 @@ #include cppuhelper/compbase4.hxx #include com/sun/star/lang/XInitialization.hpp #include com/sun/star/lang/XServiceInfo.hpp -#include com/sun/star/lang/XInitialization.hpp #include com/sun/star/ui/dialogs/XFilePicker3.hpp #include com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp #include com/sun/star/beans/StringPair.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf external/CustomTarget_s
config_host.mk.in |1 configure.ac | 18 distro-configs/LibreOfficeLinux.conf |1 distro-configs/LibreOfficeOpenBSD.conf|1 distro-configs/OxygenOfficeLinux.conf |1 external/CustomTarget_stdlibs.mk | 21 -- external/Module_external.mk | 10 -- external/Package_stdlibs.mk | 17 --- scp2/InstallModule_stdlibs.mk | 38 -- scp2/InstallScript_setup_osl.mk |3 -- scp2/Module_scp2.mk |3 -- setup_native/source/packinfo/packinfo_ure.txt | 16 ++ 12 files changed, 4 insertions(+), 126 deletions(-) New commits: commit 3708fe8434ad6f64d527215f4619556b0a5701ff Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Feb 19 10:04:59 2013 +0100 Kill the --without-system-stdlibs option Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f diff --git a/config_host.mk.in b/config_host.mk.in index e2a0bef..43566cb 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -578,7 +578,6 @@ export SYSTEM_PYTHON=@SYSTEM_PYTHON@ export SYSTEM_REDLAND=@SYSTEM_REDLAND@ export SYSTEM_RHINO=@SYSTEM_RHINO@ export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@ -export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@ export SYSTEM_UCPP=@SYSTEM_UCPP@ export SYSTEM_VIGRA=@SYSTEM_VIGRA@ export SYSTEM_ZLIB=@SYSTEM_ZLIB@ diff --git a/configure.ac b/configure.ac index 5b0a5d9..7e7406c 100644 --- a/configure.ac +++ b/configure.ac @@ -1289,11 +1289,6 @@ AC_ARG_WITH(system-jars, on the system. Use this to disable that]),, [with_system_jars=$with_system_libs]) -AC_ARG_WITH(system-stdlibs, -AS_HELP_STRING([--without-system-stdlibs], -[Bundle the used libstdc++/libgcc_s into the installation set.]),, -[with_system_stdlibs=$with_system_libs]) - AC_ARG_WITH(system-cairo, AS_HELP_STRING([--with-system-cairo], [Use Cairo libraries already on system.]),, @@ -7127,19 +7122,6 @@ AC_SUBST(MINGWCXX) AC_SUBST(MINGWSTRIP) dnl === -dnl Check for system stdlibs -dnl === -AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset]) -if test $with_system_stdlibs != no; then -AC_MSG_RESULT([no]) -SYSTEM_STDLIBS=YES -else -AC_MSG_RESULT([yes]) -SYSTEM_STDLIBS=NO -fi -AC_SUBST(SYSTEM_STDLIBS) - -dnl === dnl Check for system zlib dnl === if test $with_system_zlib = auto; then diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index c46c878..1c0aa3c 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -3,7 +3,6 @@ --with-myspell-dicts --without-unix-wrapper --without-system-zlib ---without-system-stdlibs --without-system-poppler --without-system-openssl --without-system-mozilla diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index f149adc..0122baa 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -38,7 +38,6 @@ --with-system-openssl --with-system-poppler --with-system-redland ---with-system-stdlibs --with-system-zlib --with-vendor=The OpenBSD project --without-junit diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 56379c0..a9def8e 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -56,7 +56,6 @@ --with-jdk-home=/usr/local/jdk1.6.0_23/ --without-system-dicts --without-system-zlib ---without-system-stdlibs --without-system-poppler --without-system-openssl --without-system-mesa-headers diff --git a/external/CustomTarget_stdlibs.mk b/external/CustomTarget_stdlibs.mk deleted file mode 100644 index 786cb15..000 --- a/external/CustomTarget_stdlibs.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,external/stdlibs)) - -$(eval $(call gb_CustomTarget_register_targets,external/stdlibs,\ - libgcc_s.so.$(gb_SHORTSTDC3) \ - libstdc++.so.$(gb_SHORTSTDCPP3) \ -)) - -$(call gb_CustomTarget_get_workdir,external/stdlibs)/lib%: - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),STL,1) - $(PERL) -w $(SOLARENV)/bin/gccinstlib.pl $(notdir $@) $(dir $@) - -# vim:set shiftwidth=4
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source
cui/source/options/optgdlg.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a6d76052a0c620840829230cfc06787c6a24bc8d
Author: Andras Timar ati...@suse.com
Date: Mon Feb 18 20:02:06 2013 +0100
Fix the Ignore system input language label truncated in translations
Change-Id: I3d05135f7973d6ca9cb3e554a4c80544a17e6f60
Reviewed-on: https://gerrit.libreoffice.org/2246
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 9ed740d..0a15582 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -662,7 +662,7 @@ TabPage OFA_TP_LANGUAGES
{
HelpID = cui:CheckBox:OFA_TP_LANGUAGES:CB_IGNORE_LANG_CHANGE;
Pos = MAP_APPFONT ( 12 , 188-11+13 ) ;
-Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
+Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = Ignore s~ystem input language;
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/txtnode/ndtxt.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 586faf3589e23c10e7259e000d13f746212e8eda Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sun Feb 17 11:19:29 2013 +0100 apparently there's no ssize_t on windows Change-Id: Ic9aef7fe5295b7dae6f5b7ee7f28378d393cbfe4 diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index c8182b6..ee1dd01 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1711,8 +1711,8 @@ OUString SwTxtNode::InsertText( const XubString rStr, const SwIndex rIdx, xub_StrLen aPos = rIdx.GetIndex(); xub_StrLen nLen = m_Text.Len() - aPos; -ssize_t const nOverflow(static_castssize_t(m_Text.Len()) -+ static_castssize_t(rStr.Len()) - TXTNODE_MAX); +long const nOverflow(static_castlong(m_Text.Len()) ++ static_castlong(rStr.Len()) - TXTNODE_MAX); SAL_WARN_IF(nOverflow 0, sw.core, SwTxtNode::InsertText: node text with insertion TXTNODE_MAX.); OUString const sInserted( @@ -3331,8 +3331,8 @@ void SwTxtNode::ReplaceText( const SwIndex rStart, const xub_StrLen nDelLen, rStart.GetIndex() + nDelLen = m_Text.Len(), SwTxtNode::ReplaceText: index out of bounds ); -ssize_t const nOverflow(static_castssize_t(m_Text.Len()) -+ static_castssize_t(rStr.Len()) - nDelLen - TXTNODE_MAX); +long const nOverflow(static_castlong(m_Text.Len()) ++ static_castlong(rStr.Len()) - nDelLen - TXTNODE_MAX); SAL_WARN_IF(nOverflow 0, sw.core, SwTxtNode::ReplaceText: node text with insertion TXTNODE_MAX.); OUString const sInserted( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/sdr-dbus-for-4-0'
New branch 'feature/sdr-dbus-for-4-0' available with the following commits: commit 93abe8688a4700c04b5ab045eb296298e1b49031 Author: Michael Meeks michael.me...@suse.com Date: Mon Feb 18 14:40:24 2013 + sdremote: listening to dynamic changes to adapters. Allows LibreOffice to start with no bluetooth, and for it to appear and disappear dynamically at run-time, cleaning up stale bluetooth sockets, and re-binding successfully each time. Change-Id: Ifa04c8cc1859c98adca94ac0e57c7ebd85f2f31f commit 618fe83d6e8aeabc309540fae998aeb78465bb4d Author: Michael Meeks michael.me...@suse.com Date: Mon Feb 18 13:31:21 2013 + sdremote: re-work discoverable property get/set to use libdbus. Change-Id: I5e11a0fcfd8db648a40c738cbc8181889cb36136 commit 0d89d814055d5c267a2cc57e302a23e9f0b521e3 Author: Michael Meeks michael.me...@suse.com Date: Mon Feb 18 11:30:54 2013 + sdremote: switch to a non-blocking socket, and polling glib mainloop. Conflicts: sd/source/ui/remotecontrol/BluetoothServer.cxx Change-Id: I84c0a522fe16fbc8fc86a8e4bccb84aec0a1acd1 commit 5a90716b802d281c111e1f4f43f3fefded2c1f81 Author: Michael Meeks michael.me...@suse.com Date: Mon Feb 18 10:55:31 2013 + sdremote: re-write SDP registration to use raw dbus-1 not dbus-glib. Conflicts: sd/source/ui/remotecontrol/BluetoothServer.cxx Change-Id: I65ff5e603b6719df69b3c2aef7ff438ad54d23e2 commit 21979643e47e503a20113b1e8e98814717c71ac5 Author: Michael Meeks michael.me...@suse.com Date: Mon Feb 18 09:24:23 2013 + improve bluetooth discoverability toggling API. Change-Id: I289d43fcb173b64b01183a41f780bc74d2ba0abe ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sdr-dbusr' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - cui/Library_cui.mk cui/source svx/inc svx/source
cui/Library_cui.mk|1
cui/source/dialogs/about.cxx | 123 ++
svx/inc/svx/svdundo.hxx |9 +++
svx/source/svdraw/svdundo.cxx | 62 -
4 files changed, 173 insertions(+), 22 deletions(-)
New commits:
commit 3432c63c0cdcdfe3e74702c16ce6c746d9c0fdf4
Author: David Tardon dtar...@redhat.com
Date: Wed Feb 13 08:52:52 2013 +0100
fdo#34548 don't crash on undoing text frame removal
Change-Id: I48b95c6c0cbfb2f4c4b09cc90b254b96de40b3e9
(cherry picked from commit 115054fef08998c56cba8f14472df1d15007f635)
Reviewed-on: https://gerrit.libreoffice.org/2232
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 0d3713e..2221164 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -253,6 +253,10 @@ public:
//
class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj {
+class ObjListListener;
+friend class ObjListListener;
+
+private:
boolbOwner;
protected:
@@ -262,6 +266,7 @@ protected:
sal_uInt32 nOrdNum;
// Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes
// statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE
+ObjListListener*m_pListener;
protected:
SdrUndoObjList(SdrObject rNewObj, bool bOrdNumDirect = false);
@@ -270,6 +275,10 @@ protected:
void SetView(SdrView* pView1, SdrPageView* pPageView1) { pView=pView1;
pPageView=pPageView1; }
bool IsOwner() { return bOwner; }
void SetOwner(bool bNew);
+
+private:
+sal_uInt32 GetOrdNum() const;
+void SetOrdNum(sal_uInt32 nOrdNum_);
};
//
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 452761d..c1e4b4d 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -18,6 +18,8 @@
*/
+#include svl/lstner.hxx
+
#include svx/svdundo.hxx
#include svx/svditext.hxx
#include svx/svdotext.hxx
@@ -655,11 +657,55 @@ OUString SdrUndoGeoObj::GetComment() const
+class SdrUndoObjList::ObjListListener : public SfxListener
+{
+public:
+ObjListListener(SdrUndoObjList rThat, SdrObject rObject, SfxBroadcaster
rBroadcaster);
+~ObjListListener();
+
+private:
+virtual void Notify(SfxBroadcaster rBroadcaster, const SfxHint rHint);
+
+private:
+SdrUndoObjList m_rThat;
+SdrObject m_rObject;
+SfxBroadcaster* m_pBroadcaster;
+};
+
+SdrUndoObjList::ObjListListener::ObjListListener(SdrUndoObjList rThat,
SdrObject rObject, SfxBroadcaster rBroadcaster)
+: m_rThat(rThat)
+, m_rObject(rObject)
+, m_pBroadcaster(rBroadcaster)
+{
+StartListening(*m_pBroadcaster);
+}
+
+SdrUndoObjList::ObjListListener::~ObjListListener()
+{
+if (m_pBroadcaster)
+EndListening(*m_pBroadcaster);
+}
+
+void SdrUndoObjList::ObjListListener::Notify(SfxBroadcaster, const SfxHint
rHint)
+{
+const SdrHint* const pSdrHint(dynamic_castconst SdrHint*(rHint));
+if (pSdrHint)
+{
+if ((pSdrHint-GetObject() == m_rObject) (pSdrHint-GetKind() ==
HINT_OBJCHG))
+{
+const sal_uInt32 nNewOrdNum(m_rObject.GetOrdNum());
+if (nNewOrdNum != m_rThat.GetOrdNum())
+m_rThat.SetOrdNum(nNewOrdNum);
+}
+}
+}
+
SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool bOrdNumDirect)
: SdrUndoObj(rNewObj),
bOwner(sal_False),
pView(NULL),
-pPageView(NULL)
+pPageView(NULL),
+m_pListener(NULL)
{
pObjList=pObj-GetObjList();
if (bOrdNumDirect) {
@@ -667,10 +713,14 @@ SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool
bOrdNumDirect)
} else {
nOrdNum=pObj-GetOrdNum();
}
+
+m_pListener = new ObjListListener(*this, *pObj, *pObjList-GetModel());
}
SdrUndoObjList::~SdrUndoObjList()
{
+delete m_pListener;
+
if (pObj!=NULL IsOwner())
{
// Attribute have to go back to the regular Pool
@@ -686,6 +736,16 @@ void SdrUndoObjList::SetOwner(bool bNew)
bOwner = bNew;
}
+sal_uInt32 SdrUndoObjList::GetOrdNum() const
+{
+return nOrdNum;
+}
+
+void SdrUndoObjList::SetOrdNum(sal_uInt32 nOrdNum_)
+{
+nOrdNum = nOrdNum_;
+}
+
void SdrUndoRemoveObj::Undo()
commit d35dd1dbd89e390eb1bcfa50e2f02e7c65bdb0ab
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Jan 31 23:59:10 2013 +0100
Fix fdo#59970 slowless of about box rendering
Prevent creation of transparent bitmap at arbitrary scale, and
subsequent scaling down. For remote X, that even has to fetch
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - config_host.mk.in configure.ac distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.c
config_host.mk.in |1 configure.ac | 18 distro-configs/LibreOfficeLinux.conf |1 distro-configs/LibreOfficeOpenBSD.conf|1 distro-configs/OxygenOfficeLinux.conf |1 scp2/InstallModule_stdlibs.mk | 38 -- scp2/InstallScript_setup_osl.mk |3 -- scp2/Module_scp2.mk |3 -- setup_native/source/packinfo/packinfo_ure.txt | 16 ++ 9 files changed, 4 insertions(+), 78 deletions(-) New commits: commit 4465624e770155a60c6e4ac10ac87429a039b37f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Feb 19 10:04:59 2013 +0100 Kill the --without-system-stdlibs option (cherry picked from commit 3708fe8434ad6f64d527215f4619556b0a5701ff) Conflicts: external/Module_external.mk scp2/Module_scp2.mk Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f Reviewed-on: https://gerrit.libreoffice.org/2252 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/config_host.mk.in b/config_host.mk.in index 0af569c..17ab6a6 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -559,7 +559,6 @@ export SYSTEM_PYTHON=@SYSTEM_PYTHON@ export SYSTEM_REDLAND=@SYSTEM_REDLAND@ export SYSTEM_RHINO=@SYSTEM_RHINO@ export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@ -export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@ export SYSTEM_UCPP=@SYSTEM_UCPP@ export SYSTEM_VIGRA=@SYSTEM_VIGRA@ export SYSTEM_ZLIB=@SYSTEM_ZLIB@ diff --git a/configure.ac b/configure.ac index 8addb6e..bc36fc1 100644 --- a/configure.ac +++ b/configure.ac @@ -1245,11 +1245,6 @@ AC_ARG_WITH(system-jars, on the system. Use this to disable that]),, [with_system_jars=$with_system_libs]) -AC_ARG_WITH(system-stdlibs, -AS_HELP_STRING([--without-system-stdlibs], -[Bundle the used libstdc++/libgcc_s into the installation set.]),, -[with_system_stdlibs=$with_system_libs]) - AC_ARG_WITH(system-cairo, AS_HELP_STRING([--with-system-cairo], [Use Cairo libraries already on system.]),, @@ -6780,19 +6775,6 @@ AC_SUBST(MINGWCXX) AC_SUBST(MINGWSTRIP) dnl === -dnl Check for system stdlibs -dnl === -AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset]) -if test $with_system_stdlibs != no; then -AC_MSG_RESULT([no]) -SYSTEM_STDLIBS=YES -else -AC_MSG_RESULT([yes]) -SYSTEM_STDLIBS=NO -fi -AC_SUBST(SYSTEM_STDLIBS) - -dnl === dnl Check for system zlib dnl === if test $with_system_zlib = auto; then diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 5bf8cd0..5246138 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -2,7 +2,6 @@ --with-system-dicts --without-unix-wrapper --without-system-zlib ---without-system-stdlibs --without-system-poppler --without-system-openssl --without-system-mozilla diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index a56c097..e9623c6 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -38,7 +38,6 @@ --with-system-openssl --with-system-poppler --with-system-redland ---with-system-stdlibs --with-system-zlib --with-vendor=The OpenBSD project --without-junit diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 56379c0..a9def8e 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -56,7 +56,6 @@ --with-jdk-home=/usr/local/jdk1.6.0_23/ --without-system-dicts --without-system-zlib ---without-system-stdlibs --without-system-poppler --without-system-openssl --without-system-mesa-headers diff --git a/scp2/InstallModule_stdlibs.mk b/scp2/InstallModule_stdlibs.mk deleted file mode 100644 index 5f6c171..000 --- a/scp2/InstallModule_stdlibs.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012
Re: [Libreoffice-ux-advise] EasyHack proposals
Rainer Bielefeld schrieb: But to be honest, it's long ago that I read the HeasHack Wiki page, Well, currently there on https://wiki.documentfoundation.org/Development/EasyHacks#Creating_new_EasyHacks I read New EasyHacks should be created by developers ... Write EasyHack (or ProposedEasyHack) ... I do not think that that is very useful, IMHO to imprecise! My suggestions: Whiteboard - We have 2 accepted Whiteboard tags: EasyHack and ProposedEasyHack, IMHO we should use tem as following: * ProposedEasyHack: added by experienced QA users or developers, if applicable with skills. Will be rejected by a developer if too difficult or * EasyHack: Replaces ProposedEasyHack, only added by developers who really can estimate the easiness, and only if a developer is in CC (or can be added) who can be mentor. If there are no concerns or different suggestions and nobody else does I will complete the Wiki text. Proceeding: --- We need a proceeding how to track success. Currently I count 43 ProposedEasyHack Bugs without any action within 1/4 years [1]. Best would be if some willing mentors check these bugs whether really EH. We need experienced QA staff who actively encourage new developers (especially who already did an EasyHack fix) to try more fixes. I already planned to do so, but Developers' feedback es required, for example whether tat is useful or whether mentoring costs too much time or whatever. I suggest to continue discussion with all interested people ONLY on libreoffice...@lists.freedesktop.org. Best regards Rainer Hyperlinks -- [1] https://bugs.freedesktop.org/buglist.cgi?f1=days_elapsedlist_id=236007o1=greaterthanresolution=---status_whiteboard_type=allwordssubstrquery_format=advancedstatus_whiteboard=ProposedEasyHackbug_status=UNCONFIRMEDbug_status=NEWbug_status=REOPENEDbug_status=NEEDINFObug_status=PLEASETESTv1=90product=LibreOffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac m4/libo_externals.m4
configure.ac | 206 +-- m4/libo_externals.m4 | 30 +++ 2 files changed, 84 insertions(+), 152 deletions(-) New commits: commit a2dbcf1e723e082a76ad1a7ef275f693dab34c98 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Sat Feb 16 15:34:03 2013 +0100 simplify external module check with macro - a 12.000 LOC configure.ac is more than enough for everybody - removing some 100 lines cant hurt - the SYSTEM_LIBCDR=$SYSTEM_CDR stuff should be removed in a later step, by renaming them in the build Change-Id: I5c065c5c341561258800a124b0fc1f40b3d59211 diff --git a/configure.ac b/configure.ac index 7e7406c..33cd9f4 100644 --- a/configure.ac +++ b/configure.ac @@ -7135,6 +7135,10 @@ if test $with_system_zlib = auto; then esac fi +dnl we want to use libo_CHECK_SYSTEM_MODULE here too, but OS X is too stupid +dnl and has no pkg-config for it at least on some tinderboxes, +dnl so leaving that out for now +dnl libo_CHECK_SYSTEM_MODULE([zlib],[ZLIB],[zlib]) AC_MSG_CHECKING([which zlib to use]) if test $with_system_zlib = yes; then AC_MSG_RESULT([external]) @@ -7185,15 +7189,12 @@ fi AC_SUBST(SYSTEM_JPEG) AC_SUBST([MINGW_JPEG_DLL]) + dnl === dnl Check for system clucene dnl === -AC_MSG_CHECKING([which clucene to use]) +libo_CHECK_SYSTEM_MODULE([clucence],[CLUCENE],[liblucence-core]) if test $with_system_clucene = yes; then -AC_MSG_RESULT([external]) -SYSTEM_CLUCENE=YES -PKG_CHECK_MODULES(CLUCENE, libclucene-core) - AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS save_CPPFLAGS=$CPPFLAGS @@ -7208,175 +7209,96 @@ if test $with_system_clucene = yes; then AC_LANG_POP([C++]) CLUCENE_LIBS=$CLUCENE_LIBS -lclucene-contribs-lib -else -AC_MSG_RESULT([internal]) -SYSTEM_CLUCENE=NO -BUILD_TYPE=$BUILD_TYPE CLUCENE fi -AC_SUBST(SYSTEM_CLUCENE) -AC_SUBST(CLUCENE_CFLAGS) -AC_SUBST(CLUCENE_LIBS) dnl === dnl Check for system expat dnl === -AC_MSG_CHECKING([which expat to use]) +libo_CHECK_SYSTEM_MODULE([expat],[EXPAT],[expat]) if test $with_system_expat = yes; then -AC_MSG_RESULT([external]) -SYSTEM_EXPAT=YES -AC_CHECK_HEADER(expat.h, [], -[AC_MSG_ERROR(expat.h not found. install expat)], []) -AC_CHECK_LIB([expat], [XML_ParserCreate], [:], -[AC_MSG_RESULT(expat library not found or functional.)], []) libo_MINGW_CHECK_DLL([EXPAT], [libexpat]) -else -AC_MSG_RESULT([internal]) -SYSTEM_EXPAT=NO -BUILD_TYPE=$BUILD_TYPE EXPAT -fi -AC_SUBST(SYSTEM_EXPAT) +fi AC_SUBST([MINGW_EXPAT_DLL]) dnl === dnl Check for system libcdr dnl === -AC_MSG_CHECKING([which libcdr to use]) -if test $with_system_libcdr = yes; then -AC_MSG_RESULT([external]) -SYSTEM_LIBCDR=YES -PKG_CHECK_MODULES( CDR, libcdr-0.0 = 0.0.5 ) -elif test $_os = iOS; then -# libcdr depends on libwpd and libwpg and those are LGPL -AC_MSG_RESULT([none]) +if test $_os = iOS; then +# libcdr depends on libwpd and libwpg and those are LGPL, publishing empty flags +libo_PUBLISH_MODULE([CDR]) else -AC_MSG_RESULT([internal]) -SYSTEM_LIBCDR=NO -BUILD_TYPE=$BUILD_TYPE CDR +libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.0 = 0.0.5]) fi +SYSTEM_LIBCDR=$SYSTEM_CDR AC_SUBST(SYSTEM_LIBCDR) -AC_SUBST(CDR_CFLAGS) -AC_SUBST(CDR_LIBS) dnl === dnl Check for system libmspub dnl === -AC_MSG_CHECKING([which libmspub to use]) -if test $with_system_libmspub = yes; then -AC_MSG_RESULT([external]) -SYSTEM_LIBMSPUB=YES -PKG_CHECK_MODULES( MSPUB, libmspub-0.0 ) -elif test $_os = iOS; then -# libmspub depends on libwpd and libwpg and those are LGPL -AC_MSG_RESULT([none]) +if test $_os = iOS; then +# libmspub depends on libwpd and libwpg and those are LGPL, publishing empty flags +libo_PUBLISH_MODULE([MSPUB]) else -AC_MSG_RESULT([internal]) -SYSTEM_LIBMSPUB=NO -BUILD_TYPE=$BUILD_TYPE MSPUB +libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.0]) fi +SYSTEM_LIBMSPUB=$SYSTEM_MSPUB AC_SUBST(SYSTEM_LIBMSPUB) -AC_SUBST(MSPUB_CFLAGS) -AC_SUBST(MSPUB_LIBS) dnl === dnl Check for system libvisio dnl === -AC_MSG_CHECKING([which libvisio to use]) -if test $with_system_libvisio = yes; then -AC_MSG_RESULT([external]) -SYSTEM_LIBVISIO=YES -
[PATCH] simplify external module check with macro
Hello LibreOffice gerrit bot, David Tardon, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2185 to look at the new patch set (#5). Change subject: simplify external module check with macro .. simplify external module check with macro - a 12.000 LOC configure.ac is more than enough for everybody - removing some 100 lines cant hurt - the SYSTEM_LIBCDR=$SYSTEM_CDR stuff should be removed in a later step, by renaming them in the build Change-Id: I5c065c5c341561258800a124b0fc1f40b3d59211 --- M configure.ac A m4/libo_externals.m4 2 files changed, 84 insertions(+), 152 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2185/5 -- To view, visit https://gerrit.libreoffice.org/2185 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5c065c5c341561258800a124b0fc1f40b3d59211 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Mathias M m...@gmx.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] [PUSHED] simplify external module check with macro
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2185 -- To view, visit https://gerrit.libreoffice.org/2185 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c065c5c341561258800a124b0fc1f40b3d59211 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Mathias M m...@gmx.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0c3d3d58c9a88a682dcb673f8727390a602fec55
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 19 10:07:29 2013 +
sdremote: fix linux conditional.
Change-Id: I911863f07b08e771d78a4a98d9a4f82c93a7d55e
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 5692406..94276b5 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -625,11 +625,11 @@ void BluetoothServer::restoreDiscoverable()
void BluetoothServer::doEnsureDiscoverable()
{
+#ifdef LINUX_BLUETOOTH
if (!spServer-mpImpl-mpConnection ||
spServer-meWasDiscoverable != UNKNOWN )
return;
-#ifdef LINUX_BLUETOOTH
// Find out if we are discoverable already ...
DBusObject *pAdapter = spServer-mpImpl-getAdapter();
if( !pAdapter )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sdr-dbus-for-4-0' - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit da8cf16796b916552e4aa0ab294359f91a9b8c0e
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 19 10:07:29 2013 +
sdremote: fix linux conditional.
Change-Id: I911863f07b08e771d78a4a98d9a4f82c93a7d55e
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 69cc593..8706e67 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -633,11 +633,11 @@ void BluetoothServer::restoreDiscoverable()
void BluetoothServer::doEnsureDiscoverable()
{
+#ifdef LINUX_BLUETOOTH
if (!spServer-mpImpl-mpConnection ||
spServer-meWasDiscoverable != UNKNOWN )
return;
-#ifdef LINUX_BLUETOOTH
// Find out if we are discoverable already ...
DBusObject *pAdapter = spServer-mpImpl-getAdapter();
if( !pAdapter )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/macosx/spotlight/main.m |1 +
1 file changed, 1 insertion(+)
New commits:
commit f68b89cbfd76e43a701f8457a3a97c87be74758a
Author: Tor Lillqvist t...@iki.fi
Date: Mon Feb 18 21:42:00 2013 +0200
Make sure MetadataImporterPluginFactory has external linkage
Otherwise, in a LO built with hidden visibility (as gcc terminology,
not ELF, Mac OS X does not use ELF), Spotlight won't be able to use
our importer.
(cherry picked from commit 7c6b42851bc0a94f6aa8c3e28892d1ab4b297c25)
Change-Id: Ie19082f9f14e4cc75ae6f7583031b929b7b75330
Reviewed-on: https://gerrit.libreoffice.org/2247
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/extensions/source/macosx/spotlight/main.m
b/extensions/source/macosx/spotlight/main.m
index 491adc1..3016a8a 100644
--- a/extensions/source/macosx/spotlight/main.m
+++ b/extensions/source/macosx/spotlight/main.m
@@ -212,6 +212,7 @@ ULONG MetadataImporterPluginRelease(void *thisInstance)
//
-
//Implementation of the factory function for this type.
//
+__attribute__ ((visibility(default)))
void *
MetadataImporterPluginFactory(CFAllocatorRef allocator, CFUUIDRef typeID)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bootstrap solenv/bin solenv/inc
bootstrap|1
solenv/bin/gccinstlib.pl | 78 ---
solenv/inc/unitools.mk |1
3 files changed, 80 deletions(-)
New commits:
commit 8ff09509d725ce18814d5d77794f227d0c72037b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Feb 19 11:31:17 2013 +0100
No need to copy the gcc libraries anymore
Change-Id: I6dbf44bb78f14ab71a48a9cd4e9ebba60bfc97d2
diff --git a/bootstrap b/bootstrap
index 38ebb4e..6a2d691 100755
--- a/bootstrap
+++ b/bootstrap
@@ -76,7 +76,6 @@ fi
chmod +x $SRC_ROOT/solenv/bin/build.pl
chmod +x $SRC_ROOT/solenv/bin/zipdep.pl
-chmod +x $SRC_ROOT/solenv/bin/gccinstlib.pl
# Local Variables:
# mode: shell-script
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
deleted file mode 100755
index 2deb4d4..000
--- a/solenv/bin/gccinstlib.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+$@}'
- if 0;
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# http://www.openoffice.org/license.html
-# for a copy of the LGPLv3 License.
-#
-#*
-
-$ENV{'LC_MESSAGES'} = 'C';
-
-$Dest = pop(@ARGV) || die No destination to copy to;
-
-$cc = $ENV{'CC'} || die No CC environment set;
-
-if ($Dest =~ /--help/ || @ARGV 1) {
-print Syntax:\n gcc-instlib library-in-libpath ...
destination-dir\n;
-exit (0);
-}
-
-%SrcAndDest = ();
-
-foreach $File (@ARGV) {
-my $string;
-
-my $NormFile = $File;
-$NormFile =~ s/\.so\.\d+/.so/;
-@search = ($File, $NormFile);
-
-foreach $entry (@search) {
-open (GCCOut, LANGUAGE=C LC_ALL=C $cc -print-file-name=$entry|) ||
-next;
-$string=GCCOut;
-chomp ($string);
-close (GCCOut);
-if (-e $string) {
-$SrcAndDest{$string} = $Dest/$File;
-last;
-}
-}
-}
-
-while (($Src, $FullDest) = each %SrcAndDest) {
-printf copy $Src to $FullDest\n;
-system (/bin/cp $Src $FullDest) die copy failed: $!;
-}
-
-
-foreach $File (@ARGV) {
-#https://bugzilla.redhat.com/show_bug.cgi?id=149465
-printf unprelinking $Dest/$File\n;
-#If it's already unprelinked .i.e. no .gnu.prelink_undo section, that's
fine
-#If prelink is not installed, it's massively unlikely that it's prelinked
-system (prelink -u $Dest/$File /dev/null 21);
-}
-
-exit (0);
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 5b7ed0a..81d1752 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -176,7 +176,6 @@ RM+=$(RMFLAGS)
ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl
EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl
-GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl
# The dmake $(PWD) apparantly produces paths with symlinks resolved, while the
# bash pwd command by default produces paths with unresolved symlinks, so that
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 9a49ff646bdd27fb1355847828794b0a9df40e1d
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 19 11:33:28 2013 +0100
nsscrypto_initializer: MSVC does not support C99 dynamic arrays
Change-Id: I407b2308756b46fbf0920881fc20972b486819b7
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 988d362..f9bc487 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -62,6 +62,8 @@
#include digestcontext.hxx
#include ciphercontext.hxx
+#include boost/scoped_array.hpp
+
#include nspr.h
#include cert.h
#include nss.h
@@ -282,9 +284,9 @@ bool nsscrypto_initialize( const css::uno::Reference
css::uno::XComponentContex
int errlen = PR_GetErrorTextLength();
if(errlen 0)
{
-char error[errlen + 1];
-PR_GetErrorText(error);
-xmlsec_trace(%s,error);
+boost::scoped_arraychar const error(new char[errlen + 1]);
+PR_GetErrorText(error.get());
+xmlsec_trace(%s, error.get());
}
bSuccess = false;
}
@@ -299,9 +301,9 @@ bool nsscrypto_initialize( const css::uno::Reference
css::uno::XComponentContex
int errlen = PR_GetErrorTextLength();
if(errlen 0)
{
-char error[errlen + 1];
-PR_GetErrorText(error);
-xmlsec_trace(%s,error);
+boost::scoped_arraychar const error(new char[errlen + 1]);
+PR_GetErrorText(error.get());
+xmlsec_trace(%s, error.get());
}
return false ;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - solenv/inc
solenv/inc/minor.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 55d873ddd6ee0b514d5a4a263c5c0552e4adf6e2 Author: Andras Timar ati...@suse.com Date: Tue Feb 19 11:44:35 2013 +0100 fix minor.mk Change-Id: I7c017f3da2546c3804161879166edc46a987e66f diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 2003971..52fa8f8 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=360 -RSCREVISION=360m1(Build:-311) -BUILD=-311 +RSCREVISION=360m1(Build:311) +BUILD=311 LAST_MINOR=m1 SOURCEVERSION=OOO360 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Personas Proxies
Hi Olivier, Olivier Hallot píše v Po 18. 02. 2013 v 20:49 -0300: Is there a page where the user-agent of LibreOffice for Personas is described? Some organizations have proxies/firewalls that allows FFox to get the persona but blocks LibreOffice to get its own. I use what ucp provides, I do not set anything special, so it seems to me that it is set to 'LibreOffice' via this code: http://cgit.freedesktop.org/libreoffice/core/tree/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx#n1151 but haven't checked it in any sniffing tool to be 100% sure. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 793c1b17abebd248a9c35580fe3fb4fc9230
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Feb 19 11:50:12 2013 +0100
writerfilter: get rid of these hardcoded values
Change-Id: I381266cbc9eb2a6d95b7bdc5e80a1e486112dbbe
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 52fbd0c..bdfe896 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -30,6 +30,7 @@
#include com/sun/star/text/SizeType.hpp
#include com/sun/star/text/TableColumnSeparator.hpp
#include com/sun/star/text/VertOrientation.hpp
+#include com/sun/star/text/WritingMode2.hpp
#include ooxml/resourceids.hxx
#include doctok/sprmids.hxx
#include dmapperLoggers.hxx
@@ -251,28 +252,26 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
case NS_ooxml::LN_CT_TcPrBase_textDirection:
{
TablePropertyMapPtr pPropMap( new TablePropertyMap );
-const sal_Int16 HORI_LEFT_TOP = 0;
-const sal_Int16 VERT_TOP_RIGHT = 2;
bool bInsertCellProps = true;
switch ( nIntValue )
{
case 1: // tbRl
// Binary filter takes BiDirection into account ( but I
have no idea about that here )
// or even what it is. But... here's where to handle it if
it becomes an issue
-pPropMap-Insert( PROP_FRM_DIRECTION, false,
uno::makeAny( VERT_TOP_RIGHT ));
+pPropMap-Insert( PROP_FRM_DIRECTION, false,
uno::makeAny( text::WritingMode2::TB_RL ));
SAL_INFO( writerfilter, Have inserted textDirection
nIntValue );
break;
case 3: // btLr
// We have to fake this text direction
- pPropMap-Insert( PROP_FRM_DIRECTION, false,
uno::makeAny( HORI_LEFT_TOP ));
+ pPropMap-Insert( PROP_FRM_DIRECTION, false,
uno::makeAny( text::WritingMode2::LR_TB ));
pPropMap-Insert( PROP_CHAR_ROTATION, false,
uno::makeAny( sal_Int16( 900 ) ));
SAL_INFO( writerfilter, Have inserted textDirection
nIntValue );
break;
case 4: // lrTbV
-pPropMap-Insert( PROP_FRM_DIRECTION, false,
uno::makeAny( HORI_LEFT_TOP ));
+pPropMap-Insert( PROP_FRM_DIRECTION, false,
uno::makeAny( text::WritingMode2::LR_TB ));
break;
case 5: // tbRlV
-pPropMap-Insert( PROP_FRM_DIRECTION, false,
uno::makeAny( VERT_TOP_RIGHT ));
+pPropMap-Insert( PROP_FRM_DIRECTION, false,
uno::makeAny( text::WritingMode2::TB_RL ));
break;
case 0: // lrTb
case NS_ooxml::LN_Value_ST_TextDirection_tbLrV:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1c885ce3fc3b451b6f6a3b29f2f0e9848b76f890 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 19 10:55:53 2013 + Updated core Project: help b568e27d3e9627927db41ebe0600f171cddf3708 diff --git a/helpcontent2 b/helpcontent2 index 4e2efdd..b568e27 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4e2efdde70cad695078965988da7c4c1228cc818 +Subproject commit b568e27d3e9627927db41ebe0600f171cddf3708 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 -- source/text/shared/optionen/01011000.xhp | 36 +-- 2 files changed, 16 insertions(+), 27 deletions(-) New commits: commit b568e27d3e9627927db41ebe0600f171cddf3708 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 19 10:55:53 2013 + update help ids for memory options page Change-Id: I8447f2e085ad15b3f1dfa0c946cc083c4f122aae diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 447ca96..9811343 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2669,7 +2669,6 @@ HID_OFA_HYPERLINK_NAME,35079, HID_OFA_HYPERLINK_TARGET,35053, HID_OFA_HYPERLINK_URL,35081, HID_OFA_TP_LANGUAGES,35147, -HID_OFA_TP_MEMORY,35152, HID_OFA_TP_VIEW,35057, HID_OLE_CHECKLB,53245, HID_OLE_TOOLBOX,54831, @@ -7496,7 +7495,6 @@ svx_CheckBox_OFA_TP_LANGUAGES_CB_ASIANSUPPORT,81059, svx_CheckBox_OFA_TP_LANGUAGES_CB_CTLSUPPORT,810566671, svx_CheckBox_OFA_TP_LANGUAGES_CB_CURRENT_DOC,81057, svx_CheckBox_OFA_TP_LANGUAGES_CB_DECIMALSEPARATOR,810566684, -svx_CheckBox_OFA_TP_MEMORY_CB_QUICKLAUNCH,811303963, svx_CheckBox_OFA_TP_VIEW_CB_FONTANTIALIASING,810517567, svx_CheckBox_OFA_TP_VIEW_CB_FONT_HISTORY,810517566, svx_CheckBox_OFA_TP_VIEW_CB_FONT_SHOW,810517564, @@ -8177,10 +8175,6 @@ svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761, svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874, svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT,1598216200, svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINWIDTH,1598216202, -svx_NumericField_OFA_TP_MEMORY_ED_UNDO,811309068, -svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICCACHE,811309074, -svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE,811309076, -svx_NumericField_OFA_TP_MEMORY_NF_OLECACHE,811309081, svx_NumericField_OFA_TP_VIEW_NF_AA_POINTLIMIT,810522688, svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES,809162881, svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN,809162880, @@ -8479,7 +8473,6 @@ svx_TabPage_RID_SVXPAGE_MACROASSIGN,705560576, svx_TabPage_RID_SVXPAGE_TEXTANIMATION,703725568, svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320, svx_TabPage_RID_SVX_XFORMS_TABPAGES,832110592, -svx_TimeField_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME,811311126, svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL,702187035, svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_HYPH,702187050, svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_SHRINK,702187053, diff --git a/source/text/shared/optionen/01011000.xhp b/source/text/shared/optionen/01011000.xhp index 2a1e95d..d884817 100644 --- a/source/text/shared/optionen/01011000.xhp +++ b/source/text/shared/optionen/01011000.xhp @@ -34,7 +34,9 @@ bookmark_valuegraphics; cache/bookmark_value bookmark_valuecache for graphics/bookmark_value bookmark_valueQuickstarter/bookmark_value -/bookmarkcommentMW moved quickstarter to the top of page and corrected a typo./commentparagraph role=heading id=hd_id3157909 xml-lang=en-US level=1 l10n=U oldref=25link href=text/shared/optionen/01011000.xhp name=MemoryMemory/link/paragraph +/bookmark +bookmark xml-lang=en-US branch=hid/cui/ui/optmemoryspage/OptMemoryPage id=bm_id8346202 localize=false/ +paragraph role=heading id=hd_id3157909 xml-lang=en-US level=1 l10n=U oldref=25link href=text/shared/optionen/01011000.xhp name=MemoryMemory/link/paragraph paragraph role=paragraph id=par_id3154307 xml-lang=en-US l10n=CHG oldref=26ahelp hid=.Defines the settings for the graphics cache and the number of steps you can undo./ahelp/paragraph /section section id=howtoget @@ -42,28 +44,22 @@ /section paragraph role=heading id=hd_id3155390 xml-lang=en-US level=2 l10n=U oldref=1Undo/paragraph paragraph role=paragraph id=par_id3145673 xml-lang=en-US l10n=U oldref=2Defines the maximum number of reverse steps allowed./paragraph -!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO -- -bookmark xml-lang=en-US branch=hid/cui:NumericField:OFA_TP_MEMORY:ED_UNDO id=bm_id2490005 localize=false/paragraph role=heading id=hd_id3153881 xml-lang=en-US level=3 l10n=U oldref=3Number of steps/paragraph -paragraph role=paragraph id=par_id3148685 xml-lang=en-US l10n=U oldref=4ahelp hid=OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDOYou can specify the number of steps which can be undone by selecting a number from the box./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/optmemorypage/undo id=bm_id2490005 localize=false/paragraph role=heading id=hd_id3153881 xml-lang=en-US level=3 l10n=U oldref=3Number of steps/paragraph +paragraph role=paragraph id=par_id3148685 xml-lang=en-US l10n=U oldref=4ahelp hid=cui/ui/optmemorypage/undoYou can specify the number of steps which can be undone by selecting a number from the box./ahelp/paragraph paragraph role=heading id=hd_id3147530 xml-lang=en-US level=2 l10n=U oldref=10Graphics cache/paragraph paragraph role=paragraph id=par_id3145069 xml-lang=en-US l10n=U oldref=11The graphics cache
Re: Regression - LO Writer 4.0
Hi Raymond, Miklos Vajna píše v Út 19. 02. 2013 v 09:40 +0100: Do you intend to debug this yourself? Then the first step would be https://wiki.documentfoundation.org/Bibisect to see what commit caused this problem. If you have further questions regarding code pointers, we're happy to help here. Or, if you are not about to hack on this, report it to the bugzilla: https://www.libreoffice.org/get-help/bug/ Just to add - even in this case, the Bibisect (see the link above) would be much appreciated, and will greatly decrease the time to fix for this bug. Bibisecting is easy, it is an equivalent of testing in several LO versions, just with easy switching between them. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svtools/source
svtools/source/graphic/grfmgr2.cxx | 94 +++--
1 file changed, 71 insertions(+), 23 deletions(-)
New commits:
commit 0ff04e11c0e79a2969774c21df8e0d5822b54e08
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Feb 18 19:32:34 2013 -0600
fdo#60719 : fix crash on scaling bmp with target/source width/height = 1
The rendering is quite ugly compared to the same pdf opened
with pdf reader. but at least it does not crash anymore.
The function ImplCreateRotatedScaled seems quite sub-optimal
for one thing it is called even when there is no rotation
and still bother with doing a lot of work to 'rotate' things.
It was assuming Width and Height 1 for both the source and the target
The patch tries to 'hide' the misery... but I'm not convinced
that this is 'right'.
Change-Id: I9aec5eb6655ea3678aa018ae5928dabb8058bec6
Reviewed-on: https://gerrit.libreoffice.org/2195
Reviewed-by: Arnaud Versini arnaud.vers...@gmail.com
Tested-by: Arnaud Versini arnaud.vers...@gmail.com
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/2248
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index 4aeccf9..88a6ce8 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -276,38 +276,88 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx rBmpEx,
const GraphicAttr rAt
long* pMapIY = new long[ aUnrotatedHeight ];
long* pMapFY = new long[ aUnrotatedHeight ];
-const double fScaleX = ( aUnrotatedWidth - 1 ) / (double) ( aBitmapWidth
- 1 );
-const double fScaleY = ( aUnrotatedHeight - 1 ) / (double) ( aBitmapHeight
- 1 );
-
-const double fRevScaleX = 1.0 / fScaleX;
-const double fRevScaleY = 1.0 / fScaleY;
+double fRevScaleX;
+double fRevScaleY;
+bool scaleByAveraging = false;
int x,y;
-// create horizontal mapping table
-for( x = 0, nTmpX = aBitmapWidth - 1L, nTmp = aBitmapWidth - 2L; x
aUnrotatedWidth; x++ )
+if(aBitmapWidth 1 aUnrotatedWidth 1)
{
-fTmp = x * fRevScaleX;
+fRevScaleX = (double) ( aBitmapWidth - 1 ) / (double)(
aUnrotatedWidth - 1 );
+// create horizontal mapping table
+for( x = 0, nTmpX = aBitmapWidth - 1L, nTmp = aBitmapWidth - 2L = 0 ?
aBitmapWidth -2L : 0L; x aUnrotatedWidth; x++ )
+{
+fTmp = x * fRevScaleX;
-if( bHMirr )
-fTmp = nTmpX - fTmp;
+if( bHMirr )
+fTmp = nTmpX - fTmp;
-pMapIX[ x ] = MinMax( fTmp, 0, nTmp );
-pMapFX[ x ] = (long) ( ( fTmp - pMapIX[ x ] ) * 1048576.0 );
+pMapIX[ x ] = MinMax( fTmp, 0, nTmp );
+pMapFX[ x ] = (long) ( ( fTmp - pMapIX[ x ] ) * 1048576.0 );
+}
+scaleByAveraging |= fRevScaleX 5.0/3.0;
}
+else
+{
+if(aBitmapWidth == 1)
+{
+fRevScaleX = 1.0 / (double)( aUnrotatedWidth );
+for ( x = 0; x aUnrotatedWidth ; x++)
+{
+pMapIX[x] = 0;
+pMapFX[x] = 0.5;
+}
+scaleByAveraging = true;
+}
+else
+{
+fRevScaleX = (double) aBitmapWidth / (double)( aUnrotatedWidth);
+fTmp = (double)aBitmapWidth / 2.0;
-// create vertical mapping table
-for( y = 0, nTmpY = aBitmapHeight - 1L, nTmp = aBitmapHeight - 2L; y
aUnrotatedHeight; y++ )
+pMapIX[ 0 ] = (long)fTmp;
+pMapFX[ 0 ] = (long)( ( fTmp - pMapIX[ 0 ] ) * 1048576.0 );
+scaleByAveraging = true;
+}
+}
+if(aBitmapHeight 1 aUnrotatedHeight 1)
{
-fTmp = y * fRevScaleY;
+fRevScaleY = (double) ( aBitmapHeight - 1 ) / (double)(
aUnrotatedHeight - 1 );
+// create vertical mapping table
+for( y = 0, nTmpY = aBitmapHeight - 1L, nTmp = aBitmapHeight - 2L = 0
? aBitmapHeight - 2L : 0L; y aUnrotatedHeight; y++ )
+{
+fTmp = y * fRevScaleY;
-if( bVMirr )
-fTmp = nTmpY - fTmp;
+if( bVMirr )
+fTmp = nTmpY - fTmp;
-pMapIY[ y ] = MinMax( fTmp, 0, nTmp );
-pMapFY[ y ] = (long) ( ( fTmp - pMapIY[ y ] ) * 1048576.0 );
+pMapIY[ y ] = MinMax( fTmp, 0, nTmp );
+pMapFY[ y ] = (long) ( ( fTmp - pMapIY[ y ] ) * 1048576.0 );
+}
+scaleByAveraging |= fRevScaleY 5.0/3.0;
}
+else
+{
+if(aBitmapHeight == 1)
+{
+fRevScaleY = 1.0 / (double)( aUnrotatedHeight);
+for ( y = 0; y aUnrotatedHeight ; y++)
+{
+pMapIY[y] = 0;
+pMapFY[y] = 0.5;
+
Re: Subject: [PATCH] better usability of Import CSV dialog
Hi Petr, Petr Vorel píše v Čt 14. 02. 2013 v 20:34 +0100: import CSV dialog window has two list boxes - language and charset. Both show just 6 options which seems to me quite uncomfortable to use. Could you please increase a bit their height? My patch does that, but maybe too much - both show 28 items now, but still fit into main dialog window (might have problems on some small resolutions), but making them even a bit higher would be nice. PS: Not sure if this is not waiting for rewriting https://wiki.documentfoundation.org/Development/WidgetLayout#ListBoxes_and_ComboBoxes Indeed - converting the dialog to the new Widget layout would be best. Are you willing to help, please? For a start, it would be enough to re-draw the dialog in Glade, we can adapt the underlying code if you do not fell like that :-) Thank you a lot, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 4c7d04c681a44caff1eba8f2022dacdf1242b1b5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Feb 19 12:10:25 2013 +0100
g_strcmp0 is not in our baseline glib2
Change-Id: I65b4ea5bb8beacef79e963e4dd78fa764f3ab697
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 11742c1..32bce4d 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -39,6 +39,17 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc;
using namespace com::sun::star::sdbcx;
+namespace
+{
+int libo_strcmp0 (const char *str1, const char *str2)
+{
+ if (!str1)
+ return -(str1 != str2);
+ if (!str2)
+ return str1 != str2;
+ return strcmp (str1, str2);
+}
+}
namespace connectivity
{
@@ -1090,7 +1101,7 @@ bool isSourceBackend(ESource *pSource, const char
*backendname)
return false;
gpointer extension = e_source_get_extension (pSource,
E_SOURCE_EXTENSION_ADDRESS_BOOK);
-return extension g_strcmp0 (e_source_backend_get_backend_name
(extension), backendname) == 0;
+return extension libo_strcmp0 (e_source_backend_get_backend_name
(extension), backendname) == 0;
}
Reference XResultSet SAL_CALL OEvoabDatabaseMetaData::getTables(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - bootstrap solenv/bin solenv/inc
bootstrap|1
solenv/bin/gccinstlib.pl | 78 ---
solenv/inc/unitools.mk |1
3 files changed, 80 deletions(-)
New commits:
commit 930adff42e498ee4f8655cee09bcb2e43838413a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Feb 19 11:31:17 2013 +0100
No need to copy the gcc libraries anymore
Change-Id: I6dbf44bb78f14ab71a48a9cd4e9ebba60bfc97d2
(cherry picked from commit 8ff09509d725ce18814d5d77794f227d0c72037b)
Reviewed-on: https://gerrit.libreoffice.org/2254
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com
diff --git a/bootstrap b/bootstrap
index b7a7362..bbe941d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -76,7 +76,6 @@ fi
chmod +x $SRC_ROOT/solenv/bin/build.pl
chmod +x $SRC_ROOT/solenv/bin/zipdep.pl
-chmod +x $SRC_ROOT/solenv/bin/gccinstlib.pl
# Local Variables:
# mode: shell-script
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
deleted file mode 100755
index 2deb4d4..000
--- a/solenv/bin/gccinstlib.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+$@}'
- if 0;
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# http://www.openoffice.org/license.html
-# for a copy of the LGPLv3 License.
-#
-#*
-
-$ENV{'LC_MESSAGES'} = 'C';
-
-$Dest = pop(@ARGV) || die No destination to copy to;
-
-$cc = $ENV{'CC'} || die No CC environment set;
-
-if ($Dest =~ /--help/ || @ARGV 1) {
-print Syntax:\n gcc-instlib library-in-libpath ...
destination-dir\n;
-exit (0);
-}
-
-%SrcAndDest = ();
-
-foreach $File (@ARGV) {
-my $string;
-
-my $NormFile = $File;
-$NormFile =~ s/\.so\.\d+/.so/;
-@search = ($File, $NormFile);
-
-foreach $entry (@search) {
-open (GCCOut, LANGUAGE=C LC_ALL=C $cc -print-file-name=$entry|) ||
-next;
-$string=GCCOut;
-chomp ($string);
-close (GCCOut);
-if (-e $string) {
-$SrcAndDest{$string} = $Dest/$File;
-last;
-}
-}
-}
-
-while (($Src, $FullDest) = each %SrcAndDest) {
-printf copy $Src to $FullDest\n;
-system (/bin/cp $Src $FullDest) die copy failed: $!;
-}
-
-
-foreach $File (@ARGV) {
-#https://bugzilla.redhat.com/show_bug.cgi?id=149465
-printf unprelinking $Dest/$File\n;
-#If it's already unprelinked .i.e. no .gnu.prelink_undo section, that's
fine
-#If prelink is not installed, it's massively unlikely that it's prelinked
-system (prelink -u $Dest/$File /dev/null 21);
-}
-
-exit (0);
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index bbd51bf..24c8a7a 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -176,7 +176,6 @@ RM+=$(RMFLAGS)
ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl
EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl
-GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl
# The dmake $(PWD) apparantly produces paths with symlinks resolved, while the
# bash pwd command by default produces paths with unresolved symlinks, so that
___
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/remotecontrol/BufferedStreamSocket.cxx |6 +++---
sd/source/ui/remotecontrol/Receiver.cxx |3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 25f7288ff8ea26e3d3976329d6bbcfe7ca5c5260
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Feb 19 12:18:12 2013 +0100
Fix crashes in sdremote after suspend/resume cycles.
Change-Id: I0f64820887919386f266290ae8b7c53f8a0a5458
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 30022d6..50ee736 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -77,7 +77,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
// Process buffer first incase data already present.
vectorchar::iterator aIt;
if ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
-!= aBuffer.end() )
+ != aBuffer.end() )
{
sal_uInt64 aLocation = aIt - aBuffer.begin();
@@ -96,9 +96,9 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
else
aRet = ::recv( mSocket, aBuffer[aRead], 100, 0 );
-if ( aRet == 0 )
+if ( aRet = 0 )
{
-return aRet;
+return 0;
}
// Prevent buffer from growing massively large.
if ( aRead MAX_LINE_LENGTH )
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index 572551d..3ec14de 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -52,7 +52,8 @@ void Receiver::Timeout()
{
std::vector rtl::OString aCommands( maExecQueue.front() );
maExecQueue.pop_front();
-executeCommand( aCommands );
+if( !aCommands.empty() )
+executeCommand( aCommands );
Start();
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sdr-dbus-for-4-0' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |6 +++---
sd/source/ui/remotecontrol/Receiver.cxx |3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 58085642d0ac8d526fc7e08cada644ed54e877ee
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Feb 19 12:18:12 2013 +0100
Fix crashes in sdremote after suspend/resume cycles.
Change-Id: I0f64820887919386f266290ae8b7c53f8a0a5458
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index c4f7f611..71fec17 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -73,7 +73,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
// Process buffer first incase data already present.
vectorchar::iterator aIt;
if ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
-!= aBuffer.end() )
+ != aBuffer.end() )
{
sal_uInt64 aLocation = aIt - aBuffer.begin();
@@ -92,9 +92,9 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
else
aRet = ::recv( mSocket, aBuffer[aRead], 100, 0 );
-if ( aRet == 0 )
+if ( aRet = 0 )
{
-return aRet;
+return 0;
}
// Prevent buffer from growing massively large.
if ( aRead MAX_LINE_LENGTH )
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index c3e7d8a..eaa2c6e 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -51,7 +51,8 @@ void Receiver::Timeout()
{
std::vector rtl::OString aCommands( maExecQueue.front() );
maExecQueue.pop_front();
-executeCommand( aCommands );
+if( !aCommands.empty() )
+executeCommand( aCommands );
Start();
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac m4/libo_externals.m4
configure.ac | 206 +-- m4/libo_externals.m4 | 30 --- 2 files changed, 152 insertions(+), 84 deletions(-) New commits: commit 324d2f94749dfd94c7f09d1923310e145bb64deb Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Feb 19 12:32:45 2013 +0100 Revert simplify external module check with macro Reverting this because it breaks a lot of stuff This reverts commit a2dbcf1e723e082a76ad1a7ef275f693dab34c98. diff --git a/configure.ac b/configure.ac index 33cd9f4..7e7406c 100644 --- a/configure.ac +++ b/configure.ac @@ -7135,10 +7135,6 @@ if test $with_system_zlib = auto; then esac fi -dnl we want to use libo_CHECK_SYSTEM_MODULE here too, but OS X is too stupid -dnl and has no pkg-config for it at least on some tinderboxes, -dnl so leaving that out for now -dnl libo_CHECK_SYSTEM_MODULE([zlib],[ZLIB],[zlib]) AC_MSG_CHECKING([which zlib to use]) if test $with_system_zlib = yes; then AC_MSG_RESULT([external]) @@ -7189,12 +7185,15 @@ fi AC_SUBST(SYSTEM_JPEG) AC_SUBST([MINGW_JPEG_DLL]) - dnl === dnl Check for system clucene dnl === -libo_CHECK_SYSTEM_MODULE([clucence],[CLUCENE],[liblucence-core]) +AC_MSG_CHECKING([which clucene to use]) if test $with_system_clucene = yes; then +AC_MSG_RESULT([external]) +SYSTEM_CLUCENE=YES +PKG_CHECK_MODULES(CLUCENE, libclucene-core) + AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS save_CPPFLAGS=$CPPFLAGS @@ -7209,96 +7208,175 @@ if test $with_system_clucene = yes; then AC_LANG_POP([C++]) CLUCENE_LIBS=$CLUCENE_LIBS -lclucene-contribs-lib +else +AC_MSG_RESULT([internal]) +SYSTEM_CLUCENE=NO +BUILD_TYPE=$BUILD_TYPE CLUCENE fi +AC_SUBST(SYSTEM_CLUCENE) +AC_SUBST(CLUCENE_CFLAGS) +AC_SUBST(CLUCENE_LIBS) dnl === dnl Check for system expat dnl === -libo_CHECK_SYSTEM_MODULE([expat],[EXPAT],[expat]) +AC_MSG_CHECKING([which expat to use]) if test $with_system_expat = yes; then +AC_MSG_RESULT([external]) +SYSTEM_EXPAT=YES +AC_CHECK_HEADER(expat.h, [], +[AC_MSG_ERROR(expat.h not found. install expat)], []) +AC_CHECK_LIB([expat], [XML_ParserCreate], [:], +[AC_MSG_RESULT(expat library not found or functional.)], []) libo_MINGW_CHECK_DLL([EXPAT], [libexpat]) -fi +else +AC_MSG_RESULT([internal]) +SYSTEM_EXPAT=NO +BUILD_TYPE=$BUILD_TYPE EXPAT +fi +AC_SUBST(SYSTEM_EXPAT) AC_SUBST([MINGW_EXPAT_DLL]) dnl === dnl Check for system libcdr dnl === -if test $_os = iOS; then -# libcdr depends on libwpd and libwpg and those are LGPL, publishing empty flags -libo_PUBLISH_MODULE([CDR]) +AC_MSG_CHECKING([which libcdr to use]) +if test $with_system_libcdr = yes; then +AC_MSG_RESULT([external]) +SYSTEM_LIBCDR=YES +PKG_CHECK_MODULES( CDR, libcdr-0.0 = 0.0.5 ) +elif test $_os = iOS; then +# libcdr depends on libwpd and libwpg and those are LGPL +AC_MSG_RESULT([none]) else -libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.0 = 0.0.5]) +AC_MSG_RESULT([internal]) +SYSTEM_LIBCDR=NO +BUILD_TYPE=$BUILD_TYPE CDR fi -SYSTEM_LIBCDR=$SYSTEM_CDR AC_SUBST(SYSTEM_LIBCDR) +AC_SUBST(CDR_CFLAGS) +AC_SUBST(CDR_LIBS) dnl === dnl Check for system libmspub dnl === -if test $_os = iOS; then -# libmspub depends on libwpd and libwpg and those are LGPL, publishing empty flags -libo_PUBLISH_MODULE([MSPUB]) +AC_MSG_CHECKING([which libmspub to use]) +if test $with_system_libmspub = yes; then +AC_MSG_RESULT([external]) +SYSTEM_LIBMSPUB=YES +PKG_CHECK_MODULES( MSPUB, libmspub-0.0 ) +elif test $_os = iOS; then +# libmspub depends on libwpd and libwpg and those are LGPL +AC_MSG_RESULT([none]) else -libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.0]) +AC_MSG_RESULT([internal]) +SYSTEM_LIBMSPUB=NO +BUILD_TYPE=$BUILD_TYPE MSPUB fi -SYSTEM_LIBMSPUB=$SYSTEM_MSPUB AC_SUBST(SYSTEM_LIBMSPUB) +AC_SUBST(MSPUB_CFLAGS) +AC_SUBST(MSPUB_LIBS) dnl === dnl Check for system libvisio dnl === -if test $_os = iOS; then -# libvisio depends on libwpd and libwpg and those are LGPL, publishing empty flags -libo_PUBLISH_MODULE([VISIO]) +AC_MSG_CHECKING([which libvisio to use]) +if test $with_system_libvisio = yes; then +AC_MSG_RESULT([external]) +SYSTEM_LIBVISIO=YES +PKG_CHECK_MODULES(
[Libreoffice-commits] core.git: 8 commits - connectivity/source extensions/source offapi/com reportbuilder/java reportdesign/source xmloff/inc xmloff/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |1 extensions/source/propctrlr/formmetadata.cxx |2 extensions/source/propctrlr/propcontroller.cxx |6 extensions/source/propctrlr/propcontroller.hxx |2 offapi/com/sun/star/report/XReportControlModel.idl |2 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java | 144 +- reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java |2 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java | 132 + reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java |4 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java |4 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java |2 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java | 40 ++ reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java | 10 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd |2 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java |2 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java |4 reportdesign/source/core/inc/ReportControlModel.hxx |2 reportdesign/source/filter/xml/xmlEnums.hxx |4 reportdesign/source/filter/xml/xmlExport.cxx |2 reportdesign/source/filter/xml/xmlReportElement.cxx |8 reportdesign/source/filter/xml/xmlfilter.cxx |2 reportdesign/source/ui/inc/metadata.hxx | 16 - reportdesign/source/ui/inspection/inspection.src |2 xmloff/inc/xmloff/xmltoken.hxx |2 xmloff/source/core/xmltoken.cxx |2 25 files changed, 221 insertions(+), 178 deletions(-) New commits: commit 7acc78705242464fa3fd5248cd8c73ff259ccc8b Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 19 12:27:51 2013 +0100 Tweak properties ordering That's so that heavily related ones stay together: PRINTREPEATEDVALUES PRINTWHENGROUPCHANGE Change-Id: I90513da4ae9ce0798dec91e5057b112735c1cdc2 diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 2757a27..a4812ea 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -129,9 +129,9 @@ namespace pcr DEF_INFO_3( READONLY, READONLY, READONLY, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( PRINTABLE, PRINTABLE, PRINTABLE, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( STEP, STEP, STEP, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), +DEF_INFO_3( WHEEL_BEHAVIOR,WHEEL_BEHAVIOR, WHEEL_BEHAVIOR, FORM_VISIBLE, ENUM, COMPOSEABLE ), DEF_INFO_3( TABSTOP, TABSTOP,TABSTOP, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( TABINDEX, TABINDEX, TABINDEX, FORM_VISIBLE, DIALOG_VISIBLE ), -DEF_INFO_3( WHEEL_BEHAVIOR,WHEEL_BEHAVIOR, WHEEL_BEHAVIOR, FORM_VISIBLE, ENUM, COMPOSEABLE ), DEF_INFO_2( BOUND_CELL,BOUND_CELL, BOUND_CELL, FORM_VISIBLE, DATA_PROPERTY ), DEF_INFO_3( CELL_EXCHANGE_TYPE,CELL_EXCHANGE_TYPE, CELL_EXCHANGE_TYPE,FORM_VISIBLE, DATA_PROPERTY, ENUM ), diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 97ee6b2..06493f0 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -113,14 +113,14 @@ namespace rptui #define PROPERTY_ID_WIDTH 14
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - external/gcc3_specific external/prj
external/gcc3_specific/makefile.mk | 43 - external/prj/build.lst |1 2 files changed, 44 deletions(-) New commits: commit 66e5365a626e99752110fb94b4e1469c0dff32bd Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Feb 19 12:51:45 2013 +0100 No need of gcc3_specific either Change-Id: Ia71e77dbde3d4fe791ca9cdd093951e708e53f32 Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk deleted file mode 100644 index 501acfa..000 --- a/external/gcc3_specific/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -PRJ=.. -PRJNAME=external -TARGET=gcc3_specific - -# -- -.INCLUDE: settings.mk -# -- - -.IF $(SYSTEM_STDLIBS) != YES $(COMID)==gcc3 - -.IF $(OS)!=MACOSX $(OS)!=IOS $(OS)!=ANDROID $(OS)!=FREEBSD $(OS)!=NETBSD $(OS)!=OPENBSD $(OS)!=DRAGONFLY - -.EXPORT : CC - -.IF $(OS)==AIX - -all .SEQUENTIAL : $(LB)$/libstdc++.a $(LB)$/libgcc_s.a - -$(LB)$/libstdc++.a : -$(GCCINSTLIB) libstdc++.a $(LB) - -$(LB)$/libgcc_s.a : -$(GCCINSTLIB) libgcc_s.a $(LB) - -.ELSE - -all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3) - - -$(LB)$/libstdc++.so.$(SHORTSTDCPP3) : -$(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB) - -$(LB)$/libgcc_s.so.$(SHORTSTDC3) : -$(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB) - -.ENDIF - -.ENDIF - -.ENDIF - -.INCLUDE: target.mk - diff --git a/external/prj/build.lst b/external/prj/build.lst index 65665db..90abdc9 100644 --- a/external/prj/build.lst +++ b/external/prj/build.lst @@ -1,7 +1,6 @@ el external : soltools NULL el externalusr1 - all el_mkout NULL el external\glibc nmake - all el_glibc NULL -el external\gcc3_specific nmake - all el_gcc3 NULL el external\mingwheaders nmake - w el_mingwheaders NULL el external\mingw-dlls nmake - w el_mingwdlls NULL el external\jawt nmake - w el_jawt NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSet.cxx| 138 - dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 10 - dbaccess/source/core/api/tablecontainer.cxx| 67 3 files changed, 105 insertions(+), 110 deletions(-) New commits: commit 3cfe6ad137aa358e26b0d7b1f591e91bd19957ce Author: GergŠMocsi gmocs...@gmail.com Date: Mon Feb 18 14:29:48 2013 +0100 fdo#38838, ::rtl::OUString to OUString, String to OUString ::rtl::OUString was replaced to OUString and all occurences of String was replaced to OUString in dbaccess/source/core/api Change-Id: I9771708408e04dcebe18f49a75c83036740f0ca2 Reviewed-on: https://gerrit.libreoffice.org/2239 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 9d64899..f3654a6 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -169,16 +169,16 @@ ORowSet::ORowSet( const Reference ::com::sun::star::lang::XMultiServiceFactory // sdb.RowSet Properties registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, m_aActiveConnection, ::getCppuType(static_cast Reference XConnection * (0))); -registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, m_aDataSourceName, ::getCppuType(static_cast ::rtl::OUString*(0))); -registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, m_aCommand, ::getCppuType(static_cast ::rtl::OUString*(0))); +registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, m_aDataSourceName, ::getCppuType(static_cast OUString*(0))); +registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, m_aCommand, ::getCppuType(static_cast OUString*(0))); registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, m_nCommandType, ::getCppuType(static_cast sal_Int32*(0))); -registerProperty(PROPERTY_ACTIVECOMMAND,PROPERTY_ID_ACTIVECOMMAND, nRBT, m_aActiveCommand, ::getCppuType(static_cast ::rtl::OUString*(0))); +registerProperty(PROPERTY_ACTIVECOMMAND,PROPERTY_ID_ACTIVECOMMAND, nRBT, m_aActiveCommand, ::getCppuType(static_cast OUString*(0))); registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, m_bIgnoreResult, ::getBooleanCppuType()); -registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, m_aFilter, ::getCppuType(static_cast ::rtl::OUString*(0))); -registerProperty(PROPERTY_HAVING_CLAUSE,PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, m_aHavingClause, ::getCppuType(static_cast ::rtl::OUString*(0))); -registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, m_aGroupBy, ::getCppuType(static_cast ::rtl::OUString*(0))); +registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, m_aFilter, ::getCppuType(static_cast OUString*(0))); +registerProperty(PROPERTY_HAVING_CLAUSE,PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, m_aHavingClause, ::getCppuType(static_cast OUString*(0))); +registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, m_aGroupBy, ::getCppuType(static_cast OUString*(0))); registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, m_bApplyFilter, ::getBooleanCppuType()); -registerProperty(PROPERTY_ORDER,PROPERTY_ID_ORDER, PropertyAttribute::BOUND, m_aOrder, ::getCppuType(static_cast ::rtl::OUString*(0))); +registerProperty(PROPERTY_ORDER,PROPERTY_ID_ORDER, PropertyAttribute::BOUND, m_aOrder, ::getCppuType(static_cast OUString*(0))); registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT,m_nPrivileges, ::getCppuType(static_cast sal_Int32*(0))); registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT,m_bModified, ::getBooleanCppuType());
INFRA IMPORTANT: users on kermit, save your files
Hello, kermit, our old web server, is nearing the end of its use. Just some Plone sites to migrate which I'm working on with Andreas, and after that, I'd like to put the machine off service, to begin with the migration of our second (and last) old server, bilbo. I ask everyone who was/is working on kermit to please save your personal files. Everything that is outside of /var/www/sites has *NOT* been automatically migrated, and will *NOT* be automatically migrated. If you have put stuff in /opt, /home or any other directory, please do save it now, to avoid unpleasant surprises. ;-) If you have any questions, feel free to poke hostmas...@documentfoundation.org directly. Thanks, Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |6 +++---
sd/source/ui/remotecontrol/Receiver.cxx |3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit e818eedacaddad52c83d3102df8f1183a675697c
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Feb 19 12:18:12 2013 +0100
Fix crashes in sdremote after suspend/resume cycles.
Change-Id: I0f64820887919386f266290ae8b7c53f8a0a5458
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index c4f7f611..71fec17 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -73,7 +73,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
// Process buffer first incase data already present.
vectorchar::iterator aIt;
if ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
-!= aBuffer.end() )
+ != aBuffer.end() )
{
sal_uInt64 aLocation = aIt - aBuffer.begin();
@@ -92,9 +92,9 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
else
aRet = ::recv( mSocket, aBuffer[aRead], 100, 0 );
-if ( aRet == 0 )
+if ( aRet = 0 )
{
-return aRet;
+return 0;
}
// Prevent buffer from growing massively large.
if ( aRead MAX_LINE_LENGTH )
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index c3e7d8a..eaa2c6e 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -51,7 +51,8 @@ void Receiver::Timeout()
{
std::vector rtl::OString aCommands( maExecQueue.front() );
maExecQueue.pop_front();
-executeCommand( aCommands );
+if( !aCommands.empty() )
+executeCommand( aCommands );
Start();
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svx/inc svx/source
svx/inc/svx/svdundo.hxx |9 ++
svx/source/svdraw/svdundo.cxx | 62 +-
2 files changed, 70 insertions(+), 1 deletion(-)
New commits:
commit 156d6552ce70ed387668d20e9000b5e725bda45f
Author: David Tardon dtar...@redhat.com
Date: Wed Feb 13 08:52:52 2013 +0100
fdo#34548 don't crash on undoing text frame removal
Change-Id: I48b95c6c0cbfb2f4c4b09cc90b254b96de40b3e9
(cherry picked from commit 115054fef08998c56cba8f14472df1d15007f635)
Reviewed-on: https://gerrit.libreoffice.org/2233
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 3b0436a..ba3a4b7 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -260,6 +260,10 @@ public:
//
class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj {
+class ObjListListener;
+friend class ObjListListener;
+
+private:
boolbOwner;
protected:
@@ -269,6 +273,7 @@ protected:
sal_uInt32 nOrdNum;
// Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes
// statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE
+ObjListListener*m_pListener;
protected:
SdrUndoObjList(SdrObject rNewObj, bool bOrdNumDirect = false);
@@ -277,6 +282,10 @@ protected:
void SetView(SdrView* pView1, SdrPageView* pPageView1) { pView=pView1;
pPageView=pPageView1; }
bool IsOwner() { return bOwner; }
void SetOwner(bool bNew);
+
+private:
+sal_uInt32 GetOrdNum() const;
+void SetOrdNum(sal_uInt32 nOrdNum_);
};
//
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index b3fca80..52e4f11 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -27,6 +27,8 @@
/
+#include svl/lstner.hxx
+
#include svx/svdundo.hxx
#include svx/svditext.hxx
#include svx/svdotext.hxx
@@ -673,11 +675,55 @@ rtl::OUString SdrUndoGeoObj::GetComment() const
+class SdrUndoObjList::ObjListListener : public SfxListener
+{
+public:
+ObjListListener(SdrUndoObjList rThat, SdrObject rObject, SfxBroadcaster
rBroadcaster);
+~ObjListListener();
+
+private:
+virtual void Notify(SfxBroadcaster rBroadcaster, const SfxHint rHint);
+
+private:
+SdrUndoObjList m_rThat;
+SdrObject m_rObject;
+SfxBroadcaster* m_pBroadcaster;
+};
+
+SdrUndoObjList::ObjListListener::ObjListListener(SdrUndoObjList rThat,
SdrObject rObject, SfxBroadcaster rBroadcaster)
+: m_rThat(rThat)
+, m_rObject(rObject)
+, m_pBroadcaster(rBroadcaster)
+{
+StartListening(*m_pBroadcaster);
+}
+
+SdrUndoObjList::ObjListListener::~ObjListListener()
+{
+if (m_pBroadcaster)
+EndListening(*m_pBroadcaster);
+}
+
+void SdrUndoObjList::ObjListListener::Notify(SfxBroadcaster, const SfxHint
rHint)
+{
+const SdrHint* const pSdrHint(dynamic_castconst SdrHint*(rHint));
+if (pSdrHint)
+{
+if ((pSdrHint-GetObject() == m_rObject) (pSdrHint-GetKind() ==
HINT_OBJCHG))
+{
+const sal_uInt32 nNewOrdNum(m_rObject.GetOrdNum());
+if (nNewOrdNum != m_rThat.GetOrdNum())
+m_rThat.SetOrdNum(nNewOrdNum);
+}
+}
+}
+
SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool bOrdNumDirect)
: SdrUndoObj(rNewObj),
bOwner(sal_False),
pView(NULL),
-pPageView(NULL)
+pPageView(NULL),
+m_pListener(NULL)
{
pObjList=pObj-GetObjList();
if (bOrdNumDirect) {
@@ -685,10 +731,14 @@ SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool
bOrdNumDirect)
} else {
nOrdNum=pObj-GetOrdNum();
}
+
+m_pListener = new ObjListListener(*this, *pObj, *pObjList-GetModel());
}
SdrUndoObjList::~SdrUndoObjList()
{
+delete m_pListener;
+
if (pObj!=NULL IsOwner())
{
// Attribute have to go back to the regular Pool
@@ -704,6 +754,16 @@ void SdrUndoObjList::SetOwner(bool bNew)
bOwner = bNew;
}
+sal_uInt32 SdrUndoObjList::GetOrdNum() const
+{
+return nOrdNum;
+}
+
+void SdrUndoObjList::SetOrdNum(sal_uInt32 nOrdNum_)
+{
+nOrdNum = nOrdNum_;
+}
+
void SdrUndoRemoveObj::Undo()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Personas Proxies
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Em 19-02-2013 07:54, Jan Holesovsky escreveu: Hi Olivier, Olivier Hallot píše v Po 18. 02. 2013 v 20:49 -0300: Is there a page where the user-agent of LibreOffice for Personas is described? Some organizations have proxies/firewalls that allows FFox to get the persona but blocks LibreOffice to get its own. I use what ucp provides, I do not set anything special, so it seems to me that it is set to 'LibreOffice' via this code: http://cgit.freedesktop.org/libreoffice/core/tree/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx#n1151 but haven't checked it in any sniffing tool to be 100% sure. All the best, Kendy Hello Kendy It helped me to look at with wireshark. I posted the answer in Askbot: http://ask.libreoffice.org/en/question/12565/libreoffice-personas-behind-proxy-firewall/ Thank you very much - -- 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/ iQEcBAEBAgAGBQJRI2VPAAoJEJp3R7nH3vLxbxsIAJWOxKX3AtEflztdw1Ed17yS eid74n9YYgH7QofPzOVi2UKfz5zH9QUpbdglCdXn7VQC8+YZgKfFC48ka5VixTQu hES18zSCSBdLPoaHc52KFCTZrcoUVk2SHqq7/Zd8omqosbWrD4paSl7PSOWkaZFA 6skZLYnfq+fQcOfpCqSQkN2Zz/XWEpjOLSdNFPGy2Fkl0jLLKv1UwJfJw2K8whHw enb9iFBa3UU+qLsLOB1PqRMUTLuD8ubOp/B8SSGw49LguTe+mQAlUAMNkEiFMaf8 F2zYFdIQjc0hAunwle/NlDZaZEPFiOM4ATUdsKnOavb1cehYsaFj+d9Jl3skeMk= =piAS -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 8 commits - config_host.mk.in configure.ac libcdr/Module_libcdr.mk libcmis/Module_libcmis.mk libmspub/Module_libmspub.mk libvisio/Module_libvisio.mk libwpd/Module_libwp
RepositoryExternal.mk | 42 +++ config_host.mk.in | 14 +- configure.ac | 187 +- libcdr/Module_libcdr.mk |2 libcmis/Module_libcmis.mk |2 libmspub/Module_libmspub.mk |2 libvisio/Module_libvisio.mk |2 libwpd/Module_libwpd.mk |2 libwpg/Module_libwpg.mk |2 libwps/Module_libwps.mk |2 m4/libo_externals.m4 | 30 + writerperfect/Module_writerperfect.mk | 18 +-- 12 files changed, 124 insertions(+), 181 deletions(-) New commits: commit cac113602c8f60b7eaea8709f6670b00b0925447 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Feb 19 12:42:30 2013 +0100 rename SYSTEM_LIBWPG to SYSTEM_WPG to remove specialcasing Change-Id: I7fe4da07852d538216b92b9350903b7022bdc9fa diff --git a/config_host.mk.in b/config_host.mk.in index 2e2fa56..e1249dd 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -555,7 +555,7 @@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@ export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ export SYSTEM_VISIO=@SYSTEM_VISIO@ export SYSTEM_WPD=@SYSTEM_WPD@ -export SYSTEM_LIBWPG=@SYSTEM_WPG@ +export SYSTEM_WPG=@SYSTEM_WPG@ export SYSTEM_WPS=@SYSTEM_WPS@ export SYSTEM_LIBXML=@SYSTEM_LIBXML@ export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@ commit 3a3254a900a6a8aad8d3321bf8b10d1770555cf5 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Feb 19 11:26:46 2013 +0100 rename SYSTEM_LIBWPS to SYSTEM_WPS to remove specialcasing Change-Id: I54880cd7d404692b8fee16c331c8e7a64508f52b diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d295a0c..aed173b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1319,7 +1319,7 @@ endef endif # SYSTEM_WPD -ifeq ($(SYSTEM_LIBWPG),YES) +ifeq ($(SYSTEM_WPG),YES) define gb_LinkTarget__use_wpg $(call gb_LinkTarget_set_include,$(1),\ @@ -1331,7 +1331,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPG_LIBS)) endef gb_ExternalProject__use_wpg := -else # !SYSTEM_LIBWPG +else # !SYSTEM_WPG $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ wpglib \ @@ -1352,10 +1352,10 @@ $(call gb_ExternalProject_use_static_libraries,$(1),wpglib) endef -endif # SYSTEM_LIBWPG +endif # SYSTEM_WPG -ifeq ($(SYSTEM_LIBWPS),YES) +ifeq ($(SYSTEM_WPS),YES) define gb_LinkTarget__use_wps $(call gb_LinkTarget_set_include,$(1),\ @@ -1367,7 +1367,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPS_LIBS)) endef gb_ExternalProject__use_wps := -else # !SYSTEM_LIBWPS +else # !SYSTEM_WPS $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ wpslib \ @@ -1385,7 +1385,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),wpslib) endef -endif # SYSTEM_LIBWPS +endif # SYSTEM_WPS ifeq ($(SYSTEM_LCMS2),YES) diff --git a/config_host.mk.in b/config_host.mk.in index 2d63e35..2e2fa56 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -555,8 +555,8 @@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@ export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ export SYSTEM_VISIO=@SYSTEM_VISIO@ export SYSTEM_WPD=@SYSTEM_WPD@ -export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@ -export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@ +export SYSTEM_LIBWPG=@SYSTEM_WPG@ +export SYSTEM_WPS=@SYSTEM_WPS@ export SYSTEM_LIBXML=@SYSTEM_LIBXML@ export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@ export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@ diff --git a/configure.ac b/configure.ac index 9013f05..ef68d52 100644 --- a/configure.ac +++ b/configure.ac @@ -7343,8 +7343,6 @@ else fi libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2]) fi -SYSTEM_LIBWPS=$SYSTEM_WPS -AC_SUBST(SYSTEM_LIBWPS) dnl === dnl Check for system libwpg @@ -7358,8 +7356,6 @@ else fi libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2]) fi -SYSTEM_LIBWPG=$SYSTEM_WPG -AC_SUBST(SYSTEM_LIBWPG) dnl === dnl Check whether freetype2 supports emboldening diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk index e628b89..63924c2 100644 --- a/libwpg/Module_libwpg.mk +++ b/libwpg/Module_libwpg.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libwpg)) -ifeq ($(SYSTEM_LIBWPG),NO) +ifeq ($(SYSTEM_WPG),NO) $(eval $(call gb_Module_add_targets,libwpg,\ ExternalPackage_libwpg \ diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk index a903fa9..b17779a 100644 --- a/libwps/Module_libwps.mk +++ b/libwps/Module_libwps.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libwps)) -ifeq ($(SYSTEM_LIBWPS),NO) +ifeq ($(SYSTEM_WPS),NO) $(eval $(call gb_Module_add_targets,libwps,\ ExternalPackage_libwps \ diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index faf9d43..0a9b8b5 100644 ---
[Libreoffice-commits] voting.git: vote/include
vote/include/schema.sql | 32 +--- 1 file changed, 17 insertions(+), 15 deletions(-) New commits: commit c5e8568a01780ca2ed3106e2508c656312945573 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Feb 19 13:36:54 2013 +0100 Make schema actually importable. diff --git a/vote/include/schema.sql b/vote/include/schema.sql index 4388d50..4b756f8 100644 --- a/vote/include/schema.sql +++ b/vote/include/schema.sql @@ -1,15 +1,6 @@ CREATE database elections; - /* this user has elevated rights - not to be used from php */ - CREATE USER 'voting'@'localhost' IDENTIFIED BY 'secure_pw'; - GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP ON elections.* TO 'voting'@'localhost'; - - /* this user has lowest-possible rights - to be used from php */ - CREATE USER 'web'@'localhost' IDENTIFIED BY 'whatever'; - GRANT SELECT ON elections.* TO 'web'@'localhost'; - GRANT SELECT,INSERT ON elections.election_anon_tokens TO 'web'@'localhost'; - GRANT SELECT,INSERT ON elections.election_votes TO 'web'@'localhost'; - GRANT SELECT,DELETE ON elections.election_tmp_tokens TO 'web'@'localhost'; + use elections; CREATE TABLE `elections` ( `id` int(11) NOT NULL auto_increment, @@ -46,25 +37,36 @@ ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /* -from members database we prepare anon tokens + from members database we prepare anon tokens then insert those anon tokens to database of course before a new election record should be created since its id is needed for anon_tokens and election_choices are to be inserted rest is handled by itself iirc */ -CREATE TABLE `election_votes` ( + CREATE TABLE `election_votes` ( `id` int(11) NOT NULL auto_increment, `choice_id` int(11) NOT NULL default '0', `anon_id` int(11) NOT NULL default '0', `preference` int(11) NOT NULL default '0', PRIMARY KEY (`id`) -) ENGINE=InnoDB; + ) ENGINE=InnoDB; -CREATE TABLE `election_results` ( + CREATE TABLE `election_results` ( `id` int(11) NOT NULL auto_increment, `election_id` int(11) NOT NULL default '0', `result` text NOT NULL, PRIMARY KEY (`id`) -) DEFAULT CHARSET=utf8; + ) DEFAULT CHARSET=utf8; + + /* this user has elevated rights - not to be used from php */ + CREATE USER 'voting'@'localhost' IDENTIFIED BY 'secure_pw'; + GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP ON elections.* TO 'voting'@'localhost'; + + /* this user has lowest-possible rights - to be used from php */ + CREATE USER 'web'@'localhost' IDENTIFIED BY 'whatever'; + GRANT SELECT ON elections.* TO 'web'@'localhost'; + GRANT SELECT,INSERT ON elections.election_anon_tokens TO 'web'@'localhost'; + GRANT SELECT,INSERT ON elections.election_votes TO 'web'@'localhost'; + GRANT SELECT,DELETE ON elections.election_tmp_tokens TO 'web'@'localhost'; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - external/prj
external/prj/d.lst |3 --- 1 file changed, 3 deletions(-) New commits: commit 256254bcf78ecfb383d7e87ea30c5942a53f1618 Author: Petr Mladek pmla...@suse.cz Date: Tue Feb 19 13:32:37 2013 +0100 bin also copying stdlibs into solver related to the removal of --without-system-stdlibs option Change-Id: I46291a2cd648505c47c6f4222aeb73bfbbd3fdc4 Reviewed-on: https://gerrit.libreoffice.org/2259 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/external/prj/d.lst b/external/prj/d.lst index ae55dd4..7ee2582 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -23,9 +23,6 @@ mkdir: %_DEST%\inc\external\wine ..\%__SRC%\lib\libautorec*.* %_DEST%\lib\lib*.* -..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib\libgcc_s.so.* -..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib\libstdc++.so.* - ..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll ..\msvcp80\msvcm80*.dll %_DEST%\bin ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cppcheck: 'is_vertical_run' is assigned a value that is never used (vcl module)
Hi Julien,
julien2412 píše v Pá 15. 02. 2013 v 15:13 -0800:
Cppcheck reported this:
vcl/coretext/salcoretextlayout.cxx
569 unreadVariable style Variable 'is_vertical_run' is assigned a value
that
is never used.
565 bool is_vertical_run = false;
566 CFDictionaryRef aDict = CTRunGetAttributes( run
);
567 if ( aDict ) {
568 const CFBooleanRef aValue = (const
CFBooleanRef)CFDictionaryGetValue( aDict, kCTVerticalFormsAttributeName );
569 is_vertical_run = (aValue ==
kCFBooleanTrue) ? true : false;
570 }
See
http://opengrok.libreoffice.org/xref/core/vcl/coretext/salcoretextlayout.cxx#565
Should vertical_run variable just be removed or should it be used in a
way?
From what I see, it has been introduced with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=83ba7b4e8f67cc3a21fbaf476621af509032ae47
Tor - can it go, or is it of some use for later?
Regards,
Kendy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-11'
Tag 'suse-3.6-11' created by Andras Timar ati...@suse.com at 2013-02-19 12:50 -0800 suse-3.6-11 Changes since suse-3.6-10-9: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-11'
Tag 'suse-3.6-11' created by Andras Timar ati...@suse.com at 2013-02-19 12:50 -0800 suse-3.6-11 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-11'
Tag 'suse-3.6-11' created by Andras Timar ati...@suse.com at 2013-02-19 12:50 -0800 suse-3.6-11 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-11'
Tag 'suse-3.6-11' created by Andras Timar ati...@suse.com at 2013-02-19 12:50 -0800 suse-3.6-11 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 Stephan Bergmann (1): fdo#51074: Start table cells with | | --- helpcontent2/to-wiki/wikiconv2.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-11'
Tag 'suse-3.6-11' created by Andras Timar ati...@suse.com at 2013-02-19 12:50 -0800 suse-3.6-11 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: stoc/test
stoc/test/testintrosp.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f8a75e4b225d3a998174f47066b9a72472546767
Author: Stefan Schick stinde...@googlemail.com
Date: Mon Feb 18 22:01:18 2013 +0100
Translated some comments from german to english
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 56e4f1a..e7c6b85 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -215,7 +215,7 @@ Sequence Property
ImplPropertySetInfo::getProperties(void)
if( !pSeq )
{
-// die Informationen für die Properties Width, Height und Name
anlegen
+// Create information for the properties Width, Height and Name
pSeq = new SequenceProperty( 3 );
Property * pAry = pSeq-getArray();
@@ -234,7 +234,7 @@ Sequence Property
ImplPropertySetInfo::getProperties(void)
pAry[2].Type = getCppuType( (OUString*) NULL );
pAry[2].Attributes = TRANSIENT;
}
-// Die Information über alle drei Properties liefern.
+// Return information about all three properties
return *pSeq;
}
@@ -249,7 +249,7 @@ Property ImplPropertySetInfo::getPropertyByName(const
OUString Name)
if( pAry[i].Name == Name )
return pAry[i];
}
-// Property unbekannt, also leere liefern
+// Property unknown, also return empty ones
return Property();
}
@@ -264,7 +264,7 @@ sal_Bool ImplPropertySetInfo::hasPropertyByName(const
OUString Name)
if( pAry[i].Name == Name )
return sal_True;
}
-// Property unbekannt, also leere liefern
+// Property unknown, also return empty ones
return sal_False;
}
@@ -275,7 +275,7 @@ class ImplIntroTest : public ImplIntroTestHelper
friend class ImplPropertySetInfo;
-// Properties fuer das PropertySet
+// Properties for the PropertySet
Any aAnyArray[10];
Reference XPropertySetInfo m_xMyInfo;
@@ -295,10 +295,10 @@ class ImplIntroTest : public ImplIntroTestHelper
Sequence Sequence Sequence sal_Int16aMultSeq;
Reference XIntroTest m_xIntroTest;
-// Daten fuer NameAccess
+// Data for NameAccess
Reference XIntroTest * pNameAccessTab;
-// Daten fuer IndexAccess
+// Data for IndexAccess
Reference XIntroTest * pIndexAccessTab;
sal_Int16 iIndexAccessCount;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cppcheck: 'is_vertical_run' is assigned a value that is never used (vcl module)
Tor - can it go, or is it of some use for later? Hmm, I think it could be kept and instead a comment added // Here the intent probably is to use this information for something ;) This is not my code originally, and it is work in progress. --tml ___ 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 48360, which changed state. Bug 48360 Summary: FILESAVE: Conditional formatting is lost when saving in another format than ODS (export of dxf records into xlsx) https://bugs.freedesktop.org/show_bug.cgi?id=48360 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New test to automatically importing all bugzilla documents
On Monday 18 of February 2013, Markus Mohrhard wrote: Currently I plan to run the script every 2 or 3 weeks on a TDF server and report the documents back. Hopefully some of these tasks can be automated by time and we only need someone to start the build. There are several open tasks and some things I noticed would be nice to have. I list them here to make is easier for others to step in and implement some of them or add their own ideas: TODOS: * Calc and Draw/Impress document import * Script allowing to manage running several scripts in parallel: In therory this is a task that can be done in perfect parallelisation and it would help with the time needed as we have alone more than 15000 writer documents, at least more than 8000 calc documents ... How long does it take to run the complete test? I'm asking because the practice with tinderboxes is often that if one of them collects a larger number of commits between two rebuilds, then if a breakage shows up, nobody seems to feel responsible. So, if possible, I think it'd be better if this was run more often than 2-3 weeks, possibly as another tinderbox running the check. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/global.hxx |4 ++--
sc/inc/scabstdlg.hxx |4 ++--
sc/source/core/data/docpool.cxx|4 ++--
sc/source/core/data/global.cxx | 10 +-
sc/source/core/data/table3.cxx |4 ++--
sc/source/core/tool/compiler.cxx |2 +-
sc/source/filter/xml/xmlwrap.cxx |8
sc/source/ui/attrdlg/scdlgfact.cxx |4 ++--
sc/source/ui/attrdlg/scdlgfact.hxx |4 ++--
sc/source/ui/inc/inscodlg.hxx |6 +++---
sc/source/ui/miscdlgs/inscodlg.cxx |2 +-
11 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 742515639168cd35a0c2036a5bf6c46b2a3a554e
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date: Thu Feb 14 20:15:38 2013 +0100
fdo#38838 ScGlobal::GetRscString() now returns OUString instead of String.
Cleaned up the call sites.
Change-Id: I6c688cecd4f872ed064ccfa3af4b402a779860dc
Reviewed-on: https://gerrit.libreoffice.org/2155
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 53ede60..978985a 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -494,7 +494,7 @@ class ScGlobal
static FuncCollection* pFuncCollection;
static ScUnoAddInCollection* pAddInCollection;
static ScUserList* pUserList;
-static String** ppRscString;
+static OUString** ppRscString;
static String* pStrScDoc;
static String* pEmptyString;
static ::rtl::OUString* pEmptyOUString;
@@ -553,7 +553,7 @@ public:
SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
SC_DLLPUBLIC static ScUserList* GetUserList();
static void SetUserList( const ScUserList* pNewList );
-SC_DLLPUBLIC static const String GetRscString( sal_uInt16 nIndex );
+SC_DLLPUBLIC static const OUString GetRscString( sal_uInt16 nIndex
);
static void OpenURL( const String rURL, const String
rTarget );
SC_DLLPUBLIC static String GetAbsDocName( const String
rFileName,
SfxObjectShell* pShell );
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 0dc4345..4113b64 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -388,8 +388,8 @@ public:
virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*
pParent, //add for ScInsertContentsDlg
int nId,
-sal_uInt16
nCheckDefaults = 0,
-const
String* pStrTitle = NULL ) = 0;
+sal_uInt16
nCheckDefaults = 0,
+const
OUString* pStrTitle = NULL ) = 0;
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent,
ScViewData rViewData,
SCTAB nTabCount, bool bFromFile) = 0;
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 8a4e870..535a480 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -994,7 +994,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ),
ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE )
{
-rText = OUString(ScGlobal::GetRscString(STR_HEADER)) + ( +
aBuffer + ) ;
+rText = ScGlobal::GetRscString(STR_HEADER) + ( + aBuffer +
) ;
}
}
break;
@@ -1005,7 +1005,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ),
ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE )
{
-rText = OUString(ScGlobal::GetRscString(STR_FOOTER)) + ( +
aBuffer + ) ;
+rText = ScGlobal::GetRscString(STR_FOOTER) + ( + aBuffer +
) ;
}
}
break;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 3a00dd5..0d0a3d0 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -88,7 +88,7 @@ ScAutoFormat* ScGlobal::pAutoFormat = NULL;
FuncCollection* ScGlobal::pFuncCollection = NULL;
ScUnoAddInCollection* ScGlobal::pAddInCollection = NULL;
ScUserList* ScGlobal::pUserList = NULL;
-String**ScGlobal::ppRscString = NULL;
+OUString** ScGlobal::ppRscString = NULL;
LanguageTypeScGlobal::eLnge = LANGUAGE_SYSTEM;
::com::sun::star::lang::Locale* ScGlobal::pLocale = NULL;
SvtSysLocale* ScGlobal::pSysLocale = NULL;
@@ -339,7 +339,7 @@ void ScGlobal::SetUserList(
Gdb support for exceptions (Re: using backtrace() in exception throwing?)
On Monday 18 of February 2013, Tom Tromey wrote:
Lubos == Lubos Lunak l.lu...@suse.cz writes:
Lubos This could be very useful ('catch throw' is so cumbersome in
Lubos gdb),
Is there something we could do to improve it?
I don't know how much control gdb over exception handling has, so I don't
know :).
What I was refering to was the problem that if a catch block catches an
exception, it's often difficult to find out where it actually came from.
Using 'catch catch' doesn't show where it originated (unless I missed a
non-obvious way). And if the exception propagated out of complex nesting of
function calls, then 'catch throw' may trigger a number of times for
exceptions that will be handled elsewhere.
So it would be useful to have some kind of 'catch throw-for-this-catch', or
at least some 'show exception' (mentioned in 'help catch') that would show
where the currently propagating exception started.
--
Lubos Lunak
l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Re: Translated some comments from german to english
Hey, thanks for the reply. All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Regards, Stefan -- View this message in context: http://nabble.documentfoundation.org/PATCH-Translated-some-comments-from-german-to-english-tp4038525p4038651.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
Re: New test to automatically importing all bugzilla documents
2013/2/19 Lubos Lunak l.lu...@suse.cz: On Monday 18 of February 2013, Markus Mohrhard wrote: Currently I plan to run the script every 2 or 3 weeks on a TDF server and report the documents back. Hopefully some of these tasks can be automated by time and we only need someone to start the build. There are several open tasks and some things I noticed would be nice to have. I list them here to make is easier for others to step in and implement some of them or add their own ideas: TODOS: * Calc and Draw/Impress document import * Script allowing to manage running several scripts in parallel: In therory this is a task that can be done in perfect parallelisation and it would help with the time needed as we have alone more than 15000 writer documents, at least more than 8000 calc documents ... How long does it take to run the complete test? The writer test files are nearly completed now after about 20 hours with a dbgutil build. But I have been running the test in parallel with up to 5 instances with one for each of the tested file formats. I'm asking because the practice with tinderboxes is often that if one of them collects a larger number of commits between two rebuilds, then if a breakage shows up, nobody seems to feel responsible. So, if possible, I think it'd be better if this was run more often than 2-3 weeks, possibly as another tinderbox running the check. At least for writer this should be the smaller problem right now. What I can see from the long list of crashes that have been reproduced already there is for now enough work on fixing the existing crashes. Additionally this script still needs a bit of manual love and I suspect it will finally need about 2 days for a full run with Calc, Writer and Draw/Impress. All this limited to ODF, OOXML, the old binary Microsoft formats and a few more formats like RTF. The experience we have in Calc where we did such tests manually already before the 3.5 and 4.0 release is that if the number of documents is small enough (in our case we had about 15) and all core developers are interested in it you can get all crashes fixed in reasonable time. I hope that everybody feels at least responsible enough to help clean that list before a release. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docfly.cxx | 33 ++---
1 file changed, 18 insertions(+), 15 deletions(-)
New commits:
commit e70defefd80c44646a742ff581bca9b467b8e713
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Feb 17 15:01:37 2013 -0600
coverity#983198 Resource leak
Change-Id: Ie8b8741fbad8e5e9f600dc1497b64ecd27515818
Reviewed-on: https://gerrit.libreoffice.org/2204
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 729dff7..11ad910 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -811,22 +811,25 @@ bool SwDoc::ChgAnchor( const SdrMarkList _rMrkList,
}
// #i54336#
-if ( pNewAnchorFrm pOldAsCharAnchorPos )
+if( pOldAsCharAnchorPos )
{
-// We need to handle InCntnts in a special way:
-// The TxtAttribut needs to be destroyed which, unfortunately,
also
-// destroys the format. To avoid that, we disconnect the
format from
-// the attribute.
-const xub_StrLen nIndx(
pOldAsCharAnchorPos-nContent.GetIndex() );
-SwTxtNode* pTxtNode(
pOldAsCharAnchorPos-nNode.GetNode().GetTxtNode() );
-OSL_ENSURE( pTxtNode, SwDoc::ChgAnchor(..) - missing
previous anchor text node for as-character anchored object );
-OSL_ENSURE( pTxtNode-HasHints(), Missing FlyInCnt-Hint. );
-SwTxtAttr * const pHnt =
-pTxtNode-GetTxtAttrForCharAt( nIndx, RES_TXTATR_FLYCNT );
-const_castSwFmtFlyCnt(pHnt-GetFlyCnt()).SetFlyFmt();
-
-// They are disconnected. We now have to destroy the attribute.
-pTxtNode-DeleteAttributes( RES_TXTATR_FLYCNT, nIndx, nIndx );
+if ( pNewAnchorFrm)
+{
+// We need to handle InCntnts in a special way:
+// The TxtAttribut needs to be destroyed which,
unfortunately, also
+// destroys the format. To avoid that, we disconnect the
format from
+// the attribute.
+const xub_StrLen nIndx(
pOldAsCharAnchorPos-nContent.GetIndex() );
+SwTxtNode* pTxtNode(
pOldAsCharAnchorPos-nNode.GetNode().GetTxtNode() );
+OSL_ENSURE( pTxtNode, SwDoc::ChgAnchor(..) - missing
previous anchor text node for as-character anchored object );
+OSL_ENSURE( pTxtNode-HasHints(), Missing FlyInCnt-Hint.
);
+SwTxtAttr * const pHnt =
+pTxtNode-GetTxtAttrForCharAt( nIndx,
RES_TXTATR_FLYCNT );
+const_castSwFmtFlyCnt(pHnt-GetFlyCnt()).SetFlyFmt();
+
+// They are disconnected. We now have to destroy the
attribute.
+pTxtNode-DeleteAttributes( RES_TXTATR_FLYCNT, nIndx,
nIndx );
+}
delete pOldAsCharAnchorPos;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: autodoc/source
autodoc/source/display/idl/hfi_typetext.cxx | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 396eb4f5cf8b37cd2a9f14d85764e03761ade19f
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Feb 18 00:47:58 2013 -0600
coverity#440141 Null Dereference
Change-Id: Ifdbfecdb5443024f7186882cf09d8fba998e94f2
Reviewed-on: https://gerrit.libreoffice.org/2213
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/autodoc/source/display/idl/hfi_typetext.cxx
b/autodoc/source/display/idl/hfi_typetext.cxx
index a100066..03c4b26 100644
--- a/autodoc/source/display/idl/hfi_typetext.cxx
+++ b/autodoc/source/display/idl/hfi_typetext.cxx
@@ -543,23 +543,19 @@ int
HF_IdlTypeText::count_Sequences( const char * i_sFullType ) const
{
int ret = 0;
+const char* pCount = i_sFullType;
-for ( const char * pCount = i_sFullType;
- *pCount != 0;
- )
+while((pCount = strstr(pCount,sequence)) != 0)
{
-pCount = strstr(pCount,sequence);
-if (pCount != 0)
+
+pCount += sizeof(sequence); // = strlen(sequence) + 1 for ''.
+if ( *(pCount-1) == '\0' )
{
-pCount += sizeof(sequence); // = strlen(sequence) + 1 for ''.
-if ( *(pCount-1) == '\0' )
-{
-// SYNTAX_ERR
-return 0;
-}
-++ret;
+// SYNTAX_ERR
+return 0;
}
-} // end for
+ret += 1;
+}
return ret;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New test to automatically importing all bugzilla documents
Markus Mohrhard schrieb: so after much work the idea to automatically import all bugzilla files was succesful. Hi Markus, that's GREAT! Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Makefile.in
Makefile.in |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit f37df270f1a984f0a6138f4f22fc79a50e71dcc2 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Feb 19 15:22:03 2013 +0100 Revert Improve the make dev-install message. The one command running the soffice wrapper that does also some extra work is the usual and simple case, running soffice.bin is needed only when launching LO in gdb. This reverts commit eee2fe2e7efe1476d363bfb36b09d7e0d4042438. Conflicts: Makefile.in diff --git a/Makefile.in b/Makefile.in index 0eedd22..45c2927 100644 --- a/Makefile.in +++ b/Makefile.in @@ -386,9 +386,7 @@ ifeq ($(OS),LINUX) @echo @echo Developer installation finished, you can now execute: @echo - @echo cd $(SRCDIR)/install/program - @echo . ./ooenv - @echo ./soffice.bin + @echo $(SRCDIR)/install/program/soffice else ifeq ($(OS),MACOSX) @echo @echo Developer installation finished, you can now run: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit bf46dfdb45b1d6cd99a5c729ee98df89db363225
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Feb 17 13:10:03 2013 -0600
coverity#983356 ressource leak
Change-Id: Idcc2d548363ddab04dd8acaa1dfb854a19ca47ef
Reviewed-on: https://gerrit.libreoffice.org/2200
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 8661138..ece259a 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1325,7 +1325,13 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
mGraphicsGradientStyles.push_back(new
TagCloseElement(draw:opacity));
}
}
-
+else
+{
+/* if mxGradient.count() == 1 for some reason we would leak
+ * pDrawGradientElement
+ */
+delete pDrawGradientElement;
+}
if(!bUseOpacityGradient)
delete pDrawOpacityElement;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - setup_native/source solenv/bin
setup_native/source/packinfo/packinfo_ure.txt |6 ++-
solenv/bin/modules/installer/epmfile.pm | 43 ++
2 files changed, 34 insertions(+), 15 deletions(-)
New commits:
commit 5b7b42f867908daf9fea631b480935ced0735bcf
Author: Petr Mladek pmla...@suse.cz
Date: Tue Feb 19 16:04:37 2013 +0100
fix dependencies of the obsolete stdlibs package on linux
The old version should get repalced by the ure package. It should also
conflict
with the new ure package.
This commit adds support for %incompat epm tag. It produces conflicts in rpm
and deb. It can be defined in setup_native/source/packinfo by
linuxincompat.
This commit also removes obsolete hack for debian dependencies.
libreoffice-bundled conflict is mentioned in the desktop-integration package
these day. The hack in epmfile.pm was not used because no package
used replace tag.
Change-Id: I5e9cb89a6108c22c61287fce1ffc6baf3f618d15
Reviewed-on: https://gerrit.libreoffice.org/2260
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/setup_native/source/packinfo/packinfo_ure.txt
b/setup_native/source/packinfo/packinfo_ure.txt
index dfa0375..36ebc0d 100644
--- a/setup_native/source/packinfo/packinfo_ure.txt
+++ b/setup_native/source/packinfo/packinfo_ure.txt
@@ -21,7 +21,8 @@ module = gid_Module_Root
solarispackagename = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
solarisrequires = SUNWzlibr
solarisprovides = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
-provides = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
+linuxreplaces = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
+linuxincompat = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
packagename = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
copyright = 2012 The Document Foundation
solariscopyright = solariscopyrightfile
@@ -36,7 +37,8 @@ module = gid_Module_Root_Ure_Hidden
solarispackagename = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
solarisrequires = SUNWzlibr
solarisprovides = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
-provides = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
+linuxreplaces = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
+linuxincompat = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
packagename = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
copyright = 2012 The Document Foundation
solariscopyright = solariscopyrightfile
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index fa66fd9..26406cc 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -265,6 +265,8 @@ sub create_epm_header
# %readme /test/replace/01/README01
# %requires foo
# %provides bar
+# %replaces bar
+# %incompat bar
# The first language in the languages array determines the language of
license and readme file
@@ -512,23 +514,38 @@ sub create_epm_header
$onereplaces = debian_rewrite($onereplaces);
$line = %replaces . . $onereplaces . \n;
push(@epmheader, $line);
+}
+}
+}
-# Force the openofficeorg packages to get removed,
-# see
http://www.debian.org/doc/debian-policy/ch-relationships.html
-# 7.5.2 Replacing whole packages, forcing their removal
+# including %incompat
-if ( $installer::globals::debian )
-{
-$line = %incompat . . $onereplaces . \n;
-push(@epmheader, $line);
-}
-}
+my $incompat = ;
+
+if (( $installer::globals::issolarispkgbuild ) ( !
$installer::globals::patch ))
+{
+$incompat = solarisincompat; # the name in the packagelist
+}
+elsif (( $installer::globals::islinuxbuild ) ( !
$installer::globals::patch ))
+{
+$incompat = linuxincompat;# the name in the packagelist
+}
-if ( $installer::globals::debian
$variableshashref-{'UNIXPRODUCTNAME'} eq 'libreoffice' )
+if (( $incompat ) ( ! $installer::globals::patch ))
+{
+if ( $onepackage-{$incompat} )
+{
+my $incompatstring = $onepackage-{$incompat};
+
+my $allincompat =
installer::converter::convert_stringlist_into_array(\$incompatstring, ,);
+
+for ( my $i = 0; $i = $#{$allincompat}; $i++ )
{
-$line = %provides . libreoffice-unbundled\n;
-push(@epmheader, $line);
-$line = %incompat . libreoffice-bundled\n;
+my $oneincompat = ${$allincompat}[$i];
+$oneincompat =~ s/\s*$//;
+
installer::packagelist::resolve_packagevariables(\$oneincompat,
$variableshashref, 1);
+$oneincompat = debian_rewrite($oneincompat);
+$line = %incompat . .
[Libreoffice-commits] core.git: extensions/source
extensions/source/macosx/spotlight/OOoSpotlightImporter.m | 21 ++
1 file changed, 16 insertions(+), 5 deletions(-)
New commits:
commit b8da61acb2bb887a7335a5db82b8b5ae1e0fab69
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 19 17:10:50 2013 +0200
Fix scan for central directory end signature in ODF in Spotlight importer
Once this was fixed it seems to work nicely. Add keywords in
File:Properties and they show up in Finder's Properties, and Spotlight
finds text from the document contents.
Change-Id: I203576a5a7e53ca3485b0a82f0c6d06122f361d1
diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index 964b627..a4cefc0 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -208,21 +208,32 @@ static bool areHeadersConsistent(const LocalFileHeader
*header, const CentralDir
static bool findCentralDirectoryEnd(NSFileHandle *file)
{
+// Assume the cdir end is in the last 1024 bytes
+// Scan backward from end of file for the end signature
+
[file seekToEndOfFile];
unsigned long long fileLength = [file offsetInFile];
-[file seekToFileOffset: 0];
-while ([file offsetInFile] fileLength)
+if (fileLength 10)
+return false;
+
+[file seekToFileOffset: (fileLength - 4)];
+
+unsigned long long offset;
+while ((offset = [file offsetInFile]) 0 offset = fileLength - 1024)
{
-unsigned long long offset = [file offsetInFile];
unsigned signature = readInt(file);
if (signature == CDIR_END_SIG)
{
-[file seekToFileOffset: (offset - 4)];
+// Seek back over the CDIR_END_SIG
+[file seekToFileOffset: offset];
return true;
}
else
-[file seekToFileOffset: (offset - 3)];
+{
+// Seek one byte back
+[file seekToFileOffset: (offset - 1)];
+}
}
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice Development [ Comments in .pptx ] (Annotations Issue)
Vinaya Mandke wrote: I followed the PPT (ImportComment10) flow and was able to display the comments!!! Hi Vinaya, just checking in - how's it going, any patch you would be comfortable submitting to gerrit already? ;) (https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch) Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added Depends on||59928 --- Comment #110 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- I nominate bug 59928 as it is a regression which make fields (like cross-reference) useless. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmlreader/inc
xmlreader/inc/xmlreader/span.hxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit a062799bd6902061895e19cace0099fadf696bb4
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Tue Feb 19 12:41:55 2013 +0100
add equals(OString const text) to Span
useful when removing RTL_CONST_STRINGPARAM
Change-Id: Ic131876a3fb38e69185342c4c7a46d536d60c8e5
Reviewed-on: https://gerrit.libreoffice.org/2256
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/xmlreader/inc/xmlreader/span.hxx b/xmlreader/inc/xmlreader/span.hxx
index 6233b5b..58266e9 100644
--- a/xmlreader/inc/xmlreader/span.hxx
+++ b/xmlreader/inc/xmlreader/span.hxx
@@ -53,6 +53,11 @@ struct OOO_DLLPUBLIC_XMLREADER Span {
return equals(Span(textBegin, textLength));
}
+inline bool equals(rtl::OString const text) const {
+return rtl_str_compare_WithLength(
+begin, length, text.getStr(), text.getLength()) == 0;
+}
+
rtl::OUString convertFromUtf8() const;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/macosx/spotlight/OOoSpotlightImporter.m |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 95e6a0885e65cc57b11719cc0658be9d8b78fba9
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 19 17:38:19 2013 +0200
Guard against unsigned ickyness for files less than 1024 bytes
Change-Id: I360fb8db35b36194c4f7ae08c93126e2a7bda853
diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index a4cefc0..3a72d53 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -219,8 +219,14 @@ static bool findCentralDirectoryEnd(NSFileHandle *file)
[file seekToFileOffset: (fileLength - 4)];
+unsigned long long limit;
+if (fileLength 1024)
+limit = fileLength - 1024;
+else
+limit = 0;
+
unsigned long long offset;
-while ((offset = [file offsetInFile]) 0 offset = fileLength - 1024)
+while ((offset = [file offsetInFile]) limit)
{
unsigned signature = readInt(file);
if (signature == CDIR_END_SIG)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0-1'
New branch 'libreoffice-4-0-1' available with the following commits: commit 9b616a969056b256cd9c548e53baaf16c9dc298d Author: Petr Mladek pmla...@suse.cz Date: Tue Feb 19 16:40:01 2013 +0100 Branch libreoffice-4-0-1 This is 'libreoffice-4-0-1' - the stable branch for the 4.0.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0-1'
New branch 'libreoffice-4-0-1' available with the following commits: commit a844278209271c5500e4dee81b23da4cbebafc88 Author: Petr Mladek pmla...@suse.cz Date: Tue Feb 19 16:40:01 2013 +0100 Branch libreoffice-4-0-1 This is 'libreoffice-4-0-1' - the stable branch for the 4.0.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0-1'
New branch 'libreoffice-4-0-1' available with the following commits: commit fd021ef13d945d0885089068ef9d87a6c93ae792 Author: Petr Mladek pmla...@suse.cz Date: Tue Feb 19 16:40:02 2013 +0100 Branch libreoffice-4-0-1 This is 'libreoffice-4-0-1' - the stable branch for the 4.0.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0-1'
New branch 'libreoffice-4-0-1' available with the following commits: commit 0b20ad793aae7ebfb3f4cafe179b0a8300020ceb Author: Petr Mladek pmla...@suse.cz Date: Tue Feb 19 16:40:09 2013 +0100 Branch libreoffice-4-0-1 This is 'libreoffice-4-0-1' - the stable branch for the 4.0.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I80a7ba7cc65ed9ffe97f3b98656291dabe172df1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac i18npool/CustomTarget_breakiterator.mk i18npool/source i18nutil/source xmlreader/inc
config_host.mk.in |1 +
configure.ac| 11 +--
i18npool/CustomTarget_breakiterator.mk |1 +
i18npool/source/breakiterator/data/line.txt |3 +--
i18nutil/source/utility/unicode.cxx | 20 +++-
xmlreader/inc/xmlreader/span.hxx| 16 +++-
6 files changed, 38 insertions(+), 14 deletions(-)
New commits:
commit 826cb27cc80ae843927d68e0337ad2caffa9f023
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 19 15:36:44 2013 +
reuse the ConstCharArrayDetector in Span
Change-Id: I33bc390aaa8f6e3cc2505632670970038140eb3c
diff --git a/xmlreader/inc/xmlreader/span.hxx b/xmlreader/inc/xmlreader/span.hxx
index 58266e9..f7cd157 100644
--- a/xmlreader/inc/xmlreader/span.hxx
+++ b/xmlreader/inc/xmlreader/span.hxx
@@ -22,7 +22,8 @@
#include sal/config.h
-#include rtl/string.h
+#include rtl/string.hxx
+#include rtl/stringutils.hxx
#include sal/types.h
#include xmlreader/detail/xmlreaderdllapi.hxx
@@ -58,6 +59,19 @@ struct OOO_DLLPUBLIC_XMLREADER Span {
begin, length, text.getStr(), text.getLength()) == 0;
}
+#ifdef RTL_FAST_STRING
+/**
+ @overload
+ This function accepts an ASCII string literal as its argument.
+*/
+template typename T bool
+equals( T literal, typename rtl::internal::ConstCharArrayDetector T,
rtl::internal::Dummy ::Type = rtl::internal::Dummy() ) SAL_THROW(())
+{
+assert( strlen( literal ) == rtl::internal::ConstCharArrayDetector T
::size - 1 );
+return rtl_str_compare_WithLength( begin, length, literal,
rtl::internal::ConstCharArrayDetector T, void ::size - 1 );
+}
+#endif
+
rtl::OUString convertFromUtf8() const;
};
commit 138e5a051805ca8a3b7e9626742cc475e3577cc4
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 19 14:32:41 2013 +
make it possible to build with system icu 4.2 (RHEL-6)
Change-Id: I69bf7bc33a619c4aa9483e2dc3d5540e4dfa7458
diff --git a/config_host.mk.in b/config_host.mk.in
index e1249dd..a40d361 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -252,6 +252,7 @@ export ICECREAM_RUN=@ICECREAM_RUN@
export ICU_MAJOR=@ICU_MAJOR@
export ICU_MICRO=@ICU_MICRO@
export ICU_MINOR=@ICU_MINOR@
+export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
export
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@
export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@
export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
diff --git a/configure.ac b/configure.ac
index ef68d52..6fad25a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8457,6 +8457,7 @@ SYSTEM_GENCMN=
ICU_MAJOR=49
ICU_MINOR=1
ICU_MICRO=1
+ICU_RECLASSIFIED_CLOSE_PARENTHESIS=YES
ICU_RECLASSIFIED_PREPEND_SET_EMPTY=YES
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=YES
ICU_RECLASSIFIED_HEBREW_LETTER=YES
@@ -8481,10 +8482,10 @@ if test $with_system_icu = yes; then
ICU_MINOR=`echo $ICU_VERSION | cut -d. -f2`
ICU_MICRO=`echo $ICU_VERSION | cut -d. -f3`
-if test $ICU_MAJOR -ge 49 -o \( $ICU_MAJOR = 4 -a $ICU_MINOR -ge
6 \); then
+if test $ICU_MAJOR -ge 49 -o \( $ICU_MAJOR = 4 -a $ICU_MINOR -ge
2 \); then
AC_MSG_RESULT([OK, $ICU_VERSION])
else
-AC_MSG_ERROR([not suitable, only = 4.6 supported currently])
+AC_MSG_ERROR([not suitable, only = 4.2 supported currently])
fi
if test $cross_compiling = yes -a \( $with_system_icu_for_build =
yes -o $with_system_icu_for_build = force \); then
@@ -8519,6 +8520,11 @@ You can use --with-system-icu-for-build=force to use it
anyway.])
if test -z $SYSTEM_GENCMN; then
AC_MSG_ERROR([\'gencmn\' not found in \$PATH, install the icu
development tool \'gencmn\'])
fi
+if test $ICU_MAJOR -ge 49 -o \( $ICU_MAJOR = 4 -a $ICU_MINOR
-ge 4 \); then
+ICU_RECLASSIFIED_CLOSE_PARENTHESIS=YES
+else
+ICU_RECLASSIFIED_CLOSE_PARENTHESIS=NO
+fi
if test $ICU_MAJOR -ge 49; then
ICU_RECLASSIFIED_PREPEND_SET_EMPTY=YES
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=YES
@@ -8552,6 +8558,7 @@ AC_SUBST(SYSTEM_GENCMN)
AC_SUBST(ICU_MAJOR)
AC_SUBST(ICU_MINOR)
AC_SUBST(ICU_MICRO)
+AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)
AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER)
diff --git a/i18npool/CustomTarget_breakiterator.mk
b/i18npool/CustomTarget_breakiterator.mk
index da3c224..887b11e 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -97,6 +97,7 @@ $(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(call
gb_ExternalExecutable_g
$(i18npool_BIDIR)/%.txt : \
$(SRCDIR)/i18npool/source/breakiterator/data/%.txt |
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |2 -
2 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 3df31ccde8ed719c6617eeb6114d5365ae343847
Author: Petr Mladek pmla...@suse.cz
Date: Tue Feb 19 16:44:31 2013 +0100
bump product version to 4.0.2.0+, reset number to 0
Change-Id: I9121d7148d1f5343b3b61bfe4ddcbeb9a9253bed
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index d913cd8..115b31a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.1.0
+UREPACKAGEVERSION 4.0.2.0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .1.0
+PRODUCTEXTENSION .2.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.1.0
+ABOUTBOXPRODUCTVERSION 4.0.2.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.1.0
+PACKAGEVERSION 4.0.2.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .1.0
+PRODUCTEXTENSION .2.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.1.0
+ABOUTBOXPRODUCTVERSION 4.0.2.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.1.0
+PACKAGEVERSION 4.0.2.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.1.0
+PACKAGEVERSION 4.0.2.0
PACKAGEREVISION 1
-PRODUCTEXTENSION .1.0
+PRODUCTEXTENSION .2.0
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .1.0
+PRODUCTEXTENSION .2.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.1.0
+PACKAGEVERSION 4.0.2.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .1.0
+PRODUCTEXTENSION .2.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.1.0
+PACKAGEVERSION 4.0.2.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .1.0
+PRODUCTEXTENSION .2.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.1.0
+PACKAGEVERSION 4.0.2.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .1.0
+PRODUCTEXTENSION .2.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.1.0
+
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit bee8ed6772f420f9eefc57fee01da29ff466a8e9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Feb 19 16:44:51 2013 +0100
Allow specifying of page names
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index ece259a..4474b48 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -664,8 +664,13 @@ void OdgGenerator::startGraphics(const ::WPXPropertyList
propList)
TagOpenElement *pStylePageLayoutOpenElement = new
TagOpenElement(style:page-layout);
WPXString sValue;
-sValue.sprintf(page%i, mpImpl-miPageIndex);
-pDrawPageOpenElement-addAttribute(draw:name, sValue);
+if (propList[draw:name])
+pDrawPageOpenElement-addAttribute(draw:name,
propList[draw:name]-getStr());
+else
+{
+sValue.sprintf(page%i, mpImpl-miPageIndex);
+pDrawPageOpenElement-addAttribute(draw:name, sValue);
+}
#ifdef MULTIPAGE_WORKAROUND
pStyleMasterPageOpenElement-addAttribute(style:page-layout-name, PM0);
pStylePageLayoutOpenElement-addAttribute(style:page-layout-name, PM0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/wmf/enhwmf.cxx | 14 ++--
vcl/source/filter/wmf/winmtf.cxx | 123 ---
vcl/source/filter/wmf/winmtf.hxx | 19 +-
3 files changed, 127 insertions(+), 29 deletions(-)
New commits:
commit 3998d1abb291309ddbbc2c9869736ebb1ea608f0
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Feb 9 13:47:38 2013 +0100
fdo#56886 EMF: Fixes some scaling problems of clipped regions, Twips
If a Metafile's scaling is incompletely defined, there are some arbitrary
values used.
This bug is just filed as regression because aoo 3.3 used the WMF part and
Lo the EMF part!
Please use environment variable EMF_PLUS_DISABLE if you have further
problems with EMF files.
This Patch also adds an (untested) TWIPS scaling, which was missing.
known issue: vertical text ratio still scaled differently than lineart.
Change-Id: I7c0139853961eb338476a9e3a5e08d3f87225f2e
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/1886
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f8b9884..541d68d 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -485,8 +485,8 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
EMFP_DEBUG(printf (\t\tunknown id: 0x%x\n,(unsigned int)
id));
}
}
-} else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF )
-
+}
+else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF )
switch( nRecType )
{
case EMR_POLYBEZIERTO :
@@ -518,14 +518,14 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
case EMR_SETWINDOWEXTEX :
{ // #75383#
*pWMF nW nH;
-pOut-SetWinExt( Size( nW, nH ) );
+pOut-SetWinExt( Size( nW, nH ), true);
}
break;
case EMR_SETWINDOWORGEX :
{
*pWMF nX32 nY32;
-pOut-SetWinOrg( Point( nX32, nY32 ) );
+pOut-SetWinOrg( Point( nX32, nY32 ), true);
}
break;
@@ -917,7 +917,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
PolyPolygon aPolyPoly;
if ( cbRgnData )
ImplReadRegion( aPolyPoly, *pWMF, nRecSize );
-pOut-SetClipPath( aPolyPoly, iMode, sal_False );
+pOut-SetClipPath( aPolyPoly, iMode, sal_True );
}
break;
@@ -1352,7 +1352,7 @@ sal_Bool EnhWMFReader::ReadHeader()
return sal_False;
// bound size
-Rectangle rclBounds;// rectangle in logical units 1/100th mm
+Rectangle rclBounds;// rectangle in logical units
*pWMF nLeft nTop nRight nBottom;
rclBounds.Left() = nLeft;
rclBounds.Top() = nTop;
@@ -1360,7 +1360,7 @@ sal_Bool EnhWMFReader::ReadHeader()
rclBounds.Bottom() = nBottom;
// picture frame size
-Rectangle rclFrame; // rectangle in device units
+Rectangle rclFrame; // rectangle in device units 1/100th mm
*pWMF nLeft nTop nRight nBottom;
rclFrame.Left() = nLeft;
rclFrame.Top() = nTop;
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 0adca65..fcfd07f 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -350,6 +350,20 @@ Color WinMtf::ReadColor()
//---
//---
+Point WinMtfOutput::ImplScale( const Point rPt)//Hack to set varying defaults
for incompletely defined files.
+{
+if (mbIsMapDevSet mbIsMapWinSet)
+{
+return
Point((rPt.X())*mnWinExtX/mnDevWidth-mrclFrame.Left(),(rPt.Y())*mnWinExtY/mnDevHeight-mrclFrame.Top());
+}
+else
+{
+return
Point((rPt.X())*UNDOCUMENTED_WIN_RCL_RELATION-mrclFrame.Left(),(rPt.Y())*UNDOCUMENTED_WIN_RCL_RELATION-mrclFrame.Top());
+}
+}
+
+//---
+
Point WinMtfOutput::ImplMap( const Point rPt )
{
if ( mnWinExtX mnWinExtY )
@@ -368,8 +382,8 @@ Point WinMtfOutput::ImplMap( const Point rPt )
fX2 -= mnWinOrgX;
fY2 -= mnWinOrgY;
if( mnDevWidth != 1 || mnDevHeight != 1 ) {
-fX2 *= 2540.0/mnUnitsPerInch;
-fY2 *= 2540.0/mnUnitsPerInch;
+fX2 *=
HUNDREDTH_MILLIMETERS_PER_MILLIINCH*1000/mnUnitsPerInch;
+fY2 *=
HUNDREDTH_MILLIMETERS_PER_MILLIINCH*1000/mnUnitsPerInch;
}
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/builder.cxx | 90 +-
vcl/source/window/layout.cxx |8 +--
2 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit a09f11715be53587ee2b0368e19f45cc85fb6cf1
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Sun Feb 17 20:38:27 2013 +0100
Remove RTL_CONST_STRINGPARAM
Change-Id: Iac8a36a1f4a9c56d7b8689acd1b2273550a8c968
Reviewed-on: https://gerrit.libreoffice.org/2257
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9b3da1b..1f7d3a8 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -446,11 +446,11 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader
reader)
if (res == xmlreader::XmlReader::RESULT_BEGIN)
{
-if (name.equals(RTL_CONSTASCII_STRINGPARAM(e)))
+if (name.equals(e))
{
while (reader.nextAttribute(nsId, name))
{
-if (name.equals(RTL_CONSTASCII_STRINGPARAM(g)))
+if (name.equals(g))
{
name = reader.getAttributeValue(false);
sID = OString(name.begin, name.length);
@@ -458,7 +458,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader
reader)
if (nDelim != -1)
sID = sID.copy(nDelim);
}
-else if (name.equals(RTL_CONSTASCII_STRINGPARAM(i)))
+else if (name.equals(i))
{
name = reader.getAttributeValue(false);
sProperty = OString(name.begin, name.length);
@@ -1306,11 +1306,11 @@ void VclBuilder::handleTabChild(Window *pParent,
xmlreader::XmlReader reader)
if (res == xmlreader::XmlReader::RESULT_BEGIN)
{
++nLevel;
-if (name.equals(RTL_CONSTASCII_STRINGPARAM(object)))
+if (name.equals(object))
{
while (reader.nextAttribute(nsId, name))
{
-if (name.equals(RTL_CONSTASCII_STRINGPARAM(id)))
+if (name.equals(id))
{
name = reader.getAttributeValue(false);
sID = OString(name.begin, name.length);
@@ -1324,7 +1324,7 @@ void VclBuilder::handleTabChild(Window *pParent,
xmlreader::XmlReader reader)
}
}
}
-else if (name.equals(RTL_CONSTASCII_STRINGPARAM(property)))
+else if (name.equals(property))
collectProperty(reader, sID, aProperties);
}
@@ -1409,18 +1409,18 @@ void VclBuilder::handleChild(Window *pParent,
xmlreader::XmlReader reader)
while (reader.nextAttribute(nsId, name))
{
-if (name.equals(RTL_CONSTASCII_STRINGPARAM(type)))
+if (name.equals(type))
{
name = reader.getAttributeValue(false);
sType = OString(name.begin, name.length);
}
-else if (name.equals(RTL_CONSTASCII_STRINGPARAM(internal-child)))
+else if (name.equals(internal-child))
{
bIsInternalChild = true;
}
}
-if (sType == tab)
+if (sType.equals(tab))
{
handleTabChild(pParent, reader);
return;
@@ -1434,7 +1434,7 @@ void VclBuilder::handleChild(Window *pParent,
xmlreader::XmlReader reader)
if (res == xmlreader::XmlReader::RESULT_BEGIN)
{
-if (name.equals(RTL_CONSTASCII_STRINGPARAM(object)) ||
name.equals(RTL_CONSTASCII_STRINGPARAM(placeholder)))
+if (name.equals(object) || name.equals(placeholder))
{
pCurrentChild = handleObject(pParent, reader);
@@ -1474,7 +1474,7 @@ void VclBuilder::handleChild(Window *pParent,
xmlreader::XmlReader reader)
}
}
}
-else if (name.equals(RTL_CONSTASCII_STRINGPARAM(packing)))
+else if (name.equals(packing))
{
handlePacking(pCurrentChild, reader);
}
@@ -1503,12 +1503,12 @@ void
VclBuilder::collectPangoAttribute(xmlreader::XmlReader reader, stringmap
while (reader.nextAttribute(nsId, span))
{
-if (span.equals(RTL_CONSTASCII_STRINGPARAM(name)))
+if (span.equals(name))
{
span = reader.getAttributeValue(false);
sProperty = OString(span.begin, span.length);
}
-else if (span.equals(RTL_CONSTASCII_STRINGPARAM(value)))
+else if (span.equals(value))
{
span = reader.getAttributeValue(false);
sValue = OString(span.begin, span.length);
@@ -1529,12 +1529,12 @@ void
[PUSHED] [PUSHED] fdo#56886 EMF: Fixes some scaling problems of clipped region...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1886 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1886 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c0139853961eb338476a9e3a5e08d3f87225f2e Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net Gerrit-Reviewer: Lennard Wasserthal wassert...@nefkom.net Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Radek Doulík r...@novell.com Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extensions/source sal/inc sal/osl sax/qa scripting/source sdext/source stoc/source tools/source xmlsecurity/source
extensions/source/update/check/updateprotocoltest.cxx |9 +-
sal/inc/sal/log-areas.dox |8 ++
sal/osl/all/loadmodulerelative.cxx| 10 +--
sax/qa/cppunit/test_converter.cxx | 60 +++---
scripting/source/provider/ScriptImpl.cxx |7 +-
sdext/source/pdfimport/pdfiadaptor.cxx| 26 +++
stoc/source/corereflection/lrucache.hxx | 21 +++---
stoc/source/tdmanager/lrucache.hxx| 21 +++---
tools/source/memtools/mempool.cxx |6 -
xmlsecurity/source/helper/xsecverify.cxx | 25 +++
10 files changed, 95 insertions(+), 98 deletions(-)
New commits:
commit ef1d096ddc311a2fd821d4076421c4a8f8d63abf
Author: Radu Ioan ioan.rad...@gmail.com
Date: Wed Feb 6 00:10:23 2013 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced osl_trace with sal_info
- added new log areas to log-area.dox
Change-Id: Ib47c4b4c9604bca1f8a635dd01bb89702b47b591
Reviewed-on: https://gerrit.libreoffice.org/2010
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/extensions/source/update/check/updateprotocoltest.cxx
b/extensions/source/update/check/updateprotocoltest.cxx
index e88367c..fa82e9e 100644
--- a/extensions/source/update/check/updateprotocoltest.cxx
+++ b/extensions/source/update/check/updateprotocoltest.cxx
@@ -26,6 +26,7 @@
#include sal/main.h
#include osl/process.h
#include stdio.h
+#include sal/log.hxx
namespace task = ::com::sun::star::task;
namespace uno = ::com::sun::star::uno;
@@ -58,18 +59,16 @@ SAL_IMPLEMENT_MAIN()
{
if( checkForUpdates(rComponentContext, uno::Reference
task::XInteractionHandler (), aURL, aVersion) )
{
-OSL_TRACE( Update found: %s on %s,
-rtl::OUStringToOString( aVersion,
RTL_TEXTENCODING_UTF8).getStr(),
-rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8).getStr());
+SAL_INFO(extensions.update, Update found: aVersion on
aURL);
}
else
{
-OSL_TRACE( no updates found );
+SAL_INFO(extensions.update, no updates found );
}
}
catch( ... )
{
-OSL_TRACE( unhandled exception caught );
+SAL_INFO(extensions.update, unhandled exception caught );
}
return 0;
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index e1422ca..378dcf5c 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -33,6 +33,7 @@ certain functionality.
@li @c canvas
@li @c canvas.cairo
+@li @c canvas.null
@section connectivity
@@ -65,6 +66,7 @@ certain functionality.
@li @c sd.fwk
@li @c sd.sls
@li @c sd.tools
+@li @c sd.ui
@li @c sd.view
@li @c sd.slideshow
@li @c sdremote
@@ -165,6 +167,7 @@ certain functionality.
@section tools
@li @c tools.debug
+@li @c tools.memtools
@li @c tools.rc - resource manager
@li @c tools.stream - SvStream class
@@ -183,6 +186,10 @@ certain functionality.
@li @c rtl.string - ::rtl::OString, ::rtl::OUString, and related functionality
@li @c salhelper.thread - ::salhelper::Thread class
+@section stoc
+
+@li @c stoc.corerefl
+@li @c stoc.tdmanager
@section VCL
@@ -220,6 +227,7 @@ certain functionality.
@section xmlsecurity
@li @c xmlsecurity.dialogs - xml security dialogs
+@li @c xmlsecurity.helper
@li @c xmlsecurity.xmlsec - xmlsec wrapper
@section other
diff --git a/sal/osl/all/loadmodulerelative.cxx
b/sal/osl/all/loadmodulerelative.cxx
index 0a91169..98cf137 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -22,7 +22,7 @@
#include cstddef
-#include osl/diagnose.h
+#include sal/log.hxx
#include osl/module.h
#include osl/module.hxx
#include osl/thread.h
@@ -42,7 +42,7 @@ oslModule SAL_CALL osl_loadModuleRelative(
{
::rtl::OUString base;
if (!::osl::Module::getUrlFromAddress(baseModule, base)) {
-OSL_TRACE(osl::Module::getUrlFromAddress failed);
+SAL_INFO(sal.osl,osl::Module::getUrlFromAddress failed);
return NULL;
}
::rtl::OUString abs;
@@ -50,10 +50,8 @@ oslModule SAL_CALL osl_loadModuleRelative(
abs = ::rtl::Uri::convertRelToAbs(base, relativePath);
} catch (const ::rtl::MalformedUriException e) {
(void) e; // avoid warnings
-OSL_TRACE(
-rtl::MalformedUriException %s,
-rtl::OUStringToOString(e.getMessage(),
osl_getThreadTextEncoding()).
-getStr());
+SAL_INFO(sal.osl,
+rtl::MalformedUriException e.getMessage() );
//TODO: let some OSL_TRACE variant take care of text conversion?
return NULL;
}
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 26627f8..7860092 100644
---
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/vcl/temporaryfonts.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 55dda63b297a287c9abc6ba2f19946817e8744e7
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Feb 19 17:21:38 2013 +0100
fix documentation to match reality
Change-Id: Ibeb24ca336c599e75108a25d1a017f97092681e7
diff --git a/vcl/inc/vcl/temporaryfonts.hxx b/vcl/inc/vcl/temporaryfonts.hxx
index ecd590e..f8fe162 100644
--- a/vcl/inc/vcl/temporaryfonts.hxx
+++ b/vcl/inc/vcl/temporaryfonts.hxx
@@ -24,8 +24,8 @@ class VCL_DLLPUBLIC TemporaryFonts
{
public:
/**
- Returns an URL for a file where to store contents of a temporary font,
or an empty string
- if this font is already known. The file will be cleaned up automatically
as appropriate.
+ Returns an URL for a file where to store contents of a temporary font
+ (the file may or may not exist). The file will be cleaned up
automatically as appropriate.
Use activateTemporaryFont() to actually enable usage of the font.
@param fontName name of the font (e.g. 'Times New Roman')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - icu/icu4c.9948.mlym-crash.patch icu/UnpackedTarball_icu.mk sot/source svl/source
icu/UnpackedTarball_icu.mk |1 +
icu/icu4c.9948.mlym-crash.patch | 11 +++
sot/source/sdstor/stgelem.cxx |5 +++--
svl/source/numbers/zformat.cxx |4 ++--
4 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit eea3634b2bd85e7f290e0504da1b8906c7d33ca4
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 19 16:18:16 2013 +
Resolves: fdo#52519 crash on typing some Malayalam
Change-Id: Ie31da5896d98908fd540146d1105ecc4257fa071
diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index 4b35dd9..329c1af 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_post_action,icu,\
))
$(eval $(call gb_UnpackedTarball_add_patches,icu,\
+ icu/icu4c.9948.mlym-crash.patch \
icu/icu4c-bsd.patch \
icu/icu4c-build.patch \
icu/icu4c.8198.revert.icu5431.patch \
diff --git a/icu/icu4c.9948.mlym-crash.patch b/icu/icu4c.9948.mlym-crash.patch
new file mode 100644
index 000..2a5d89c
--- /dev/null
+++ b/icu/icu4c.9948.mlym-crash.patch
@@ -0,0 +1,11 @@
+--- misc/build/icu/source/layout/IndicClassTables.cpp 2013-02-19
16:04:09.919412782 +
misc/icu/source/layout/IndicClassTables.cpp2013-02-19
16:04:14.519351601 +
+@@ -273,7 +273,7 @@
+
+ static const IndicClassTable kndaClassTable = {0x0C80, 0x0CEF, 4,
KNDA_SCRIPT_FLAGS, kndaCharClasses, kndaSplitTable};
+
+-static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 3,
MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable};
++static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 4,
MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable};
+
+ static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 4,
SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable};
+
commit 0db079cd5a09b3f24b0dd3563f100c77561ccfde
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 18 09:41:28 2013 +
coverity#982801 Out-of-bounds access
surely given we stream this in on Load, we should stream
it out on Store, rather than dump it out
Change-Id: Ibf499dad8ebe6eb7a60cdbaf667d35eed8331685
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 86e4fb8..48938f5 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -157,8 +157,9 @@ sal_Bool StgHeader::Store( StgIo rIo )
return sal_True;
SvStream r = *rIo.GetStrm();
r.Seek( 0L );
-r.Write( cSignature, 8 + 16 );
-r nVersion // 1A version number
+r.Write( cSignature, 8 );
+r aClsId // 08 Class ID
+ nVersion // 1A version number
nByteOrder // 1C Unicode byte order indicator
nPageSize // 1E 1 nPageSize = block size
nDataPageSize // 20 1 this size == data block size
commit 5bdd1e9ee8f3ca9dc647998a8ec7b9415add01fe
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 18 08:20:04 2013 +
related coverity#984042 move potentially uninitialized scalar variables
Change-Id: I7cc181ca1cad1e8bce9cb44a7c2e2c7f534921e5
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 759136f..94fa2c0 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3629,7 +3629,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
int nUseMonthCase = 0; // not decided yet
OUString aOrgCalendar;// empty = not changed yet
-double fOrgDateTime(0.);
+double fOrgDateTime(0.0);
bool bOtherCalendar = ImpIsOtherCalendar( NumFor[nIx] );
if ( bOtherCalendar )
{
@@ -3851,7 +3851,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
int nUseMonthCase = 0; // not decided yet
OUString aOrgCalendar;// empty = not changed yet
-double fOrgDateTime;
+double fOrgDateTime(0.0);
bool bOtherCalendar = ImpIsOtherCalendar( NumFor[nIx] );
if ( bOtherCalendar )
{
___
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/remotecontrol/BufferedStreamSocket.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 49db90342f193f31500b2717cc27bdf2f25e2d95
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 19 18:25:06 2013 +0200
Surely we want closesocket() on Windows
Change-Id: I13d5715248612c9b1b50314d72f5eca202debd04
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 50ee736..0defa3c 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -63,7 +63,11 @@ void BufferedStreamSocket::close()
{
if( usingCSocket )
{
+#ifdef WIN32
+::closesocket( mSocket );
+#else
::close( mSocket );
+#endif
mSocket = -1;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
| 11 +-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit bcaa4cd4f3be07f9211b51da4d258b61423f1e28
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 19 16:26:52 2013 +
sdremote: debugging to get a better handle on failed image allocations.
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
index 2135dbf..3925fe2 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
@@ -9,7 +9,9 @@
package org.libreoffice.impressremote.communication;
import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.Globals;
+import android.util.Log;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -54,7 +56,14 @@ public class SlideShow {
return BitmapFactory.decodeResource(mContext.getResources(),
R.drawable.image_loading);
}
-Bitmap aBitmap = BitmapFactory.decodeByteArray(aImage, 0,
aImage.length);
+Bitmap aBitmap = null;
+try {
+aBitmap = BitmapFactory.decodeByteArray(aImage, 0, aImage.length);
+} catch (OutOfMemoryError e) {
+Log.e(Globals.TAG, Bitmap decoding error byte length: +
aImage.length +
+ first 4 bytes: + aImage[0] + + aImage[1] + +
aImage[2] + + aImage[3] +
+ Exception + e);
+}
if (aBitmap == null) {
return BitmapFactory.decodeResource(mContext.getResources(),
R.drawable.image_loading);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit bf357749bee218b59b08d4e3e467f89c27ff
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 19 18:25:06 2013 +0200
Surely we want closesocket() on Windows
(cherry picked from commit 49db90342f193f31500b2717cc27bdf2f25e2d95)
Change-Id: I13d5715248612c9b1b50314d72f5eca202debd04
Reviewed-on: https://gerrit.libreoffice.org/2262
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 71fec17..e2c7a4a 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -59,7 +59,11 @@ void BufferedStreamSocket::close()
{
if( usingCSocket )
{
+#ifdef WIN32
+::closesocket( mSocket );
+#else
::close( mSocket );
+#endif
mSocket = -1;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit f602b40561a381bcde713ecce7b2340be55dbd78
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 19 18:25:06 2013 +0200
Surely we want closesocket() on Windows
(cherry picked from commit 49db90342f193f31500b2717cc27bdf2f25e2d95)
Change-Id: I91461ae31c9934e6b3176402e2772ba7371f0fdb
Reviewed-on: https://gerrit.libreoffice.org/2263
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 71fec17..e2c7a4a 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -59,7 +59,11 @@ void BufferedStreamSocket::close()
{
if( usingCSocket )
{
+#ifdef WIN32
+::closesocket( mSocket );
+#else
::close( mSocket );
+#endif
mSocket = -1;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
(KDE4) file dialog broken (Re: [Libreoffice-commits] core.git: 14 commits - basctl/source cui/source dbaccess/source desktop/source dtrans/Library_dnd.mk dtrans/Library_ftransl.mk dtrans/Library_sysdt
On Tuesday 12 of February 2013, Noel Grandin wrote: commit 4b51374a7021d52f7f1be1861e2ee6a011b30ecd Author: Noel Grandin n...@peralex.com Date: Tue Feb 12 09:23:05 2013 +0200 fdo#46808, Adapt ui::dialogs::FilePicker UNO service to new style Change-Id: I1cafbfc53994e5d74241042dbd1d292ddbda67d5 I see rather serious breakage with the KDE4 file dialog on master, automatic file extension adding doesn't work (the checkbox doesn't even show) and there's no existing file overwrite warning. From what I can tell, at least KDE4FilePicker::addCustomControl() doesn't get called anymore. As there have been no other changes in the area, I suspect this commit. Could you please have a look? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
