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>

8 files changed, 29 insertions, 29 deletions

diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 1de04845a67c..d3cb2063951b 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1186,7 +1186,7 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
             else
             {
                 OUString aText( nSlotId == FN_DELETE_NOTE_AUTHOR ?
-                                SW_RES( STR_DELETE_NOTE_AUTHOR ) : SW_RES( STR_HIDE_NOTE_AUTHOR ) );
+                                SwResId( STR_DELETE_NOTE_AUTHOR ) : SwResId( STR_HIDE_NOTE_AUTHOR ) );
                 SwRewriter aRewriter;
                 aRewriter.AddRule( UndoArg1, pPostItMgr->GetActiveSidebarWin()->GetAuthor() );
                 aText = aRewriter.Apply( aText );
@@ -1208,7 +1208,7 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
                     OUString sAuthor;
                     if( (sAuthor = aUserOpt.GetFullName()).isEmpty() &&
                         (sAuthor = aUserOpt.GetID()).isEmpty() )
-                        sAuthor = SW_RES( STR_REDLINE_UNKNOWN_AUTHOR );
+                        sAuthor = SwResId( STR_REDLINE_UNKNOWN_AUTHOR );
                     if (sAuthor == pPostItMgr->GetActiveSidebarWin()->GetAuthor())
                         rSet.DisableItem(nWhich);
                 }
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 027ec78151a8..48c4a0d0d7ca 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2702,9 +2702,9 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
 
             if (rSh.GetTableFormat())
             {
-                aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_START_QUOTE));
+                aRewriter.AddRule(UndoArg1, SwResId(STR_START_QUOTE));
                 aRewriter.AddRule(UndoArg2, rSh.GetTableFormat()->GetName());
-                aRewriter.AddRule(UndoArg3, SW_RESSTR(STR_END_QUOTE));
+                aRewriter.AddRule(UndoArg3, SwResId(STR_END_QUOTE));
 
             }
             rSh.EndUndo(SwUndoId::INSTABLE, &aRewriter); // If possible change the Shell
@@ -2728,7 +2728,7 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet )
             nTableRowPos  = nTableCellPos = nPagePos =
             nHeaderPos    = nFooterPos = 0;
             sal_uInt8 nPos = 1;
-            rLst.push_back( SW_RESSTR( STR_SWBG_PAGE ) );
+            rLst.push_back( SwResId( STR_SWBG_PAGE ) );
             nPagePos = nPos++;
             sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell());
             bool bHtmlMode = 0 != (nHtmlMode & HTMLMODE_ON);
@@ -2736,50 +2736,50 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet )
             if ( (!bHtmlMode || (nHtmlMode & HTMLMODE_FULL_STYLES)) &&
                  (nSel & SelectionType::Text) )
             {
-                rLst.push_back( SW_RESSTR( STR_SWBG_PARAGRAPH ) );
+                rLst.push_back( SwResId( STR_SWBG_PARAGRAPH ) );
                 nParagraphPos = nPos++;
             }
             if ( (!bHtmlMode || (nHtmlMode & HTMLMODE_SOME_STYLES)) &&
                     nSel & (SelectionType::Table|SelectionType::TableCell) )
             {
-                rLst.push_back( SW_RESSTR( STR_SWBG_TABLE ) );
+                rLst.push_back( SwResId( STR_SWBG_TABLE ) );
                 nTablePos = nPos++;
 
                 if(!bHtmlMode)
                 {
-                    rLst.push_back( SW_RESSTR( STR_SWBG_TABLE_ROW ) );
+                    rLst.push_back( SwResId( STR_SWBG_TABLE_ROW ) );
                     nTableRowPos = nPos++;
                 }
 
-                rLst.push_back( SW_RESSTR( STR_SWBG_TABLE_CELL) );
+                rLst.push_back( SwResId( STR_SWBG_TABLE_CELL) );
                 nTableCellPos = nPos++;
             }
             if(!bHtmlMode)
             {
                 if ( nSel & SelectionType::Frame )
                 {
-                    rLst.push_back( SW_RESSTR( STR_SWBG_FRAME ) );
+                    rLst.push_back( SwResId( STR_SWBG_FRAME ) );
                     nFramePos = nPos++;
                 }
                 if ( nSel & SelectionType::Graphic )
                 {
-                    rLst.push_back( SW_RESSTR( STR_SWBG_GRAPHIC ) );
+                    rLst.push_back( SwResId( STR_SWBG_GRAPHIC ) );
                     nGraphicPos = nPos++;
                 }
                 if ( nSel & SelectionType::Ole )
                 {
-                    rLst.push_back( SW_RESSTR( STR_SWBG_OLE ) );
+                    rLst.push_back( SwResId( STR_SWBG_OLE ) );
                     nOlePos = nPos++;
                 }
                 const FrameTypeFlags nType = rSh.GetFrameType(nullptr,true);
                 if ( nType & FrameTypeFlags::HEADER )
                 {
-                    rLst.push_back( SW_RESSTR( STR_SWBG_HEADER ) );
+                    rLst.push_back( SwResId( STR_SWBG_HEADER ) );
                     nHeaderPos = nPos++;
                 }
                 if ( nType & FrameTypeFlags::FOOTER )
                 {
-                    rLst.push_back( SW_RESSTR( STR_SWBG_FOOTER ) );
+                    rLst.push_back( SwResId( STR_SWBG_FOOTER ) );
                     nFooterPos = nPos;
                 }
             }
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 6f2ee322b88e..4adf956213ab 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -124,7 +124,7 @@ void SwDrawShell::InsertPictureFromFile(SdrObject& rObject)
 
     if(pSdrView)
     {
-        SvxOpenGraphicDialog aDlg(SW_RESSTR(STR_INSERT_GRAPHIC));
+        SvxOpenGraphicDialog aDlg(SwResId(STR_INSERT_GRAPHIC));
 
         if(GRFILTER_OK == aDlg.Execute())
         {
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 31778367ac9e..b617d3fa9970 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -771,16 +771,16 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                             {
                                 case SID_OBJECT_ALIGN_UP     :
                                 case FN_FRAME_ALIGN_VERT_TOP:
-                                    sNewLabel = SW_RES(STR_TOP_BASE);
+                                    sNewLabel = SwResId(STR_TOP_BASE);
                                     break;
                                 case SID_OBJECT_ALIGN_MIDDLE :
                                 case FN_FRAME_ALIGN_VERT_CENTER:
-                                    sNewLabel = SW_RES(STR_CENTER_BASE);
+                                    sNewLabel = SwResId(STR_CENTER_BASE);
                                     break;
                                 case SID_OBJECT_ALIGN_DOWN :
                                 case FN_FRAME_ALIGN_VERT_BOTTOM:
                                     if(!bHtmlMode)
-                                        sNewLabel = SW_RES(STR_BOTTOM_BASE);
+                                        sNewLabel = SwResId(STR_BOTTOM_BASE);
                                     else
                                         rSet.DisableItem( nWhich );
                                 break;
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 6327ef785d55..84bc4a39fba5 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -760,7 +760,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                     case TableMergeErr::TooComplex:
                     {
                         ScopedVclPtrInstance<MessageDialog> aInfoBox( GetView().GetWindow(),
-                                    SW_RES( STR_ERR_TABLE_MERGE ), VclMessageType::Info );
+                                    SwResId( STR_ERR_TABLE_MERGE ), VclMessageType::Info );
                         aInfoBox->Execute();
                         break;
                     }
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 12cf61076926..1fe73b0478ff 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -78,7 +78,7 @@ using namespace nsSwDocInfoSubType;
 
 static OUString lcl_BuildTitleWithRedline( const SwRangeRedline *pRedline )
 {
-    const OUString sTitle(SW_RESSTR(STR_REDLINE_COMMENT));
+    const OUString sTitle(SwResId(STR_REDLINE_COMMENT));
 
     sal_uInt16 nResId = 0;
     switch( pRedline->GetType() )
@@ -103,7 +103,7 @@ static OUString lcl_BuildTitleWithRedline( const SwRangeRedline *pRedline )
             return sTitle;
     }
 
-    return sTitle + SW_RESSTR( nResId );
+    return sTitle + SwResId( nResId );
 }
 
 void SwTextShell::ExecField(SfxRequest &rReq)
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 4647ca0edcd7..613a008ad967 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -515,7 +515,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                 {
                     SwRewriter aRewriter;
 
-                    aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_FRAME));
+                    aRewriter.AddRule(UndoArg1, SwResId(STR_FRAME));
 
                     rShell.EndUndo(SwUndoId::INSERT, &aRewriter);
                 }
