[Libreoffice-commits] core.git: 3 commits - framework/source include/helpcompiler include/svtools svtools/source

[Tor Lillqvist]

 framework/source/uielement/menubarmanager.cxx |    2 ++
 include/helpcompiler/dllapi.h                 |    6 ------
 include/svtools/htmlout.hxx                   |    6 +-----
 include/svtools/rtfout.hxx                    |    6 +-----
 svtools/source/svhtml/htmlout.cxx             |    6 +++---
 svtools/source/svrtf/rtfout.cxx               |    6 +++---
 6 files changed, 10 insertions(+), 22 deletions(-)

New commits:
commit 5c046a31e1e19e01a60d4bf22cf2a5eb8ef13a63
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 20:34:06 2013 +0300

    WaE: unused parameter 'SystemType'
    
    Change-Id: I52717d85269dd1802b942ba19f5710b9e469faf1

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 027448c..4729859 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -279,6 +279,8 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces
         {
             a <<= (long) aSystemMenuData.hMenu;
         }
+#else
+        (void) SystemType;
 #endif
     }
 
commit b11f257d9b6927a7df1f2a3f03405e045a1beec6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 20:13:48 2013 +0300

    Test _WIN32 instead of UNX as it's Win32 that is the special case here
    
    Change-Id: Ic729eab62109d854122fa5c6b7b4dc163088dd04

diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 789ee194..9b0c8fd 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -51,11 +51,7 @@ struct SVT_DLLPUBLIC HTMLOutContext
 
 struct HTMLOutFuncs
 {
-#if defined(UNX)
-    static const sal_Char sNewLine;     // nur \012 oder \015
-#else
-    static const sal_Char sNewLine[];   // \015\012
-#endif
+    static const sal_Char sNewLine[];
 
     SVT_DLLPUBLIC static OString ConvertStringToHTML( const OUString& sSrc,
                         rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx
index 9258053..7c38947 100644
--- a/include/svtools/rtfout.hxx
+++ b/include/svtools/rtfout.hxx
@@ -33,11 +33,7 @@ class SvStream;
 class SVT_DLLPUBLIC RTFOutFuncs
 {
 public:
-#if defined(UNX)
-    static const sal_Char sNewLine;     // nur \012 oder \015
-#else
-    static const sal_Char sNewLine[];   // \015\012
-#endif
+    static const sal_Char sNewLine[];
 
     static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
                     int *pUCMode,
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index b633e70..5c0b1d8 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -31,10 +31,10 @@
 #include <svtools/imappoly.hxx>
 #include "svl/urihelper.hxx"
 
-#if defined(UNX)
-const sal_Char HTMLOutFuncs::sNewLine = '\012';
-#else
+#ifdef _WIN32
 const sal_Char HTMLOutFuncs::sNewLine[] = "\015\012";
+#else
+const sal_Char HTMLOutFuncs::sNewLine[] = "\012";
 #endif
 
 #define TXTCONV_BUFFER_SIZE 20
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 5272fe1..919a009 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -25,10 +25,10 @@
 #include <svtools/rtfout.hxx>
 
 
-#if defined(UNX)
-const sal_Char RTFOutFuncs::sNewLine = '\012';
-#else
+#ifdef _WIN32
 const sal_Char RTFOutFuncs::sNewLine[] = "\015\012";
+#else
+const sal_Char RTFOutFuncs::sNewLine[] = "\012";
 #endif
 
 
commit 610681b97aca28c4c40c3462875cd47105442a21
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 20:06:28 2013 +0300

    L10N_PLUGIN_PUBLIC is not used anywhere
    
    Change-Id: I27bc41e76aa19cf6bd0a9eb4dcbfa07a0d165eb0

diff --git a/include/helpcompiler/dllapi.h b/include/helpcompiler/dllapi.h
index c823952..a2035ba 100644
--- a/include/helpcompiler/dllapi.h
+++ b/include/helpcompiler/dllapi.h
@@ -29,12 +29,6 @@
 #define L10N_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
-#if defined UNX && ! defined MACOS
-#define L10N_PLUGIN_PUBLIC L10N_DLLPUBLIC
-#else
-#define L10N_PLUGIN_PUBLIC SAL_DLLPRIVATE
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */