[Libreoffice-commits] core.git: configure.ac idl/inc idl/source

[Matúš Kukan]

 configure.ac                 |    2 +-
 idl/inc/database.hxx         |    2 --
 idl/source/objects/types.cxx |   25 ++-----------------------
 idl/source/prj/database.cxx  |    1 -
 4 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit 50c5a4ce9cb7c908e798158edac8001246f6e888
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Fri Mar 14 10:09:19 2014 +0100

    Revert "Avoid duplicate symbols in libmerged for Windows too."
    
    Forgot to test properly on Windows :-(.
    
    This reverts commit fc27a685d466dc380a8b68cd48f47db632ed3693.

diff --git a/configure.ac b/configure.ac
index 7c5d277..92ca7dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12424,11 +12424,11 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then
     if test "$enable_mergelibs" = "all"; then
         MERGELIBS="ALL"
         URELIBS="TRUE"
-        AC_DEFINE(STATIC_LINKING)
     else
         MERGELIBS="CORE"
     fi
     AC_MSG_RESULT([yes])
+    AC_DEFINE(STATIC_LINKING)
 else
     AC_MSG_RESULT([no])
 fi
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index f9abfd2..15e87f2 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -81,8 +81,6 @@ protected:
         aIFaceName = OString();
     }
 public:
-    OUString sSlotMapFile;
-
                 explicit SvIdlDataBase( const SvCommand& rCmd );
                 ~SvIdlDataBase();
     static sal_Bool IsBinaryFormat( SvStream & rInStm );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 6dc8216..1797fa2 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1398,7 +1398,7 @@ sal_uLong SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
 }
 
 void SvMetaType::WriteSfxItem(
-    const OString& rItemName, SvIdlDataBase& rBase, SvStream& rOutStm )
+    const OString& rItemName, SvIdlDataBase &, SvStream & rOutStm )
 {
     WriteStars( rOutStm );
     OStringBuffer aVarName(" a");
@@ -1411,35 +1411,14 @@ void SvMetaType::WriteSfxItem(
         OString::number(nAttrCount));
     aTypeName.append(aAttrCount);
 
-    bool bExport = false, bReturn = false;
-    // these are exported from sfx library
-    if (rItemName == "SfxBoolItem" ||
-        rItemName == "SfxStringItem" ||
-        rItemName == "SfxUInt16Item" ||
-        rItemName == "SfxUInt32Item" ||
-        rItemName == "SfxVoidItem")
-    {
-        if (rBase.sSlotMapFile.endsWith("sfxslots.hxx"))
-            bExport = true;
-        else
-            bReturn = true;
-    }
-
-    rOutStm.WriteCharPtr( "extern " );
-    if (bExport)
-        rOutStm.WriteCharPtr( "SFX2_DLLPUBLIC " );
-    rOutStm.WriteCharPtr( aTypeName.getStr() )
+    rOutStm.WriteCharPtr( "extern " ).WriteCharPtr( aTypeName.getStr() )
            .WriteCharPtr( aVarName.getStr() ).WriteChar( ';' ) << endl;
-    if (bReturn)
-        return;
 
     // write the implementation part
     rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl;
     rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))) || STATIC_LINKING)" ) << endl;
     rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl;
     rOutStm.WriteCharPtr( "#endif" ) << endl;
-    if (bExport)
-        rOutStm.WriteCharPtr( "SFX2_DLLPUBLIC " );
     rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() )
            .WriteCharPtr( " = " ) << endl;
     rOutStm.WriteChar( '{' ) << endl;
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 04f351c..3ac165d 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -34,7 +34,6 @@ SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
     , aPersStream( *IDLAPP->pClassMgr, NULL )
     , pIdTable( NULL )
 {
-    sSlotMapFile = rCmd.aSlotMapFile;
 }
 
 SvIdlDataBase::~SvIdlDataBase()