sfx2: Kill SFX_OBJECTBAR_REGISTRATION macro.

Change-Id: Ic80e9bebba8c7e76a0400769a2f9d75301227194

43 files changed, 91 insertions, 86 deletions

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index fa7f139a8041..365383ce0653 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_OBJECTBAR_REGISTRATION(nPos,rResId) \
-        GetStaticInterface()->RegisterObjectBar( nPos, rResId )
-
 #define SFX_FEATURED_OBJECTBAR_REGISTRATION(nPos,rResId,nFeature) \
         GetStaticInterface()->RegisterObjectBar( nPos, rResId, nFeature )
 
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 7a471c0f149d..f3fd4ab783f4 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -121,8 +121,9 @@ static sal_uInt16 nIdleCount = 0;
 
 SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
-                                ScResId(RID_OBJECTBAR_APP) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
+                                            ScResId(RID_OBJECTBAR_APP));
+
     SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) );     // nur ID wichtig
 }
 
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index e84b1be9fd40..e15d279aac2d 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -47,8 +47,9 @@ namespace drawing = com::sun::star::drawing;
 
 SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
-                                ScResId(RID_DRAW_OBJECTBAR) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
+                                            ScResId(RID_DRAW_OBJECTBAR));
+
     SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_CHART) );
 }
 
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index faa86dd3fc4f..06e9185f53a2 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -63,9 +63,11 @@ TYPEINIT1( ScDrawShell, SfxShell );
 
 SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
-                                ScResId(RID_DRAW_OBJECTBAR) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
+                                            ScResId(RID_DRAW_OBJECTBAR));
+
     SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_DRAW) );
+
     SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() );
 }
 
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 02cf369c3498..3e871de39424 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -43,8 +43,9 @@
 
 SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
-                                ScResId(RID_OBJECTBAR_FORMAT) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
+                                            ScResId(RID_OBJECTBAR_FORMAT));
+
     SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_DRAWFORM) );
 }
 
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 28028af7f1f7..3a08f79c7a4c 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -82,9 +82,11 @@ using namespace ::com::sun::star;
 
 SFX_IMPL_INTERFACE( ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
-                                ScResId(RID_TEXT_TOOLBOX) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
+                                            ScResId(RID_TEXT_TOOLBOX));
+
     SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_DRAWTEXT) );
+
     SFX_CHILDWINDOW_REGISTRATION( ScGetFontWorkId() );
 }
 
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 82602d9000f0..778c90fc2673 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -66,8 +66,9 @@ public:
 
 SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
-                                ScResId(RID_GRAPHIC_OBJECTBAR) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
+                                            ScResId(RID_GRAPHIC_OBJECTBAR));
+
     SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_GRAPHIC) );
 }
 
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 5e03dbd4e760..ec3d7264c98f 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -38,7 +38,8 @@
 
 SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT, ScResId(RID_MEDIA_OBJECTBAR) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, ScResId(RID_MEDIA_OBJECTBAR));
+
     SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_MEDIA) );
 }
 
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 9add3117d3df..89f33ddbef36 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -43,8 +43,9 @@
 
 SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
-                                ScResId(RID_DRAW_OBJECTBAR) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
+                                            ScResId(RID_DRAW_OBJECTBAR));
+
     SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_OLE) );
 }
 
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 87038194612b..3579152d5f5b 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -65,9 +65,9 @@ TYPEINIT1( ScCellShell, ScFormatShell );
 
 SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell , ScResId(SCSTR_CELLSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD |
-                                SFX_VISIBILITY_SERVER,
-                                ScResId(RID_OBJECTBAR_FORMAT));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
+                                            ScResId(RID_OBJECTBAR_FORMAT));
+
     SFX_POPUPMENU_REGISTRATION(ScResId(RID_POPUP_CELLS));
 }
 
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index dff4d44f6461..a70a7ef59fab 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -122,13 +122,10 @@ TYPEINIT1( ScFormatShell, SfxShell );
 
 SFX_IMPL_INTERFACE(ScFormatShell, SfxShell, ScResId(SCSTR_FORMATSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD |
-                                SFX_VISIBILITY_SERVER,
-                                ScResId(RID_OBJECTBAR_FORMAT));
-
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
+                                            ScResId(RID_OBJECTBAR_FORMAT));
 }
 
