[Libreoffice-commits] core.git: 4 commits - comphelper/source framework/source idl/source include/comphelper include/filter

[Tor Lillqvist]

 comphelper/source/misc/syntaxhighlight.cxx    |    2 +-
 framework/source/uielement/menubarmanager.cxx |   10 +---------
 idl/source/prj/svidl.cxx                      |    6 ------
 include/comphelper/syntaxhighlight.hxx        |   13 -------------
 include/filter/dllapi.h                       |    6 ------
 5 files changed, 2 insertions(+), 35 deletions(-)

New commits:
commit 352f4f1f047be99c1068ba8bac3a4e3aaebf030a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 20:03:29 2013 +0300

    FILTER_PLUGIN_PUBLIC is not used anywhere
    
    Change-Id: I2788bac96326f888e758a895d587125d4b8a3b3b

diff --git a/include/filter/dllapi.h b/include/filter/dllapi.h
index 9b94621..5b93bff 100644
--- a/include/filter/dllapi.h
+++ b/include/filter/dllapi.h
@@ -29,12 +29,6 @@
 #define FILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
-#if defined UNX && ! defined MACOS
-#define FILTER_PLUGIN_PUBLIC FILTER_DLLPUBLIC
-#else
-#define FILTER_PLUGIN_PUBLIC SAL_DLLPRIVATE
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 265ae345c01335a4d9d28bd23b86c43705062497
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 19:35:26 2013 +0300

    Bin obsolete CDECL crack
    
    Change-Id: I69da428711681d14fd48c198fbce0bb545665b5a

diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index 11cfc34..c1f4ca5 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -224,7 +224,7 @@ static const char* strListSqlKeyWords[] = {
 };
 
 
-extern "C" int CDECL compare_strings( const void *arg1, const void *arg2 )
+static int compare_strings( const void *arg1, const void *arg2 )
 {
     return strcmp( (char *)arg1, *(char **)arg2 );
 }
diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index ef1a948..dfea10f 100644
--- a/include/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.hxx
@@ -24,23 +24,10 @@
 
 #include <comphelper/comphelperdllapi.h>
 
-
-#if defined CDECL
-#undef CDECL
-#endif
-
-// for the bsearch
-#ifdef WNT
-#define CDECL _cdecl
-#endif
-#if defined(UNX)
-#define CDECL
-#endif
 #ifdef UNX
 #include <sys/resource.h>
 #endif
 
-
 // Token-Typen TT_...
 enum TokenTypes
 {
commit 2c096cb5b0154a94b7c8a59d1e7c7943ac699910
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 19:21:40 2013 +0300

    cdecl is the default anyway
    
    Change-Id: Iee47fbc9ea43be2af2712efe15df3d7936277cf7

diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 4db3d36..b9dc81e 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -103,14 +103,8 @@ inline OUString tempFileHelper(OUString const & fname)
     return aTmpFile;
 }
 
-#if defined( UNX ) || defined (__MINGW32__)
 int main ( int argc, char ** argv)
 {
-#else
-int cdecl main ( int argc, char ** argv)
-{
-#endif
-
     OUString aTmpListFile;
     OUString aTmpSlotMapFile;
     OUString aTmpSfxItemFile;
commit 87708fd311145a7fb0415842f277693fdea3c816
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 19:17:21 2013 +0300

    Simplify
    
    Change-Id: Ic2afa7e60da57c5b516a043f717dea21a3cf0d55

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index e0bac02..027448c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -274,19 +274,11 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces
         aSystemMenuData.nSize = sizeof( SystemMenuData );
 
         m_pVCLMenu->GetSystemMenuData( &aSystemMenuData );
-#ifdef MACOSX
-        if( SystemType == SystemDependent::SYSTEM_MAC )
-        {
-        }
-#elif (defined WNT)
+#ifdef _WIN32
         if( SystemType == SystemDependent::SYSTEM_WIN32 )
         {
             a <<= (long) aSystemMenuData.hMenu;
         }
-#elif (defined UNX)
-        if( SystemType == SystemDependent::SYSTEM_XWINDOW )
-        {
-        }
 #endif
     }