@@ -967,7 +967,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
 
         // Delete selected content.
         SwRewriter aRewriter;
-        aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_SPECIALCHAR));
+        aRewriter.AddRule(UndoArg1, SwResId(STR_SPECIALCHAR));
 
         rSh.StartUndo( SwUndoId::INSERT, &aRewriter );
         if ( rSh.HasSelection() )
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 1cbbff3dcf25..bc71aad799b6 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -257,18 +257,18 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
 static short lcl_AskRedlineFlags(vcl::Window *pWin)
 {
     ScopedVclPtrInstance<MessBox> aQBox( pWin, 0,
-                    OUString( SW_RES( STR_REDLINE_TITLE ) ),
-                    OUString( SW_RES( STR_REDLINE_MSG ) ) );
+                    OUString( SwResId( STR_REDLINE_TITLE ) ),
+                    OUString( SwResId( STR_REDLINE_MSG ) ) );
     aQBox->SetImage( QueryBox::GetStandardImage() );
     const ButtonDialogFlags nBtnFlags = ButtonDialogFlags::Default |
                         ButtonDialogFlags::OK |
                         ButtonDialogFlags::Focus;
 
-    aQBox->AddButton(OUString(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags);
+    aQBox->AddButton(SwResId(STR_REDLINE_ACCEPT_ALL), RET_OK, nBtnFlags);
     aQBox->GetPushButton( RET_OK )->SetHelpId(HID_AUTOFORMAT_ACCEPT);
-    aQBox->AddButton(OUString(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, ButtonDialogFlags::Cancel);
+    aQBox->AddButton(SwResId(STR_REDLINE_REJECT_ALL), RET_CANCEL, ButtonDialogFlags::Cancel);
     aQBox->GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT  );
-    aQBox->AddButton(OUString(SW_RES(STR_REDLINE_EDIT)), 2);
+    aQBox->AddButton(SwResId(STR_REDLINE_EDIT), 2);
     aQBox->GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG);
     aQBox->SetButtonHelpText( RET_OK, OUString() );
 
@@ -303,7 +303,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             {
                 SwRewriter aRewriter;
                 aRewriter.AddRule( UndoArg1, aToggle.StringToReplace() );
-                aRewriter.AddRule( UndoArg2, SW_RES(STR_YIELDS) );
+                aRewriter.AddRule( UndoArg2, SwResId(STR_YIELDS) );
                 aRewriter.AddRule( UndoArg3, sReplacement );
                 rWrtSh.StartUndo(SwUndoId::REPLACE, &aRewriter);
                 rWrtSh.GetCursor()->Normalize(false);