make string translation loading more uniform

change various ResId classes that use conversion operator to OUString to
functions that return a OUString

drop various defines

drop unnecessary toString calls

Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92
Reviewed-on: https://gerrit.libreoffice.org/37817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

16 files changed, 75 insertions, 75 deletions

diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 01db8f5688e8..e88feb3fafcf 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -247,7 +247,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
         RID_STR_SEARCH_WHOLE
     };
     for (unsigned short nResId : nResIds)
-        m_plbPosition->InsertEntry( OUString( CUI_RES( nResId ) ) );
+        m_plbPosition->InsertEntry( OUString( CuiResId( nResId ) ) );
     m_plbPosition->SelectEntryPos(MATCHING_ANYWHERE);
 
     // the field listbox
@@ -438,7 +438,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void)
     // direction -> pass on and reset the checkbox-text for StartOver
     else if (&rBox == m_pcbBackwards)
     {
-        m_pcbStartOver->SetText( OUString( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
+        m_pcbStartOver->SetText( OUString( CuiResId( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
         m_pSearchEngine->SetDirection(!bChecked);
     }
     // similarity-search or regular expression
@@ -702,7 +702,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
         case FmSearchProgress::State::Progress:
             if (pProgress->bOverflow)
             {
-                OUString sHint( CUI_RES( m_pcbBackwards->IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
+                OUString sHint( CuiResId( m_pcbBackwards->IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
                 m_pftHint->SetText( sHint );
                 m_pftHint->Invalidate();
             }
@@ -712,7 +712,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
             break;
 
         case FmSearchProgress::State::ProgressCounting:
-            m_pftHint->SetText(CUI_RES(RID_STR_SEARCH_COUNTING));
+            m_pftHint->SetText(CuiResId(RID_STR_SEARCH_COUNTING));
             m_pftHint->Invalidate();
 
             m_pftRecord->SetText(OUString::number(pProgress->nCurrentRecord));
@@ -730,7 +730,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
             sal_uInt16 nErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState)
                 ? RID_STR_SEARCH_GENERAL_ERROR
                 : RID_STR_SEARCH_NORECORD;
-            ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(nErrorId))->Execute();
+            ScopedVclPtrInstance<MessageDialog>(this, CuiResId(nErrorId))->Execute();
             SAL_FALLTHROUGH;
         }
         case FmSearchProgress::State::Canceled:
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ff298167227d..273363e384cd 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -559,7 +559,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl, Button*, void)
 
         if( ( pInfo->GetId() == nId ) && ( pInfo->GetThemeName() != pThm->GetName() ) )
         {
-            OUString aStr( CUI_RES( RID_SVXSTR_GALLERY_ID_EXISTS ) );
+            OUString aStr( CuiResId( RID_SVXSTR_GALLERY_ID_EXISTS ) );
 
             aStr += " (" + pInfo->GetThemeName() + ")";
 
@@ -592,7 +592,7 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
     OUString aText = GetText() + pData->pTheme->GetName();
 
     if( pData->pTheme->IsReadOnly() )
-        aText +=  CUI_RES( RID_SVXSTR_GALLERY_READONLY );
+        aText +=  CuiResId( RID_SVXSTR_GALLERY_READONLY );
 
     SetText( aText );
 }
@@ -645,9 +645,9 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
 
     GalleryTheme*       pThm = pData->pTheme;
     OUString            aOutStr( OUString::number(pThm->GetObjectCount()) );
-    OUString            aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
+    OUString            aObjStr( CuiResId( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
     OUString            aAccess;
-    OUString            aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
+    OUString            aType( SvxResId( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
     bool            bReadOnly = pThm->IsReadOnly();
 
     m_pEdtMSName->SetText( pThm->GetName() );
@@ -659,7 +659,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
         m_pEdtMSName->Enable();
 
     if( pThm->IsReadOnly() )
-        aType += CUI_RES( RID_SVXSTR_GALLERY_READONLY );
+        aType += CuiResId( RID_SVXSTR_GALLERY_READONLY );
 
     m_pFtMSShowType->SetText( aType );
     m_pFtMSShowPath->SetText( pThm->GetSdgURL().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) );
@@ -748,7 +748,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
     m_pCbbFileType->EnableDDAutoWidth( false );
     m_pLbxFound->SetDoubleClickHdl(LINK(this, TPGalleryThemeProperties, DClickFoundHdl));
     m_pLbxFound->SetSelectHdl(LINK(this, TPGalleryThemeProperties, SelectFoundHdl));
-    m_pLbxFound->InsertEntry(OUString(CUI_RES(RID_SVXSTR_GALLERY_NOFILES)));
+    m_pLbxFound->InsertEntry(OUString(CuiResId(RID_SVXSTR_GALLERY_NOFILES)));
     m_pLbxFound->Show();
 
     FillFilterList();
@@ -947,7 +947,7 @@ void TPGalleryThemeProperties::FillFilterList()
 #endif
 
     pFilterEntry = new FilterEntry;
-    pFilterEntry->aFilterName = CUI_RES(RID_SVXSTR_GALLERY_ALLFILES);
+    pFilterEntry->aFilterName = CuiResId(RID_SVXSTR_GALLERY_ALLFILES);
     pFilterEntry->aFilterName = addExtension( pFilterEntry->aFilterName, aExtensions );
     size_t pos = m_pCbbFileType->InsertEntry( pFilterEntry->aFilterName, 0 );
     if ( pos < aFilterEntryList.size() ) {
@@ -1182,7 +1182,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void)
   }
   else
   {
-      m_pLbxFound->InsertEntry( OUString( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) );
+      m_pLbxFound->InsertEntry( OUString( CuiResId( RID_SVXSTR_GALLERY_NOFILES ) ) );
       m_pBtnTakeAll->Disable();
       m_pCbxPreview->Disable();
       bEntriesFound = false;
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 9f9e01406f89..6830ff7b320b 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -98,21 +98,21 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
         aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality);
         aImage = Image(aBitmap);
     }
-    aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLINETTP );
+    aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create );
-    pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
-    aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLMAILTP );
+    pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
+    aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create );
-    pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
-    aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCTP );
+    pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
+    aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
-    pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
-    aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCNTP );
+    pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
+    aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
-    pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
+    pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
 
     // set OK/Cancel - button
