diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 11:38:19 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:49:26 +0200 |
commit | 2be92a9d4e5255963af5261c7511003626831be9 (patch) | |
tree | 5147355c0a176467b6fd1f85f69a932274faa193 | |
parent | 62256ea10a5b7d2b554902780fbb3be12a8d07b3 (diff) |
svidl: Unwind SFX_SLOTMAP_ARG, and kill it.
Change-Id: Icd99fd2cd530f52b0acf5d91667eeec8142e8340
-rw-r--r-- | idl/source/objects/object.cxx | 2 | ||||
-rw-r--r-- | include/sfx2/shell.hxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 635bf62d0c6f..d549d8fecbd9 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -611,7 +611,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) rOutStm << endl; // write slotmap - rOutStm.WriteCharPtr( "SFX_SLOTMAP_ARG(" ).WriteCharPtr( GetName().getString().getStr() ).WriteChar( ')' ) << endl; + rOutStm.WriteCharPtr("static SfxSlot a").WriteCharPtr(GetName().getString().getStr()).WriteCharPtr("Slots_Impl[] =") << endl; rOutStm.WriteChar( '{' ) << endl; // write all attributes diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 8ec070d28800..fa7f139a8041 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -298,8 +298,6 @@ inline void SfxShell::SetPool #define SFX_SLOTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[1]; \ static SfxSlot a##ShellClass##Slots_Impl[] = -#define SFX_SLOTMAP_ARG(ShellClass) static SfxSlot a##ShellClass##Slots_Impl[] = - #define SFX_DECL_INTERFACE(nId) \ static SfxInterface* pInterface; \ private: \ |