-
 ScFormatShell::ScFormatShell(ScViewData* pData) :
     SfxShell(pData->GetViewShell()),
     pViewData(pData)
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index ddc0563eb41f..914cabc14722 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -85,9 +85,9 @@ TYPEINIT1( ScPreviewShell, SfxViewShell );
 
 SFX_IMPL_INTERFACE( ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL) )
 {
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|
-                                SFX_VISIBILITY_SERVER|SFX_VISIBILITY_READONLYDOC,
-                                ScResId(RID_OBJECTBAR_PREVIEW));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER|SFX_VISIBILITY_READONLYDOC,
+                                            ScResId(RID_OBJECTBAR_PREVIEW));
+
     SFX_POPUPMENU_REGISTRATION(ScResId(RID_POPUP_PREVIEW));
 }
 
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 7daff6dd0670..5e5200182888 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -48,9 +48,8 @@ TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener);
 
 SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS  | SFX_VISIBILITY_STANDARD |
-                                SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
-                                ScResId(RID_OBJECTBAR_TOOLS) );
+    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());
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index c2a5fa7099ee..163418b8ee83 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -112,11 +112,12 @@ namespace sd {
 SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL))
 {
     SFX_POPUPMENU_REGISTRATION( SdResId(RID_OUTLINE_POPUP) );
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD |
-                                SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
-                                SdResId(RID_OUTLINE_TOOLBOX) );
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC,
-                                SdResId(RID_DRAW_VIEWER_TOOLBOX) );
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
+                                            SdResId(RID_OUTLINE_TOOLBOX));
+    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() );
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 94988d8ff4cb..53cb9a70f20b 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -61,26 +61,18 @@ using namespace ::com::sun::star::presentation;
 
 namespace sd {
 
-
-// - PresentationViewShell -
-
-
 SFX_IMPL_INTERFACE( PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSHELL ) )
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD |
-                                SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
-                                SdResId(RID_DRAW_TOOLBOX));
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC,
-                                SdResId(RID_DRAW_VIEWER_TOOLBOX) );
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OPTIONS | SFX_VISIBILITY_STANDARD |
-                                SFX_VISIBILITY_SERVER,
-                                SdResId(RID_DRAW_OPTIONS_TOOLBOX));
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_COMMONTASK | SFX_VISIBILITY_STANDARD |
-                                SFX_VISIBILITY_SERVER,
-                                SdResId(RID_DRAW_COMMONTASK_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
+                                            SdResId(RID_DRAW_TOOLBOX));
+    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) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OPTIONS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
+                                            SdResId(RID_DRAW_OPTIONS_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_COMMONTASK | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
+                                            SdResId(RID_DRAW_COMMONTASK_TOOLBOX));
 }
 
-
 TYPEINIT1( PresentationViewShell, DrawViewShell );
 
 PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView)
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index eee3e6054110..a55cb8a3ea8d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -150,8 +150,8 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
     SFX_CHILDWINDOW_REGISTRATION( SID_BROWSER );
     SFX_CHILDWINDOW_REGISTRATION( SID_RECORDING_FLOATWINDOW );
 #if HAVE_FEATURE_DESKTOP
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) );
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) );
 #endif
 }
 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 29383a20f6b9..f2550c110b59 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -931,9 +931,8 @@ TYPEINIT1( SmViewShell, SfxViewShell );
 
 SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD |
-                                SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
-                                SmResId(RID_MATH_TOOLBOX ));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
+                                            SmResId(RID_MATH_TOOLBOX ));
     //Dummy-Objectbar, to avoid quiver while activating
 
     SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 5810e161bee7..08b13f3855ff 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -63,7 +63,7 @@ SFX_SLOTMAP(ExtrusionBar)
 
 SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell, SVX_RES(RID_SVX_EXTRUSION_BAR))
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_EXTRUSION_BAR) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_EXTRUSION_BAR) );
 }
 
 TYPEINIT1( ExtrusionBar, SfxShell );
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 83a1ee11f791..5cd2b14ae900 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -179,7 +179,7 @@ SFX_SLOTMAP(FontworkBar)
 
 SFX_IMPL_INTERFACE(FontworkBar, SfxShell, SVX_RES(RID_SVX_FONTWORK_BAR))
 {
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_FONTWORK_BAR) );
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_FONTWORK_BAR));
 }
 
 TYPEINIT1( FontworkBar, SfxShell );