-    GetCancelButton().SetText ( CUI_RES(RID_SVXSTR_HYPDLG_CLOSEBUT) );
+    GetCancelButton().SetText ( CuiResId(RID_SVXSTR_HYPDLG_CLOSEBUT) );
 
     // create itemset for tabpages
     mpItemSet = new SfxItemSet( SfxGetpApp()->GetPool(), SID_HYPERLINK_GETLINK,
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cb959b327987..dc33da086b0b 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -574,8 +574,8 @@ namespace svx
         m_pSuggestions->set_height_request( m_pSuggestions->GetTextHeight() * 5 );
         m_pSuggestions->set_width_request( m_pSuggestions->approximate_char_width() * 48 );
 
-        const OUString sHangul(CUI_RES(RID_SVXSTR_HANGUL));
-        const OUString sHanja(CUI_RES(RID_SVXSTR_HANJA));
+        const OUString sHangul(CuiResId(RID_SVXSTR_HANGUL));
+        const OUString sHanja(CuiResId(RID_SVXSTR_HANJA));
         m_pHanjaAbove->init( sHangul, sHanja, PseudoRubyText::eAbove );
         m_pHanjaBelow->init( sHangul, sHanja, PseudoRubyText::eBelow );
         m_pHangulAbove->init( sHanja, sHangul, PseudoRubyText::eAbove );
@@ -1730,7 +1730,7 @@ namespace svx
 
     HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict )
         :ModalDialog            ( _pParent, "HangulHanjaEditDictDialog", "cui/ui/hangulhanjaeditdictdialog.ui" )
