From b731d71c67b864b61f5c08e219140be59c473f53 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 18 Apr 2014 17:25:30 +0200 Subject: 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 --- basctl/source/basicide/basdoc.cxx | 4 +++- basctl/source/basicide/basidesh.cxx | 4 ++-- include/sfx2/shell.hxx | 4 +--- sc/source/ui/app/scmod.cxx | 4 +++- sc/source/ui/docshell/docsh.cxx | 2 ++ sc/source/ui/drawfunc/chartsh.cxx | 4 +++- sc/source/ui/drawfunc/drawsh.cxx | 5 ++-- sc/source/ui/drawfunc/drformsh.cxx | 4 +++- sc/source/ui/drawfunc/drtxtob.cxx | 4 ++-- sc/source/ui/drawfunc/graphsh.cxx | 4 +++- sc/source/ui/drawfunc/mediash.cxx | 4 +++- sc/source/ui/drawfunc/oleobjsh.cxx | 4 +++- sc/source/ui/view/auditsh.cxx | 3 ++- sc/source/ui/view/cellsh.cxx | 4 +++- sc/source/ui/view/editsh.cxx | 3 ++- sc/source/ui/view/formatsh.cxx | 4 +++- sc/source/ui/view/pgbrksh.cxx | 2 ++ sc/source/ui/view/pivotsh.cxx | 2 ++ sc/source/ui/view/prevwsh.cxx | 4 +++- sc/source/ui/view/tabvwsh.cxx | 4 +++- sd/source/ui/app/sdmod.cxx | 3 ++- sd/source/ui/dlg/PaneShells.cxx | 4 ++++ sd/source/ui/docshell/docshell.cxx | 3 ++- sd/source/ui/docshell/grdocsh.cxx | 2 ++ .../ui/slidesorter/shell/SlideSorterViewShell.cxx | 7 ++---- sd/source/ui/table/tableobjectbar.cxx | 8 ++----- sd/source/ui/view/GraphicObjectBar.cxx | 8 ++----- sd/source/ui/view/MediaObjectBar.cxx | 9 ++----- sd/source/ui/view/ViewShellBase.cxx | 3 ++- sd/source/ui/view/drbezob.cxx | 3 ++- sd/source/ui/view/drtxtob.cxx | 8 +++---- sd/source/ui/view/drvwshrg.cxx | 6 +++-- sd/source/ui/view/outlnvsh.cxx | 9 +++---- sd/source/ui/view/presvish.cxx | 4 +++- sfx2/source/appl/appmisc.cxx | 10 ++++---- sfx2/source/appl/module.cxx | 8 ++----- sfx2/source/doc/objserv.cxx | 8 ++----- sfx2/source/view/viewfrm.cxx | 5 ++-- sfx2/source/view/viewsh.cxx | 5 ++-- starmath/source/document.cxx | 5 ++-- starmath/source/smmod.cxx | 6 ++--- starmath/source/view.cxx | 4 ++-- svx/source/form/fmshell.cxx | 3 ++- svx/source/toolbars/extrusionbar.cxx | 28 ++++------------------ svx/source/toolbars/fontworkbar.cxx | 25 ++++--------------- sw/source/core/uibase/app/apphdl.cxx | 4 +++- sw/source/core/uibase/app/docsh.cxx | 4 +++- sw/source/core/uibase/misc/glshell.cxx | 8 +++++-- sw/source/core/uibase/shells/annotsh.cxx | 2 ++ sw/source/core/uibase/shells/basesh.cxx | 2 ++ sw/source/core/uibase/shells/beziersh.cxx | 2 ++ sw/source/core/uibase/shells/drawsh.cxx | 2 ++ sw/source/core/uibase/shells/drformsh.cxx | 2 ++ sw/source/core/uibase/shells/drwbassh.cxx | 2 ++ sw/source/core/uibase/shells/drwtxtsh.cxx | 2 ++ sw/source/core/uibase/shells/frmsh.cxx | 2 ++ sw/source/core/uibase/shells/grfsh.cxx | 2 ++ sw/source/core/uibase/shells/listsh.cxx | 2 ++ sw/source/core/uibase/shells/mediash.cxx | 2 ++ sw/source/core/uibase/shells/navsh.cxx | 2 ++ sw/source/core/uibase/shells/olesh.cxx | 2 ++ sw/source/core/uibase/shells/tabsh.cxx | 2 ++ sw/source/core/uibase/shells/textsh.cxx | 2 ++ sw/source/core/uibase/uiview/pview.cxx | 2 ++ sw/source/core/uibase/uiview/srcview.cxx | 4 +++- sw/source/core/uibase/uiview/view0.cxx | 4 +++- sw/source/core/uibase/web/wdocsh.cxx | 5 ++-- sw/source/core/uibase/web/wformsh.cxx | 2 ++ sw/source/core/uibase/web/wfrmsh.cxx | 2 ++ sw/source/core/uibase/web/wgrfsh.cxx | 2 ++ sw/source/core/uibase/web/wlistsh.cxx | 2 ++ sw/source/core/uibase/web/wolesh.cxx | 2 ++ sw/source/core/uibase/web/wtabsh.cxx | 2 ++ sw/source/core/uibase/web/wtextsh.cxx | 2 ++ sw/source/core/uibase/web/wview.cxx | 4 +++- 75 files changed, 185 insertions(+), 151 deletions(-) diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 1e70ea46edd8..c1dddbaa99c5 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -39,7 +39,9 @@ TYPEINIT1(DocShell, SfxObjectShell); SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SFXOBJECTSHELL_STD_NORMAL, "sbasic" ) -SFX_IMPL_INTERFACE( basctl_DocShell, SfxObjectShell, IDEResId( 0 ) ) +SFX_IMPL_INTERFACE(basctl_DocShell, SfxObjectShell, IDEResId(0)) + +void basctl_DocShell::InitInterface_Impl() { GetStaticInterface()->RegisterStatusBar(IDEResId(SID_BASICIDE_STATUSBAR)); } diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 4aafd11a0ee9..cad57f72a00c 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -135,8 +135,9 @@ SFX_IMPL_NAMED_VIEWFACTORY( Shell, "Default" ) SFX_VIEW_REGISTRATION( DocShell ); } +SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell, IDEResId(RID_STR_IDENAME)) -SFX_IMPL_INTERFACE( basctl_Shell, SfxViewShell, IDEResId( RID_STR_IDENAME ) ) +void basctl_Shell::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); @@ -152,7 +153,6 @@ unsigned const ShellFlags = SFX_VIEW_CAN_PRINT | SFX_VIEW_NO_NEWWINDOW; } - unsigned Shell::nShellCount = 0; Shell::Shell( SfxViewFrame* pFrame_, SfxViewShell* /* pOldShell */ ) : diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index fdc05434d190..3a8c5d847085 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -336,9 +336,7 @@ inline void SfxShell::SetPool void Class::RegisterInterface(SfxModule* pMod) \ { \ GetStaticInterface()->Register(pMod); \ - } \ - \ - void Class::InitInterface_Impl() + } #define SFX_POSITION_MASK 0x000F #define SFX_VISIBILITY_MASK 0xFFF0 diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index d001186a0bc4..246130f45102 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -119,7 +119,9 @@ static sal_uInt16 nIdleCount = 0; -SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) +SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_APPTITLE)) + +void ScModule::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, ScResId(RID_OBJECTBAR_APP)); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 0c2b700a8f57..e08aa62d0de3 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -171,6 +171,8 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell, ScResId(SCSTR_DOCSHELL)) + +void ScDocShell::InitInterface_Impl() { } diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 396264e3925a..59072eac484f 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -45,7 +45,9 @@ using namespace css::uno; namespace drawing = com::sun::star::drawing; -SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL) ) +SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL)) + +void ScChartShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, ScResId(RID_DRAW_OBJECTBAR)); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 0960af4b47a1..8a082c06aaef 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -61,7 +61,9 @@ TYPEINIT1( ScDrawShell, SfxShell ); -SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) ) +SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL)) + +void ScDrawShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, ScResId(RID_DRAW_OBJECTBAR)); @@ -71,7 +73,6 @@ SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) ) GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId()); } - // abschalten der nicht erwuenschten Acceleratoren: void ScDrawShell::StateDisableItems( SfxItemSet &rSet ) diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 754b668c9a88..6842f494f750 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -41,7 +41,9 @@ #include "scslots.hxx" -SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL) ) +SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL)) + +void ScDrawFormShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, ScResId(RID_OBJECTBAR_FORMAT)); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index ef800d70ad84..9101591b3ef5 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -76,11 +76,11 @@ #define ScDrawTextObjectBar #include "scslots.hxx" - using namespace ::com::sun::star; +SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL)) -SFX_IMPL_INTERFACE( ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL) ) +void ScDrawTextObjectBar::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, ScResId(RID_TEXT_TOOLBOX)); diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index bb2d6273a0a4..6f48256a79e5 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -64,7 +64,9 @@ public: } }; -SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL) ) +SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL)) + +void ScGraphicShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, ScResId(RID_GRAPHIC_OBJECTBAR)); diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index d8bb003dead6..ac8ef7f6ebd5 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -36,7 +36,9 @@ #define ScMediaShell #include "scslots.hxx" -SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL) ) +SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL)) + +void ScMediaShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, ScResId(RID_MEDIA_OBJECTBAR)); diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index d3a583c8dd1b..99d9f03dec1d 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -41,7 +41,9 @@ #include "scslots.hxx" -SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL) ) +SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL)) + +void ScOleObjectShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, ScResId(RID_DRAW_OBJECTBAR)); diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index a150d13d63a6..f8723e688ccf 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -37,11 +37,12 @@ TYPEINIT1( ScAuditingShell, SfxShell ); SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) + +void ScAuditingShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_AUDIT)); } - ScAuditingShell::ScAuditingShell(ScViewData* pData) : SfxShell(pData->GetViewShell()), pViewData( pData ), diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 1fcc28d8e5a5..79da4a4ed08a 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -63,7 +63,9 @@ TYPEINIT1( ScCellShell, ScFormatShell ); -SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell , ScResId(SCSTR_CELLSHELL) ) +SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell, ScResId(SCSTR_CELLSHELL)) + +void ScCellShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, ScResId(RID_OBJECTBAR_FORMAT)); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index d5600939721e..14bfab8e2737 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -82,11 +82,12 @@ using namespace ::com::sun::star; TYPEINIT1( ScEditShell, SfxShell ); SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) + +void ScEditShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_EDIT)); } - ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) : pEditView (pView), pViewData (pData), diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index a70a7ef59fab..a0e7e55c5c59 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -120,7 +120,9 @@ SvxCellVerJustify lclConvertSlotToVAlign( sal_uInt16 nSlot ) TYPEINIT1( ScFormatShell, SfxShell ); -SFX_IMPL_INTERFACE(ScFormatShell, SfxShell, ScResId(SCSTR_FORMATSHELL) ) +SFX_IMPL_INTERFACE(ScFormatShell, SfxShell, ScResId(SCSTR_FORMATSHELL)) + +void ScFormatShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, ScResId(RID_OBJECTBAR_FORMAT)); diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 2b1db9ed0246..5265c93a1cb7 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -37,6 +37,8 @@ TYPEINIT1( ScPageBreakShell, SfxShell ); SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL)) + +void ScPageBreakShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PAGEBREAK)); } diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index 79b87bd9b915..a094cffe620b 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -45,6 +45,8 @@ TYPEINIT1( ScPivotShell, SfxShell ); SFX_IMPL_INTERFACE(ScPivotShell, SfxShell, ScResId(SCSTR_PIVOTSHELL)) + +void ScPivotShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PIVOT)); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 016015fd07ba..e1a83495b307 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -83,7 +83,9 @@ using namespace com::sun::star; TYPEINIT1( ScPreviewShell, SfxViewShell ); -SFX_IMPL_INTERFACE( ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL) ) +SFX_IMPL_INTERFACE(ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL)) + +void ScPreviewShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER|SFX_VISIBILITY_READONLYDOC, ScResId(RID_OBJECTBAR_PREVIEW)); diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 8847d5e0a3a8..3a048d0525c5 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -46,7 +46,9 @@ TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener); -SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) +SFX_IMPL_INTERFACE(ScTabViewShell, SfxViewShell, ScResId(SCSTR_TABVIEWSHELL)) + +void ScTabViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, ScResId(RID_OBJECTBAR_TOOLS)); diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 830f3e86ed94..2466c84279c6 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -59,8 +59,9 @@ TYPEINIT1( SdModule, SfxModule ); #define SdModule #include "sdslots.hxx" - SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR)) + +void SdModule::InitInterface_Impl() { GetStaticInterface()->RegisterStatusBar(SdResId(RID_DRAW_STATUSBAR)); } diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index bdd4c3c4810f..5e1e212553d6 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -37,6 +37,8 @@ SFX_SLOTMAP(LeftImpressPaneShell) }; SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell, SdResId(STR_LEFT_IMPRESS_PANE_SHELL)) + +void LeftImpressPaneShell::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(::sd::LeftPaneImpressChildWindow::GetChildWindowId()); } @@ -61,6 +63,8 @@ SFX_SLOTMAP(LeftDrawPaneShell) }; SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell, SdResId(STR_LEFT_DRAW_PANE_SHELL)) + +void LeftDrawPaneShell::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(::sd::LeftPaneDrawChildWindow::GetChildWindowId()); } diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 96fbbe545868..f43878762457 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -74,11 +74,12 @@ using namespace sd; #include "sdslots.hxx" SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0)) + +void DrawDocShell::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); } - namespace sd { /** diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index 83278ce4c6ff..5a0b821addae 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -45,6 +45,8 @@ namespace sd TYPEINIT1(GraphicDocShell, DrawDocShell); SFX_IMPL_INTERFACE(GraphicDocShell, SfxObjectShell, SdResId(0)) + +void GraphicDocShell::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 5e10da2de460..5c7f6cb4312e 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -82,18 +82,15 @@ using ::sfx2::sidebar::EnumContext; namespace sd { namespace slidesorter { - SFX_IMPL_INTERFACE(SlideSorterViewShell, SfxShell, SdResId(STR_SLIDESORTERVIEWSHELL)) + +void SlideSorterViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); } - - TYPEINIT1(SlideSorterViewShell, ViewShell); - - ::boost::shared_ptr SlideSorterViewShell::Create ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index cc9f9d55b29f..88f6670a8ebe 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -75,20 +75,16 @@ void RegisterInterfaces(SfxModule* pMod) TableObjectBar::RegisterInterface(pMod); } - // - TableObjectBar - - TYPEINIT1( TableObjectBar, SfxShell ); +SFX_IMPL_INTERFACE(TableObjectBar, SfxShell, SdResId(STR_TABLEOBJECTBARSHELL)) - -SFX_IMPL_INTERFACE( TableObjectBar, SfxShell, SdResId( STR_TABLEOBJECTBARSHELL ) ) +void TableObjectBar::InitInterface_Impl() { } - - TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell( pSdViewShell->GetViewShell() ) , mpView( pSdView ) diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 1f950457b552..8248808dbd70 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "GraphicObjectBar.hxx" #include @@ -34,7 +33,6 @@ #include #include - #include #include "app.hrc" @@ -54,13 +52,11 @@ using namespace sd; namespace sd { - - - // - GraphicObjectBar - +SFX_IMPL_INTERFACE(GraphicObjectBar, SfxShell, SdResId(STR_GRAFOBJECTBARSHELL)) -SFX_IMPL_INTERFACE( GraphicObjectBar, SfxShell, SdResId( STR_GRAFOBJECTBARSHELL ) ) +void GraphicObjectBar::InitInterface_Impl() { } diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 90cc1e344674..c2bfb8a2d704 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "MediaObjectBar.hxx" #include #include @@ -48,20 +47,16 @@ using namespace sd; namespace sd { - // - MediaObjectBar - - TYPEINIT1( MediaObjectBar, SfxShell ); +SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell, SdResId(STR_MEDIAOBJECTBARSHELL)) - -SFX_IMPL_INTERFACE( MediaObjectBar, SfxShell, SdResId( STR_MEDIAOBJECTBARSHELL ) ) +void MediaObjectBar::InitInterface_Impl() { } - - MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell( pSdViewShell->GetViewShell() ), mpView( pSdView ), diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 573630db02d8..833c12aedf81 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -214,7 +214,6 @@ private: }; } // end of anonymous namespace - //===== ViewShellBase ========================================================= TYPEINIT1(ViewShellBase, SfxViewShell); @@ -225,6 +224,8 @@ TYPEINIT1(ViewShellBase, SfxViewShell); SfxViewFactory* ViewShellBase::pFactory; SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0)) + +void ViewShellBase::InitInterface_Impl() { } diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index 32dffba88de2..bf1b88631f94 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -57,12 +57,13 @@ namespace sd { */ SFX_IMPL_INTERFACE(BezierObjectBar, ::SfxShell, SdResId(STR_BEZIEROBJECTBARSHELL)) + +void BezierObjectBar::InitInterface_Impl() { } TYPEINIT1(BezierObjectBar, ::SfxShell); - BezierObjectBar::BezierObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView) diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 0d48df45586c..13b1def5845b 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TextObjectBar.hxx" #include @@ -48,7 +47,6 @@ #include #include - #include #include "app.hrc" @@ -65,7 +63,6 @@ #include "Window.hxx" #include "OutlineView.hxx" - using namespace sd; using namespace ::com::sun::star; @@ -79,13 +76,14 @@ namespace sd { * something that (hopefully) never occurs. */ -SFX_IMPL_INTERFACE( TextObjectBar, SfxShell, SdResId(STR_TEXTOBJECTBARSHELL) ) +SFX_IMPL_INTERFACE(TextObjectBar, SfxShell, SdResId(STR_TEXTOBJECTBARSHELL)) + +void TextObjectBar::InitInterface_Impl() { } TYPEINIT1( TextObjectBar, SfxShell ); - TextObjectBar::TextObjectBar ( ViewShell* pSdViewSh, SfxItemPool& rItemPool, diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 2524ce4e01c0..3fdf95f4d7d0 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawViewShell.hxx" #include #include @@ -36,7 +35,6 @@ #include #include - #include "app.hrc" #include "strings.hrc" #include "res_bmp.hrc" @@ -63,6 +61,8 @@ namespace sd { */ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) + +void DrawViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP)); @@ -89,6 +89,8 @@ TYPEINIT1( DrawViewShell, ViewShell ); // SdGraphicViewShell SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH... + +void GraphicViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP)); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index c34be2e74df4..f8d61b0f7757 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "OutlineViewShell.hxx" #include "ViewShellImplementation.hxx" @@ -95,6 +94,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; using namespace sd; + #define OutlineViewShell #include "sdslots.hxx" @@ -103,13 +103,12 @@ namespace sd { #define MIN_ZOOM 10 // minimum zoom factor #define MAX_ZOOM 1000 // maximum zoom factor -/************************************************************************/ - - /** * Declare SFX-Slotmap and standard interface */ SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL)) + +void OutlineViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SdResId(RID_OUTLINE_POPUP)); @@ -126,10 +125,8 @@ SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL)) GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); } - TYPEINIT1( OutlineViewShell, ViewShell ); - /** * common initialization part of both constructors */ diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 53cb9a70f20b..b81af442b771 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -61,7 +61,9 @@ using namespace ::com::sun::star::presentation; namespace sd { -SFX_IMPL_INTERFACE( PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSHELL ) ) +SFX_IMPL_INTERFACE(PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSHELL ) ) + +void PresentationViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, SdResId(RID_DRAW_TOOLBOX)); diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 76a120885cca..a301d0ba29dc 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -91,6 +91,8 @@ using namespace ::com::sun::star::container; #define SFX_ITEMTYPE_STATBAR 4 SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) + +void SfxApplication::InitInterface_Impl() { GetStaticInterface()->RegisterStatusBar(SfxResId(SFX_ITEMTYPE_STATBAR)); @@ -106,11 +108,7 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_9); } -SfxProgress* SfxApplication::GetProgress() const - -/* [Description] - - Returns the running SfxProgress for the entire application or 0 if +/** Returns the running SfxProgress for the entire application or 0 if none is running for the entire application. [Cross-reference] @@ -118,7 +116,7 @@ SfxProgress* SfxApplication::GetProgress() const */ - +SfxProgress* SfxApplication::GetProgress() const { return pAppData_Impl->pProgress; } diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 1eefa3f9f6a1..32508b602dca 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -99,21 +99,17 @@ ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, bool bBig ) TYPEINIT1(SfxModule, SfxShell); +SFX_IMPL_INTERFACE(SfxModule, SfxShell, SfxResId(0)) - -SFX_IMPL_INTERFACE(SfxModule,SfxShell,SfxResId(0)) +void SfxModule::InitInterface_Impl() { } - - ResMgr* SfxModule::GetResMgr() { return pResMgr; } - - SfxModule::SfxModule( ResMgr* pMgrP, bool bDummyP, SfxObjectFactory* pFactoryP, ... ) : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L) diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 87dc8ebcfbb7..9dc181c89eac 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -113,16 +113,12 @@ using namespace ::com::sun::star::task; #define SfxObjectShell #include "sfxslots.hxx" +SFX_IMPL_INTERFACE(SfxObjectShell, SfxShell, SfxResId(0)) - - - -SFX_IMPL_INTERFACE(SfxObjectShell,SfxShell,SfxResId(0)) +void SfxObjectShell::InitInterface_Impl() { } - - class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener > { bool m_bGotOwnership; diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 10f63b651f1e..2fdf5a6c8829 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -143,9 +143,9 @@ using ::com::sun::star::container::XIndexContainer; #include "sfxslots.hxx" #undef SfxViewFrame - - SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) + +void SfxViewFrame::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(SID_BROWSER); GetStaticInterface()->RegisterChildWindow(SID_RECORDING_FLOATWINDOW); @@ -158,7 +158,6 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) TYPEINIT2(SfxViewFrame,SfxShell,SfxListener); TYPEINIT1(SfxViewFrameItem, SfxPoolItem); - namespace { bool moduleHasToolPanels( SfxViewFrame_Impl& i_rViewFrameImpl ) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index f204d345c875..69ef3af1c123 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -289,17 +289,16 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags) , m_pAccExec(0) {} - SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0)) + +void SfxViewShell::InitInterface_Impl() { } TYPEINIT2(SfxViewShell,SfxShell,SfxListener); - /** search for a filter name dependent on type and module */ - static OUString impl_retrieveFilterNameFromTypeAndModule( const css::uno::Reference< css::container::XContainerQuery >& rContainerQuery, const OUString& rType, 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" ); diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 0df17375bb04..987e729e645b 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -161,7 +161,6 @@ FmDesignModeChangedHint::~FmDesignModeChangedHint() { } - const sal_uInt32 FM_UI_FEATURE_SHOW_DATABASEBAR = 0x00000001; const sal_uInt32 FM_UI_FEATURE_SHOW_FIELD = 0x00000002; const sal_uInt32 FM_UI_FEATURE_SHOW_PROPERTIES = 0x00000004; @@ -175,6 +174,8 @@ const sal_uInt32 FM_UI_FEATURE_TB_FORMDESIGN = 0x00000200; const sal_uInt32 FM_UI_FEATURE_SHOW_DATANAVIGATOR = 0x00000400; SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL)) + +void FmFormShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC, SVX_RES(RID_SVXTBX_FORM_NAVIGATION), diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 08b13f3855ff..191e91dcb05e 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -41,7 +41,6 @@ #include #include "extrusiondepthdialog.hxx" - using namespace ::svx; using namespace ::rtl; using namespace ::cppu; @@ -49,32 +48,22 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; -/************************************************************************* -|* -|* Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also -|* tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). -|* -\************************************************************************/ - +// Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also +// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). SFX_SLOTMAP(ExtrusionBar) { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell, SVX_RES(RID_SVX_EXTRUSION_BAR)) + +void ExtrusionBar::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_EXTRUSION_BAR) ); } TYPEINIT1( ExtrusionBar, SfxShell ); - -/************************************************************************* -|* -|* Standard-Konstruktor -|* -\************************************************************************/ - ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) : SfxShell(pViewShell) { @@ -86,13 +75,6 @@ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) SetName(SVX_RESSTR(RID_SVX_EXTRUSION_BAR)); } - -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - ExtrusionBar::~ExtrusionBar() { SetRepeatTarget(NULL); diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 5cd2b14ae900..24a1c25b927c 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -165,32 +165,22 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.Put( SfxStringItem( SID_FONTWORK_SHAPE_TYPE, aFontWorkShapeType ) ); } -/************************************************************************* -|* -|* Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also -|* tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). -|* -\************************************************************************/ - +// Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also +// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). SFX_SLOTMAP(FontworkBar) { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; SFX_IMPL_INTERFACE(FontworkBar, SfxShell, SVX_RES(RID_SVX_FONTWORK_BAR)) + +void FontworkBar::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_FONTWORK_BAR)); } TYPEINIT1( FontworkBar, SfxShell ); - -/************************************************************************* -|* -|* Standard-Konstruktor -|* -\************************************************************************/ - FontworkBar::FontworkBar(SfxViewShell* pViewShell ) : SfxShell(pViewShell) { @@ -202,13 +192,6 @@ FontworkBar::FontworkBar(SfxViewShell* pViewShell ) SetName( SVX_RESSTR( RID_SVX_FONTWORK_BAR )); } - -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - FontworkBar::~FontworkBar() { SetRepeatTarget(NULL); diff --git a/sw/source/core/uibase/app/apphdl.cxx b/sw/source/core/uibase/app/apphdl.cxx index fd517e832bc9..7fbdc2d70193 100644 --- a/sw/source/core/uibase/app/apphdl.cxx +++ b/sw/source/core/uibase/app/apphdl.cxx @@ -111,7 +111,9 @@ using namespace ::com::sun::star; #include -SFX_IMPL_INTERFACE( SwModule, SfxModule, SW_RES(RID_SW_NAME) ) +SFX_IMPL_INTERFACE(SwModule, SfxModule, SW_RES(RID_SW_NAME) ) + +void SwModule::InitInterface_Impl() { GetStaticInterface()->RegisterStatusBar(SW_RES(CFG_STATUSBAR)); diff --git a/sw/source/core/uibase/app/docsh.cxx b/sw/source/core/uibase/app/docsh.cxx index 58f176942d77..240c8ead1514 100644 --- a/sw/source/core/uibase/app/docsh.cxx +++ b/sw/source/core/uibase/app/docsh.cxx @@ -115,7 +115,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; -SFX_IMPL_INTERFACE( SwDocShell, SfxObjectShell, SW_RES(0) ) +SFX_IMPL_INTERFACE(SwDocShell, SfxObjectShell, SW_RES(0) ) + +void SwDocShell::InitInterface_Impl() { } diff --git a/sw/source/core/uibase/misc/glshell.cxx b/sw/source/core/uibase/misc/glshell.cxx index e78ca093bc85..0f4d8693762d 100644 --- a/sw/source/core/uibase/misc/glshell.cxx +++ b/sw/source/core/uibase/misc/glshell.cxx @@ -53,11 +53,15 @@ using namespace ::com::sun::star; -SFX_IMPL_INTERFACE( SwGlosDocShell, SwDocShell, SW_RES(0) ) +SFX_IMPL_INTERFACE(SwGlosDocShell, SwDocShell, SW_RES(0) ) + +void SwGlosDocShell::InitInterface_Impl() { } -SFX_IMPL_INTERFACE( SwWebGlosDocShell, SwWebDocShell, SW_RES(0) ) +SFX_IMPL_INTERFACE(SwWebGlosDocShell, SwWebDocShell, SW_RES(0) ) + +void SwWebGlosDocShell::InitInterface_Impl() { } diff --git a/sw/source/core/uibase/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx index eaba65bc2069..96faa5945cf9 100644 --- a/sw/source/core/uibase/shells/annotsh.cxx +++ b/sw/source/core/uibase/shells/annotsh.cxx @@ -137,6 +137,8 @@ using namespace ::com::sun::star::i18n; #include SFX_IMPL_INTERFACE(SwAnnotationShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT)) + +void SwAnnotationShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX)); diff --git a/sw/source/core/uibase/shells/basesh.cxx b/sw/source/core/uibase/shells/basesh.cxx index e86ed00d1b47..dfcc17498ef6 100644 --- a/sw/source/core/uibase/shells/basesh.cxx +++ b/sw/source/core/uibase/shells/basesh.cxx @@ -143,6 +143,8 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0)) + +void SwBaseShell::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SvxContourDlgChildWindow::GetChildWindowId()); diff --git a/sw/source/core/uibase/shells/beziersh.cxx b/sw/source/core/uibase/shells/beziersh.cxx index 8a42b1c0ce1f..3268ea5b36e6 100644 --- a/sw/source/core/uibase/shells/beziersh.cxx +++ b/sw/source/core/uibase/shells/beziersh.cxx @@ -44,6 +44,8 @@ #include SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell, SW_RES(STR_SHELLNAME_BEZIER)) + +void SwBezierShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAW_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx index daabdc27b99c..2091c921d775 100644 --- a/sw/source/core/uibase/shells/drawsh.cxx +++ b/sw/source/core/uibase/shells/drawsh.cxx @@ -75,6 +75,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAW)) + +void SwDrawShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAW_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/drformsh.cxx b/sw/source/core/uibase/shells/drformsh.cxx index 55ebc7bbba92..1c39b6837c20 100644 --- a/sw/source/core/uibase/shells/drformsh.cxx +++ b/sw/source/core/uibase/shells/drformsh.cxx @@ -58,6 +58,8 @@ using namespace ::com::sun::star; SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM)) + +void SwDrawFormShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAWFORM_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/drwbassh.cxx b/sw/source/core/uibase/shells/drwbassh.cxx index be1fea36e8d8..d8a7ee97559c 100644 --- a/sw/source/core/uibase/shells/drwbassh.cxx +++ b/sw/source/core/uibase/shells/drwbassh.cxx @@ -68,6 +68,8 @@ using namespace ::com::sun::star; SFX_IMPL_INTERFACE(SwDrawBaseShell, SwBaseShell, SW_RES(0)) + +void SwDrawBaseShell::InitInterface_Impl() { } diff --git a/sw/source/core/uibase/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx index d4614dc032fa..99551ac9bc89 100644 --- a/sw/source/core/uibase/shells/drwtxtsh.cxx +++ b/sw/source/core/uibase/shells/drwtxtsh.cxx @@ -80,6 +80,8 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::i18n; SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT)) + +void SwDrawTextShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRWTXT_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx index f3e9615f00e4..b565dd9f09ce 100644 --- a/sw/source/core/uibase/shells/frmsh.cxx +++ b/sw/source/core/uibase/shells/frmsh.cxx @@ -105,6 +105,8 @@ static const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const OUString& rNam #include "swslots.hxx" SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell, SW_RES(STR_SHELLNAME_FRAME)) + +void SwFrameShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_FRM_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/grfsh.cxx b/sw/source/core/uibase/shells/grfsh.cxx index a75c61c34a71..d78af685d773 100644 --- a/sw/source/core/uibase/shells/grfsh.cxx +++ b/sw/source/core/uibase/shells/grfsh.cxx @@ -96,6 +96,8 @@ namespace } SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell, SW_RES(STR_SHELLNAME_GRAPHIC)) + +void SwGrfShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_GRF_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/listsh.cxx b/sw/source/core/uibase/shells/listsh.cxx index 37bad349b695..6d2f7bd296ae 100644 --- a/sw/source/core/uibase/shells/listsh.cxx +++ b/sw/source/core/uibase/shells/listsh.cxx @@ -53,6 +53,8 @@ #include SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST)) + +void SwListShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX)); } diff --git a/sw/source/core/uibase/shells/mediash.cxx b/sw/source/core/uibase/shells/mediash.cxx index cc59d2e40dff..e5323f9c60a3 100644 --- a/sw/source/core/uibase/shells/mediash.cxx +++ b/sw/source/core/uibase/shells/mediash.cxx @@ -69,6 +69,8 @@ #include "swabstdlg.hxx" SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell, SW_RES(STR_SHELLNAME_MEDIA)) + +void SwMediaShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_MEDIA_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/navsh.cxx b/sw/source/core/uibase/shells/navsh.cxx index c5a9199daa32..af68afaebc63 100644 --- a/sw/source/core/uibase/shells/navsh.cxx +++ b/sw/source/core/uibase/shells/navsh.cxx @@ -30,6 +30,8 @@ #include "navmgr.hxx" SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell, SW_RES(STR_SHELLNAME_NAVIGATION)) + +void SwNavigationShell::InitInterface_Impl() { } diff --git a/sw/source/core/uibase/shells/olesh.cxx b/sw/source/core/uibase/shells/olesh.cxx index be3f3d3d0f84..a872e3a98ff1 100644 --- a/sw/source/core/uibase/shells/olesh.cxx +++ b/sw/source/core/uibase/shells/olesh.cxx @@ -38,6 +38,8 @@ #include SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell, SW_RES(STR_SHELLNAME_OBJECT)) + +void SwOleShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_OLE_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/tabsh.cxx b/sw/source/core/uibase/shells/tabsh.cxx index 033ba9f78693..3fd9a853f63f 100644 --- a/sw/source/core/uibase/shells/tabsh.cxx +++ b/sw/source/core/uibase/shells/tabsh.cxx @@ -90,6 +90,8 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE)) + +void SwTableShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TAB_POPUPMENU)); diff --git a/sw/source/core/uibase/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx index 4f5f3b7cc1f5..0a8805b7ee2e 100644 --- a/sw/source/core/uibase/shells/textsh.cxx +++ b/sw/source/core/uibase/shells/textsh.cxx @@ -115,6 +115,8 @@ using namespace ::com::sun::star; #include SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_TEXT)) + +void SwTextShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TEXT_POPUPMENU)); diff --git a/sw/source/core/uibase/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx index d70878bfdcad..d34c0da3c15f 100644 --- a/sw/source/core/uibase/uiview/pview.cxx +++ b/sw/source/core/uibase/uiview/pview.cxx @@ -89,6 +89,8 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview") } SFX_IMPL_INTERFACE(SwPagePreview, SfxViewShell, SW_RES(RID_PVIEW_TOOLBOX)) + +void SwPagePreview::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_PPREVIEW_POPUPMENU)); diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx index d7b589fca43a..156876e74902 100644 --- a/sw/source/core/uibase/uiview/srcview.cxx +++ b/sw/source/core/uibase/uiview/srcview.cxx @@ -112,7 +112,9 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView") SFX_VIEW_REGISTRATION(SwWebDocShell); } -SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) ) +SFX_IMPL_INTERFACE(SwSrcView, SfxViewShell, SW_RES(0) ) + +void SwSrcView::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_SRCVIEW_POPUPMENU)); diff --git a/sw/source/core/uibase/uiview/view0.cxx b/sw/source/core/uibase/uiview/view0.cxx index 100619a0ee32..a13db11d95ec 100644 --- a/sw/source/core/uibase/uiview/view0.cxx +++ b/sw/source/core/uibase/uiview/view0.cxx @@ -88,7 +88,9 @@ 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) ) + +void SwView::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); diff --git a/sw/source/core/uibase/web/wdocsh.cxx b/sw/source/core/uibase/web/wdocsh.cxx index 12b47059b199..85101332066e 100644 --- a/sw/source/core/uibase/web/wdocsh.cxx +++ b/sw/source/core/uibase/web/wdocsh.cxx @@ -30,7 +30,6 @@ #include "swtypes.hxx" #include "shellio.hxx" -// just because of the itemtypes #include "wdocsh.hxx" #include "web.hrc" @@ -39,7 +38,9 @@ #include -SFX_IMPL_INTERFACE( SwWebDocShell, SfxObjectShell, SW_RES(0) ) +SFX_IMPL_INTERFACE(SwWebDocShell, SfxObjectShell, SW_RES(0) ) + +void SwWebDocShell::InitInterface_Impl() { } diff --git a/sw/source/core/uibase/web/wformsh.cxx b/sw/source/core/uibase/web/wformsh.cxx index e112fd7c4742..be3b7b830757 100644 --- a/sw/source/core/uibase/web/wformsh.cxx +++ b/sw/source/core/uibase/web/wformsh.cxx @@ -37,6 +37,8 @@ #include "swslots.hxx" SFX_IMPL_INTERFACE(SwWebDrawFormShell, SwDrawFormShell, SW_RES(0)) + +void SwWebDrawFormShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAWFORM_POPUPMENU)); diff --git a/sw/source/core/uibase/web/wfrmsh.cxx b/sw/source/core/uibase/web/wfrmsh.cxx index 795644c4c7d8..b28b57fe267b 100644 --- a/sw/source/core/uibase/web/wfrmsh.cxx +++ b/sw/source/core/uibase/web/wfrmsh.cxx @@ -36,6 +36,8 @@ #include "swslots.hxx" SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell, SW_RES(STR_SHELLNAME_WEBFRAME)) + +void SwWebFrameShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_FRM_POPUPMENU)); diff --git a/sw/source/core/uibase/web/wgrfsh.cxx b/sw/source/core/uibase/web/wgrfsh.cxx index 295ea3bd5984..b9fd9401d193 100644 --- a/sw/source/core/uibase/web/wgrfsh.cxx +++ b/sw/source/core/uibase/web/wgrfsh.cxx @@ -39,6 +39,8 @@ #include "swslots.hxx" SFX_IMPL_INTERFACE(SwWebGrfShell, SwGrfShell, SW_RES(STR_SHELLNAME_GRAPHIC)) + +void SwWebGrfShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_GRF_POPUPMENU)); diff --git a/sw/source/core/uibase/web/wlistsh.cxx b/sw/source/core/uibase/web/wlistsh.cxx index 1c42b209a89e..5d9e9c8a3f76 100644 --- a/sw/source/core/uibase/web/wlistsh.cxx +++ b/sw/source/core/uibase/web/wlistsh.cxx @@ -35,6 +35,8 @@ #include "swslots.hxx" SFX_IMPL_INTERFACE(SwWebListShell, SwListShell, SW_RES(STR_SHELLNAME_LIST)) + +void SwWebListShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX)); } diff --git a/sw/source/core/uibase/web/wolesh.cxx b/sw/source/core/uibase/web/wolesh.cxx index 13143b205547..2a30b7ffa697 100644 --- a/sw/source/core/uibase/web/wolesh.cxx +++ b/sw/source/core/uibase/web/wolesh.cxx @@ -36,6 +36,8 @@ #include "swslots.hxx" SFX_IMPL_INTERFACE(SwWebOleShell, SwOleShell, SW_RES(STR_SHELLNAME_OBJECT)) + +void SwWebOleShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_OLE_POPUPMENU)); diff --git a/sw/source/core/uibase/web/wtabsh.cxx b/sw/source/core/uibase/web/wtabsh.cxx index 2d87bfce8b8f..013f2bbe169e 100644 --- a/sw/source/core/uibase/web/wtabsh.cxx +++ b/sw/source/core/uibase/web/wtabsh.cxx @@ -39,6 +39,8 @@ #include "swslots.hxx" SFX_IMPL_INTERFACE(SwWebTableShell, SwTableShell, SW_RES(STR_SHELLNAME_TABLE)) + +void SwWebTableShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TAB_POPUPMENU)); diff --git a/sw/source/core/uibase/web/wtextsh.cxx b/sw/source/core/uibase/web/wtextsh.cxx index 031e9ad13f87..901a78f8c03c 100644 --- a/sw/source/core/uibase/web/wtextsh.cxx +++ b/sw/source/core/uibase/web/wtextsh.cxx @@ -42,6 +42,8 @@ #include "swslots.hxx" SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT)) + +void SwWebTextShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TEXT_POPUPMENU)); diff --git a/sw/source/core/uibase/web/wview.cxx b/sw/source/core/uibase/web/wview.cxx index cb899a7ba24e..8c4eb4cb1108 100644 --- a/sw/source/core/uibase/web/wview.cxx +++ b/sw/source/core/uibase/web/wview.cxx @@ -72,7 +72,9 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") SFX_VIEW_REGISTRATION(SwWebDocShell); } -SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) +SFX_IMPL_INTERFACE(SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) + +void SwWebView::InitInterface_Impl() { GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); -- cgit