diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 16:01:27 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:51:04 +0200 |
| commit | f4d61eca610140670e483407c9b87acdcd9a9c17 (patch) | |
| tree | 36952ba2154ff8eeb9b578a2721c70a0edbfaad3 /sfx2 | |
| parent | 1a1daff34e23e6b6c25975675a1f1a5a4db6ff08 (diff) | |
sfx2: Kill SFX_CHILDWINDOW_REGISTRATION macro.
Change-Id: Icd56e0cee1ce0283e8a1cbaafc81ecca25469185
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 26 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 4 |
2 files changed, 13 insertions, 17 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 01402bb06bb5..c256f75d6ea7 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -85,30 +85,26 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; - - #define SfxApplication #include "sfxslots.hxx" - - #define SFX_ITEMTYPE_STATBAR 4 SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) { SFX_STATUSBAR_REGISTRATION(SfxResId(SFX_ITEMTYPE_STATBAR)); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_0); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_1); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_2); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_3); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_4); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_5); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_6); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_7); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_8); - SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_9); -} + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_0); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_1); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_2); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_3); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_4); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_5); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_6); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_7); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_8); + GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_9); +} SfxProgress* SfxApplication::GetProgress() const diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index a55cb8a3ea8d..10f63b651f1e 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -147,8 +147,8 @@ using ::com::sun::star::container::XIndexContainer; SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) { - SFX_CHILDWINDOW_REGISTRATION( SID_BROWSER ); - SFX_CHILDWINDOW_REGISTRATION( SID_RECORDING_FLOATWINDOW ); + GetStaticInterface()->RegisterChildWindow(SID_BROWSER); + GetStaticInterface()->RegisterChildWindow(SID_RECORDING_FLOATWINDOW); #if HAVE_FEATURE_DESKTOP GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) ); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) ); |