diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 17:25:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:51:06 +0200 |
| commit | b731d71c67b864b61f5c08e219140be59c473f53 (patch) | |
| tree | 29f8a9f208e2e72b93389d5ee06d244599aefdc9 /sfx2/source/appl | |
| parent | 8c3ab6093afad91f7dcb7b674adb257be9530ca7 (diff) | |
sfx2: Move InitInterface_Impl() method out of SFX_IMPL_INTERFACE.
SFX_IMPL_INTERFACE previously looked like a function; where in fact it is
several methods defined at once, and only the last one has a body.
This is extremely confusing and hard to read; let's kill that nonsense.
Change-Id: Ia4ae22eb58b1260c9c827c894f5345693bad49e7
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 10 | ||||
| -rw-r--r-- | sfx2/source/appl/module.cxx | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 76a120885cca..a301d0ba29dc 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -91,6 +91,8 @@ using namespace ::com::sun::star::container; #define SFX_ITEMTYPE_STATBAR 4 SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) + +void SfxApplication::InitInterface_Impl() { GetStaticInterface()->RegisterStatusBar(SfxResId(SFX_ITEMTYPE_STATBAR)); @@ -106,11 +108,7 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_9); } -SfxProgress* SfxApplication::GetProgress() const - -/* [Description] - - Returns the running SfxProgress for the entire application or 0 if +/** Returns the running SfxProgress for the entire application or 0 if none is running for the entire application. [Cross-reference] @@ -118,7 +116,7 @@ SfxProgress* SfxApplication::GetProgress() const <SfxProgress::GetActiveProgress(SfxViewFrame*)> <SfxViewFrame::GetProgress()const> */ - +SfxProgress* SfxApplication::GetProgress() const { return pAppData_Impl->pProgress; } diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 1eefa3f9f6a1..32508b602dca 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -99,21 +99,17 @@ ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, bool bBig ) TYPEINIT1(SfxModule, SfxShell); +SFX_IMPL_INTERFACE(SfxModule, SfxShell, SfxResId(0)) - -SFX_IMPL_INTERFACE(SfxModule,SfxShell,SfxResId(0)) +void SfxModule::InitInterface_Impl() { } - - ResMgr* SfxModule::GetResMgr() { return pResMgr; } - - SfxModule::SfxModule( ResMgr* pMgrP, bool bDummyP, SfxObjectFactory* pFactoryP, ... ) : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L) |