summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-04-18 15:17:25 +0200
committerJan Holesovsky <kendy@collabora.com>2014-04-18 22:49:27 +0200
commit7acb27081c6da9fc0ae64f4d145d8744c81d4b0a (patch)
tree93d32031ef3a32153b9917600e4ea862321c3ff1 /sw
parent2be92a9d4e5255963af5261c7511003626831be9 (diff)
sfx2: Kill SFX_OBJECTBAR_REGISTRATION macro.
Change-Id: Ic80e9bebba8c7e76a0400769a2f9d75301227194
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/uibase/app/apphdl.cxx6
-rw-r--r--sw/source/core/uibase/shells/annotsh.cxx3
-rw-r--r--sw/source/core/uibase/shells/beziersh.cxx3
-rw-r--r--sw/source/core/uibase/shells/drawsh.cxx4
-rw-r--r--sw/source/core/uibase/shells/drformsh.cxx3
-rw-r--r--sw/source/core/uibase/shells/drwtxtsh.cxx4
-rw-r--r--sw/source/core/uibase/shells/frmsh.cxx3
-rw-r--r--sw/source/core/uibase/shells/grfsh.cxx3
-rw-r--r--sw/source/core/uibase/shells/listsh.cxx2
-rw-r--r--sw/source/core/uibase/shells/mediash.cxx3
-rw-r--r--sw/source/core/uibase/shells/olesh.cxx2
-rw-r--r--sw/source/core/uibase/shells/tabsh.cxx2
-rw-r--r--sw/source/core/uibase/shells/textsh.cxx2
-rw-r--r--sw/source/core/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/core/uibase/uiview/srcview.cxx2
-rw-r--r--sw/source/core/uibase/uiview/view0.cxx2
-rw-r--r--sw/source/core/uibase/web/wformsh.cxx2
-rw-r--r--sw/source/core/uibase/web/wfrmsh.cxx2
-rw-r--r--sw/source/core/uibase/web/wgrfsh.cxx2
-rw-r--r--sw/source/core/uibase/web/wlistsh.cxx2
-rw-r--r--sw/source/core/uibase/web/wolesh.cxx2
-rw-r--r--sw/source/core/uibase/web/wtabsh.cxx2
-rw-r--r--sw/source/core/uibase/web/wtextsh.cxx2
-rw-r--r--sw/source/core/uibase/web/wview.cxx2
24 files changed, 36 insertions, 26 deletions
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) );
}