summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-24 15:09:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-11-24 16:36:02 +0000
commit577dd616bc438bfddf5f65246b1564737bba6a6f (patch)
tree9b6a1e33b54e55742ca8a8c9d39785911b7d2ad9
parent0b3e6b79af3721f51569d2b7090713f41d522ece (diff)
so these ResIds are only being used for the numerical value
Change-Id: I21c67b56424de59d7231f8420055775cd5f67aae
-rw-r--r--include/sfx2/objface.hxx4
-rw-r--r--sc/source/ui/app/scmod.cxx2
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx2
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/mediash.cxx2
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx2
-rw-r--r--sc/source/ui/view/cellsh.cxx2
-rw-r--r--sc/source/ui/view/formatsh.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx4
-rw-r--r--sd/source/ui/view/presvish.cxx8
-rw-r--r--sfx2/source/control/objface.cxx31
-rw-r--r--sfx2/source/view/viewfrm.cxx4
-rw-r--r--starmath/source/view.cxx2
-rw-r--r--svx/source/form/fmshell.cxx12
-rw-r--r--svx/source/toolbars/extrusionbar.cxx2
-rw-r--r--svx/source/toolbars/fontworkbar.cxx2
-rw-r--r--sw/source/uibase/app/apphdl.cxx2
-rw-r--r--sw/source/uibase/shells/annotsh.cxx2
-rw-r--r--sw/source/uibase/shells/beziersh.cxx2
-rw-r--r--sw/source/uibase/shells/drawsh.cxx2
-rw-r--r--sw/source/uibase/shells/drformsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx2
-rw-r--r--sw/source/uibase/shells/frmsh.cxx2
-rw-r--r--sw/source/uibase/shells/grfsh.cxx2
-rw-r--r--sw/source/uibase/shells/listsh.cxx2
-rw-r--r--sw/source/uibase/shells/mediash.cxx2
-rw-r--r--sw/source/uibase/shells/olesh.cxx2
-rw-r--r--sw/source/uibase/shells/tabsh.cxx2
-rw-r--r--sw/source/uibase/shells/textsh.cxx2
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/uibase/uiview/srcview.cxx2
-rw-r--r--sw/source/uibase/uiview/view0.cxx2
-rw-r--r--sw/source/uibase/web/wformsh.cxx2
-rw-r--r--sw/source/uibase/web/wfrmsh.cxx2
-rw-r--r--sw/source/uibase/web/wgrfsh.cxx2
-rw-r--r--sw/source/uibase/web/wlistsh.cxx2
-rw-r--r--sw/source/uibase/web/wolesh.cxx2
-rw-r--r--sw/source/uibase/web/wtabsh.cxx2
-rw-r--r--sw/source/uibase/web/wtextsh.cxx2
-rw-r--r--sw/source/uibase/web/wview.cxx2
45 files changed, 68 insertions, 73 deletions
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 9dd834f79ef4..e6a9a92240c7 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -70,8 +70,8 @@ public:
const SfxInterface* GetGenoType() const { return pGenoType; }
- void RegisterObjectBar(sal_uInt16, const ResId&);
- void RegisterObjectBar(sal_uInt16, const ResId&, sal_uInt32 nFeature);
+ void RegisterObjectBar(sal_uInt16, sal_uInt32 nResId);
+ void RegisterObjectBar(sal_uInt16, sal_uInt32 nResId, sal_uInt32 nFeature);
void RegisterChildWindow(sal_uInt16, bool bContext = false);
void RegisterChildWindow(sal_uInt16, bool bContext, sal_uInt32 nFeature);
void RegisterStatusBar( const ResId& );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 84657caf7b27..1f45e96818b6 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -124,7 +124,7 @@ SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_SC_NAME))
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));
+ RID_OBJECTBAR_APP);
GetStaticInterface()->RegisterStatusBar(ScResId(SCCFG_STATUSBAR));
}
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 59072eac484f..e222a0b6423f 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -50,7 +50,7 @@ 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));
+ RID_DRAW_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CHART));
}
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 9f0ce375474d..1bae28dbd4c3 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -67,7 +67,7 @@ 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));
+ RID_DRAW_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAW));
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 8c93b92a417c..b3d1383f164d 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -45,7 +45,7 @@ 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));
+ RID_OBJECTBAR_FORMAT);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWFORM));
}
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 0c9d4fe64a5d..a8410a44796a 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -86,7 +86,7 @@ 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));
+ RID_TEXT_TOOLBOX);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWTEXT));
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index c74431a7619d..6ee703e02772 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -69,7 +69,7 @@ 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));
+ RID_GRAPHIC_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_GRAPHIC));
}
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index ce1135188c82..66e969abf062 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -39,7 +39,7 @@ SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL))
void ScMediaShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, ScResId(RID_MEDIA_OBJECTBAR));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_MEDIA_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_MEDIA));
}
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 86212211291e..7b084853e999 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -45,7 +45,7 @@ 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));
+ RID_DRAW_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_OLE));
}
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 2d44764ad2ce..f670fd348954 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -69,7 +69,7 @@ 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));
+ RID_OBJECTBAR_FORMAT);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CELLS));
}
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 9632c17b1e37..9a556ec90958 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -124,7 +124,7 @@ 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));
+ RID_OBJECTBAR_FORMAT);
}
ScFormatShell::ScFormatShell(ScViewData* pData) :
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index babb226712e9..5d362248cc83 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -90,7 +90,7 @@ 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));
+ RID_OBJECTBAR_PREVIEW);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PREVIEW));
}
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 027adfc8ce1d..c7070da7573a 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -51,7 +51,7 @@ 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));
+ RID_OBJECTBAR_TOOLS);
GetStaticInterface()->RegisterChildWindow(FID_INPUTLINE_STATUS);
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 04a96d83e238..328db0537c2b 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -113,9 +113,9 @@ void OutlineViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(SdResId(RID_OUTLINE_POPUP));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
- SdResId(RID_OUTLINE_TOOLBOX));
+ 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));
+ RID_DRAW_VIEWER_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId());
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 2f6a68ccb5f5..a36d3a0aa0b7 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -65,13 +65,13 @@ SFX_IMPL_INTERFACE(PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSH
void PresentationViewShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
- SdResId(RID_DRAW_TOOLBOX));
+ 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) );
+ RID_DRAW_VIEWER_TOOLBOX);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OPTIONS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
- SdResId(RID_DRAW_OPTIONS_TOOLBOX));
+ RID_DRAW_OPTIONS_TOOLBOX);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_COMMONTASK | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
- SdResId(RID_DRAW_COMMONTASK_TOOLBOX));
+ RID_DRAW_COMMONTASK_TOOLBOX);
}
TYPEINIT1( PresentationViewShell, DrawViewShell );
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 588bf6e46665..448fdfe8f2a2 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -56,21 +56,20 @@ SfxCompareSlots_bsearch( const void* pSmaller, const void* pBigger )
struct SfxObjectUI_Impl
{
sal_uInt16 nPos;
- ResId aResId;
+ sal_uInt32 nResId;
bool bVisible;
bool bContext;
OUString* pName;
sal_uInt32 nFeature;
- SfxObjectUI_Impl(sal_uInt16 n, const ResId& rResId, bool bVis, sal_uInt32 nFeat) :
+ SfxObjectUI_Impl(sal_uInt16 n, sal_uInt32 nId, bool bVis, sal_uInt32 nFeat) :
nPos(n),
- aResId(rResId.GetId(), *rResId.GetResMgr()),
+ nResId(nId),
bVisible(bVis),
bContext(false),
pName(0),
nFeature(nFeat)
{
- aResId.SetRT(rResId.GetRT());
}
~SfxObjectUI_Impl()
@@ -108,7 +107,7 @@ struct SfxInterface_Impl
}
};
-static SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature);
+static SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nResId, sal_uInt32 nFeature);
// constuctor, registeres a new unit
SfxInterface::SfxInterface( const char *pClassName,
@@ -380,24 +379,24 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId )
pImpData->aPopupRes = rResId;
}
-void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, const ResId& rResId)
+void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, sal_uInt32 nResId)
{
- RegisterObjectBar(nPos, rResId, 0UL);
+ RegisterObjectBar(nPos, nResId, 0UL);
}
-void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature)
+void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, sal_uInt32 nResId, sal_uInt32 nFeature)
{
- SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl(nPos, rResId, nFeature);
+ SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl(nPos, nResId, nFeature);
if ( pUI )
pImpData->aObjectBars.push_back(pUI);
}
-SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature)
+SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nResId, sal_uInt32 nFeature)
{
if ((nPos & SFX_VISIBILITY_MASK) == 0)
nPos |= SFX_VISIBILITY_STANDARD;
- return new SfxObjectUI_Impl(nPos, rResId, true, nFeature);
+ return new SfxObjectUI_Impl(nPos, nResId, true, nFeature);
}
sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const
@@ -416,7 +415,7 @@ sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const
assert( nNo<pImpData->aObjectBars.size() );
- return pImpData->aObjectBars[nNo]->aResId.GetId();
+ return pImpData->aObjectBars[nNo]->nResId;
}
sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
@@ -438,9 +437,6 @@ sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
return pImpData->aObjectBars[nNo]->nPos;
}
-
-
-
sal_uInt16 SfxInterface::GetObjectBarCount() const
{
if (pGenoType && ! pGenoType->HasName())
@@ -456,7 +452,7 @@ void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext)
void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32 nFeature)
{
- SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), true, nFeature);
+ SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, true, nFeature);
pUI->bContext = bContext;
pImpData->aChildWindows.push_back(pUI);
}
@@ -466,7 +462,6 @@ void SfxInterface::RegisterStatusBar(const ResId& rResId)
pImpData->aStatBarRes = rResId;
}
-
sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const
{
if ( pGenoType )
@@ -482,7 +477,7 @@ sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const
assert( nNo<pImpData->aChildWindows.size() );
- sal_uInt32 nRet = pImpData->aChildWindows[nNo]->aResId.GetId();
+ sal_uInt32 nRet = pImpData->aChildWindows[nNo]->nResId;
if ( pImpData->aChildWindows[nNo]->bContext )
nRet += sal_uInt32( nClassId ) << 16;
return nRet;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 79387be96631..b2a1b28c36a0 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -152,8 +152,8 @@ void SfxViewFrame::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_BROWSER);
GetStaticInterface()->RegisterChildWindow(SID_RECORDING_FLOATWINDOW);
#if HAVE_FEATURE_DESKTOP
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) );
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) );
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, RID_FULLSCREENTOOLBOX);
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, RID_ENVTOOLBOX );
#endif
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 5cdc2103e237..d4fe21ec1442 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -934,7 +934,7 @@ 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 ));
+ RID_MATH_TOOLBOX);
//Dummy-Objectbar, to avoid quiver while activating
GetStaticInterface()->RegisterChildWindow(SID_TASKPANE);
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 62d08808055b..91fb513eab35 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -171,15 +171,15 @@ 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),
+ RID_SVXTBX_FORM_NAVIGATION,
FM_UI_FEATURE_SHOW_DATABASEBAR);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC,
- SVX_RES(RID_SVXTBX_FORM_FILTER),
+ RID_SVXTBX_FORM_FILTER,
FM_UI_FEATURE_SHOW_FILTERBAR);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_READONLYDOC,
- SVX_RES(RID_SVXTBX_TEXT_CONTROL_ATTRIBUTES),
+ RID_SVXTBX_TEXT_CONTROL_ATTRIBUTES,
FM_UI_FEATURE_SHOW_TEXT_CONTROL_BAR);
GetStaticInterface()->RegisterChildWindow(SID_FM_ADD_FIELD, false, FM_UI_FEATURE_SHOW_FIELD);
@@ -189,15 +189,15 @@ void FmFormShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_FM_SHOW_DATANAVIGATOR, false, FM_UI_FEATURE_SHOW_DATANAVIGATOR);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD,
- SVX_RES(RID_SVXTBX_CONTROLS),
+ RID_SVXTBX_CONTROLS,
FM_UI_FEATURE_TB_CONTROLS);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD,
- SVX_RES(RID_SVXTBX_MORECONTROLS),
+ RID_SVXTBX_MORECONTROLS,
FM_UI_FEATURE_TB_MORECONTROLS);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD,
- SVX_RES(RID_SVXTBX_FORMDESIGN),
+ RID_SVXTBX_FORMDESIGN,
FM_UI_FEATURE_TB_FORMDESIGN);
}
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index d26311e4b595..814acfdc1e69 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -58,7 +58,7 @@ 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) );
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_SVX_EXTRUSION_BAR);
}
TYPEINIT1( ExtrusionBar, SfxShell );
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index d42073403081..1f3a89e04005 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -176,7 +176,7 @@ 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));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_SVX_FONTWORK_BAR);
}
TYPEINIT1( FontworkBar, SfxShell );
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 003a2323a73e..6db25aea7dd3 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -122,7 +122,7 @@ void SwModule::InitInterface_Impl()
GetStaticInterface()->RegisterStatusBar(SW_RES(CFG_STATUSBAR));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
- SW_RES(RID_MODULE_TOOLBOX));
+ RID_MODULE_TOOLBOX);
}
// other states
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 319e1ae06817..172bd26c62cf 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -140,7 +140,7 @@ 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));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_ANNOTATION_POPUPMENU));
}
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 7ba6f6d2bba2..a9d59035609d 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -49,7 +49,7 @@ void SwBezierShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAW_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_BEZIER_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_BEZIER_TOOLBOX);
}
TYPEINIT1(SwBezierShell,SwBaseShell)
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 5986acb0b1d9..6ee669d8ecef 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -81,7 +81,7 @@ void SwDrawShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAW_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_DRAW_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
}
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 68eb28e6f7f9..2c04eb52d245 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -63,7 +63,7 @@ void SwDrawFormShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAWFORM_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
}
TYPEINIT1(SwDrawFormShell, SwDrawBaseShell)
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 36defc21dbb3..3ec5c14a34b6 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -87,7 +87,7 @@ void SwDrawTextShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRWTXT_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TEXT_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_DRAW_TEXT_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
}
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 8ba06c9eaa70..dcea1310aa3b 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -114,7 +114,7 @@ void SwFrameShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_FRM_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_FRAME_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_FRAME_TOOLBOX);
}
void SwFrameShell::Execute(SfxRequest &rReq)
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 2679b8b4f6c8..7407d7f1bbbc 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -103,7 +103,7 @@ void SwGrfShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_GRF_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_GRAFIK_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_GRAFIK_TOOLBOX);
}
void SwGrfShell::Execute(SfxRequest &rReq)
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 7e24741deadc..5d3ab97078a6 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -55,7 +55,7 @@ SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST))
void SwListShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_NUM_TOOLBOX);
}
TYPEINIT1(SwListShell,SwBaseShell)
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index 3f0ee0006150..feafe2c5a518 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -75,7 +75,7 @@ void SwMediaShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_MEDIA_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_MEDIA_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_MEDIA_TOOLBOX);
}
void SwMediaShell::ExecMedia(SfxRequest &rReq)
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index a872e3a98ff1..2bb5d9769686 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -43,7 +43,7 @@ void SwOleShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_OLE_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_OLE_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_OLE_TOOLBOX);
}
SwOleShell::SwOleShell(SwView &_rView) :
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 90e441dddc02..d6992baa967f 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -97,7 +97,7 @@ void SwTableShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TAB_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TABLE_TOOLBOX);
}
TYPEINIT1(SwTableShell,SwBaseShell)
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 89f0871a1faf..ea9e96f730d0 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -122,7 +122,7 @@ void SwTextShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TEXT_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(FN_EDIT_FORMULA);
GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD);
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 4adc0a272e5c..22efb9c11a4e 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -96,7 +96,7 @@ void SwPagePreview::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_PPREVIEW_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_CLIENT|SFX_VISIBILITY_FULLSCREEN|SFX_VISIBILITY_READONLYDOC,
- SW_RES(RID_PVIEW_TOOLBOX));
+ RID_PVIEW_TOOLBOX);
}
TYPEINIT1(SwPagePreview,SfxViewShell)
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 9ba50daa59c4..2a4c45522123 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -122,7 +122,7 @@ void SwSrcView::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_SRCVIEW_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
- SW_RES(RID_WEBTOOLS_TOOLBOX) );
+ RID_WEBTOOLS_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId());
}
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index c7e81bbe6af3..7424cf91fead 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -111,7 +111,7 @@ void SwView::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(FN_MAILMERGE_CHILDWINDOW, false, CHILDWIN_MAILMERGE);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
- SW_RES(RID_TOOLS_TOOLBOX));
+ RID_TOOLS_TOOLBOX);
#endif
}
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index be3b7b830757..f83196549454 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -42,7 +42,7 @@ void SwWebDrawFormShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAWFORM_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
}
TYPEINIT1(SwWebDrawFormShell, SwDrawFormShell)
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index b28b57fe267b..07572f72ca15 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -41,7 +41,7 @@ void SwWebFrameShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_FRM_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBFRAME_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBFRAME_TOOLBOX);
}
TYPEINIT1(SwWebFrameShell, SwFrameShell)
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index b9fd9401d193..54f59a1b85dc 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -44,7 +44,7 @@ void SwWebGrfShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_GRF_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBGRAPHIC_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBGRAPHIC_TOOLBOX);
}
TYPEINIT1(SwWebGrfShell,SwGrfShell)
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 5d9e9c8a3f76..efda0b9afbdb 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -38,7 +38,7 @@ SFX_IMPL_INTERFACE(SwWebListShell, SwListShell, SW_RES(STR_SHELLNAME_LIST))
void SwWebListShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_NUM_TOOLBOX);
}
TYPEINIT1(SwWebListShell,SwListShell)
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index 2a30b7ffa697..e10f0824555b 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -41,7 +41,7 @@ void SwWebOleShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_OLE_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBOLE_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBOLE_TOOLBOX);
}
SwWebOleShell::SwWebOleShell(SwView &_rView) :
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index 013f2bbe169e..0d3c20c97409 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -44,7 +44,7 @@ void SwWebTableShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TAB_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TABLE_TOOLBOX);
}
TYPEINIT1(SwWebTableShell,SwTableShell)
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 901a78f8c03c..077e9425b33e 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -47,7 +47,7 @@ void SwWebTextShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TEXT_POPUPMENU));
- GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
+ GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(FN_EDIT_FORMULA);
GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD);
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 258cdcda5912..027fa051219a 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -80,7 +80,7 @@ void SwWebView::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
- SW_RES(RID_WEBTOOLS_TOOLBOX) );
+ RID_WEBTOOLS_TOOLBOX);
}
TYPEINIT1(SwWebView,SwView)