sc/source/filter/dif/difexp.cxx | 3 ++- sc/source/filter/excel/impop.cxx | 3 ++- sc/source/filter/excel/xepivot.cxx | 5 +++-- sc/source/filter/excel/xestream.cxx | 3 ++- sc/source/filter/excel/xestyle.cxx | 5 +++-- sc/source/filter/excel/xiescher.cxx | 27 ++++++++++++++------------- sc/source/filter/excel/xistyle.cxx | 7 ++++--- sc/source/filter/excel/xltools.cxx | 5 +++-- sc/source/filter/ftools/fprogressbar.cxx | 5 +++-- sc/source/filter/html/htmlexp.cxx | 6 +++--- sc/source/filter/oox/stylesbuffer.cxx | 7 ++++--- sc/source/filter/oox/workbookfragment.cxx | 3 ++- sc/source/filter/oox/workbookhelper.cxx | 5 +++-- sc/source/filter/orcus/interface.cxx | 3 ++- sc/source/filter/rtf/eeimpars.cxx | 3 ++- sc/source/filter/xml/xmlwrap.cxx | 3 ++- 16 files changed, 54 insertions(+), 39 deletions(-)
New commits: commit fabbeb7a8d8a5bb7ce030c1871e6ad7cf33d4a07 Author: Gabor Kelemen <[email protected]> Date: Sat May 12 19:52:17 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/filter/ for easier review. Change-Id: I77adc446e66623535a9d4c871ac1403e88efff78 Reviewed-on: https://gerrit.libreoffice.org/54183 Tested-by: Jenkins <[email protected]> Reviewed-by: Julien Nabet <[email protected]> diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index b9c1b6700b4a..8d13faa38480 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -24,6 +24,7 @@ #include <document.hxx> #include <formulacell.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <global.hxx> #include <progress.hxx> #include <rtl/tencinfo.h> @@ -99,7 +100,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, SCROW nNumRows = nEndRow - rRange.aStart.Row() + 1; SCTAB nTab = rRange.aStart.Tab(); - ScProgress aPrgrsBar( pDoc->GetDocumentShell(), ScGlobal::GetRscString( STR_LOAD_DOC ), nNumRows, true ); + ScProgress aPrgrsBar( pDoc->GetDocumentShell(), ScResId( STR_LOAD_DOC ), nNumRows, true ); aPrgrsBar.SetState( 0 ); diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 90616ce57d2a..85ebffc50295 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -47,6 +47,7 @@ #include <patattr.hxx> #include <attrib.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <global.hxx> #include <markdata.hxx> #include <olinetab.hxx> @@ -1249,7 +1250,7 @@ void ImportExcel::PostDocLoad() /* Set automatic page numbering in Default page style (default is "page number = 1"). Otherwise hidden tables (i.e. for scenarios) which have Default page style will break automatic page numbering. */ - if( SfxStyleSheetBase* pStyleSheet = GetStyleSheetPool().Find( ScGlobal::GetRscString( STR_STYLENAME_STANDARD ), SfxStyleFamily::Page ) ) + if( SfxStyleSheetBase* pStyleSheet = GetStyleSheetPool().Find( ScResId( STR_STYLENAME_STANDARD ), SfxStyleFamily::Page ) ) pStyleSheet->GetItemSet().Put( SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 0 ) ); // outlines for all sheets, sets hidden rows and columns (#i11776# after filtered ranges) diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index d763d74ccc89..a47fd26f50e1 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -37,6 +37,7 @@ #include <dpdimsave.hxx> #include <dpshttab.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <fapihelper.hxx> #include <xestring.hxx> #include <xelink.hxx> @@ -881,7 +882,7 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, ScGeneralFunction e default:; } if (pResIdx) - aCaption = ScGlobal::GetRscString(pResIdx) + " - "; + aCaption = ScResId(pResIdx) + " - "; aCaption += rFieldName; return aCaption; } @@ -1308,7 +1309,7 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData ) if (pDim && pDim->GetLayoutName()) maPTInfo.maDataName = *pDim->GetLayoutName(); else - maPTInfo.maDataName = ScGlobal::GetRscString(STR_PIVOT_DATA); + maPTInfo.maDataName = ScResId(STR_PIVOT_DATA); } void XclExpPivotTable::SetFieldPropertiesFromDim( const ScDPSaveDimension& rSaveDim ) diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 5a1c4a96df8a..1bda7dc820ca 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -43,6 +43,7 @@ #include <tokenstringcontext.hxx> #include <refreshtimerprotector.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <docsh.hxx> #include <viewdata.hxx> @@ -1043,7 +1044,7 @@ bool XclExpXmlStream::exportDocument() uno::Reference<task::XStatusIndicator> xStatusIndicator = getStatusIndicator(); if (xStatusIndicator.is()) - xStatusIndicator->start(ScGlobal::GetRscString(STR_SAVE_DOC), 100); + xStatusIndicator->start(ScResId(STR_SAVE_DOC), 100); // NOTE: Don't use SotStorage or SvStream any more, and never call // SfxMedium::GetOutStream() anywhere in the xlsx export filter code! diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 169d0d77de5e..746cad084b16 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -50,6 +50,7 @@ #include <patattr.hxx> #include <attrib.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <xestring.hxx> #include <conditio.hxx> @@ -2057,7 +2058,7 @@ XclExpXF::XclExpXF( const XclExpRoot& rRoot, const SfxStyleSheetBase& rStyleShee XclExpRoot( rRoot ), mnParentXFId( XclExpXFBuffer::GetXFIdFromIndex( EXC_XF_STYLEPARENT ) ) { - bool bDefStyle = (rStyleSheet.GetName() == ScGlobal::GetRscString( STR_STYLENAME_STANDARD )); + bool bDefStyle = (rStyleSheet.GetName() == ScResId( STR_STYLENAME_STANDARD )); sal_Int16 nScript = bDefStyle ? GetDefApiScript() : css::i18n::ScriptType::WEAK; Init( const_cast< SfxStyleSheetBase& >( rStyleSheet ).GetItemSet(), nScript, NUMBERFORMAT_ENTRY_NOT_FOUND, EXC_FONT_NOTFOUND, false, bDefStyle ); @@ -2890,7 +2891,7 @@ void XclExpXFBuffer::InsertDefaultRecords() maFills.push_back( lcl_GetPatternFill_Gray125() ); // index 0: default style - if( SfxStyleSheetBase* pDefStyleSheet = GetStyleSheetPool().Find( ScGlobal::GetRscString( STR_STYLENAME_STANDARD ), SfxStyleFamily::Para ) ) + if( SfxStyleSheetBase* pDefStyleSheet = GetStyleSheetPool().Find( ScResId( STR_STYLENAME_STANDARD ), SfxStyleFamily::Para ) ) { XclExpXFRef xDefStyle( new XclExpXF( GetRoot(), *pDefStyleSheet ) ); sal_uInt32 nXFId = AppendBuiltInXFWithStyle( xDefStyle, EXC_STYLE_NORMAL ); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 9e2db5f9b04c..b530e8705f7c 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -92,6 +92,7 @@ #include <convuno.hxx> #include <postit.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <fprogressbar.hxx> #include <xltracer.hxx> @@ -4235,27 +4236,27 @@ XclImpObjectManager::XclImpObjectManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { maDefObjNames[ EXC_OBJTYPE_GROUP ] = "Group"; - maDefObjNames[ EXC_OBJTYPE_LINE ] = ScGlobal::GetRscString( STR_SHAPE_LINE ); - maDefObjNames[ EXC_OBJTYPE_RECTANGLE ] = ScGlobal::GetRscString( STR_SHAPE_RECTANGLE ); - maDefObjNames[ EXC_OBJTYPE_OVAL ] = ScGlobal::GetRscString( STR_SHAPE_OVAL ); + maDefObjNames[ EXC_OBJTYPE_LINE ] = ScResId( STR_SHAPE_LINE ); + maDefObjNames[ EXC_OBJTYPE_RECTANGLE ] = ScResId( STR_SHAPE_RECTANGLE ); + maDefObjNames[ EXC_OBJTYPE_OVAL ] = ScResId( STR_SHAPE_OVAL ); maDefObjNames[ EXC_OBJTYPE_ARC ] = "Arc"; maDefObjNames[ EXC_OBJTYPE_CHART ] = "Chart"; maDefObjNames[ EXC_OBJTYPE_TEXT ] = "Text"; - maDefObjNames[ EXC_OBJTYPE_BUTTON ] = ScGlobal::GetRscString( STR_FORM_BUTTON ); + maDefObjNames[ EXC_OBJTYPE_BUTTON ] = ScResId( STR_FORM_BUTTON ); maDefObjNames[ EXC_OBJTYPE_PICTURE ] = "Picture"; maDefObjNames[ EXC_OBJTYPE_POLYGON ] = "Freeform"; - maDefObjNames[ EXC_OBJTYPE_CHECKBOX ] = ScGlobal::GetRscString( STR_FORM_CHECKBOX ); - maDefObjNames[ EXC_OBJTYPE_OPTIONBUTTON ] = ScGlobal::GetRscString( STR_FORM_OPTIONBUTTON ); + maDefObjNames[ EXC_OBJTYPE_CHECKBOX ] = ScResId( STR_FORM_CHECKBOX ); + maDefObjNames[ EXC_OBJTYPE_OPTIONBUTTON ] = ScResId( STR_FORM_OPTIONBUTTON ); maDefObjNames[ EXC_OBJTYPE_EDIT ] = "Edit Box"; - maDefObjNames[ EXC_OBJTYPE_LABEL ] = ScGlobal::GetRscString( STR_FORM_LABEL ); + maDefObjNames[ EXC_OBJTYPE_LABEL ] = ScResId( STR_FORM_LABEL ); maDefObjNames[ EXC_OBJTYPE_DIALOG ] = "Dialog Frame"; - maDefObjNames[ EXC_OBJTYPE_SPIN ] = ScGlobal::GetRscString( STR_FORM_SPINNER ); - maDefObjNames[ EXC_OBJTYPE_SCROLLBAR ] = ScGlobal::GetRscString( STR_FORM_SCROLLBAR ); - maDefObjNames[ EXC_OBJTYPE_LISTBOX ] = ScGlobal::GetRscString( STR_FORM_LISTBOX ); - maDefObjNames[ EXC_OBJTYPE_GROUPBOX ] = ScGlobal::GetRscString( STR_FORM_GROUPBOX ); - maDefObjNames[ EXC_OBJTYPE_DROPDOWN ] = ScGlobal::GetRscString( STR_FORM_DROPDOWN ); + maDefObjNames[ EXC_OBJTYPE_SPIN ] = ScResId( STR_FORM_SPINNER ); + maDefObjNames[ EXC_OBJTYPE_SCROLLBAR ] = ScResId( STR_FORM_SCROLLBAR ); + maDefObjNames[ EXC_OBJTYPE_LISTBOX ] = ScResId( STR_FORM_LISTBOX ); + maDefObjNames[ EXC_OBJTYPE_GROUPBOX ] = ScResId( STR_FORM_GROUPBOX ); + maDefObjNames[ EXC_OBJTYPE_DROPDOWN ] = ScResId( STR_FORM_DROPDOWN ); maDefObjNames[ EXC_OBJTYPE_NOTE ] = "Comment"; - maDefObjNames[ EXC_OBJTYPE_DRAWING ] = ScGlobal::GetRscString( STR_SHAPE_AUTOSHAPE ); + maDefObjNames[ EXC_OBJTYPE_DRAWING ] = ScResId( STR_SHAPE_AUTOSHAPE ); } XclImpObjectManager::~XclImpObjectManager() diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 6e357267e12a..07216a81db1f 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -52,6 +52,7 @@ #include <stlsheet.hxx> #include <formulacell.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <attarray.hxx> #include <xltracer.hxx> #include <xistream.hxx> @@ -1351,7 +1352,7 @@ void XclImpXF::ApplyPatternToAttrVector( { ScStyleSheet* pStyleSheet = static_cast<ScStyleSheet*>( pStylePool->Find( - ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SfxStyleFamily::Para)); + ScResId(STR_STYLENAME_STANDARD), SfxStyleFamily::Para)); if (pStyleSheet) rPat.SetStyleSheet(pStyleSheet, false); @@ -1513,7 +1514,7 @@ ScStyleSheet* XclImpStyle::CreateStyleSheet() if( pXF ) pXF->SetAllUsedFlags( true ); // use existing "Default" style sheet mpStyleSheet = static_cast< ScStyleSheet* >( GetStyleSheetPool().Find( - ScGlobal::GetRscString( STR_STYLENAME_STANDARD ), SfxStyleFamily::Para ) ); + ScResId( STR_STYLENAME_STANDARD ), SfxStyleFamily::Para ) ); OSL_ENSURE( mpStyleSheet, "XclImpStyle::CreateStyleSheet - Default style not found" ); bCreatePattern = true; } @@ -1614,7 +1615,7 @@ void XclImpXFBuffer::CreateUserStyles() BIFF4W import filter is never used to import from clipboard... */ bool bReserveAll = (GetBiff() == EXC_BIFF4) && (GetCurrScTab() > 0); SfxStyleSheetIterator aStyleIter( GetDoc().GetStyleSheetPool(), SfxStyleFamily::Para ); - OUString aStandardName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); + OUString aStandardName = ScResId( STR_STYLENAME_STANDARD ); for( SfxStyleSheetBase* pStyleSheet = aStyleIter.First(); pStyleSheet; pStyleSheet = aStyleIter.Next() ) if( (pStyleSheet->GetName() != aStandardName) && (bReserveAll || !pStyleSheet->IsUserDefined()) ) if( aCellStyles.count( pStyleSheet->GetName() ) == 0 ) diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 47030af38ddf..7d697c016c03 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -31,6 +31,7 @@ #include <editutil.hxx> #include <formula/errorcodes.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <xlstyle.hxx> #include <xlname.hxx> #include <xistream.hxx> @@ -531,7 +532,7 @@ OUString XclTools::GetBuiltInStyleName( sal_uInt8 nStyleId, const OUString& rNam if( nStyleId == EXC_STYLE_NORMAL ) // "Normal" becomes "Default" style { - aStyleName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); + aStyleName = ScResId( STR_STYLENAME_STANDARD ); } else { @@ -555,7 +556,7 @@ OUString XclTools::GetBuiltInStyleName( sal_uInt8 nStyleId, const OUString& rNam bool XclTools::IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyleId, sal_Int32* pnNextChar ) { // "Default" becomes "Normal" - if (rStyleName == ScGlobal::GetRscString(STR_STYLENAME_STANDARD)) + if (rStyleName == ScResId(STR_STYLENAME_STANDARD)) { if( pnStyleId ) *pnStyleId = EXC_STYLE_NORMAL; if( pnNextChar ) *pnNextChar = rStyleName.getLength(); diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index d61fdc2b2ae7..97195e2cbc11 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -20,6 +20,7 @@ #include <fprogressbar.hxx> #include <global.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <progress.hxx> #include <osl/diagnose.h> #include <o3tl/make_unique.hxx> @@ -43,7 +44,7 @@ ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText } ScfProgressBar::ScfProgressBar(SfxObjectShell* pDocShell, const char* pResId) - : maText(ScGlobal::GetRscString(pResId)) + : maText(ScResId(pResId)) { Init( pDocShell ); } @@ -216,7 +217,7 @@ void ScfSimpleProgressBar::Init( std::size_t nSize ) ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell ) : mrStrm( rStrm ) { - Init( pDocShell, ScGlobal::GetRscString( STR_LOAD_DOC ) ); + Init( pDocShell, ScResId( STR_LOAD_DOC ) ); } void ScfStreamProgressBar::Progress() diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 04558e994015..2e5be7e5528b 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -124,7 +124,7 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = #define OUT_SP_CSTR_ASS( s ) rStrm.WriteChar( ' ').WriteCharPtr( s ).WriteChar( '=' ) -#define GLOBSTR(id) ScGlobal::GetRscString( id ) +#define GLOBSTR(id) ScResId( id ) void ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const OUString& rBaseURL, ScDocument* pDoc, const ScRange& rRange, const rtl_TextEncoding /*eNach*/, bool bAll, @@ -417,7 +417,7 @@ void ScHTMLExport::WriteOverview() OUT_HR(); IncIndent(1); TAG_ON( OOO_STRING_SVTOOLS_HTML_parabreak ); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_center ); TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 ); - OUT_STR( ScGlobal::GetRscString( STR_OVERVIEW ) ); + OUT_STR( ScResId( STR_OVERVIEW ) ); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head1 ); OUString aStr; @@ -453,7 +453,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) { pStylePool->SetSearchMask( SfxStyleFamily::Para ); pStyleSheet = pStylePool->Find( - ScGlobal::GetRscString(STR_STYLENAME_STANDARD), + ScResId(STR_STYLENAME_STANDARD), SfxStyleFamily::Para ); OSL_ENSURE( pStyleSheet, "ParaStyle not found! :-(" ); if (!pStyleSheet) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 6f3314bec1b8..6f8ad8a82f41 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -75,6 +75,7 @@ #include <scitems.hxx> #include <attrib.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <xlconst.hxx> #include <documentimport.hxx> #include <numformat.hxx> @@ -2028,7 +2029,7 @@ void Xf::applyPatternToAttrList( AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal { ScStyleSheet* pStyleSheet = static_cast<ScStyleSheet*>( pStylePool->Find( - ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SfxStyleFamily::Para)); + ScResId(STR_STYLENAME_STANDARD), SfxStyleFamily::Para)); if (pStyleSheet) rPat.SetStyleSheet( pStyleSheet, false ); @@ -2462,7 +2463,7 @@ void CellStyle::createCellStyle() if( !mbCreated ) { if ( bDefStyle && maFinalName.isEmpty() ) - maFinalName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); + maFinalName = ScResId( STR_STYLENAME_STANDARD ); mbCreated = maFinalName.isEmpty(); } @@ -2476,7 +2477,7 @@ void CellStyle::createCellStyle() { // use existing "Default" style sheet mpStyleSheet = static_cast< ScStyleSheet* >( rDoc.GetStyleSheetPool()->Find( - ScGlobal::GetRscString( STR_STYLENAME_STANDARD ), SfxStyleFamily::Para ) ); + ScResId( STR_STYLENAME_STANDARD ), SfxStyleFamily::Para ) ); OSL_ENSURE( mpStyleSheet, "CellStyle::createStyle - Default style not found" ); bCreatePattern = true; } diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index d1fef597ae2f..0899b3c557b8 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -54,6 +54,7 @@ #include <docsh.hxx> #include <calcconfig.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> @@ -548,7 +549,7 @@ void WorkbookFragment::recalcFormulaCells() vcl::Window* pWin = ScDocShell::GetActiveDialogParent(); MessageWithCheck aQueryBox(pWin ? pWin->GetFrameWeld() : nullptr, "modules/scalc/ui/recalcquerydialog.ui", "RecalcQueryDialog"); - aQueryBox.set_primary_text(ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS)); + aQueryBox.set_primary_text(ScResId(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS)); aQueryBox.set_default_response(RET_YES); bHardRecalc = aQueryBox.run() == RET_YES; diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index ce72e708e029..d50f6993138c 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -67,6 +67,7 @@ #include <documentimport.hxx> #include <drwlayer.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <formulabuffer.hxx> #include <editutil.hxx> @@ -590,7 +591,7 @@ void WorkbookGlobals::initialize() // disable automatic update of linked sheets and DDE links mpDoc->EnableExecuteLink(false); - mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), ScGlobal::GetRscString(STR_LOAD_DOC) ) ); + mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), ScResId(STR_LOAD_DOC) ) ); mxFmlaParser.reset( createFormulaParser() ); //prevent unnecessary broadcasts and "half way listeners" as @@ -599,7 +600,7 @@ void WorkbookGlobals::initialize() } else if( mrBaseFilter.isExportFilter() ) { - mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), ScGlobal::GetRscString(STR_SAVE_DOC) ) ); + mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), ScResId(STR_SAVE_DOC) ) ); } } diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index 43d4c53a2494..6dcf6600095c 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -17,6 +17,7 @@ #include <globalnames.hxx> #include <docoptio.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <compiler.hxx> #include <dbdata.hxx> #include <stlpool.hxx> @@ -564,7 +565,7 @@ void ScOrcusFactory::incrementProgress() // in all cases. if (!mnProgress) - mxStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), 100); + mxStatusIndicator->start(ScResId(STR_LOAD_DOC), 100); if (mnProgress == 99) return; diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 3f7803f8a536..890c536f80fd 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -58,6 +58,7 @@ #include <fuinsert.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <memory> @@ -118,7 +119,7 @@ namespace void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate ) { std::unique_ptr<ScProgress> pProgress( new ScProgress( mpDoc->GetDocumentShell(), - ScGlobal::GetRscString( STR_LOAD_DOC ), mpParser->ListSize(), true ) ); + ScResId( STR_LOAD_DOC ), mpParser->ListSize(), true ) ); sal_uLong nProgress = 0; SCCOL nStartCol, nEndCol; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 0ba9283aaff2..2217a4a07838 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -64,6 +64,7 @@ #include "xmlexprt.hxx" #include <global.hxx> #include <globstr.hrc> +#include <scresid.hxx> #include <scerrors.hxx> #include "XMLExportSharedData.hxx" #include <docuno.hxx> @@ -776,7 +777,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator()); sal_Int32 nProgressRange(1000000); if(xStatusIndicator.is()) - xStatusIndicator->start(ScGlobal::GetRscString(STR_SAVE_DOC), nProgressRange); + xStatusIndicator->start(ScResId(STR_SAVE_DOC), nProgressRange); xInfoSet->setPropertyValue("ProgressRange", uno::makeAny(nProgressRange)); SvtSaveOptions aSaveOpt; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
