2 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index caa0b5a51f1b..ff98cdd0cf58 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -82,7 +82,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pShowStandardizedPageCount, "standardizedpageshow");
     get(m_pStandardizedPageSizeNF, "standardpagesize");
 
-    SvxStringArray aMetricArr( SW_RES( STR_ARR_METRIC ) );
+    SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr));
     for ( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i )
     {
         const OUString sMetric = aMetricArr.GetStringByPos( i );
@@ -433,15 +433,15 @@ void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re
 
 SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", &rSet)
-    , m_sSWTable(SW_RESSTR(STR_CAPTION_TABLE))
-    , m_sSWFrame(SW_RESSTR(STR_CAPTION_FRAME))
-    , m_sSWGraphic(SW_RESSTR(STR_CAPTION_GRAPHIC))
-    , m_sOLE(SW_RESSTR(STR_CAPTION_OLE))
-    , m_sBegin(SW_RESSTR(STR_CAPTION_BEGINNING))
-    , m_sEnd(SW_RESSTR(STR_CAPTION_END))
-    , m_sAbove(SW_RESSTR(STR_CAPTION_ABOVE))
-    , m_sBelow(SW_RESSTR(STR_CAPTION_BELOW))
-    , m_sNone(SW_RESSTR(SW_STR_NONE))
+    , m_sSWTable(SwResId(STR_CAPTION_TABLE))
+    , m_sSWFrame(SwResId(STR_CAPTION_FRAME))
+    , m_sSWGraphic(SwResId(STR_CAPTION_GRAPHIC))
+    , m_sOLE(SwResId(STR_CAPTION_OLE))
+    , m_sBegin(SwResId(STR_CAPTION_BEGINNING))
+    , m_sEnd(SwResId(STR_CAPTION_END))
+    , m_sAbove(SwResId(STR_CAPTION_ABOVE))
+    , m_sBelow(SwResId(STR_CAPTION_BELOW))
+    , m_sNone(SwResId(SW_STR_NONE))
     , pMgr(new SwFieldMgr())
     , bHTMLMode(false)
 {
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index b5f2add08eba..b78e70fc5936 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -123,7 +123,7 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
         m_pVRulerRightCBox->Hide();
     m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl ));
 
-    SvxStringArray aMetricArr( SW_RES( STR_ARR_METRIC ) );
+    SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr));
     for ( size_t i = 0; i < aMetricArr.Count(); ++i )
     {
         const OUString sMetric = aMetricArr.GetStringByPos( i );
@@ -297,7 +297,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,
     const SfxItemSet& rCoreSet)
     : SfxTabPage(pParent, "PrintOptionsPage",
         "modules/swriter/ui/printoptionspage.ui", &rCoreSet)
-    , sNone(SW_RESSTR(SW_STR_NONE))
+    , sNone(SwResId(SW_STR_NONE))
     , bAttrModified(false)
     , bPreview(false)
 {
@@ -559,9 +559,9 @@ SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent,
 
     m_nFontGroup(FONT_GROUP_DEFAULT),
 
-    m_sScriptWestern(SW_RES(ST_SCRIPT_WESTERN)),
-    m_sScriptAsian(SW_RES(ST_SCRIPT_ASIAN)),
-    m_sScriptComplex(SW_RES(ST_SCRIPT_CTL))
+    m_sScriptWestern(SwResId(ST_SCRIPT_WESTERN)),
+    m_sScriptAsian(SwResId(ST_SCRIPT_ASIAN)),
+    m_sScriptComplex(SwResId(ST_SCRIPT_CTL))
 {
     get(m_pLabelFT,"label1");
     get(m_pStandardBox,"standardbox");