diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 16:10:11 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:51:06 +0200 |
commit | 8c3ab6093afad91f7dcb7b674adb257be9530ca7 (patch) | |
tree | b7773a5a6d4547be1a6f4ea26984ace57081a2ea | |
parent | 2df21aa91b72ed54728f7508a958d58afa42a543 (diff) |
sfx2: Kill SFX_STATUSBAR_REGISTRATION macro.
Change-Id: Iff0ffdb955892117a767e1f31c1f854a93feb560
-rw-r--r-- | basctl/source/basicide/basdoc.cxx | 2 | ||||
-rw-r--r-- | include/sfx2/shell.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appmisc.cxx | 2 | ||||
-rw-r--r-- | starmath/source/smmod.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/uibase/app/apphdl.cxx | 2 |
7 files changed, 6 insertions, 9 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 61c0904c2503..1e70ea46edd8 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -41,7 +41,7 @@ SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SFXOBJECTSHELL_STD_NORMAL, "sb SFX_IMPL_INTERFACE( basctl_DocShell, SfxObjectShell, IDEResId( 0 ) ) { - SFX_STATUSBAR_REGISTRATION( IDEResId( SID_BASICIDE_STATUSBAR ) ); + GetStaticInterface()->RegisterStatusBar(IDEResId(SID_BASICIDE_STATUSBAR)); } DocShell::DocShell() diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 5f2bae7d95d7..fdc05434d190 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -352,9 +352,6 @@ inline void SfxShell::SetPool #define SFX_VISIBILITY_SERVER 0x8000 #define SFX_VISIBILITY_NOCONTEXT 0xFFFF // Always visable -#define SFX_STATUSBAR_REGISTRATION(rResId) \ - GetStaticInterface()->RegisterStatusBar( rResId ) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index f3fd4ab783f4..d001186a0bc4 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -124,7 +124,7 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, ScResId(RID_OBJECTBAR_APP)); - SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig + GetStaticInterface()->RegisterStatusBar(ScResId(SCCFG_STATUSBAR)); } ScModule::ScModule( SfxObjectFactory* pFact ) : diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 8af20c4fcde3..830f3e86ed94 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -62,7 +62,7 @@ TYPEINIT1( SdModule, SfxModule ); SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR)) { - SFX_STATUSBAR_REGISTRATION(SdResId(RID_DRAW_STATUSBAR)); + GetStaticInterface()->RegisterStatusBar(SdResId(RID_DRAW_STATUSBAR)); } // Ctor diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index c256f75d6ea7..76a120885cca 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -92,7 +92,7 @@ using namespace ::com::sun::star::container; SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) { - SFX_STATUSBAR_REGISTRATION(SfxResId(SFX_ITEMTYPE_STATBAR)); + GetStaticInterface()->RegisterStatusBar(SfxResId(SFX_ITEMTYPE_STATBAR)); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_0); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_1); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 8db6486a4fe0..4c128c61460f 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -160,7 +160,7 @@ const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rU SFX_IMPL_INTERFACE(SmModule, SfxModule, SmResId(RID_APPLICATION)) { - SFX_STATUSBAR_REGISTRATION(SmResId(RID_STATUSBAR)); + GetStaticInterface()->RegisterStatusBar(SmResId(RID_STATUSBAR)); } diff --git a/sw/source/core/uibase/app/apphdl.cxx b/sw/source/core/uibase/app/apphdl.cxx index 410fb0e5db5c..fd517e832bc9 100644 --- a/sw/source/core/uibase/app/apphdl.cxx +++ b/sw/source/core/uibase/app/apphdl.cxx @@ -113,7 +113,7 @@ using namespace ::com::sun::star; SFX_IMPL_INTERFACE( SwModule, SfxModule, SW_RES(RID_SW_NAME) ) { - SFX_STATUSBAR_REGISTRATION(SW_RES(CFG_STATUSBAR)); + GetStaticInterface()->RegisterStatusBar(SW_RES(CFG_STATUSBAR)); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, SW_RES(RID_MODULE_TOOLBOX)); |