-        ,m_aEditHintText        ( CUI_RES(RID_SVXSTR_EDITHINT) )
+        ,m_aEditHintText        ( CuiResId(RID_SVXSTR_EDITHINT) )
         ,m_rDictList            ( _rDictList )
         ,m_nCurrentDict         ( 0xFFFFFFFF )
         ,m_pSuggestions         ( nullptr )
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 112c27359e82..d37c5991ce80 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -275,7 +275,7 @@ bool SvxHyperlinkNewDocTp::AskApply()
     bool bRet = ImplGetURLObject( m_pCbbPath->GetText(), m_pCbbPath->GetBaseURL(), aINetURLObject );
     if ( !bRet )
     {
-        ScopedVclPtrInstance< WarningBox > aWarning( this, WB_OK, CUI_RES(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
+        ScopedVclPtrInstance< WarningBox > aWarning( this, WB_OK, CuiResId(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
         aWarning->Execute();
     }
     return bRet;
@@ -323,7 +323,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
 
                 if( bOk )
                 {
-                    ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CUI_RES(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
+                    ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CuiResId(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
                     bCreate = aWarning->Execute() == RET_YES;
                 }
             }
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index db14236bfa33..a055a0a243ad 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -109,10 +109,10 @@ void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const ::tools:
         switch (mpParentWnd->mnError)
         {
         case LERR_NOENTRIES :
-            aStrMessage = CUI_RES( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
+            aStrMessage = CuiResId( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
             break;
         case LERR_DOCNOTOPEN :
-            aStrMessage = CUI_RES( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
+            aStrMessage = CuiResId( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
             break;
         }
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index bc4172da4c4b..15e43da019e7 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -246,8 +246,8 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( const SvxHyperlinkItem* pH
         mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() );
 
     // Form
-    OUString aStrFormText = CUI_RES( RID_SVXSTR_HYPERDLG_FROM_TEXT );
-    OUString aStrFormButton = CUI_RES( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
+    OUString aStrFormText = CuiResId( RID_SVXSTR_HYPERDLG_FROM_TEXT );
+    OUString aStrFormButton = CuiResId( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
 
     if( pHyperlinkItem->GetInsertMode() & HLINK_HTMLMODE )
     {
@@ -340,13 +340,13 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void)
         SfxMacroTabPage *pMacroPage = static_cast<SfxMacroTabPage*>( aDlg->GetTabPage() );
 
         if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOverObject )
-            pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT1) ),
+            pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT1) ),
                                   SFX_EVENT_MOUSEOVER_OBJECT );
         if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseClickObject )
-            pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT2) ),
+            pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT2) ),
                                   SFX_EVENT_MOUSECLICK_OBJECT);
         if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOutObject )
-            pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT3) ),
+            pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT3) ),
                                   SFX_EVENT_MOUSEOUT_OBJECT);
 
         if ( bIsInputEnabled )
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 7f64b780fee7..a5f16c8f6b0d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -637,7 +637,7 @@ IMPL_LINK_NOARG( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void)
             ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, OUString() );
 
     // set the title
-    aFileDlg.SetTitle(CUI_RES(RID_SVXSTR_SELECT_FILE_IFRAME));
+    aFileDlg.SetTitle(CuiResId(RID_SVXSTR_SELECT_FILE_IFRAME));
 
     // show the dialog
     if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 4c907d34635f..1f32977a0eb1 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -34,8 +34,8 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
 
 SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& sHelpId )
     : m_pDialog(VclPtr<ModalDialog>::Create(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui"))
-    , aRow(CUI_RES(RID_SVXSTR_ROW))
-    , aCol(CUI_RES(RID_SVXSTR_COL))
+    , aRow(CuiResId(RID_SVXSTR_ROW))
+    , aCol(CuiResId(RID_SVXSTR_COL))
     , bColumn(bCol)
 {
     m_pDialog->get(m_pCountEdit, "insert_number");
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 7e758c4bbbc1..da9c08262ec0 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -88,12 +88,12 @@ static long nTabs[] =
 
 SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool bHtml )
     : ModalDialog( pParent, "BaseLinksDialog", "cui/ui/baselinksdialog.ui"),
-    aStrAutolink( CUI_RES( STR_AUTOLINK ) ),
-    aStrManuallink( CUI_RES( STR_MANUALLINK ) ),
-    aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ),
-    aStrCloselinkmsg( CUI_RES( STR_CLOSELINKMSG ) ),
-    aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ),
-    aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ),
+    aStrAutolink( CuiResId( STR_AUTOLINK ) ),
+    aStrManuallink( CuiResId( STR_MANUALLINK ) ),
+    aStrBrokenlink( CuiResId( STR_BROKENLINK ) ),
+    aStrCloselinkmsg( CuiResId( STR_CLOSELINKMSG ) ),
+    aStrCloselinkmsgMulti( CuiResId( STR_CLOSELINKMSG_MULTI ) ),
+    aStrWaitinglink( CuiResId( STR_WAITINGLINK ) ),
     pLinkMgr( nullptr ),
     bHtmlMode(bHtml),
     aUpdateIdle("cui SvBaseLinksDlg UpdateIdle")
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 145077bd5c89..0bdc805d7381 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -90,7 +90,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl, Button*, void)
         }
         else
         {
-            OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
+            OUString sMsg( CuiResId( RID_MULTIPATH_DBL_ERR ) );
             sMsg = sMsg.replaceFirst( "%1", sInsPath );
             ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute();
         }
