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 /starmath/source | |
| 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 'starmath/source')
| -rw-r--r-- | starmath/source/document.cxx | 5 | ||||
| -rw-r--r-- | starmath/source/smmod.cxx | 6 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index bef01ea7a7fb..1b8307b9864e 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -104,12 +104,11 @@ using namespace ::com::sun::star::uno; #define SmDocShell #include "smslots.hxx" - - - TYPEINIT1( SmDocShell, SfxObjectShell ); SFX_IMPL_INTERFACE(SmDocShell, SfxObjectShell, SmResId(0)) + +void SmDocShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SmResId(RID_VIEWMENU)); GetStaticInterface()->RegisterPopupMenu(SmResId(RID_COMMANDMENU)); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 4c128c61460f..8bc1ddc464a3 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -156,14 +156,13 @@ const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rU return aRes; } - - SFX_IMPL_INTERFACE(SmModule, SfxModule, SmResId(RID_APPLICATION)) + +void SmModule::InitInterface_Impl() { GetStaticInterface()->RegisterStatusBar(SmResId(RID_STATUSBAR)); } - SmModule::SmModule(SfxObjectFactory* pObjFact) : SfxModule(SfxApplication::CreateResManager("sm"), false, pObjFact, NULL), pColorConfig( 0 ), @@ -177,7 +176,6 @@ SmModule::SmModule(SfxObjectFactory* pObjFact) : SvxModifyControl::RegisterControl(SID_DOC_MODIFIED, this); } - SmModule::~SmModule() { delete pConfig; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 68bcb722e19c..8973bc3e0697 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -930,6 +930,8 @@ struct SmViewShell_Impl TYPEINIT1( SmViewShell, SfxViewShell ); SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) + +void SmViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, SmResId(RID_MATH_TOOLBOX )); @@ -941,13 +943,11 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) GetStaticInterface()->RegisterChildWindow(SmElementsDockingWindowWrapper::GetChildWindowId()); } - SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default") { SFX_VIEW_REGISTRATION(SmDocShell); } - void SmViewShell::AdjustPosSizePixel(const Point &rPos, const Size &rSize) { SAL_INFO( "starmath", "SmViewShell::AdjustPosSizePixel" ); |