diff --git a/sw/source/core/uibase/app/apphdl.cxx b/sw/source/core/uibase/app/apphdl.cxx
index 452b752de5c9..410fb0e5db5c 100644
--- a/sw/source/core/uibase/app/apphdl.cxx
+++ b/sw/source/core/uibase/app/apphdl.cxx
@@ -114,9 +114,9 @@ using namespace ::com::sun::star;
 SFX_IMPL_INTERFACE( SwModule, SfxModule, SW_RES(RID_SW_NAME) )
 {
     SFX_STATUSBAR_REGISTRATION(SW_RES(CFG_STATUSBAR));
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION |
-            SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
-            SW_RES(RID_MODULE_TOOLBOX) );
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
+                                            SW_RES(RID_MODULE_TOOLBOX));
 }
 
 // other states
diff --git a/sw/source/core/uibase/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx
index cf098136a655..cde9c1fc0887 100644
--- a/sw/source/core/uibase/shells/annotsh.cxx
+++ b/sw/source/core/uibase/shells/annotsh.cxx
@@ -138,7 +138,8 @@ using namespace ::com::sun::star::i18n;
 
 SFX_IMPL_INTERFACE(SwAnnotationShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT))
 {
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_ANNOTATION_POPUPMENU));
 }
 
diff --git a/sw/source/core/uibase/shells/beziersh.cxx b/sw/source/core/uibase/shells/beziersh.cxx
index 8ba2d2a184df..b8e6a68d84b8 100644
--- a/sw/source/core/uibase/shells/beziersh.cxx
+++ b/sw/source/core/uibase/shells/beziersh.cxx
@@ -46,7 +46,8 @@
 SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell, SW_RES(STR_SHELLNAME_BEZIER))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_DRAW_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_BEZIER_TOOLBOX));
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_BEZIER_TOOLBOX));
 }
 
 TYPEINIT1(SwBezierShell,SwBaseShell)
diff --git a/sw/source/core/uibase/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx
index 4763cb55931a..548ba33a5b93 100644
--- a/sw/source/core/uibase/shells/drawsh.cxx
+++ b/sw/source/core/uibase/shells/drawsh.cxx
@@ -77,7 +77,9 @@ using namespace ::com::sun::star::uno;
 SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAW))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_DRAW_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TOOLBOX));
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TOOLBOX));
+
     SFX_CHILDWINDOW_REGISTRATION(SvxFontWorkChildWindow::GetChildWindowId());
 }
 
diff --git a/sw/source/core/uibase/shells/drformsh.cxx b/sw/source/core/uibase/shells/drformsh.cxx
index 117db5a8c69e..d2b1cafd6ccc 100644
--- a/sw/source/core/uibase/shells/drformsh.cxx
+++ b/sw/source/core/uibase/shells/drformsh.cxx
@@ -60,7 +60,8 @@ using namespace ::com::sun::star;
 SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_DRAWFORM_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
 }
 
 TYPEINIT1(SwDrawFormShell, SwDrawBaseShell)
diff --git a/sw/source/core/uibase/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx
index 27b7c1ffccc3..c5b273473d67 100644
--- a/sw/source/core/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/core/uibase/shells/drwtxtsh.cxx
@@ -82,7 +82,9 @@ using namespace ::com::sun::star::i18n;
 SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_DRWTXT_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TEXT_TOOLBOX));
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TEXT_TOOLBOX));
+
     SFX_CHILDWINDOW_REGISTRATION(SvxFontWorkChildWindow::GetChildWindowId());
 }
 
diff --git a/sw/source/core/uibase/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx
index 0a10d18f3568..bede835844fa 100644
--- a/sw/source/core/uibase/shells/frmsh.cxx
+++ b/sw/source/core/uibase/shells/frmsh.cxx
@@ -107,7 +107,8 @@ static const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const OUString& rNam
 SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell, SW_RES(STR_SHELLNAME_FRAME))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_FRM_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_FRAME_TOOLBOX));
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_FRAME_TOOLBOX));
 }
 
 void SwFrameShell::Execute(SfxRequest &rReq)
diff --git a/sw/source/core/uibase/shells/grfsh.cxx b/sw/source/core/uibase/shells/grfsh.cxx
index 980dceabe19d..c368f18accae 100644
--- a/sw/source/core/uibase/shells/grfsh.cxx
+++ b/sw/source/core/uibase/shells/grfsh.cxx
@@ -98,7 +98,8 @@ namespace
 SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell, SW_RES(STR_SHELLNAME_GRAPHIC))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_GRF_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_GRAFIK_TOOLBOX));
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_GRAFIK_TOOLBOX));
 }
 
 void SwGrfShell::Execute(SfxRequest &rReq)