@@ -114,7 +114,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl, Button*, void)
 
         if ( LISTBOX_ENTRY_NOTFOUND != m_pPathLB->GetEntryPos( sInsPath ) )
         {
-            OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
+            OUString sMsg( CuiResId( RID_MULTIPATH_DBL_ERR ) );
             sMsg = sMsg.replaceFirst( "%1", sInsPath );
             ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute();
         }
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 92866f30d842..8db8d4f633d3 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -61,10 +61,10 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
         sal_uInt16 nMaxPasswdLen,
         bool bIsPasswordToModify )
     : m_pParent( pParent )
-    , m_aOneMismatch( CUI_RES( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) )
-    , m_aTwoMismatch( CUI_RES( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) )
-    , m_aInvalidStateForOkButton( CUI_RES( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) )
-    , m_aInvalidStateForOkButton_v2( CUI_RES( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) )
+    , m_aOneMismatch( CuiResId( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) )
+    , m_aTwoMismatch( CuiResId( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) )
+    , m_aInvalidStateForOkButton( CuiResId( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) )
+    , m_aInvalidStateForOkButton_v2( CuiResId( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) )
     , m_bIsPasswordToModify( bIsPasswordToModify )
 {
     pParent->get(m_pPasswdToOpenED, "newpassEntry");
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 5b02b861473a..b1922cbc4573 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -204,7 +204,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
     mpPicture(nullptr),
     mpText(nullptr),
     mpSave(nullptr),
-    maSaveAsText(CUI_RES(RID_SVXSTR_SAVE_SCREENSHOT_AS))
+    maSaveAsText(CuiResId(RID_SVXSTR_SAVE_SCREENSHOT_AS))
 {
     // image ain't empty
     assert(!maParentDialogBitmap.IsEmpty());
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 9b5b753c2e9a..bc625d315003 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -82,8 +82,8 @@ SFTreeListBox::SFTreeListBox(vcl::Window* pParent)
     , m_libImage(BitmapEx(RID_CUIBMP_LIB))
     , m_macImage(BitmapEx(RID_CUIBMP_MACRO))
     , m_docImage(BitmapEx(RID_CUIBMP_DOC))
-    , m_sMyMacros(CUI_RES(RID_SVXSTR_MYMACROS))
-    , m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS))
+    , m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS))
+    , m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS))
 {
     SetSelectionMode( SelectionMode::Single );
 
@@ -451,15 +451,15 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& la
     : SfxModalDialog(pParent, "ScriptOrganizerDialog",
         "cui/ui/scriptorganizer.ui")
     , m_sLanguage(language)
-    , m_delErrStr(CUI_RES(RID_SVXSTR_DELFAILED))
-    , m_delErrTitleStr(CUI_RES(RID_SVXSTR_DELFAILED_TITLE))
-    , m_delQueryStr(CUI_RES(RID_SVXSTR_DELQUERY))
-    , m_delQueryTitleStr(CUI_RES(RID_SVXSTR_DELQUERY_TITLE))
-    , m_createErrStr(CUI_RES(RID_SVXSTR_CREATEFAILED))
-    , m_createDupStr(CUI_RES(RID_SVXSTR_CREATEFAILEDDUP))
-    , m_createErrTitleStr(CUI_RES(RID_SVXSTR_CREATEFAILED_TITLE))
-    , m_renameErrStr(CUI_RES(RID_SVXSTR_RENAMEFAILED))
-    , m_renameErrTitleStr(CUI_RES(RID_SVXSTR_RENAMEFAILED_TITLE))
+    , m_delErrStr(CuiResId(RID_SVXSTR_DELFAILED))
+    , m_delErrTitleStr(CuiResId(RID_SVXSTR_DELFAILED_TITLE))
+    , m_delQueryStr(CuiResId(RID_SVXSTR_DELQUERY))
+    , m_delQueryTitleStr(CuiResId(RID_SVXSTR_DELQUERY_TITLE))
+    , m_createErrStr(CuiResId(RID_SVXSTR_CREATEFAILED))
+    , m_createDupStr(CuiResId(RID_SVXSTR_CREATEFAILEDDUP))
+    , m_createErrTitleStr(CuiResId(RID_SVXSTR_CREATEFAILED_TITLE))
+    , m_renameErrStr(CuiResId(RID_SVXSTR_RENAMEFAILED))
+    , m_renameErrTitleStr(CuiResId(RID_SVXSTR_RENAMEFAILED_TITLE))
 {
     get(m_pScriptsBox, "scripts");
     get(m_pRunButton, "run");
@@ -1227,12 +1227,12 @@ OUString FormatErrorString(
 
     if ( !type.isEmpty() )
     {
-        result += "\n\n" + OUString(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)) + " " + type;
+        result += "\n\n" + OUString(CuiResId(RID_SVXSTR_ERROR_TYPE_LABEL)) + " " + type;
     }
 
     if ( !message.isEmpty() )
     {
-        result += "\n\n" + OUString(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + " " + message;
+        result += "\n\n" + OUString(CuiResId(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + " " + message;
     }
 
     return result;
@@ -1241,7 +1241,7 @@ OUString FormatErrorString(
 OUString GetErrorMessage(
     const provider::ScriptErrorRaisedException& eScriptError )
 {
-    OUString unformatted = CUI_RES( RID_SVXSTR_ERROR_AT_LINE );
+    OUString unformatted = CuiResId( RID_SVXSTR_ERROR_AT_LINE );
 
     OUString unknown("UNKNOWN");
     OUString language = unknown;
@@ -1267,11 +1267,11 @@ OUString GetErrorMessage(
         if ( eScriptError.lineNum != -1 )
         {
             line = OUString::number( eScriptError.lineNum );
-            unformatted = CUI_RES( RID_SVXSTR_ERROR_AT_LINE );
+            unformatted = CuiResId( RID_SVXSTR_ERROR_AT_LINE );
         }
         else
         {
-            unformatted = CUI_RES( RID_SVXSTR_ERROR_RUNNING );
+            unformatted = CuiResId( RID_SVXSTR_ERROR_RUNNING );
         }
 
     return FormatErrorString(
@@ -1281,7 +1281,7 @@ OUString GetErrorMessage(
 OUString GetErrorMessage(
     const provider::ScriptExceptionRaisedException& eScriptException )
 {
-    OUString unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE );
+    OUString unformatted = CuiResId( RID_SVXSTR_EXCEPTION_AT_LINE );
 
     OUString unknown("UNKNOWN");
     OUString language = unknown;
@@ -1307,11 +1307,11 @@ OUString GetErrorMessage(
     if ( eScriptException.lineNum != -1 )
     {
         line = OUString::number( eScriptException.lineNum );
-        unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE );
+        unformatted = CuiResId( RID_SVXSTR_EXCEPTION_AT_LINE );
     }
     else
     {
-        unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_RUNNING );
+        unformatted = CuiResId( RID_SVXSTR_EXCEPTION_RUNNING );
     }
 
     if ( !eScriptException.exceptionType.isEmpty() )
@@ -1326,7 +1326,7 @@ OUString GetErrorMessage(
 OUString GetErrorMessage(
     const provider::ScriptFrameworkErrorException& sError )
 {
-    OUString unformatted = CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING );
+    OUString unformatted = CuiResId( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING );
 
     OUString language("UNKNOWN");
 
@@ -1345,7 +1345,7 @@ OUString GetErrorMessage(
     if ( sError.errorType == provider::ScriptFrameworkErrorType::NOTSUPPORTED )
     {
         message = OUString(
-            CUI_RES(  RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
+            CuiResId(  RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
         message = ReplaceString(message, "%LANGUAGENAME", language );
 
     }
@@ -1440,11 +1440,11 @@ IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, p, void )
     }
     else
     {
-        message = OUString( CUI_RES( RID_SVXSTR_ERROR_TITLE ) );
+        message = OUString( CuiResId( RID_SVXSTR_ERROR_TITLE ) );
     }
 
     ScopedVclPtrInstance<MessageDialog> pBox( nullptr, message, VclMessageType::Warning );
-    pBox->SetText( CUI_RES( RID_SVXSTR_ERROR_TITLE ) );
+    pBox->SetText( CuiResId( RID_SVXSTR_ERROR_TITLE ) );
     pBox->Execute();
 
     delete pMessage;
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 23342dd3c3fc..ea01bcb7a1cc 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -137,7 +137,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
     SfxObjectShell* pSh = SfxObjectShell::Current();
     DBG_ASSERT( pSh, "No DocShell" );
 
-    ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) );
+    ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR()));
     SfxItemPool& rPool = pSh->GetPool();
     SfxItemSet aSet( rPool, pWhRanges );
     SfxWhichIter aIter( aSet );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index f0ebda71297a..51fae3d5ceea 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -443,7 +443,7 @@ SvxThesaurusDialog::SvxThesaurusDialog(
     const OUString &rWord,
     LanguageType nLanguage)
     : SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui")
-    , m_aErrStr(CUI_RES(RID_SVXSTR_ERR_TEXTNOTFOUND))
+    , m_aErrStr(CuiResId(RID_SVXSTR_ERR_TEXTNOTFOUND))
     , xThesaurus(nullptr)
     , aLookUpText()
     , nLookUpLanguage(LANGUAGE_NONE)