[Libreoffice-commits] core.git: sc/source
Gabor Kelemen
kelemeng at ubuntu.com
Sat May 12 11:43:33 UTC 2018
sc/source/ui/miscdlgs/crnrdlg.cxx | 9 +++--
sc/source/ui/miscdlgs/instbdlg.cxx | 3 +
sc/source/ui/miscdlgs/mvtabdlg.cxx | 3 +
sc/source/ui/miscdlgs/optsolver.cxx | 5 +--
sc/source/ui/miscdlgs/scuiautofmt.cxx | 4 +-
sc/source/ui/miscdlgs/solvrdlg.cxx | 9 +++--
sc/source/ui/namedlg/namedefdlg.cxx | 9 +++--
sc/source/ui/namedlg/namedlg.cxx | 9 +++--
sc/source/ui/namedlg/namemgrtable.cxx | 9 +++--
sc/source/ui/navipi/scenwnd.cxx | 3 +
sc/source/ui/optdlg/tpcalc.cxx | 3 +
sc/source/ui/optdlg/tpusrlst.cxx | 11 +++---
sc/source/ui/optdlg/tpview.cxx | 2 -
sc/source/ui/pagedlg/areasdlg.cxx | 3 +
sc/source/ui/pagedlg/hfedtdlg.cxx | 3 +
sc/source/ui/pagedlg/tphf.cxx | 7 ++--
sc/source/ui/pagedlg/tphfedit.cxx | 2 -
sc/source/ui/undo/undoblk.cxx | 39 ++++++++++++------------
sc/source/ui/undo/undoblk2.cxx | 9 +++--
sc/source/ui/undo/undoblk3.cxx | 35 +++++++++++----------
sc/source/ui/undo/undocell.cxx | 29 +++++++++---------
sc/source/ui/undo/undocell2.cxx | 3 +
sc/source/ui/undo/undoconvert.cxx | 3 +
sc/source/ui/undo/undodat.cxx | 39 ++++++++++++------------
sc/source/ui/undo/undorangename.cxx | 5 +--
sc/source/ui/undo/undosort.cxx | 3 +
sc/source/ui/undo/undostyl.cxx | 6 +--
sc/source/ui/undo/undotab.cxx | 40 ++++++++++++-------------
sc/source/ui/unoobj/PivotTableDataProvider.cxx | 2 -
sc/source/ui/unoobj/cellsuno.cxx | 5 +--
sc/source/ui/unoobj/chart2uno.cxx | 5 +--
sc/source/ui/unoobj/dapiuno.cxx | 3 +
sc/source/ui/unoobj/filtuno.cxx | 13 ++++----
sc/source/ui/unoobj/styleuno.cxx | 5 +--
34 files changed, 183 insertions(+), 155 deletions(-)
New commits:
commit aa0cd609d3f7eee02a5f05a93cba060bb82184d5
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date: Fri May 11 15:58:09 2018 +0200
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 at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
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");
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index d0ee3fb04508..d88f368d8a28 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -15,6 +15,7 @@
#include <document.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <globalnames.hxx>
#include <rangenam.hxx>
#include <reffact.hxx>
@@ -33,10 +34,10 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* p
mpDocShell ( pViewData->GetDocShell() ),
maCursorPos( aCursorPos ),
- maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
- maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
- maErrInvalidNameCellRefStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID_CELL_REF)),
- maErrNameInUse ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
+ maGlobalNameStr ( ScResId(STR_GLOBAL_SCOPE) ),
+ maErrInvalidNameStr( ScResId(STR_ERR_NAME_INVALID)),
+ maErrInvalidNameCellRefStr( ScResId(STR_ERR_NAME_INVALID_CELL_REF)),
+ maErrNameInUse ( ScResId(STR_ERR_NAME_EXISTS)),
maRangeMap( aRangeMap )
{
get(m_pEdName, "edit");
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index c6c404f36c22..f25f9582f267 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -23,6 +23,7 @@
#include <document.hxx>
#include <docfunc.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <namedlg.hxx>
#include <viewdata.hxx>
#include <tabvwsh.hxx>
@@ -46,10 +47,10 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent
std::map<OUString, std::unique_ptr<ScRangeName>> *const pRangeMap)
: ScAnyRefDlg(pB, pCW, pParent, "ManageNamesDialog", "modules/scalc/ui/managenamesdialog.ui")
- , maGlobalNameStr(ScGlobal::GetRscString(STR_GLOBAL_SCOPE))
- , maErrInvalidNameStr(ScGlobal::GetRscString(STR_ERR_NAME_INVALID))
- , maErrNameInUse(ScGlobal::GetRscString(STR_ERR_NAME_EXISTS))
- , maStrMultiSelect(ScGlobal::GetRscString(STR_MULTI_SELECT))
+ , maGlobalNameStr(ScResId(STR_GLOBAL_SCOPE))
+ , maErrInvalidNameStr(ScResId(STR_ERR_NAME_INVALID))
+ , maErrNameInUse(ScResId(STR_ERR_NAME_EXISTS))
+ , maStrMultiSelect(ScResId(STR_MULTI_SELECT))
, mpViewData(ptrViewData)
, mpDoc(ptrViewData->GetDocument())
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 129f263ba33e..a1841381fe4c 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -14,6 +14,7 @@
#include <document.hxx>
#include <docfunc.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <namedlg.hxx>
#include <viewdata.hxx>
#include <globalnames.hxx>
@@ -38,7 +39,7 @@ ScRangeManagerTable::ScRangeManagerTable(SvSimpleTableContainer& rParent,
const std::map<OUString, std::unique_ptr<ScRangeName>>& rRangeMap,
const ScAddress& rPos)
: SvSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
- , maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE))
+ , maGlobalString( ScResId(STR_GLOBAL_SCOPE))
, m_RangeMap(rRangeMap)
, maPos( rPos )
, mpInitListener(nullptr)
@@ -46,9 +47,9 @@ ScRangeManagerTable::ScRangeManagerTable(SvSimpleTableContainer& rParent,
static long aStaticTabs[] = { 0, 0, 0 };
SetTabs( SAL_N_ELEMENTS(aStaticTabs), aStaticTabs, MapUnit::MapPixel );
- OUString aNameStr(ScGlobal::GetRscString(STR_HEADER_NAME));
- OUString aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE_OR_EXPR));
- OUString aScopeStr(ScGlobal::GetRscString(STR_HEADER_SCOPE));
+ OUString aNameStr(ScResId(STR_HEADER_NAME));
+ OUString aRangeStr(ScResId(STR_HEADER_RANGE_OR_EXPR));
+ OUString aScopeStr(ScResId(STR_HEADER_SCOPE));
HeaderBar& rHeaderBar = GetTheHeaderBar();
InsertHeaderEntry( aNameStr );
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 9f6ebd9a1562..2705f8ff9784 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -28,6 +28,7 @@
#include <navipi.hxx>
#include <sc.hrc>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <helpids.h>
// class ScScenarioWindow ------------------------------------------------
@@ -185,7 +186,7 @@ void ScScenarioListBox::DeleteScenario()
{
std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr,
VclMessageType::Question, VclButtonsType::YesNo,
- ScGlobal::GetRscString(STR_QUERY_DELSCENARIO)));
+ ScResId(STR_QUERY_DELSCENARIO)));
xQueryBox->set_default_response(RET_YES);
if (xQueryBox->run() == RET_YES)
ExecuteScenarioSlot( SID_DELETE_SCENARIO );
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 1c3900b5ea31..77652e6d22b5 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -24,6 +24,7 @@
#include <global.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <uiitems.hxx>
#include <docsh.hxx>
#include <document.hxx>
@@ -235,7 +236,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
if ( nReturn == DeactivateRC::KeepPage )
{
std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning,
- VclButtonsType::Ok, ScGlobal::GetRscString(STR_INVALID_EPS)));
+ VclButtonsType::Ok, ScResId(STR_INVALID_EPS)));
xBox->run();
m_pEdEps->GrabFocus();
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 85f7c0dea701..3bd623bc7d43 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -32,6 +32,7 @@
#include <crdlg.hxx>
#include <sc.hrc>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <tpusrlst.hxx>
#define CR u'\x000D'
@@ -47,10 +48,10 @@ ScTpUserLists::ScTpUserLists( vcl::Window* pParent,
: SfxTabPage ( pParent,
"OptSortLists", "modules/scalc/ui/optsortlists.ui",
&rCoreAttrs ),
- aStrQueryRemove ( ScGlobal::GetRscString( STR_QUERYREMOVE ) ),
- aStrCopyList ( ScGlobal::GetRscString( STR_COPYLIST ) ),
- aStrCopyFrom ( ScGlobal::GetRscString( STR_COPYFROM ) ),
- aStrCopyErr ( ScGlobal::GetRscString( STR_COPYERR ) ),
+ aStrQueryRemove ( ScResId( STR_QUERYREMOVE ) ),
+ aStrCopyList ( ScResId( STR_COPYLIST ) ),
+ aStrCopyFrom ( ScResId( STR_COPYFROM ) ),
+ aStrCopyErr ( ScResId( STR_COPYERR ) ),
nWhichUserLists ( GetWhich( SID_SCUSERLISTS ) ),
pUserLists ( nullptr ),
pDoc ( nullptr ),
@@ -698,7 +699,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
{
std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(),
VclMessageType::Warning, VclButtonsType::Ok,
- ScGlobal::GetRscString(STR_INVALID_TABREF)));
+ ScResId(STR_INVALID_TABREF)));
xBox->run();
mpEdCopyFrom->GrabFocus();
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index cf7a953795ed..4c533b7099ab 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -310,7 +310,7 @@ void ScTpContentOptions::InitGridOpt()
Color aCol = pLocalOptions->GetGridColor( &aName );
if (aName.trim().isEmpty() && aCol == SC_STD_GRIDCOLOR)
- aName = ScGlobal::GetRscString(STR_GRIDCOLOR);
+ aName = ScResId(STR_GRIDCOLOR);
pColorLB->SelectEntry(std::make_pair(aCol, aName));
}
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 37593fa0be04..276303375b08 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -32,6 +32,7 @@
#include <tabvwsh.hxx>
#include <docsh.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <compiler.hxx>
#include <markdata.hxx>
@@ -56,7 +57,7 @@ namespace
{
std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(pParent,
VclMessageType::Warning, VclButtonsType::Ok,
- ScGlobal::GetRscString(rId)));
+ ScResId(rId)));
xBox->run();
}
}
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index ac07d72d5029..ecf866e24754 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -25,6 +25,7 @@
#include <hfedtdlg.hxx>
#include <global.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <scuitphfedit.hxx>
ScHFEditDlg::ScHFEditDlg( vcl::Window* pParent,
@@ -37,7 +38,7 @@ ScHFEditDlg::ScHFEditDlg( vcl::Window* pParent,
OUString aTmp = GetText();
- aTmp += " (" + ScGlobal::GetRscString( STR_PAGESTYLE ) + ": " + rPageStyle + ")";
+ aTmp += " (" + ScResId( STR_PAGESTYLE ) + ": " + rPageStyle + ")";
SetText( aTmp );
}
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 3d5bcf672304..bfc94fa35382 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -29,6 +29,7 @@
#include <sc.hrc>
#include <scabstdlg.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <tabvwsh.hxx>
#include <viewdata.hxx>
#include <document.hxx>
@@ -206,7 +207,7 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
if ( nId == SID_ATTR_PAGE_HEADERSET )
{
- aText = ScGlobal::GetRscString( STR_PAGEHEADER );
+ aText = ScResId( STR_PAGEHEADER );
if ( bRightPage )
pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
else
@@ -214,7 +215,7 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
}
else
{
- aText = ScGlobal::GetRscString( STR_PAGEFOOTER );
+ aText = ScResId( STR_PAGEFOOTER );
if ( bRightPage )
pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
else
@@ -224,7 +225,7 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType();
static_cast<ScHFEditPage*>(pDlg->GetTabPage())->SetNumType(eNumType);
- aText += " (" + ScGlobal::GetRscString( STR_PAGESTYLE );
+ aText += " (" + ScResId( STR_PAGESTYLE );
aText += ": " + aStrPageStyle + ")";
pDlg->SetText( aText );
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 819a16f26f18..535c2b117812 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -204,7 +204,7 @@ void ScEditWindow::SetCharAttributes()
ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
GetParent(), &aSet, pDocSh));
OSL_ENSURE(pDlg, "Dialog create fail!");
- pDlg->SetText( ScGlobal::GetRscString( STR_TEXTATTRS ) );
+ pDlg->SetText( ScResId( STR_TEXTATTRS ) );
if ( pDlg->Execute() == RET_OK )
{
aSet.ClearItem();
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index dbdfbbe35805..20632b5abd77 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -38,6 +38,7 @@
#include <stlpool.hxx>
#include <stlsheet.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <global.hxx>
#include <target.hxx>
#include <docpool.hxx>
@@ -100,7 +101,7 @@ ScUndoInsertCells::~ScUndoInsertCells()
OUString ScUndoInsertCells::GetComment() const
{
- return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS );
+ return ScResId( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS );
}
bool ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
@@ -366,7 +367,7 @@ ScUndoDeleteCells::~ScUndoDeleteCells()
OUString ScUndoDeleteCells::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // "Delete"
+ return ScResId( STR_UNDO_DELETECELLS ); // "Delete"
}
void ScUndoDeleteCells::SetChangeTrack()
@@ -617,7 +618,7 @@ ScUndoDeleteMulti::~ScUndoDeleteMulti()
OUString ScUndoDeleteMulti::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // like DeleteCells
+ return ScResId( STR_UNDO_DELETECELLS ); // like DeleteCells
}
void ScUndoDeleteMulti::DoChange() const
@@ -792,7 +793,7 @@ ScUndoCut::~ScUndoCut()
OUString ScUndoCut::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_CUT ); // "cut"
+ return ScResId( STR_UNDO_CUT ); // "cut"
}
void ScUndoCut::SetChangeTrack()
@@ -909,7 +910,7 @@ ScUndoPaste::~ScUndoPaste()
OUString ScUndoPaste::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_PASTE ); // "paste"
+ return ScResId( STR_UNDO_PASTE ); // "paste"
}
void ScUndoPaste::SetChangeTrack()
@@ -1186,8 +1187,8 @@ ScUndoDragDrop::~ScUndoDragDrop()
OUString ScUndoDragDrop::GetComment() const
{ // "Move" : "Copy"
return bCut ?
- ScGlobal::GetRscString( STR_UNDO_MOVE ) :
- ScGlobal::GetRscString( STR_UNDO_COPY );
+ ScResId( STR_UNDO_MOVE ) :
+ ScResId( STR_UNDO_COPY );
}
void ScUndoDragDrop::SetChangeTrack()
@@ -1493,7 +1494,7 @@ ScUndoListNames::ScUndoListNames(ScDocShell* pNewDocShell, const ScRange& rRange
OUString ScUndoListNames::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_LISTNAMES );
+ return ScResId( STR_UNDO_LISTNAMES );
}
void ScUndoListNames::DoChange( ScDocument* pSrcDoc ) const
@@ -1549,7 +1550,7 @@ ScUndoConditionalFormat::~ScUndoConditionalFormat()
OUString ScUndoConditionalFormat::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_CONDFORMAT );
+ return ScResId( STR_UNDO_CONDFORMAT );
}
void ScUndoConditionalFormat::Undo()
@@ -1599,7 +1600,7 @@ ScUndoConditionalFormatList::~ScUndoConditionalFormatList()
OUString ScUndoConditionalFormatList::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_CONDFORMAT_LIST );
+ return ScResId( STR_UNDO_CONDFORMAT_LIST );
}
void ScUndoConditionalFormatList::Undo()
@@ -1668,7 +1669,7 @@ ScUndoUseScenario::~ScUndoUseScenario()
OUString ScUndoUseScenario::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_USESCENARIO );
+ return ScResId( STR_UNDO_USESCENARIO );
}
void ScUndoUseScenario::Undo()
@@ -1783,7 +1784,7 @@ ScUndoSelectionStyle::~ScUndoSelectionStyle()
OUString ScUndoSelectionStyle::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE );
+ return ScResId( STR_UNDO_APPLYCELLSTYLE );
}
void ScUndoSelectionStyle::DoChange( const bool bUndo )
@@ -1882,7 +1883,7 @@ ScUndoEnterMatrix::~ScUndoEnterMatrix()
OUString ScUndoEnterMatrix::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_ENTERMATRIX );
+ return ScResId( STR_UNDO_ENTERMATRIX );
}
void ScUndoEnterMatrix::SetChangeTrack()
@@ -1976,7 +1977,7 @@ ScUndoIndent::~ScUndoIndent()
OUString ScUndoIndent::GetComment() const
{
const char* pId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
- return ScGlobal::GetRscString(pId);
+ return ScResId(pId);
}
void ScUndoIndent::Undo()
@@ -2031,7 +2032,7 @@ ScUndoTransliterate::~ScUndoTransliterate()
OUString ScUndoTransliterate::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_TRANSLITERATE );
+ return ScResId( STR_UNDO_TRANSLITERATE );
}
void ScUndoTransliterate::Undo()
@@ -2094,7 +2095,7 @@ ScUndoClearItems::~ScUndoClearItems()
OUString ScUndoClearItems::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );
+ return ScResId( STR_UNDO_DELETECONTENTS );
}
void ScUndoClearItems::Undo()
@@ -2148,7 +2149,7 @@ ScUndoRemoveBreaks::~ScUndoRemoveBreaks()
OUString ScUndoRemoveBreaks::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REMOVEBREAKS );
+ return ScResId( STR_UNDO_REMOVEBREAKS );
}
void ScUndoRemoveBreaks::Undo()
@@ -2217,7 +2218,7 @@ ScUndoRemoveMerge::~ScUndoRemoveMerge()
OUString ScUndoRemoveMerge::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "remove merge"
+ return ScResId( STR_UNDO_REMERGE ); // "remove merge"
}
ScDocument* ScUndoRemoveMerge::GetUndoDoc()
@@ -2367,7 +2368,7 @@ ScUndoBorder::ScUndoBorder(ScDocShell* pNewDocShell,
OUString ScUndoBorder::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! own string?
+ return ScResId( STR_UNDO_SELATTRLINES ); //! own string?
}
void ScUndoBorder::Undo()
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 3b1c99a7d66e..f66cd92ac76d 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -25,6 +25,7 @@
#include <tabvwsh.hxx>
#include <olinetab.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <global.hxx>
#include <target.hxx>
@@ -69,12 +70,12 @@ OUString ScUndoWidthOrHeight::GetComment() const
// [ "optimal " ] "Column width" | "row height"
return ( bWidth ?
( ( eMode == SC_SIZE_OPTIMAL )?
- ScGlobal::GetRscString( STR_UNDO_OPTCOLWIDTH ) :
- ScGlobal::GetRscString( STR_UNDO_COLWIDTH )
+ ScResId( STR_UNDO_OPTCOLWIDTH ) :
+ ScResId( STR_UNDO_COLWIDTH )
) :
( ( eMode == SC_SIZE_OPTIMAL )?
- ScGlobal::GetRscString( STR_UNDO_OPTROWHEIGHT ) :
- ScGlobal::GetRscString( STR_UNDO_ROWHEIGHT )
+ ScResId( STR_UNDO_OPTROWHEIGHT ) :
+ ScResId( STR_UNDO_ROWHEIGHT )
) );
}
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 99973bd4d7e7..6d362573220f 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -35,6 +35,7 @@
#include <undoblk.hxx>
#include <sc.hrc>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <global.hxx>
#include <rangenam.hxx>
#include <arealink.hxx>
@@ -91,7 +92,7 @@ ScUndoDeleteContents::~ScUndoDeleteContents()
OUString ScUndoDeleteContents::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Delete"
+ return ScResId( STR_UNDO_DELETECONTENTS ); // "Delete"
}
void ScUndoDeleteContents::SetDataSpans( const std::shared_ptr<DataSpansType>& pSpans )
@@ -233,7 +234,7 @@ ScUndoFillTable::~ScUndoFillTable()
OUString ScUndoFillTable::GetComment() const
{
- return ScGlobal::GetRscString( STR_FILL_TAB );
+ return ScResId( STR_FILL_TAB );
}
void ScUndoFillTable::SetChangeTrack()
@@ -376,7 +377,7 @@ ScUndoSelectionAttr::~ScUndoSelectionAttr()
OUString ScUndoSelectionAttr::GetComment() const
{
//"Attribute" "/Lines"
- return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR );
+ return ScResId( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR );
}
ScEditDataArray* ScUndoSelectionAttr::GetDataArray()
@@ -506,7 +507,7 @@ ScUndoAutoFill::~ScUndoAutoFill()
OUString ScUndoAutoFill::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_AUTOFILL ); //"Fill"
+ return ScResId( STR_UNDO_AUTOFILL ); //"Fill"
}
void ScUndoAutoFill::SetChangeTrack()
@@ -597,7 +598,7 @@ void ScUndoAutoFill::Redo()
nProgCount = aSource.aEnd.Row() - aSource.aStart.Row() + 1;
nProgCount *= nCount;
ScProgress aProgress( rDoc.GetDocumentShell(),
- ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount, true );
+ ScResId(STR_FILL_SERIES_PROGRESS), nProgCount, true );
rDoc.Fill( aSource.aStart.Col(), aSource.aStart.Row(),
aSource.aEnd.Col(), aSource.aEnd.Row(), &aProgress,
@@ -651,7 +652,7 @@ ScUndoMerge::~ScUndoMerge()
OUString ScUndoMerge::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_MERGE );
+ return ScResId( STR_UNDO_MERGE );
}
void ScUndoMerge::DoChange( bool bUndo ) const
@@ -783,7 +784,7 @@ ScUndoAutoFormat::~ScUndoAutoFormat()
OUString ScUndoAutoFormat::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
+ return ScResId( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
}
void ScUndoAutoFormat::Undo()
@@ -967,7 +968,7 @@ void ScUndoReplace::SetChangeTrack()
OUString ScUndoReplace::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Replace"
+ return ScResId( STR_UNDO_REPLACE ); // "Replace"
}
void ScUndoReplace::Undo()
@@ -1121,7 +1122,7 @@ ScUndoTabOp::~ScUndoTabOp()
OUString ScUndoTabOp::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Multiple operation"
+ return ScResId( STR_UNDO_TABOP ); // "Multiple operation"
}
void ScUndoTabOp::Undo()
@@ -1215,9 +1216,9 @@ OUString ScUndoConversion::GetComment() const
OUString aText;
switch( maConvParam.GetType() )
{
- case SC_CONVERSION_SPELLCHECK: aText = ScGlobal::GetRscString( STR_UNDO_SPELLING ); break;
- case SC_CONVERSION_HANGULHANJA: aText = ScGlobal::GetRscString( STR_UNDO_HANGULHANJA ); break;
- case SC_CONVERSION_CHINESE_TRANSL: aText = ScGlobal::GetRscString( STR_UNDO_CHINESE_TRANSLATION ); break;
+ case SC_CONVERSION_SPELLCHECK: aText = ScResId( STR_UNDO_SPELLING ); break;
+ case SC_CONVERSION_HANGULHANJA: aText = ScResId( STR_UNDO_HANGULHANJA ); break;
+ case SC_CONVERSION_CHINESE_TRANSL: aText = ScResId( STR_UNDO_CHINESE_TRANSLATION ); break;
default: OSL_FAIL( "ScUndoConversion::GetComment - unknown conversion type" );
}
return aText;
@@ -1297,7 +1298,7 @@ ScUndoRefConversion::~ScUndoRefConversion()
OUString ScUndoRefConversion::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
+ return ScResId( STR_UNDO_ENTERDATA ); // "Input"
}
void ScUndoRefConversion::SetChangeTrack()
@@ -1370,7 +1371,7 @@ ScUndoRefreshLink::ScUndoRefreshLink(ScDocShell* pNewDocShell,
OUString ScUndoRefreshLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_UPDATELINK );
+ return ScResId( STR_UNDO_UPDATELINK );
}
void ScUndoRefreshLink::Undo()
@@ -1501,7 +1502,7 @@ ScUndoInsertAreaLink::~ScUndoInsertAreaLink()
OUString ScUndoInsertAreaLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_INSERTAREALINK );
+ return ScResId( STR_UNDO_INSERTAREALINK );
}
void ScUndoInsertAreaLink::Undo()
@@ -1563,7 +1564,7 @@ ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink()
OUString ScUndoRemoveAreaLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! own text ??
+ return ScResId( STR_UNDO_REMOVELINK ); //! own text ??
}
void ScUndoRemoveAreaLink::Undo()
@@ -1633,7 +1634,7 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
OUString ScUndoUpdateAreaLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! own text ??
+ return ScResId( STR_UNDO_UPDATELINK ); //! own text ??
}
void ScUndoUpdateAreaLink::DoChange( const bool bUndo ) const
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 16e022bfaea9..fc9015daff20 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -34,6 +34,7 @@
#include <docsh.hxx>
#include <tabvwsh.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <global.hxx>
#include <formulacell.hxx>
#include <target.hxx>
@@ -97,7 +98,7 @@ ScUndoCursorAttr::~ScUndoCursorAttr()
OUString ScUndoCursorAttr::GetComment() const
{
//! own text for automatic attribution
- return ScGlobal::GetRscString( STR_UNDO_CURSORATTR ); // "Attribute"
+ return ScResId( STR_UNDO_CURSORATTR ); // "Attribute"
}
void ScUndoCursorAttr::SetEditData( std::unique_ptr<EditTextObject> pOld, std::unique_ptr<EditTextObject> pNew )
@@ -179,7 +180,7 @@ ScUndoEnterData::ScUndoEnterData(
OUString ScUndoEnterData::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
+ return ScResId( STR_UNDO_ENTERDATA ); // "Input"
}
void ScUndoEnterData::DoChange() const
@@ -316,7 +317,7 @@ ScUndoEnterValue::~ScUndoEnterValue()
OUString ScUndoEnterValue::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
+ return ScResId( STR_UNDO_ENTERDATA ); // "Input"
}
void ScUndoEnterValue::SetChangeTrack()
@@ -420,7 +421,7 @@ bool ScUndoSetCell::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
OUString ScUndoSetCell::GetComment() const
{
- return ScGlobal::GetRscString(STR_UNDO_ENTERDATA); // "Input"
+ return ScResId(STR_UNDO_ENTERDATA); // "Input"
}
void ScUndoSetCell::SetChangeTrack()
@@ -504,12 +505,12 @@ OUString ScUndoPageBreak::GetComment() const
//"Column break" | "Row break" "insert" | "delete"
return bColumn ?
( bInsert ?
- ScGlobal::GetRscString( STR_UNDO_INSCOLBREAK ) :
- ScGlobal::GetRscString( STR_UNDO_DELCOLBREAK )
+ ScResId( STR_UNDO_INSCOLBREAK ) :
+ ScResId( STR_UNDO_DELCOLBREAK )
) :
( bInsert ?
- ScGlobal::GetRscString( STR_UNDO_INSROWBREAK ) :
- ScGlobal::GetRscString( STR_UNDO_DELROWBREAK )
+ ScResId( STR_UNDO_INSROWBREAK ) :
+ ScResId( STR_UNDO_DELROWBREAK )
);
}
@@ -580,7 +581,7 @@ ScUndoPrintZoom::~ScUndoPrintZoom()
OUString ScUndoPrintZoom::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_PRINTSCALE );
+ return ScResId( STR_UNDO_PRINTSCALE );
}
void ScUndoPrintZoom::DoChange( bool bUndo )
@@ -650,7 +651,7 @@ ScUndoThesaurus::~ScUndoThesaurus() {}
OUString ScUndoThesaurus::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus"
+ return ScResId( STR_UNDO_THESAURUS ); // "Thesaurus"
}
void ScUndoThesaurus::SetChangeTrack( const ScCellValue& rOldCell )
@@ -789,7 +790,7 @@ bool ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
OUString ScUndoReplaceNote::GetComment() const
{
- return ScGlobal::GetRscString( maNewData.mxCaption ?
+ return ScResId( maNewData.mxCaption ?
(maOldData.mxCaption ? STR_UNDO_EDITNOTE : STR_UNDO_INSERTNOTE) : STR_UNDO_DELETENOTE );
}
@@ -861,7 +862,7 @@ bool ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
OUString ScUndoShowHideNote::GetComment() const
{
- return ScGlobal::GetRscString( mbShown ? STR_UNDO_SHOWNOTE : STR_UNDO_HIDENOTE );
+ return ScResId( mbShown ? STR_UNDO_SHOWNOTE : STR_UNDO_HIDENOTE );
}
ScUndoDetective::ScUndoDetective( ScDocShell* pNewDocShell,
@@ -899,7 +900,7 @@ OUString ScUndoDetective::GetComment() const
case SCDETOP_ADDERROR: pId = STR_UNDO_DETADDERROR; break;
}
- return ScGlobal::GetRscString(pId);
+ return ScResId(pId);
}
void ScUndoDetective::Undo()
@@ -986,7 +987,7 @@ ScUndoRangeNames::~ScUndoRangeNames()
OUString ScUndoRangeNames::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_RANGENAMES );
+ return ScResId( STR_UNDO_RANGENAMES );
}
void ScUndoRangeNames::DoChange( bool bUndo )
diff --git a/sc/source/ui/undo/undocell2.cxx b/sc/source/ui/undo/undocell2.cxx
index 125b9a767f38..da7c2ddaa0f1 100644
--- a/sc/source/ui/undo/undocell2.cxx
+++ b/sc/source/ui/undo/undocell2.cxx
@@ -9,6 +9,7 @@
#include <undocell.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <cellvalues.hxx>
namespace sc {
@@ -51,7 +52,7 @@ bool UndoSetCells::CanRepeat( SfxRepeatTarget& ) const
OUString UndoSetCells::GetComment() const
{
// "Input"
- return ScGlobal::GetRscString(STR_UNDO_ENTERDATA);
+ return ScResId(STR_UNDO_ENTERDATA);
}
void UndoSetCells::SetNewValues( const std::vector<double>& rVals )
diff --git a/sc/source/ui/undo/undoconvert.cxx b/sc/source/ui/undo/undoconvert.cxx
index 7778b2b745d5..ea9facfc22eb 100644
--- a/sc/source/ui/undo/undoconvert.cxx
+++ b/sc/source/ui/undo/undoconvert.cxx
@@ -9,6 +9,7 @@
#include <undoconvert.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <undoutil.hxx>
namespace sc {
@@ -21,7 +22,7 @@ UndoFormulaToValue::UndoFormulaToValue( ScDocShell* pDocSh, TableValues& rUndoVa
OUString UndoFormulaToValue::GetComment() const
{
- return ScGlobal::GetRscString(STR_UNDO_FORMULA_TO_VALUE);
+ return ScResId(STR_UNDO_FORMULA_TO_VALUE);
}
void UndoFormulaToValue::Undo()
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index f7ee7e4779b7..dddb262199ae 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -30,6 +30,7 @@
#include <rangenam.hxx>
#include <pivot.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <global.hxx>
#include <globalnames.hxx>
#include <target.hxx>
@@ -72,8 +73,8 @@ ScUndoDoOutline::~ScUndoDoOutline()
OUString ScUndoDoOutline::GetComment() const
{ // Show outline" "Hide outline"
return bShow ?
- ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) :
- ScGlobal::GetRscString( STR_UNDO_REDOOUTLINE );
+ ScResId( STR_UNDO_DOOUTLINE ) :
+ ScResId( STR_UNDO_REDOOUTLINE );
}
void ScUndoDoOutline::Undo()
@@ -160,8 +161,8 @@ ScUndoMakeOutline::~ScUndoMakeOutline()
OUString ScUndoMakeOutline::GetComment() const
{ // "Grouping" "Undo grouping"
return bMake ?
- ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) :
- ScGlobal::GetRscString( STR_UNDO_REMAKEOUTLINE );
+ ScResId( STR_UNDO_MAKEOUTLINE ) :
+ ScResId( STR_UNDO_REMAKEOUTLINE );
}
void ScUndoMakeOutline::Undo()
@@ -240,7 +241,7 @@ ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell,
OUString ScUndoOutlineLevel::GetComment() const
{ // "Select outline level"
- return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL );
+ return ScResId( STR_UNDO_OUTLINELEVEL );
}
void ScUndoOutlineLevel::Undo()
@@ -320,8 +321,8 @@ ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell,
OUString ScUndoOutlineBlock::GetComment() const
{ // "Show outline" "Hide outline"
return bShow ?
- ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) :
- ScGlobal::GetRscString( STR_UNDO_REDOOUTLINEBLK );
+ ScResId( STR_UNDO_DOOUTLINEBLK ) :
+ ScResId( STR_UNDO_REDOOUTLINEBLK );
}
void ScUndoOutlineBlock::Undo()
@@ -418,7 +419,7 @@ ScUndoRemoveAllOutlines::ScUndoRemoveAllOutlines(ScDocShell* pNewDocShell,
OUString ScUndoRemoveAllOutlines::GetComment() const
{ // "Remove outlines"
- return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS );
+ return ScResId( STR_UNDO_REMOVEALLOTLNS );
}
void ScUndoRemoveAllOutlines::Undo()
@@ -499,7 +500,7 @@ ScUndoAutoOutline::ScUndoAutoOutline(ScDocShell* pNewDocShell,
OUString ScUndoAutoOutline::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE );
+ return ScResId( STR_UNDO_AUTOOUTLINE );
}
void ScUndoAutoOutline::Undo()
@@ -600,7 +601,7 @@ ScUndoSubTotals::ScUndoSubTotals(ScDocShell* pNewDocShell, SCTAB nNewTab,
OUString ScUndoSubTotals::GetComment() const
{ // "Subtotals"
- return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS );
+ return ScResId( STR_UNDO_SUBTOTALS );
}
void ScUndoSubTotals::Undo()
@@ -731,7 +732,7 @@ ScUndoQuery::~ScUndoQuery()
OUString ScUndoQuery::GetComment() const
{ // "Filter";
- return ScGlobal::GetRscString( STR_UNDO_QUERY );
+ return ScResId( STR_UNDO_QUERY );
}
void ScUndoQuery::Undo()
@@ -888,7 +889,7 @@ ScUndoAutoFilter::~ScUndoAutoFilter()
OUString ScUndoAutoFilter::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_QUERY ); // same as ScUndoQuery
+ return ScResId( STR_UNDO_QUERY ); // same as ScUndoQuery
}
void ScUndoAutoFilter::DoChange( bool bUndo )
@@ -968,7 +969,7 @@ ScUndoDBData::~ScUndoDBData()
OUString ScUndoDBData::GetComment() const
{ // "Change database range";
- return ScGlobal::GetRscString( STR_UNDO_DBDATA );
+ return ScResId( STR_UNDO_DBDATA );
}
void ScUndoDBData::Undo()
@@ -1038,7 +1039,7 @@ ScUndoImportData::ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab,
OUString ScUndoImportData::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA );
+ return ScResId( STR_UNDO_IMPORTDATA );
}
void ScUndoImportData::Undo()
@@ -1247,7 +1248,7 @@ ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab,
OUString ScUndoRepeatDB::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REPEATDB );
+ return ScResId( STR_UNDO_REPEATDB );
}
void ScUndoRepeatDB::Undo()
@@ -1402,7 +1403,7 @@ OUString ScUndoDataPilot::GetComment() const
else
pResId = STR_UNDO_PIVOT_DELETE;
- return ScGlobal::GetRscString(pResId);
+ return ScResId(pResId);
}
void ScUndoDataPilot::Undo()
@@ -1543,7 +1544,7 @@ ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rA
OUString ScUndoConsolidate::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_CONSOLIDATE );
+ return ScResId( STR_UNDO_CONSOLIDATE );
}
void ScUndoConsolidate::Undo()
@@ -1700,7 +1701,7 @@ ScUndoChartData::~ScUndoChartData()
OUString ScUndoChartData::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_CHARTDATA );
+ return ScResId( STR_UNDO_CHARTDATA );
}
void ScUndoChartData::Undo()
@@ -1758,7 +1759,7 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell,
OUString ScUndoDataForm::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_PASTE );
+ return ScResId( STR_UNDO_PASTE );
}
void ScUndoDataForm::Undo()
diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx
index 151b6586899a..eb195e466b2e 100644
--- a/sc/source/ui/undo/undorangename.cxx
+++ b/sc/source/ui/undo/undorangename.cxx
@@ -9,6 +9,7 @@
#include <undorangename.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <global.hxx>
#include <docfunc.hxx>
#include <sc.hrc>
@@ -63,7 +64,7 @@ bool ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const
OUString ScUndoAllRangeNames::GetComment() const
{
- return ScGlobal::GetRscString(STR_UNDO_RANGENAMES);
+ return ScResId(STR_UNDO_RANGENAMES);
}
void ScUndoAllRangeNames::DoChange(const std::map<OUString, std::unique_ptr<ScRangeName>>& rNames)
@@ -133,7 +134,7 @@ bool ScUndoAddRangeData::CanRepeat(SfxRepeatTarget& /*rTarget*/) const
OUString ScUndoAddRangeData::GetComment() const
{
- return ScGlobal::GetRscString(STR_UNDO_RANGENAMES);
+ return ScResId(STR_UNDO_RANGENAMES);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx
index 4b1ec6bab60b..e881c09ea7d3 100644
--- a/sc/source/ui/undo/undosort.cxx
+++ b/sc/source/ui/undo/undosort.cxx
@@ -9,6 +9,7 @@
#include <undosort.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <global.hxx>
#include <undoutil.hxx>
@@ -19,7 +20,7 @@ UndoSort::UndoSort( ScDocShell* pDocSh, const ReorderParam& rParam ) :
OUString UndoSort::GetComment() const
{
- return ScGlobal::GetRscString(STR_UNDO_SORT);
+ return ScResId(STR_UNDO_SORT);
}
void UndoSort::Undo()
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index 4235136fadb7..9d1363faba60 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -28,7 +28,7 @@
#include <scmod.hxx>
#include <inputhdl.hxx>
#include <globstr.hrc>
-
+#include <scresid.hxx>
// modify style (cell or page style)
@@ -83,7 +83,7 @@ OUString ScUndoModifyStyle::GetComment() const
const char* pId = (eFamily == SfxStyleFamily::Para) ?
STR_UNDO_EDITCELLSTYLE :
STR_UNDO_EDITPAGESTYLE;
- return ScGlobal::GetRscString(pId);
+ return ScResId(pId);
}
static void lcl_DocStyleChanged( ScDocument* pDoc, const SfxStyleSheetBase* pStyle, bool bRemoved )
@@ -232,7 +232,7 @@ void ScUndoApplyPageStyle::AddSheetAction( SCTAB nTab, const OUString& rOldStyle
OUString ScUndoApplyPageStyle::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_APPLYPAGESTYLE );
+ return ScResId( STR_UNDO_APPLYPAGESTYLE );
}
void ScUndoApplyPageStyle::Undo()
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index a92a2270e59d..8b27f5b317ed 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -80,9 +80,9 @@ ScUndoInsertTab::~ScUndoInsertTab()
OUString ScUndoInsertTab::GetComment() const
{
if (bAppend)
- return ScGlobal::GetRscString( STR_UNDO_APPEND_TAB );
+ return ScResId( STR_UNDO_APPEND_TAB );
else
- return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
+ return ScResId( STR_UNDO_INSERT_TAB );
}
void ScUndoInsertTab::SetChangeTrack()
@@ -172,7 +172,7 @@ ScUndoInsertTables::~ScUndoInsertTables()
OUString ScUndoInsertTables::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
+ return ScResId( STR_UNDO_INSERT_TAB );
}
void ScUndoInsertTables::SetChangeTrack()
@@ -261,7 +261,7 @@ ScUndoDeleteTab::~ScUndoDeleteTab()
OUString ScUndoDeleteTab::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETE_TAB );
+ return ScResId( STR_UNDO_DELETE_TAB );
}
void ScUndoDeleteTab::SetChangeTrack()
@@ -422,7 +422,7 @@ ScUndoRenameTab::~ScUndoRenameTab()
OUString ScUndoRenameTab::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_RENAME_TAB );
+ return ScResId( STR_UNDO_RENAME_TAB );
}
void ScUndoRenameTab::DoChange( SCTAB nTabP, const OUString& rName ) const
@@ -484,7 +484,7 @@ ScUndoMoveTab::~ScUndoMoveTab()
OUString ScUndoMoveTab::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_MOVE_TAB );
+ return ScResId( STR_UNDO_MOVE_TAB );
}
void ScUndoMoveTab::DoChange( bool bUndo ) const
@@ -495,7 +495,7 @@ void ScUndoMoveTab::DoChange( bool bUndo ) const
if (bUndo) // UnDo
{
size_t i = mpNewTabs->size();
- std::unique_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB),
+ std::unique_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScResId(STR_UNDO_MOVE_TAB),
i * rDoc.GetCodeCount(), true));
for (; i > 0; --i)
{
@@ -517,7 +517,7 @@ void ScUndoMoveTab::DoChange( bool bUndo ) const
else
{
size_t n = mpNewTabs->size();
- std::unique_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB),
+ std::unique_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScResId(STR_UNDO_MOVE_TAB),
n * rDoc.GetCodeCount(), true));
for (size_t i = 0; i < n; ++i)
{
@@ -589,7 +589,7 @@ ScUndoCopyTab::~ScUndoCopyTab()
OUString ScUndoCopyTab::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_COPY_TAB );
+ return ScResId( STR_UNDO_COPY_TAB );
}
void ScUndoCopyTab::DoChange() const
@@ -730,8 +730,8 @@ ScUndoTabColor::~ScUndoTabColor()
OUString ScUndoTabColor::GetComment() const
{
if (aTabColorList.size() > 1)
- return ScGlobal::GetRscString(STR_UNDO_SET_MULTI_TAB_BG_COLOR);
- return ScGlobal::GetRscString(STR_UNDO_SET_TAB_BG_COLOR);
+ return ScResId(STR_UNDO_SET_MULTI_TAB_BG_COLOR);
+ return ScResId(STR_UNDO_SET_TAB_BG_COLOR);
}
void ScUndoTabColor::DoChange(bool bUndoType) const
@@ -796,7 +796,7 @@ ScUndoMakeScenario::~ScUndoMakeScenario()
OUString ScUndoMakeScenario::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_MAKESCENARIO );
+ return ScResId( STR_UNDO_MAKESCENARIO );
}
void ScUndoMakeScenario::Undo()
@@ -875,7 +875,7 @@ ScUndoImportTab::~ScUndoImportTab()
OUString ScUndoImportTab::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
+ return ScResId( STR_UNDO_INSERT_TAB );
}
void ScUndoImportTab::DoChange() const
@@ -1056,7 +1056,7 @@ ScUndoRemoveLink::~ScUndoRemoveLink()
OUString ScUndoRemoveLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REMOVELINK );
+ return ScResId( STR_UNDO_REMOVELINK );
}
void ScUndoRemoveLink::DoChange( bool bLink ) const
@@ -1155,7 +1155,7 @@ OUString ScUndoShowHideTab::GetComment() const
pId = bShow ? STR_UNDO_SHOWTAB : STR_UNDO_HIDETAB;
}
- return ScGlobal::GetRscString(pId);
+ return ScResId(pId);
}
ScUndoDocProtect::ScUndoDocProtect(ScDocShell* pShell, unique_ptr<ScDocProtection> && pProtectSettings) :
@@ -1222,7 +1222,7 @@ bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
OUString ScUndoDocProtect::GetComment() const
{
const char* pId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
- return ScGlobal::GetRscString(pId);
+ return ScResId(pId);
}
ScUndoTabProtect::ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, unique_ptr<ScTableProtection> && pProtectSettings) :
@@ -1290,7 +1290,7 @@ bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
OUString ScUndoTabProtect::GetComment() const
{
const char* pId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB;
- return ScGlobal::GetRscString(pId);
+ return ScResId(pId);
}
ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
@@ -1351,7 +1351,7 @@ bool ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const
OUString ScUndoPrintRange::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_PRINTRANGES );
+ return ScResId( STR_UNDO_PRINTRANGES );
}
ScUndoScenarioFlags::ScUndoScenarioFlags(ScDocShell* pNewDocShell, SCTAB nT,
@@ -1376,7 +1376,7 @@ ScUndoScenarioFlags::~ScUndoScenarioFlags()
OUString ScUndoScenarioFlags::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_EDITSCENARIO );
+ return ScResId( STR_UNDO_EDITSCENARIO );
}
void ScUndoScenarioFlags::Undo()
@@ -1551,7 +1551,7 @@ bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const
OUString ScUndoLayoutRTL::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_TAB_RTL );
+ return ScResId( STR_UNDO_TAB_RTL );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index cfdea1bed39e..b0a4fe18431a 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -615,7 +615,7 @@ PivotTableDataProvider::assignLabelsToDataSequence(size_t nIndex)
if (m_aLabels.empty())
{
- aLabel = ScGlobal::GetRscString(STR_PIVOT_TOTAL);
+ aLabel = ScResId(STR_PIVOT_TOTAL);
}
else
{
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 8448dc6f1c94..1ac3eac1a7ea 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -113,6 +113,7 @@
#include <brdcst.hxx>
#include <cellform.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <unonames.hxx>
#include <styleuno.hxx>
#include <rangeseq.hxx>
@@ -2006,7 +2007,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyN
bChartRowAsHdr = false;
else if ( pEntry->nWID == SC_WID_UNO_CELLSTYL )
{
- OUString aStyleName( ScGlobal::GetRscString( STR_STYLENAME_STANDARD ) );
+ OUString aStyleName( ScResId( STR_STYLENAME_STANDARD ) );
pDocShell->GetDocFunc().ApplyStyle( *GetMarkData(), aStyleName, true );
}
}
@@ -2058,7 +2059,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropert
break;
case SC_WID_UNO_CELLSTYL:
aAny <<= ScStyleNameConversion::DisplayToProgrammaticName(
- ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SfxStyleFamily::Para );
+ ScResId(STR_STYLENAME_STANDARD), SfxStyleFamily::Para );
break;
case SC_WID_UNO_TBLBORD:
case SC_WID_UNO_TBLBORD2:
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index aa88e72a1122..fd1976a75b44 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -30,6 +30,7 @@
#include <chartpos.hxx>
#include <unonames.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <convuno.hxx>
#include <rangeutl.hxx>
#include <hints.hxx>
@@ -3060,7 +3061,7 @@ public:
{
if ( meOrigin != chart2::data::LabelOrigin_LONG_SIDE)
{
- OUString aString = ScGlobal::GetRscString(STR_COLUMN);
+ OUString aString = ScResId(STR_COLUMN);
aString += " ";
ScAddress aPos( nCol, 0, 0 );
OUString aColStr(aPos.Format(ScRefFlags::COL_VALID));
@@ -3078,7 +3079,7 @@ public:
{
if (meOrigin != chart2::data::LabelOrigin_LONG_SIDE)
{
- OUString aString = ScGlobal::GetRscString(STR_ROW) +
+ OUString aString = ScResId(STR_ROW) +
" " + OUString::number( nRow+1 );
pArr[mnCount] = aString;
}
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 9e4af7a49688..8bf22f9f4925 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -42,6 +42,7 @@
#include <hints.hxx>
#include <dputil.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <generalfunction.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -2608,7 +2609,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons
}
OUString aGroupDimName = pGroupDimension->GetGroupDimName();
- OUString aGroupName = pGroupDimension->CreateGroupName( ScGlobal::GetRscString(STR_PIVOT_GROUP) );
+ OUString aGroupName = pGroupDimension->CreateGroupName( ScResId(STR_PIVOT_GROUP) );
ScDPSaveGroupItem aGroup( aGroupName );
for (sal_Int32 nEntry = 0; nEntry < rItems.getLength(); nEntry++)
{
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index f345b93d875c..20d8dbcfe487 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -31,6 +31,7 @@
#include <asciiopt.hxx>
#include <docsh.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <sc.hrc>
#include <scabstdlg.hxx>
@@ -247,7 +248,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
else
cAsciiDel = '\t';
- aTitle = ScGlobal::GetRscString( STR_EXPORT_ASCII );
+ aTitle = ScResId( STR_EXPORT_ASCII );
bAscii = true;
}
else if ( aFilterString == ScDocShell::GetLotusFilterName() )
@@ -255,7 +256,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
// lotus is only imported
OSL_ENSURE( !bExport, "Filter Options for Lotus Export is not implemented" );
- aTitle = ScGlobal::GetRscString( STR_IMPORT_LOTUS );
+ aTitle = ScResId( STR_IMPORT_LOTUS );
eEncoding = RTL_TEXTENCODING_IBM_437;
}
else if ( aFilterString == ScDocShell::GetDBaseFilterName() )
@@ -263,12 +264,12 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
if ( bExport )
{
// dBase export
- aTitle = ScGlobal::GetRscString( STR_EXPORT_DBF );
+ aTitle = ScResId( STR_EXPORT_DBF );
}
else
{
// dBase import
- aTitle = ScGlobal::GetRscString( STR_IMPORT_DBF );
+ aTitle = ScResId( STR_IMPORT_DBF );
}
std::unique_ptr<SvStream> pInStream;
@@ -291,12 +292,12 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
if ( bExport )
{
// DIF export
- aTitle = ScGlobal::GetRscString( STR_EXPORT_DIF );
+ aTitle = ScResId( STR_EXPORT_DIF );
}
else
{
// DIF import
- aTitle = ScGlobal::GetRscString( STR_IMPORT_DIF );
+ aTitle = ScResId( STR_IMPORT_DIF );
}
// common for DIF import/export
eEncoding = RTL_TEXTENCODING_MS_1252;
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 94015525c9a5..5a75b348a5be 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -71,6 +71,7 @@
#include <unonames.hxx>
#include <unowids.hxx>
#include <globstr.hrc>
+#include <scresid.hxx>
#include <cellsuno.hxx>
#include <stylehelper.hxx>
@@ -742,7 +743,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName )
else
{
if ( rDoc.RemovePageStyleInUse( aString ) )
- pDocShell->PageStyleModified( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), true );
+ pDocShell->PageStyleModified( ScResId(STR_STYLENAME_STANDARD), true );
pStylePool->Remove( pStyle );
@@ -887,7 +888,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyN
}
if (pResId)
{
- OUString sDisplayName(ScGlobal::GetRscString(pResId));
+ OUString sDisplayName(ScResId(pResId));
aRet <<= sDisplayName;
}
More information about the Libreoffice-commits
mailing list