Kaydet (Commit) 2df21aa9 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

sfx2: Kill SFX_CHILDWINDOW_CONTEXT_REGISTRATION macro.

Change-Id: Ib94cc5bc33152e53910a50cce878fb69312d0c30
üst 72d8c94d
...@@ -352,9 +352,6 @@ inline void SfxShell::SetPool ...@@ -352,9 +352,6 @@ inline void SfxShell::SetPool
#define SFX_VISIBILITY_SERVER 0x8000 #define SFX_VISIBILITY_SERVER 0x8000
#define SFX_VISIBILITY_NOCONTEXT 0xFFFF // Always visable #define SFX_VISIBILITY_NOCONTEXT 0xFFFF // Always visable
#define SFX_CHILDWINDOW_CONTEXT_REGISTRATION(nId) \
GetStaticInterface()->RegisterChildWindow( nId, true )
#define SFX_STATUSBAR_REGISTRATION(rResId) \ #define SFX_STATUSBAR_REGISTRATION(rResId) \
GetStaticInterface()->RegisterStatusBar( rResId ) GetStaticInterface()->RegisterStatusBar( rResId )
......
...@@ -55,7 +55,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) ...@@ -55,7 +55,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR); GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScNameDlgWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(ScNameDlgWrapper::GetChildWindowId());
......
...@@ -66,7 +66,7 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) ...@@ -66,7 +66,7 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL))
{ {
GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP)); 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(SfxTemplateDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
...@@ -92,7 +92,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH ...@@ -92,7 +92,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH
{ {
GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP)); 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(SfxTemplateDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
......
...@@ -90,7 +90,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") ...@@ -90,7 +90,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) 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(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment