summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-03-14 10:09:19 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-03-14 10:10:09 +0100
commit50c5a4ce9cb7c908e798158edac8001246f6e888 (patch)
tree6c8395b73cccd7e370e90073f3c72b2788ccc2d5 /idl
parentf9903a57dcb478c3b0e3c184ab6a020affff94d6 (diff)
Revert "Avoid duplicate symbols in libmerged for Windows too."
Forgot to test properly on Windows :-(. This reverts commit fc27a685d466dc380a8b68cd48f47db632ed3693.
Diffstat (limited to 'idl')
-rw-r--r--idl/inc/database.hxx2
-rw-r--r--idl/source/objects/types.cxx25
-rw-r--r--idl/source/prj/database.cxx1
3 files changed, 2 insertions, 26 deletions
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index f9abfd226f4b..15e87f29da87 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 6dc82163888d..1797fa2b3409 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 04f351c6c80d..3ac165ddcabe 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()