diff options
24 files changed, 139 insertions, 162 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 6f15f08d7b1c..5674a6ee1b33 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -138,14 +138,13 @@ SFX_IMPL_NAMED_VIEWFACTORY( Shell, "Default" ) SFX_IMPL_INTERFACE( basctl_Shell, SfxViewShell, IDEResId( RID_STR_IDENAME ) ) { - SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG ); + GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); + SFX_FEATURED_CHILDWINDOW_REGISTRATION(SID_SHOW_PROPERTYBROWSER, BASICIDE_UI_FEATURE_SHOW_BROWSER); GetStaticInterface()->RegisterPopupMenu(IDEResId(RID_POPUP_DLGED)); } - - namespace { diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index e31d56ea7782..ea2390dd9696 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -73,7 +73,7 @@ public: void RegisterObjectBar( sal_uInt16, const ResId&, const OUString* pST=0 ); void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const OUString* pST=0 ); - void RegisterChildWindow( sal_uInt16, bool bContext, const OUString* pST=0 ); + void RegisterChildWindow( sal_uInt16, bool bContext = false, const OUString* pST=0 ); void RegisterChildWindow( sal_uInt16, bool bContext, sal_uInt32 nFeature, const OUString* pST=0 ); void RegisterStatusBar( const ResId& ); const ResId& GetObjectBarResId( sal_uInt16 nNo ) const; diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 79c593c7c8cd..e2173b8e7fbb 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_REGISTRATION(nId) \ - GetStaticInterface()->RegisterChildWindow( nId, false ) - #define SFX_FEATURED_CHILDWINDOW_REGISTRATION(nId,nFeature) \ GetStaticInterface()->RegisterChildWindow( nId, false, nFeature ) diff --git a/include/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx index f6ea05bb649c..2c9e826e510f 100644 --- a/include/svx/SpellDialogChildWindow.hxx +++ b/include/svx/SpellDialogChildWindow.hxx @@ -35,7 +35,7 @@ namespace svx { <li>Call this class' RegisterChildWindow() method with the module as second argument that you want the dialog included in.</li> <li>In the SFX_IMPL_INTERFACE implementation of the view shell - that wants to use the dialog call SFX_CHILDWINDOW_REGISTRATION() + that wants to use the dialog call RegisterChildWindow() with the id returned by this class' GetChildWindowId() method.</li> <li>Include the item associated with this child window to the SDI diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 49c9b36d991a..0960af4b47a1 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -68,7 +68,7 @@ SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) ) GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAW)); - SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); + GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId()); } diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index e9965ff8c6c4..ef800d70ad84 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -87,7 +87,7 @@ SFX_IMPL_INTERFACE( ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL) GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWTEXT)); - SFX_CHILDWINDOW_REGISTRATION( ScGetFontWorkId() ); + GetStaticInterface()->RegisterChildWindow(ScGetFontWorkId()); } TYPEINIT1( ScDrawTextObjectBar, SfxShell ); diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 5e5200182888..731372a2a331 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -51,46 +51,48 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, ScResId(RID_OBJECTBAR_TOOLS)); - SFX_CHILDWINDOW_REGISTRATION(FID_INPUTLINE_STATUS); - SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(FID_INPUTLINE_STATUS); + GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); + SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR); - SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScOptSolverDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScXMLSourceDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScPivotLayoutWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScTabOpDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScFilterDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScSpecialFilterDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScDbNameDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScConsolidateDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScPrintAreasDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScColRowNameRangesDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScFormulaDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SvxIMapDlgChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScFunctionChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScFormulaDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScAcceptChgDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScHighlightChgDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScSimpleRefDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SID_SEARCH_DLG); - SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG); - SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScSpellDialogChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScValidityRefChildWin::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScRandomNumberGeneratorDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScSamplingDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScDescriptiveStatisticsDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScAnalysisOfVarianceDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScCorrelationDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScCovarianceDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScExponentialSmoothingDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScMovingAverageDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScTTestDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScNameDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScNameDefDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScSolverDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScOptSolverDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScXMLSourceDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScPivotLayoutWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScTabOpDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScFilterDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScSpecialFilterDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScDbNameDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScConsolidateDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScPrintAreasDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScColRowNameRangesDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScFormulaDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScFunctionChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScFormulaDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScAcceptChgDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScHighlightChgDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScSimpleRefDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); + GetStaticInterface()->RegisterChildWindow(SID_HYPERLINK_DIALOG); + GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScSpellDialogChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScValidityRefChildWin::GetChildWindowId()); + + GetStaticInterface()->RegisterChildWindow(ScRandomNumberGeneratorDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScSamplingDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScDescriptiveStatisticsDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScAnalysisOfVarianceDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScCorrelationDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScCovarianceDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScExponentialSmoothingDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScMovingAverageDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(ScTTestDialogWrapper::GetChildWindowId()); } diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 023dbcc810a4..bdd4c3c4810f 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -38,30 +38,21 @@ SFX_SLOTMAP(LeftImpressPaneShell) SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell, SdResId(STR_LEFT_IMPRESS_PANE_SHELL)) { - SFX_CHILDWINDOW_REGISTRATION( - ::sd::LeftPaneImpressChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sd::LeftPaneImpressChildWindow::GetChildWindowId()); } TYPEINIT1(LeftImpressPaneShell, SfxShell); - - LeftImpressPaneShell::LeftImpressPaneShell (void) : SfxShell() { SetName(OUString("LeftImpressPane")); } - - - LeftImpressPaneShell::~LeftImpressPaneShell (void) { } - - - //===== LeftDrawPaneShell ===================================================== SFX_SLOTMAP(LeftDrawPaneShell) @@ -71,28 +62,21 @@ SFX_SLOTMAP(LeftDrawPaneShell) SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell, SdResId(STR_LEFT_DRAW_PANE_SHELL)) { - SFX_CHILDWINDOW_REGISTRATION( - ::sd::LeftPaneDrawChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sd::LeftPaneDrawChildWindow::GetChildWindowId()); } TYPEINIT1(LeftDrawPaneShell, SfxShell); - - LeftDrawPaneShell::LeftDrawPaneShell (void) : SfxShell() { SetName(OUString("LeftDrawPane")); } - - - LeftDrawPaneShell::~LeftDrawPaneShell (void) { } - } // end of namespace ::sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 7d250a4508b0..96fbbe545868 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -75,7 +75,7 @@ using namespace sd; SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0)) { - SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); } diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index 836480067f91..83278ce4c6ff 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -46,7 +46,7 @@ TYPEINIT1(GraphicDocShell, DrawDocShell); SFX_IMPL_INTERFACE(GraphicDocShell, SfxObjectShell, SdResId(0)) { - SFX_CHILDWINDOW_REGISTRATION(SID_SEARCH_DLG); + GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); } SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), SFXOBJECTSHELL_STD_NORMAL, "sdraw" ) diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 9e6d070c70d2..5e10da2de460 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -85,7 +85,7 @@ namespace sd { namespace slidesorter { SFX_IMPL_INTERFACE(SlideSorterViewShell, SfxShell, SdResId(STR_SLIDESORTERVIEWSHELL)) { - SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); } diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 0f267ccf95e6..990e819b1db2 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -62,57 +62,54 @@ namespace sd { * Declare SFX-Slotmap and Standardinterface */ - SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) { GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP)); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); - SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SfxInfoBarContainerChild::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( AnimationChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( Svx3DChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxBmpMaskChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( GalleryChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxIMapDlgChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( ::sd::SpellDialogChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG ); - SFX_CHILDWINDOW_REGISTRATION( ::avmedia::MediaPlayer::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); -} + GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxColorChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(AnimationChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(Svx3DChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxBmpMaskChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); + GetStaticInterface()->RegisterChildWindow(::avmedia::MediaPlayer::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); +} TYPEINIT1( DrawViewShell, ViewShell ); - // SdGraphicViewShell - SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH... { GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP)); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); - SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( Svx3DChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxBmpMaskChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( GalleryChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxIMapDlgChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( ::sd::SpellDialogChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG ); - SFX_CHILDWINDOW_REGISTRATION( ::avmedia::MediaPlayer::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); + + GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxColorChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(Svx3DChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxBmpMaskChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); + GetStaticInterface()->RegisterChildWindow(::avmedia::MediaPlayer::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); } TYPEINIT1( GraphicViewShell, DrawViewShell ); - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 4203b985e4b0..c34be2e74df4 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -118,12 +118,12 @@ SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL)) GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC, SdResId(RID_DRAW_VIEWER_TOOLBOX)); - SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SfxInfoBarContainerChild::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( ::sd::SpellDialogChildWindow::GetChildWindowId() ); - SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG ); - SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); + GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); } 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) ); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f2550c110b59..68bcb722e19c 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -935,10 +935,10 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) SmResId(RID_MATH_TOOLBOX )); //Dummy-Objectbar, to avoid quiver while activating - SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE); - SFX_CHILDWINDOW_REGISTRATION(SmToolBoxWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SmCmdBoxWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SmElementsDockingWindowWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SID_TASKPANE); + GetStaticInterface()->RegisterChildWindow(SmToolBoxWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SmCmdBoxWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SmElementsDockingWindowWrapper::GetChildWindowId()); } diff --git a/sw/source/core/uibase/shells/basesh.cxx b/sw/source/core/uibase/shells/basesh.cxx index 27901b331468..e86ed00d1b47 100644 --- a/sw/source/core/uibase/shells/basesh.cxx +++ b/sw/source/core/uibase/shells/basesh.cxx @@ -144,8 +144,8 @@ using namespace ::com::sun::star::lang; SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0)) { - SFX_CHILDWINDOW_REGISTRATION(SvxIMapDlgChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SvxContourDlgChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxContourDlgChildWindow::GetChildWindowId()); } TYPEINIT1(SwBaseShell,SfxShell) diff --git a/sw/source/core/uibase/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx index 9f01c97dabf6..daabdc27b99c 100644 --- a/sw/source/core/uibase/shells/drawsh.cxx +++ b/sw/source/core/uibase/shells/drawsh.cxx @@ -80,7 +80,7 @@ SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAW)) GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TOOLBOX)); - SFX_CHILDWINDOW_REGISTRATION(SvxFontWorkChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId()); } TYPEINIT1(SwDrawShell,SwDrawBaseShell) diff --git a/sw/source/core/uibase/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx index 2af6858de6f1..d4614dc032fa 100644 --- a/sw/source/core/uibase/shells/drwtxtsh.cxx +++ b/sw/source/core/uibase/shells/drwtxtsh.cxx @@ -85,7 +85,7 @@ SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT)) GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TEXT_TOOLBOX)); - SFX_CHILDWINDOW_REGISTRATION(SvxFontWorkChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId()); } TYPEINIT1(SwDrawTextShell,SfxShell) diff --git a/sw/source/core/uibase/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx index 32ed6b934de5..4f5f3b7cc1f5 100644 --- a/sw/source/core/uibase/shells/textsh.cxx +++ b/sw/source/core/uibase/shells/textsh.cxx @@ -120,12 +120,12 @@ SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_TEXT)) GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX)); - SFX_CHILDWINDOW_REGISTRATION(FN_EDIT_FORMULA); - SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD); - SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_IDX_ENTRY_DLG); - SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_AUTH_ENTRY_DLG); - SFX_CHILDWINDOW_REGISTRATION(SID_RUBY_DIALOG); - SFX_CHILDWINDOW_REGISTRATION(FN_WORDCOUNT_DIALOG); + GetStaticInterface()->RegisterChildWindow(FN_EDIT_FORMULA); + GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD); + GetStaticInterface()->RegisterChildWindow(FN_INSERT_IDX_ENTRY_DLG); + GetStaticInterface()->RegisterChildWindow(FN_INSERT_AUTH_ENTRY_DLG); + GetStaticInterface()->RegisterChildWindow(SID_RUBY_DIALOG); + GetStaticInterface()->RegisterChildWindow(FN_WORDCOUNT_DIALOG); } TYPEINIT1(SwTextShell,SwBaseShell) diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx index 1f1d238989c5..d7b589fca43a 100644 --- a/sw/source/core/uibase/uiview/srcview.cxx +++ b/sw/source/core/uibase/uiview/srcview.cxx @@ -119,7 +119,7 @@ SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) ) GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, SW_RES(RID_WEBTOOLS_TOOLBOX) ); - SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); } TYPEINIT1(SwSrcView, SfxViewShell) diff --git a/sw/source/core/uibase/uiview/view0.cxx b/sw/source/core/uibase/uiview/view0.cxx index 6091b5375ee6..37c2824195b8 100644 --- a/sw/source/core/uibase/uiview/view0.cxx +++ b/sw/source/core/uibase/uiview/view0.cxx @@ -91,24 +91,26 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) { SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR); - SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SwSpellDialogChildWindow::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(FN_REDLINE_ACCEPT); - SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG); - SFX_CHILDWINDOW_REGISTRATION(FN_WORDCOUNT_DIALOG); - SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId()); + + GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SwSpellDialogChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(FN_REDLINE_ACCEPT); + GetStaticInterface()->RegisterChildWindow(SID_HYPERLINK_DIALOG); + GetStaticInterface()->RegisterChildWindow(FN_WORDCOUNT_DIALOG); + GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId()); #if HAVE_FEATURE_AVMEDIA - SFX_CHILDWINDOW_REGISTRATION(::avmedia::MediaPlayer::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::avmedia::MediaPlayer::GetChildWindowId()); #endif - SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD_DATA_ONLY); - SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS, CHILDWIN_LABEL ); - SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_MAILMERGE_CHILDWINDOW, CHILDWIN_MAILMERGE); - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS| - SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, - SW_RES(RID_TOOLS_TOOLBOX) ); + GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD_DATA_ONLY); + + SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS, CHILDWIN_LABEL ); + SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_MAILMERGE_CHILDWINDOW, CHILDWIN_MAILMERGE); + + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, + SW_RES(RID_TOOLS_TOOLBOX)); } TYPEINIT1(SwView,SfxViewShell) diff --git a/sw/source/core/uibase/web/wtextsh.cxx b/sw/source/core/uibase/web/wtextsh.cxx index 3fb5d9d37bd2..031e9ad13f87 100644 --- a/sw/source/core/uibase/web/wtextsh.cxx +++ b/sw/source/core/uibase/web/wtextsh.cxx @@ -47,8 +47,8 @@ SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT)) GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX)); - SFX_CHILDWINDOW_REGISTRATION(FN_EDIT_FORMULA); - SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD); + GetStaticInterface()->RegisterChildWindow(FN_EDIT_FORMULA); + GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD); } TYPEINIT1(SwWebTextShell, SwTextShell) diff --git a/sw/source/core/uibase/web/wview.cxx b/sw/source/core/uibase/web/wview.cxx index 584dd34ea3ff..cb899a7ba24e 100644 --- a/sw/source/core/uibase/web/wview.cxx +++ b/sw/source/core/uibase/web/wview.cxx @@ -74,12 +74,12 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) { - SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId()); - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS| - SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, - SW_RES(RID_WEBTOOLS_TOOLBOX) ); + GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); + + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, + SW_RES(RID_WEBTOOLS_TOOLBOX) ); } TYPEINIT1(SwWebView,SwView) |