diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 16:06:55 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:51:05 +0200 |
| commit | 2df21aa91b72ed54728f7508a958d58afa42a543 (patch) | |
| tree | 04e6816c1e36bdbb74487f3f4f2c32c8c09e9405 | |
| parent | 72d8c94dface439aa32928fb042a4793165f4158 (diff) | |
sfx2: Kill SFX_CHILDWINDOW_CONTEXT_REGISTRATION macro.
Change-Id: Ib94cc5bc33152e53910a50cce878fb69312d0c30
| -rw-r--r-- | include/sfx2/shell.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drvwshrg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/uibase/uiview/view0.cxx | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 22c3a1f3aabf..5f2bae7d95d7 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_CHILDWINDOW_CONTEXT_REGISTRATION(nId) \ - GetStaticInterface()->RegisterChildWindow( nId, true ) - #define SFX_STATUSBAR_REGISTRATION(rResId) \ GetStaticInterface()->RegisterStatusBar( rResId ) diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 731372a2a331..8847d5e0a3a8 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -55,7 +55,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); - SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR); + GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(ScNameDlgWrapper::GetChildWindowId()); diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 990e819b1db2..2524ce4e01c0 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -66,7 +66,7 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) { GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP)); - SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); + GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); @@ -92,7 +92,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH { GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP)); - SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); + GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId()); diff --git a/sw/source/core/uibase/uiview/view0.cxx b/sw/source/core/uibase/uiview/view0.cxx index dd1f8a69548e..100619a0ee32 100644 --- a/sw/source/core/uibase/uiview/view0.cxx +++ b/sw/source/core/uibase/uiview/view0.cxx @@ -90,7 +90,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) { - SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR); + GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); |