[Libreoffice-commits] .: 12 commits -

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Nov 12 06:54:20 PST 2010 

 0 files changed

New commits:
commit c370caf895eeac3cf8e2d765d0e57e268bd3d90e
Merge: 86030e1... 436411c...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Nov 12 14:37:38 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit 436411c3e16a0124e33be45073a7f4a9b52f2cff
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 11 13:25:06 2010 +0100

    Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)
commit b123b71ca0fdd6ad62100abddcc23aed9a2bc4ce
Author: Robert Nagy <robert at openbsd.org>
Date:   Mon Nov 8 19:41:49 2010 +0100

    add DLLPOSTFIX for OpenBSD

diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index e19f87b..3a81918 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -381,6 +381,8 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
   #define __DLLEXTENSION "mxp.dylib"
 #elif defined MACOSX && defined X86
   #define __DLLEXTENSION "mxi.dylib"
+#elif defined OPENBSD
+  #define __DLLEXTENSION "ob.so"
 #else
   #define __DLLEXTENSION ".so"
 #endif
commit 1590ff012c6e301ff6d48d2666a8c365935edffc
Author: Robert Nagy <robert at openbsd.org>
Date:   Sun Nov 7 20:24:54 2010 +0100

    define __XKeyboardExtension__ 1 on OpenBSD too

diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
index eccb8c4..3cc8f32 100644
--- a/tools/inc/tools/prex.h
+++ b/tools/inc/tools/prex.h
@@ -48,7 +48,7 @@
 extern "C" {
 #endif
 
-#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) || defined(NETBSD) // should really check for xfree86 or for X11R6.1 and higher
+#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) || defined(NETBSD) || defined(OPENBSD) // should really check for xfree86 or for X11R6.1 and higher
 #define __XKeyboardExtension__ 1
 #else
 #define __XKeyboardExtension__ 0
commit 0870d89e1a4c3fad9ad5c917c5c7bbc1c3f5e54c
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 12:33:28 2010 +0100

    Add OpenBSD ifdefs for vcl too

diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index bb878aa..4164a0f 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.hxx
@@ -47,7 +47,8 @@ class SalPrinter;
 
 DECLARE_LIST( SalDisplays, SalDisplay* )
 
-#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD
+#if defined SCO || defined LINUX || defined NETBSD || defined AIX || \
+	defined HPUX || defined FREEBSD || defined OPENBSD
 #include <pthread.h>
 #else
 typedef	unsigned int pthread_t;
diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h
index ff17213..5946492 100644
--- a/vcl/unx/inc/salunx.h
+++ b/vcl/unx/inc/salunx.h
@@ -30,7 +30,8 @@
 #define _SALUNX_H
 
 // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#if defined SCO || defined LINUX || defined HPUX || defined FREEBSD || defined NETBSD
+#if defined SCO || defined LINUX || defined HPUX || defined FREEBSD || \
+	defined NETBSD || defined OPENBSD
 #include <sys/time.h>
 #elif defined AIX
 #include <time.h>
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx
index c58532b..5a50b6a 100644
--- a/vcl/unx/source/app/i18n_ic.cxx
+++ b/vcl/unx/source/app/i18n_ic.cxx
@@ -334,7 +334,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
 
         if ( mnPreeditStyle != XIMPreeditNone )
         {
-#if defined LINUX || defined FREEBSD || defined NETBSD
+#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD
             if ( mpPreeditAttributes != NULL )
 #endif
                 mpAttributes = XVaAddToNestedList( mpAttributes,
@@ -342,7 +342,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
         }
         if ( mnStatusStyle != XIMStatusNone )
         {
-#if defined LINUX || defined FREEBSD || defined NETBSD
+#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD
             if ( mpStatusAttributes != NULL )
 #endif
                 mpAttributes = XVaAddToNestedList( mpAttributes,
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 03fb3a0..69ab594 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -894,7 +894,7 @@ void SalDisplay::Init()
         sscanf( pProperties, "%li", &nProperties_ );
     else
     {
-#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD
+#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || defined OPENBSD
         nProperties_ |= PROPERTY_FEATURE_Maximize;
 #endif
         // Server Bugs & Properties
@@ -920,7 +920,7 @@ void SalDisplay::Init()
         if( GetServerVendor() == vendor_xfree )
         {
             nProperties_ |= PROPERTY_BUG_XCopyArea_GXxor;
-#if defined LINUX || defined FREEBSD
+#if defined LINUX || defined FREEBSD || defined OPENBSD
             // otherwm and olwm are a kind of default, which are not detected
             // carefully. if we are running linux (i.e. not netbsd) on an xfree
             // display, fvwm is most probable the wm to choose, confusing with mwm
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 04fe680..d06cb26 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -42,7 +42,7 @@
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 #include "tools/postx.h"
-#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) || defined(OPENBSD)
 #include <sys/poll.h>
 #else
 #include <poll.h>
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index 389475f..c71088f 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.cxx
@@ -1207,7 +1207,7 @@ struct SystemCommandParameters
     tokenHandler    pHandler;
 };
 
-#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD)) 
+#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
 static void lpgetSysQueueTokenHandler(
     const std::list< rtl::OString >& i_rLines,
     std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues,
@@ -1352,7 +1352,7 @@ static void standardSysQueueTokenHandler(
 
 static const struct SystemCommandParameters aParms[] =
 {
-    #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) 
+    #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
     { "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler },
     { "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler },
     { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1, standardSysQueueTokenHandler }
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index e8221e4..983530c 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -332,7 +332,8 @@ SHL2STDLIBS+=`pkg-config --libs xrender`
 .IF "$(GUIBASE)"=="unx"
 
 SHL2STDLIBS += -lXext -lSM -lICE -lX11
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && \
+	&& "$(OS)"!="OPENBSD"
 # needed by salprnpsp.cxx
 SHL2STDLIBS+= -ldl
 .ENDIF
commit 06f9c63e8f111c6064009bb32bd122e1eb4415c2
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 12:09:10 2010 +0100

    add needed OpenBSD ifdefs

diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index d2c84ef..b1abae4 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -45,7 +45,7 @@
 extern "C" int mntctl( int cmd, size_t size, char* buf );
 #elif defined(NETBSD) 
 #include <sys/mount.h>
-#elif defined(FREEBSD) || defined(MACOSX)
+#elif defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)
 #elif defined DECUNIX
 struct mnttab
 {
@@ -95,7 +95,8 @@ struct mymnttab
 };
 
 
-#if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
+#if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || \
+	defined(OPENBSD)
 BOOL GetMountEntry(dev_t /* dev */, struct mymnttab * /* mytab */ )
 {
     DBG_WARNING( "Sorry, not implemented: GetMountEntry" );
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index f6e88b5..61313bc 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -210,7 +210,8 @@ static sal_uInt32 GetSvError( int nErrno )
         { 0,            SVSTREAM_OK },
         { EACCES,       SVSTREAM_ACCESS_DENIED },
         { EBADF,        SVSTREAM_INVALID_HANDLE },
-#if defined( RS6000 ) || defined( ALPHA ) || defined( HP9000 ) || defined( NETBSD ) || defined(FREEBSD) || defined(MACOSX) || defined(__FreeBSD_kernel__) || defined ( AIX )
+#if defined( RS6000 ) || defined( ALPHA ) || defined( HP9000 ) || defined( NETBSD ) || defined(FREEBSD) || defined(MACOSX) || \
+	defined(OPENBSD) || defined(__FreeBSD_kernel__) || defined ( AIX )
         { EDEADLK,      SVSTREAM_LOCKING_VIOLATION },
 #else
         { EDEADLOCK,    SVSTREAM_LOCKING_VIOLATION },
@@ -224,7 +225,8 @@ static sal_uInt32 GetSvError( int nErrno )
         { EAGAIN,       SVSTREAM_LOCKING_VIOLATION },
         { EISDIR,       SVSTREAM_PATH_NOT_FOUND },
         { ELOOP,        SVSTREAM_PATH_NOT_FOUND },
-#if ! defined( RS6000 ) && ! defined( ALPHA ) && ! defined( NETBSD ) && ! defined (FREEBSD) && ! defined (MACOSX) && ! defined(__FreeBSD_kernel__)
+#if ! defined( RS6000 ) && ! defined( ALPHA ) && ! defined( NETBSD ) && ! defined (FREEBSD) && ! defined (MACOSX) && \
+	!defined(OPENBSD) && ! defined(__FreeBSD_kernel__)
         { EMULTIHOP,    SVSTREAM_PATH_NOT_FOUND },
         { ENOLINK,      SVSTREAM_PATH_NOT_FOUND },
 #endif
commit 5530854224557e69a19215cba4d43c00ec4e4aeb
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 09:29:27 2010 +0100

    Define OpenBSD as a supported system.

diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index 1f13c99..89ee094 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/command.cxx
@@ -73,7 +73,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \
-    || defined (HPUX) || defined (MACOSX)
+    || defined (HPUX) || defined (MACOSX) || defined (OPENBSD)
 #include <sys/wait.h>
 #else
 #include <wait.h>
diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx
index 52a7ce4..ac2f8bc 100644
--- a/tools/inc/tools/inetdef.hxx
+++ b/tools/inc/tools/inetdef.hxx
@@ -59,6 +59,10 @@
 #define TOOLS_INETDEF_OS "FreeBSD/i386"
 #elif defined FREEBSD && defined X86_64
 #define TOOLS_INETDEF_OS "FreeBSD/amd64"
+#elif defined OPENBSD && defined X86
+#define TOOLS_INETDEF_OS "OpenBSD/i386"
+#elif defined OPENBSD && defined X86_64
+#define TOOLS_INETDEF_OS "OpenBSD/amd64"
 #elif defined SINIX
 #define TOOLS_INETDEF_OS "SINIX"
 #else // AIX, HPUX, SOLARIS, ...
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 4791d5b..e19f87b 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -311,6 +311,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 #define SYSTEM_UNXMACXI		33
 #define SYSTEM_OS2GCCI		34
 #define SYSTEM_UNXBSDX		35
+#define SYSTEM_UNXOBSD		36
 #define SYSTEM_WNTGCCI  	99
 
 #if defined WNT
commit be560bd2d70cc285d2737600b601edd9ae9cfd9d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 5 12:38:09 2010 +0000

    can undo this now with fix in compiler settings
    (cherry picked from commit 0dae6332bca70fab5930654a0dae641af1c76acc)

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 4f90d03..f4e7939 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3446,7 +3446,7 @@ const NfCurrencyEntry* SvNumberFormatter::GetCurrencyEntry( BOOL & bFoundBank,
 
 void SvNumberFormatter::GetCompatibilityCurrency( String& rSymbol, String& rAbbrev ) const
 {
-    const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >&
+    ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >
         xCurrencies = xLocaleData->getAllCurrencies();
     sal_Int32 nCurrencies = xCurrencies.getLength();
     sal_Int32 j;
commit 5e304209b6c0ca3b9a4aab6181d3c832055811ef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 4 14:44:14 2010 +0000

    latest libX11 changed header guards
    (cherry picked from commit cd10b146b67f7329f699e48e74d2961dbcceb123)

diff --git a/vcl/unx/inc/dtint.hxx b/vcl/unx/inc/dtint.hxx
index 724dad6..b173830 100644
--- a/vcl/unx/inc/dtint.hxx
+++ b/vcl/unx/inc/dtint.hxx
@@ -37,7 +37,7 @@ class SalBitmap;
 class SalDisplay;
 class AllSettings;
 
-#ifndef _XLIB_H_
+#if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
 // forwards from X
 struct Display;
 struct XEvent;
commit 8c9ddb2b37b2614d70bc863dbb1421f4bc0af7cf
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Nov 3 11:47:40 2010 +0100

    Changing a few more strings to read "LibreOffice"
    (cherry picked from commit d69179723a2f8f72d344b884647fd106221a1391)

diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 5b4b113..3630365 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -120,15 +120,15 @@ void KDEXLib::Init()
     pInputMethod->SetLocale();
     XrmInitialize();
 
-    KAboutData *kAboutData = new KAboutData( "OpenOffice.org",
-            I18N_NOOP( "OpenOffice.org" ),
+    KAboutData *kAboutData = new KAboutData( "LibreOffice",
+            I18N_NOOP( "LibreOffice" ),
             "1.1.0",
-            I18N_NOOP( "OpenOffice.org with KDE Native Widget Support." ),
+            I18N_NOOP( "LibreOffice with KDE Native Widget Support." ),
             KAboutData::License_LGPL,
             "(c) 2003, 2004 Novell, Inc",
-            I18N_NOOP( "OpenOffice.org is an office suite.\n" ),
-            "http://kde.openoffice.org/index.html",
-            "dev at kde.openoffice.org");
+            I18N_NOOP( "LibreOffice is an office suite.\n" ),
+            "http://libreoffice.org",
+            "libreoffice at lists.freedesktop.org");
     kAboutData->addAuthor( "Jan Holesovsky",
             I18N_NOOP( "Original author and maintainer of the KDE NWF." ),
             "kendy at artax.karlin.mff.cuni.cz",
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 75bccf0..12cb886 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -105,16 +105,16 @@ void KDEXLib::Init()
     pInputMethod->SetLocale();
     XrmInitialize();
 
-    KAboutData *kAboutData = new KAboutData("OpenOffice.org",
+    KAboutData *kAboutData = new KAboutData("LibreOffice",
             "kdelibs4",
-            ki18n( "OpenOffice.org" ),
-            "3.0.0",
-            ki18n( "OpenOffice.org with KDE Native Widget Support." ),
+            ki18n( "LibreOffice" ),
+            "3.3.0",
+            ki18n( "LibreOffice with KDE Native Widget Support." ),
             KAboutData::License_LGPL,
             ki18n( "Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Novell, Inc"),
-            ki18n( "OpenOffice.org is an office suite.\n" ),
-            "http://kde.openoffice.org/index.html",
-            "dev at kde.openoffice.org" );
+            ki18n( "LibreOffice is an office suite.\n" ),
+            "http://libreoffice.org",
+            "libreoffice at lists.freedesktop.org" );
             
     kAboutData->addAuthor( ki18n( "Jan Holesovsky" ),
             ki18n( "Original author and maintainer of the KDE NWF." ),
commit 946f6fe36abf895947484f5d0cb70181c72b3862
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 2 09:47:10 2010 +0000

    better backport this to stable

diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
index 67d8f62..7e8720e 100644
--- a/tools/qa/makefile.mk
+++ b/tools/qa/makefile.mk
@@ -32,6 +32,13 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx
index 70bd82e..aa9a24e 100644
--- a/tools/qa/test_pathutils.cxx
+++ b/tools/qa/test_pathutils.cxx
@@ -31,9 +31,11 @@
 
 #include <cwchar>
 
+#include "preextstl.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
+#include "postextstl.h"
 
 #include "tools/pathutils.hxx"
 
commit a3fa25f72a846bef918f927e3adf370c51bdf388
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Nov 1 13:50:44 2010 -0400

    Remove unnecessary coping of i18n::Currency2 instance.
    
    Without this, loading Calc fails with segmentation fault on SLED 11 x64
    platform.  The object is used read-only, so it's perfectly safe to
    treat it as such.

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index f4e7939..4f90d03 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3446,7 +3446,7 @@ const NfCurrencyEntry* SvNumberFormatter::GetCurrencyEntry( BOOL & bFoundBank,
 
 void SvNumberFormatter::GetCompatibilityCurrency( String& rSymbol, String& rAbbrev ) const
 {
-    ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >
+    const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >&
         xCurrencies = xLocaleData->getAllCurrencies();
     sal_Int32 nCurrencies = xCurrencies.getLength();
     sal_Int32 j;

More information about the Libreoffice-commits mailing list