diff --git a/sw/source/core/uibase/shells/listsh.cxx b/sw/source/core/uibase/shells/listsh.cxx
index 22379a68dcd9..37bad349b695 100644
--- a/sw/source/core/uibase/shells/listsh.cxx
+++ b/sw/source/core/uibase/shells/listsh.cxx
@@ -54,7 +54,7 @@
 
 SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST))
 {
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
 }
 
 TYPEINIT1(SwListShell,SwBaseShell)
diff --git a/sw/source/core/uibase/shells/mediash.cxx b/sw/source/core/uibase/shells/mediash.cxx
index 6f9671c42322..77673b3e9e82 100644
--- a/sw/source/core/uibase/shells/mediash.cxx
+++ b/sw/source/core/uibase/shells/mediash.cxx
@@ -71,7 +71,8 @@
 SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell, SW_RES(STR_SHELLNAME_MEDIA))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_MEDIA_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_MEDIA_TOOLBOX));
+
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_MEDIA_TOOLBOX));
 }
 
 void SwMediaShell::ExecMedia(SfxRequest &rReq)
diff --git a/sw/source/core/uibase/shells/olesh.cxx b/sw/source/core/uibase/shells/olesh.cxx
index 6014c2fd725a..87a6ec67b005 100644
--- a/sw/source/core/uibase/shells/olesh.cxx
+++ b/sw/source/core/uibase/shells/olesh.cxx
@@ -40,7 +40,7 @@
 SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell, SW_RES(STR_SHELLNAME_OBJECT))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_OLE_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_OLE_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_OLE_TOOLBOX));
 }
 
 SwOleShell::SwOleShell(SwView &_rView) :
diff --git a/sw/source/core/uibase/shells/tabsh.cxx b/sw/source/core/uibase/shells/tabsh.cxx
index 4080e9525302..032d68caefe6 100644
--- a/sw/source/core/uibase/shells/tabsh.cxx
+++ b/sw/source/core/uibase/shells/tabsh.cxx
@@ -92,7 +92,7 @@ using namespace ::com::sun::star;
 SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_TAB_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
 }
 
 TYPEINIT1(SwTableShell,SwBaseShell)
diff --git a/sw/source/core/uibase/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx
index a19bd352d24c..087994e6ebbf 100644
--- a/sw/source/core/uibase/shells/textsh.cxx
+++ b/sw/source/core/uibase/shells/textsh.cxx
@@ -117,7 +117,7 @@ using namespace ::com::sun::star;
 SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_TEXT))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_TEXT_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+    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);
diff --git a/sw/source/core/uibase/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx
index 06147f5a9c0c..fe183d016d5a 100644
--- a/sw/source/core/uibase/uiview/pview.cxx
+++ b/sw/source/core/uibase/uiview/pview.cxx
@@ -91,7 +91,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview")
 SFX_IMPL_INTERFACE(SwPagePreview, SfxViewShell, SW_RES(RID_PVIEW_TOOLBOX))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_PPREVIEW_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|
                                 SFX_VISIBILITY_CLIENT|SFX_VISIBILITY_FULLSCREEN|
                                 SFX_VISIBILITY_READONLYDOC,
                                 SW_RES(RID_PVIEW_TOOLBOX));
diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx
index 6b72e4f6c4b7..38f4f9cb494a 100644
--- a/sw/source/core/uibase/uiview/srcview.cxx
+++ b/sw/source/core/uibase/uiview/srcview.cxx
@@ -115,7 +115,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
 SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|
                                 SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                 SW_RES(RID_WEBTOOLS_TOOLBOX) );
     SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId());
diff --git a/sw/source/core/uibase/uiview/view0.cxx b/sw/source/core/uibase/uiview/view0.cxx
index a36b077cd1da..6091b5375ee6 100644
--- a/sw/source/core/uibase/uiview/view0.cxx
+++ b/sw/source/core/uibase/uiview/view0.cxx
@@ -106,7 +106,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
     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);
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|
                                 SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                 SW_RES(RID_TOOLS_TOOLBOX) );
 }
diff --git a/sw/source/core/uibase/web/wformsh.cxx b/sw/source/core/uibase/web/wformsh.cxx
index 9911d0be198a..c35f292b1c57 100644
--- a/sw/source/core/uibase/web/wformsh.cxx
+++ b/sw/source/core/uibase/web/wformsh.cxx
@@ -39,7 +39,7 @@
 SFX_IMPL_INTERFACE(SwWebDrawFormShell, SwDrawFormShell, SW_RES(0))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_DRAWFORM_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
 }
 
 TYPEINIT1(SwWebDrawFormShell, SwDrawFormShell)
