diff options
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 2 | ||||
-rw-r--r-- | tools/bootstrp/command.cxx | 2 | ||||
-rw-r--r-- | tools/inc/tools/inetdef.hxx | 4 | ||||
-rw-r--r-- | tools/inc/tools/solar.h | 1 | ||||
-rw-r--r-- | tools/source/fsys/unx.cxx | 5 | ||||
-rw-r--r-- | tools/source/stream/strmunx.cxx | 6 | ||||
-rw-r--r-- | vcl/prj/build.lst | 2 | ||||
-rw-r--r-- | vcl/source/fontsubset/cff.cxx | 4 | ||||
-rw-r--r-- | vcl/source/fontsubset/sft.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/inc/dtint.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/inc/saldata.hxx | 3 | ||||
-rw-r--r-- | vcl/unx/inc/salunx.h | 3 | ||||
-rw-r--r-- | vcl/unx/kde/kdedata.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalGraphics.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 14 | ||||
-rw-r--r-- | vcl/unx/source/app/i18n_ic.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/source/dtrans/X11_selection.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/plugadapt/salplug.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/printer/printerinfomanager.cxx | 4 | ||||
-rw-r--r-- | vcl/util/makefile.mk | 3 |
21 files changed, 54 insertions, 42 deletions
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 57c2b59dff99..179a41d33716 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; diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx index e439cc523c26..138b5ffcffaf 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 49cb612d13b6..06bc4e7ab78c 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 ca0df1cbd69d..c80cead595c0 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -310,6 +310,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 diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 7de396d9c386..0ed7dd4d8f8d 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 5734cad12c35..5e03bcf2b237 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 diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst index e6f636522acb..f64757f2c9e1 100644 --- a/vcl/prj/build.lst +++ b/vcl/prj/build.lst @@ -1,4 +1,4 @@ -vc vcl : l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl NULL +vc vcl : l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc cpputools shell svl NULL vc vcl usr1 - all vc_mkout NULL vc vcl\inc nmake - all vc_inc NULL vc vcl\source\glyphs nmake - all vc_glyphs vc_inc NULL diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index a94e46659a41..26a0100c3db8 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -2048,7 +2048,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail, return; // emit the line head - mpPtr += sprintf( mpPtr, pLineHead); + mpPtr += sprintf( mpPtr, "%s", pLineHead); // emit the vector values ValVector::value_type aVal = 0; for( ValVector::const_iterator it = rVector.begin();;) { @@ -2061,7 +2061,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail, // emit the last value mpPtr += dbl2str( mpPtr, aVal); // emit the line tail - mpPtr += sprintf( mpPtr, pLineTail); + mpPtr += sprintf( mpPtr, "%s", pLineTail); } // -------------------------------------------------------------------- diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 3555b701ef8a..f36199ae8787 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -2058,7 +2058,7 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO fprintf(outf, h02, modname, modver, modextra); fprintf(outf, h09, ttf->psname); - fprintf(outf, h10); + fprintf(outf, "%s", h10); fprintf(outf, h11, fname); /* fprintf(outf, h12, 4000000); */ @@ -2073,17 +2073,17 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO */ fprintf(outf, h17, rtl_crc32(0, ttf->ptr, ttf->fsize), nGlyphs, rtl_crc32(0, glyphArray, nGlyphs * 2), rtl_crc32(0, encoding, nGlyphs)); - fprintf(outf, h13); + fprintf(outf, "%s", h13); fprintf(outf, h14, XUnits(UPEm, GetInt16(table, 36, 1)), XUnits(UPEm, GetInt16(table, 38, 1)), XUnits(UPEm, GetInt16(table, 40, 1)), XUnits(UPEm, GetInt16(table, 42, 1))); - fprintf(outf, h15); + fprintf(outf, "%s", h15); for (i = 0; i < nGlyphs; i++) { fprintf(outf, h16, encoding[i], i); } fprintf(outf, h30, nGlyphs+1); - fprintf(outf, h31); - fprintf(outf, h32); + fprintf(outf, "%s", h31); + fprintf(outf, "%s", h32); for (i = 0; i < nGlyphs; i++) { fprintf(outf, h33, i); @@ -2131,14 +2131,14 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO } if (n > 0) fprintf(outf, "\tfill\n"); /* if glyph is not a whitespace character */ - fprintf(outf, h34); + fprintf(outf, "%s", h34); free(pa); free(path); } - fprintf(outf, h35); + fprintf(outf, "%s", h35); - fprintf(outf, h40); + fprintf(outf, "%s", h40); fprintf(outf, h41, fname); return SF_OK; diff --git a/vcl/unx/inc/dtint.hxx b/vcl/unx/inc/dtint.hxx index 064916e7ac12..b6f7aa4b9350 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; diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index b5d789b8521b..e27a9974c872 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 89732db6c91d..9956537a8b80 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/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index aeac873aea5f..a9be7668e6b9 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@kde.openoffice.org"); + I18N_NOOP( "LibreOffice is an office suite.\n" ), + "http://libreoffice.org", + "libreoffice@lists.freedesktop.org"); kAboutData->addAuthor( "Jan Holesovsky", I18N_NOOP( "Original author and maintainer of the KDE NWF." ), "kendy@artax.karlin.mff.cuni.cz", diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index e130afbecd15..936167f8c879 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -441,6 +441,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, //setup parameters from the OO values option.minimum = sbVal->mnMin; option.maximum = sbVal->mnMax - sbVal->mnVisibleSize; + option.maximum = qMax( option.maximum, option.minimum ); // bnc#619772 option.sliderValue = sbVal->mnCur; option.sliderPosition = sbVal->mnCur; option.pageStep = sbVal->mnVisibleSize; diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 94fe2378c887..ea7c7fd64cac 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@kde.openoffice.org" ); + ki18n( "LibreOffice is an office suite.\n" ), + "http://libreoffice.org", + "libreoffice@lists.freedesktop.org" ); kAboutData->addAuthor( ki18n( "Jan Holesovsky" ), ki18n( "Original author and maintainer of the KDE NWF." ), diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx index 59fb02f1919a..48f6c53b5c5c 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 0fbfae40aeec..e49fc719b29c 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 9d68974eced8..18d120d4961b 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/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx index 0accb8def42f..7398cc8410a6 100644 --- a/vcl/unx/source/plugadapt/salplug.cxx +++ b/vcl/unx/source/plugadapt/salplug.cxx @@ -284,7 +284,7 @@ void SalAbort( const XubString& rErrorText ) std::fprintf( stderr, "Application Error" ); else std::fprintf( stderr, "%s", ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() ); - abort(); + exit(-1); } const OUString& SalGetDesktopEnvironment() diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx index ecf3f78a49cb..0fff5b590b98 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 e8221e41ae3a..983530c58206 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 |