Replace ScGlobal::GetRscString with simple ScResId calls

After the gettext migration there is no point to have two
APIs for reading the same .mo file.

This patch is for sc/source/ui/[m-u]* for easier review.

Change-Id: I326902a89b8c65e32a42c3ebb55bea3609d32db6
Reviewed-on: https://gerrit.libreoffice.org/54136
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

6 files changed, 19 insertions, 14 deletions

diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index c43811ca39a6..1596b4a8574b 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -20,6 +20,7 @@
 #include <reffact.hxx>
 #include <document.hxx>
 #include <globstr.hrc>
+#include <scresid.hxx>
 #include <docsh.hxx>
 #include <crnrdlg.hxx>
 #include <vcl/weld.hxx>
@@ -384,7 +385,7 @@ void ScColRowNameRangesDlg::UpdateNames()
     OUString aString;
     OUString strDelim(" --- ");
     aString = strDelim;
-    aString += ScGlobal::GetRscString( STR_COLUMN );
+    aString += ScResId( STR_COLUMN );
     aString += strDelim;
     sal_Int32 nPos = pLbRange->InsertEntry( aString );
     pLbRange->SetEntryData( nPos, reinterpret_cast<void*>(nEntryDataDelim) );
@@ -428,7 +429,7 @@ void ScColRowNameRangesDlg::UpdateNames()
         }
     }
     aString = strDelim;
-    aString += ScGlobal::GetRscString( STR_ROW );
+    aString += ScResId( STR_ROW );
     aString += strDelim;
     nPos = pLbRange->InsertEntry( aString );
     pLbRange->SetEntryData( nPos, reinterpret_cast<void*>(nEntryDataDelim) );
@@ -582,7 +583,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void)
         }
         else
         {
-            ERRORBOX(GetFrameWeld(), ScGlobal::GetRscString(STR_INVALIDTABNAME));
+            ERRORBOX(GetFrameWeld(), ScResId(STR_INVALIDTABNAME));
             if ( !bOk1 )
                 pEdAssign->GrabFocus();
             else
@@ -610,7 +611,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void)
         bFound = true;
     if ( bFound )
     {
-        OUString aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY );
+        OUString aStrDelMsg = ScResId( STR_QUERY_DELENTRY );
         OUString aMsg       = aStrDelMsg.getToken( 0, '#' )
                             + aRangeStr
                             + aStrDelMsg.getToken( 1, '#' );
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 3848936fdd42..ea26de1491b3 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -31,6 +31,7 @@
 #include <docsh.hxx>
 #include <viewdata.hxx>
 #include <globstr.hrc>
+#include <scresid.hxx>
 #include <instbdlg.hxx>
 
 ScInsertTableDlg::ScInsertTableDlg( vcl::Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile )
@@ -298,7 +299,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl, Button*, void)
     }
     else
     {
-        OUString aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) );
+        OUString aErrMsg ( ScResId( STR_INVALIDTABNAME ) );
         std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning,
                     VclButtonsType::Ok, aErrMsg));
         xBox->run();
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index fb7926441522..9c38f0284bf6 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -24,6 +24,7 @@
 #include <docsh.hxx>
 #include <global.hxx>
 #include <globstr.hrc>
+#include <scresid.hxx>
 
 ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, const OUString& rDefault)
     : GenericDialogController(pParent, "modules/scalc/ui/movecopysheet.ui", "MoveCopySheetDialog")
@@ -289,7 +290,7 @@ IMPL_LINK_NOARG(ScMoveTableDlg, SelHdl, weld::ComboBoxText&, void)
             m_xLbTable->append_text(aName);
         }
     }
-    m_xLbTable->append_text(ScGlobal::GetRscString(STR_MOVE_TO_END));
+    m_xLbTable->append_text(ScResId(STR_MOVE_TO_END));
     m_xLbTable->thaw();
     m_xLbTable->select(0);
     ResetRenameInput();
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 2faf061518b5..479262509a71 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -37,6 +37,7 @@
 #include <solveroptions.hxx>
 #include <solverutil.hxx>
 #include <globstr.hrc>
+#include <scresid.hxx>
 
 #include <optsolver.hxx>
 
@@ -179,8 +180,8 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Windo
                           ScDocShell* pDocSh, const ScAddress& aCursorPos )
 
     : ScAnyRefDlg(pB, pCW, pParent, "SolverDialog", "modules/scalc/ui/solverdlg.ui")
-    , maInputError(ScGlobal::GetRscString(STR_INVALIDINPUT))
-    , maConditionError(ScGlobal::GetRscString(STR_INVALIDCONDITION))
+    , maInputError(ScResId(STR_INVALIDINPUT))
+    , maConditionError(ScResId(STR_INVALIDCONDITION))
 
     , mpDocShell(pDocSh)
     , mrDoc(pDocSh->GetDocument())
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index fb946f41eb7f..b772bb90c30f 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -261,7 +261,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl, Button*, void)
                 {
                     std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(),
                                 VclMessageType::Error, VclButtonsType::OkCancel,
-                                ScGlobal::GetRscString(STR_INVALID_AFNAME)));
+                                ScResId(STR_INVALID_AFNAME)));
 
                     sal_uInt16 nRet = xBox->run();
 
@@ -381,7 +381,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, Button*, void)
             {
                 std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(),
                             VclMessageType::Error, VclButtonsType::OkCancel,
-                            ScGlobal::GetRscString(STR_INVALID_AFNAME)));
+                            ScResId(STR_INVALID_AFNAME)));
 
                 bOk = RET_CANCEL == xBox->run();
             }
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 0fd0fb093075..c64802940ffa 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -27,6 +27,7 @@
 #include <reffact.hxx>
 #include <document.hxx>
 #include <globstr.hrc>
+#include <scresid.hxx>
 #include <sc.hrc>
 #include <solvrdlg.hxx>
 
@@ -52,10 +53,10 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPa
     , nCurTab(aCursorPos.Tab())
     , pEdActive(nullptr)
     , bDlgLostFocus(false)
-    , errMsgInvalidVar(ScGlobal::GetRscString(STR_INVALIDVAR))
-    , errMsgInvalidForm(ScGlobal::GetRscString(STR_INVALIDFORM))
-    , errMsgNoFormula(ScGlobal::GetRscString(STR_NOFORMULA))
-    , errMsgInvalidVal(ScGlobal::GetRscString(STR_INVALIDVAL))
+    , errMsgInvalidVar(ScResId(STR_INVALIDVAR))
+    , errMsgInvalidForm(ScResId(STR_INVALIDFORM))
+    , errMsgNoFormula(ScResId(STR_NOFORMULA))
+    , errMsgInvalidVal(ScResId(STR_INVALIDVAL))
 {
     get(m_pFtFormulaCell, "formulatext");
     get(m_pEdFormulaCell, "formulaedit");