2 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 34b00493b67f..a1fc7fa5655b 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -133,7 +133,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
     // Read user label from writer.cfg
     SwLabItem aItem(static_cast<const SwLabItem&>(rSet.Get( FN_LABEL )));
     std::unique_ptr<SwLabRec> pRec(new SwLabRec);
-    pRec->aMake = pRec->aType = SW_RESSTR( STR_CUSTOM );
+    pRec->aMake = pRec->aType = SwResId( STR_CUSTOM );
     pRec->SetFromItem( aItem );
 
     bool bDouble = false;
@@ -204,7 +204,7 @@ SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, bool bCont)
 {
     SwLabRec* pRec = nullptr;
     bool bFound = false;
-    const OUString sCustom(SW_RES(STR_CUSTOM));
+    const OUString sCustom(SwResId(STR_CUSTOM));
 
     const size_t nCount = Recs().size();
     for (size_t i = 0; i < nCount; ++i)
@@ -380,7 +380,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void)
     const size_t nCount   = GetParentSwLabDlg()->Recs().size();
     size_t nLstType = 0;
 
-    const OUString sCustom(SW_RES(STR_CUSTOM));
+    const OUString sCustom(SwResId(STR_CUSTOM));
     //insert the entries into the sorted list box
     for ( size_t i = 0; i < nCount; ++i )
     {
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index d272566ca190..937cfb59bd31 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -101,16 +101,16 @@ void DrawArrow(vcl::RenderContext& rRenderContext, const Point &rP1, const Point
 SwLabPreview::SwLabPreview(vcl::Window* pParent)
     : Window(pParent, 0)
     , m_aGrayColor(COL_LIGHTGRAY)
-    , m_aHDistStr(SW_RESSTR(STR_HDIST))
-    , m_aVDistStr(SW_RESSTR(STR_VDIST))
-    , m_aWidthStr(SW_RESSTR(STR_WIDTH))
-    , m_aHeightStr(SW_RESSTR(STR_HEIGHT))
-    , m_aLeftStr(SW_RESSTR(STR_LEFT))
-    , m_aUpperStr(SW_RESSTR(STR_UPPER))
-    , m_aColsStr(SW_RESSTR(STR_COLS))
-    , m_aRowsStr(SW_RESSTR(STR_ROWS))
-    , m_aPWidthStr(SW_RESSTR(STR_PWIDTH))
-    , m_aPHeightStr(SW_RESSTR(STR_PHEIGHT))
+    , m_aHDistStr(SwResId(STR_HDIST))
+    , m_aVDistStr(SwResId(STR_VDIST))
+    , m_aWidthStr(SwResId(STR_WIDTH))
+    , m_aHeightStr(SwResId(STR_HEIGHT))
+    , m_aLeftStr(SwResId(STR_LEFT))
+    , m_aUpperStr(SwResId(STR_UPPER))
+    , m_aColsStr(SwResId(STR_COLS))
+    , m_aRowsStr(SwResId(STR_ROWS))
+    , m_aPWidthStr(SwResId(STR_PWIDTH))
+    , m_aPHeightStr(SwResId(STR_PHEIGHT))
 {
     SetMapMode(MapUnit::MapPixel);
 
@@ -507,7 +507,7 @@ void SwLabFormatPage::FillItem(SwLabItem& rItem)
 {
     if (bModified)
     {
-        rItem.m_aMake = rItem.m_aType = SW_RESSTR(STR_CUSTOM);
+        rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM);
 
         SwLabRec& rRec = *GetParentSwLabDlg()->Recs()[0];
         rItem.m_lHDist  = rRec.lHDist  = static_cast< long >(GETFLDVAL(*m_pHDistField ));