diff --git a/sw/source/core/uibase/web/wfrmsh.cxx b/sw/source/core/uibase/web/wfrmsh.cxx
index d2697400f983..c6addc826aab 100644
--- a/sw/source/core/uibase/web/wfrmsh.cxx
+++ b/sw/source/core/uibase/web/wfrmsh.cxx
@@ -38,7 +38,7 @@
 SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell, SW_RES(STR_SHELLNAME_WEBFRAME))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_FRM_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBFRAME_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBFRAME_TOOLBOX));
 }
 
 TYPEINIT1(SwWebFrameShell, SwFrameShell)
diff --git a/sw/source/core/uibase/web/wgrfsh.cxx b/sw/source/core/uibase/web/wgrfsh.cxx
index 042b4ddbbefd..0e6d2c420131 100644
--- a/sw/source/core/uibase/web/wgrfsh.cxx
+++ b/sw/source/core/uibase/web/wgrfsh.cxx
@@ -41,7 +41,7 @@
 SFX_IMPL_INTERFACE(SwWebGrfShell, SwGrfShell, SW_RES(STR_SHELLNAME_GRAPHIC))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_GRF_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBGRAPHIC_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBGRAPHIC_TOOLBOX));
 }
 
 TYPEINIT1(SwWebGrfShell,SwGrfShell)
diff --git a/sw/source/core/uibase/web/wlistsh.cxx b/sw/source/core/uibase/web/wlistsh.cxx
index 7bca24fcf64e..1c42b209a89e 100644
--- a/sw/source/core/uibase/web/wlistsh.cxx
+++ b/sw/source/core/uibase/web/wlistsh.cxx
@@ -36,7 +36,7 @@
 
 SFX_IMPL_INTERFACE(SwWebListShell, SwListShell, SW_RES(STR_SHELLNAME_LIST))
 {
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
 }
 
 TYPEINIT1(SwWebListShell,SwListShell)
diff --git a/sw/source/core/uibase/web/wolesh.cxx b/sw/source/core/uibase/web/wolesh.cxx
index bf8359c8ef47..57b70ec9764e 100644
--- a/sw/source/core/uibase/web/wolesh.cxx
+++ b/sw/source/core/uibase/web/wolesh.cxx
@@ -38,7 +38,7 @@
 SFX_IMPL_INTERFACE(SwWebOleShell, SwOleShell, SW_RES(STR_SHELLNAME_OBJECT))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_OLE_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBOLE_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBOLE_TOOLBOX));
 }
 
 SwWebOleShell::SwWebOleShell(SwView &_rView) :
diff --git a/sw/source/core/uibase/web/wtabsh.cxx b/sw/source/core/uibase/web/wtabsh.cxx
index ca24430380fd..99ba669b5604 100644
--- a/sw/source/core/uibase/web/wtabsh.cxx
+++ b/sw/source/core/uibase/web/wtabsh.cxx
@@ -41,7 +41,7 @@
 SFX_IMPL_INTERFACE(SwWebTableShell, SwTableShell, SW_RES(STR_SHELLNAME_TABLE))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_TAB_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
 }
 
 TYPEINIT1(SwWebTableShell,SwTableShell)
diff --git a/sw/source/core/uibase/web/wtextsh.cxx b/sw/source/core/uibase/web/wtextsh.cxx
index 16299b4f2e68..9c1af4123e8e 100644
--- a/sw/source/core/uibase/web/wtextsh.cxx
+++ b/sw/source/core/uibase/web/wtextsh.cxx
@@ -44,7 +44,7 @@
 SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_TEXT_POPUPMENU));
-    SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
     SFX_CHILDWINDOW_REGISTRATION(FN_EDIT_FORMULA);
     SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD);
 }
diff --git a/sw/source/core/uibase/web/wview.cxx b/sw/source/core/uibase/web/wview.cxx
index 8c3eebf0c2e6..584dd34ea3ff 100644
--- a/sw/source/core/uibase/web/wview.cxx
+++ b/sw/source/core/uibase/web/wview.cxx
@@ -77,7 +77,7 @@ 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());
-    SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
+    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|
                                 SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                 SW_RES(RID_WEBTOOLS_TOOLBOX) );
 }