sc/source/core/data/SolverSettings.cxx | 2 +- sc/source/core/data/attrib.cxx | 2 +- sc/source/core/data/docpool.cxx | 4 ++-- sc/source/core/data/documen2.cxx | 6 +++--- sc/source/core/data/documen3.cxx | 4 ++-- sc/source/core/data/documen5.cxx | 8 ++++---- sc/source/core/data/document.cxx | 4 ++-- sc/source/core/data/dptabres.cxx | 14 +++++++------- sc/source/core/data/dptabsrc.cxx | 24 ++++++++++++------------ sc/source/core/data/dputil.cxx | 2 +- sc/source/core/data/drwlayer.cxx | 8 ++++---- sc/source/core/data/formulacell.cxx | 30 +++++++++++++++--------------- sc/source/core/data/funcdesc.cxx | 24 ++++++++++++------------ sc/source/core/data/global.cxx | 2 +- sc/source/core/data/postit.cxx | 4 ++-- sc/source/core/data/table3.cxx | 2 +- sc/source/core/data/validat.cxx | 6 +++--- 17 files changed, 73 insertions(+), 73 deletions(-)
New commits: commit 239641a4df8c137dc59eb4040608e5d7d9f79320 Author: Noel Grandin <[email protected]> AuthorDate: Thu May 16 13:33:45 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu May 16 16:06:22 2024 +0200 loplugin:ostr in sc/../data Change-Id: I5fef1585ccc9492961328affd284f2c60a004e14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167738 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sc/source/core/data/SolverSettings.cxx b/sc/source/core/data/SolverSettings.cxx index 1320d470efcf..333751d26734 100644 --- a/sc/source/core/data/SolverSettings.cxx +++ b/sc/source/core/data/SolverSettings.cxx @@ -202,7 +202,7 @@ OUString SolverSettings::GetParameter(SolverParameter eParam) return m_sLibrarySize; break; default: - return ""; + return u""_ustr; } } diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 1a587d2b6572..35e6e991dd53 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -540,7 +540,7 @@ bool ScViewObjectModeItem::GetPresentation const IntlWrapper& /* rIntl */ ) const { - OUString aDel(": "); + OUString aDel(u": "_ustr); rText.clear(); switch ( ePres ) diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 5ef4c4a4091f..2add110bc0f2 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -257,7 +257,7 @@ static ItemInfoPackage& getItemInfoPackageScDocument() } ScDocumentPool::ScDocumentPool() -: SfxItemPool("ScDocumentPool") +: SfxItemPool(u"ScDocumentPool"_ustr) { registerItemInfoPackage(getItemInfoPackageScDocument()); } @@ -373,7 +373,7 @@ bool ScDocumentPool::GetPresentation( sal_uInt16 nW = rItem.Which(); OUString aStrYes ( ScResId(STR_YES) ); OUString aStrNo ( ScResId(STR_NO) ); - OUString aStrSep(": "); + OUString aStrSep(u": "_ustr); bool ePresentationRet = true; switch( nW ) diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index a551bf014c42..ca7fbcc938c4 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -578,7 +578,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab ) { maTabs.resize(nTab+1); } - maTabs[nTab].reset( new ScTable(*this, nTab, "baeh") ); + maTabs[nTab].reset( new ScTable(*this, nTab, u"baeh"_ustr) ); if (nTab < pSourceDoc->GetTableCount() && pSourceDoc->maTabs[nTab]) maTabs[nTab]->SetLayoutRTL( pSourceDoc->maTabs[nTab]->IsLayoutRTL() ); } @@ -595,7 +595,7 @@ void ScDocument::EnsureTable( SCTAB nTab ) maTabs.resize(nTab+1); if (!maTabs[nTab]) - maTabs[nTab].reset( new ScTable(*this, nTab, "temp", bExtras, bExtras) ); + maTabs[nTab].reset( new ScTable(*this, nTab, u"temp"_ustr, bExtras, bExtras) ); } ScRefCellValue ScDocument::GetRefCellValue( const ScAddress& rPos ) @@ -1107,7 +1107,7 @@ bool ScDocument::TransferTab( ScDocument& rSrcDoc, SCTAB nSrcPos, ScDocShell* pSrcShell = rSrcDoc.GetDocumentShell(); if ( pSrcShell ) { - OUString aLibName("Standard"); + OUString aLibName(u"Standard"_ustr); #if HAVE_FEATURE_SCRIPTING const BasicManager *pBasicManager = pSrcShell->GetBasicManager(); if (pBasicManager && !pBasicManager->GetName().isEmpty()) diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index e31c111a3786..db8a9972e43f 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -2048,7 +2048,7 @@ void ScDocument::DoMergeContents( SCCOL nStartCol, SCROW nStartRow, aCell = ScRefCellValue(*this, aPos); } if (nCol != nStartCol || nRow != nStartRow) - SetString(nCol,nRow,nTab,""); + SetString(nCol,nRow,nTab,u""_ustr); } if (aCell.isEmpty() || !GetString(nStartCol, nStartRow, nTab).isEmpty()) @@ -2066,7 +2066,7 @@ void ScDocument::DoEmptyBlock( SCCOL nStartCol, SCROW nStartRow, for (nCol=nStartCol; nCol<=nEndCol; nCol++) { // empty block except first cell if (nCol != nStartCol || nRow != nStartRow) - SetString(nCol,nRow,nTab,""); + SetString(nCol,nRow,nTab,u""_ustr); } } diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 8a592b63a1c0..21e21b3ab05e 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -82,16 +82,16 @@ static void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataRec uno::Sequence< beans::PropertyValue > aArgs{ beans::PropertyValue( - "CellRangeRepresentation", -1, + u"CellRangeRepresentation"_ustr, -1, uno::Any( rRanges ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "HasCategories", -1, + u"HasCategories"_ustr, -1, uno::Any( bHasCategories ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "FirstCellAsLabel", -1, + u"FirstCellAsLabel"_ustr, -1, uno::Any( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "DataRowSource", -1, + u"DataRowSource"_ustr, -1, uno::Any( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ) }; xReceiver->setArguments( aArgs ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 6aef04f9bf1c..51d636c588af 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -873,7 +873,7 @@ bool ScDocument::RenameTab( SCTAB nTab, const OUString& rName, bool bExternalDoc } } - collectUIInformation({{"NewName", rName}}, "Rename_Sheet"); + collectUIInformation({{"NewName", rName}}, u"Rename_Sheet"_ustr); return bValid; } @@ -6609,7 +6609,7 @@ void ScDocument::SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab, std::unique_ptr<ScP if (ScDocShell* pDocSh = GetDocumentShell()) { HelperNotifyChanges::NotifyIfChangesListeners( - *pDocSh, ScRange(nCol, nRow, nTab), "note"); + *pDocSh, ScRange(nCol, nRow, nTab), u"note"_ustr); } } } diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index e2e59d6987f2..d074343dcc01 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -876,7 +876,7 @@ OUString ScDPResultData::GetMeasureDimensionName(tools::Long nMeasure) const if ( nMeasure < 0 ) { OSL_FAIL("GetMeasureDimensionName: negative"); - return "***"; + return u"***"_ustr; } return mrSource.GetDataDimName(nMeasure); @@ -1797,7 +1797,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, #if DUMP_PIVOT_TABLE void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - dumpRow("ScDPResultMember", GetName(), nullptr, pDoc, rPos); + dumpRow(u"ScDPResultMember"_ustr, GetName(), nullptr, pDoc, rPos); SCROW nStartRow = rPos.Row(); if (pDataRoot) @@ -2657,7 +2657,7 @@ void ScDPDataMember::UpdateRunningTotals( #if DUMP_PIVOT_TABLE void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - dumpRow("ScDPDataMember", GetName(), &aAggregate, pDoc, rPos); + dumpRow(u"ScDPDataMember"_ustr, GetName(), &aAggregate, pDoc, rPos); SCROW nStartRow = rPos.Row(); const ScDPDataDimension* pDataChild = GetChildDimension(); @@ -3471,8 +3471,8 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( #if DUMP_PIVOT_TABLE void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - OUString aDimName = bIsDataLayout ? OUString("(data layout)") : GetName(); - dumpRow("ScDPResultDimension", aDimName, nullptr, pDoc, rPos); + OUString aDimName = bIsDataLayout ? u"(data layout)"_ustr : GetName(); + dumpRow(u"ScDPResultDimension"_ustr, aDimName, nullptr, pDoc, rPos); SCROW nStartRow = rPos.Row(); @@ -3851,8 +3851,8 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim, #if DUMP_PIVOT_TABLE void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const { - OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString("(unknown)"); - dumpRow("ScDPDataDimension", aDimName, nullptr, pDoc, rPos); + OUString aDimName = bIsDataLayout ? u"(data layout)"_ustr : u"(unknown)"_ustr; + dumpRow(u"ScDPDataDimension"_ustr, aDimName, nullptr, pDoc, rPos); SCROW nStartRow = rPos.Row(); diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 20ddc28a9f99..52e72455b2d1 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -62,23 +62,23 @@ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; #define SC_MINCOUNT_LIMIT 1000000 -SC_SIMPLE_SERVICE_INFO( ScDPSource, "ScDPSource", "com.sun.star.sheet.DataPilotSource" ) -SC_SIMPLE_SERVICE_INFO( ScDPDimensions, "ScDPDimensions", "com.sun.star.sheet.DataPilotSourceDimensions" ) -SC_SIMPLE_SERVICE_INFO( ScDPDimension, "ScDPDimension", "com.sun.star.sheet.DataPilotSourceDimension" ) +SC_SIMPLE_SERVICE_INFO( ScDPSource, u"ScDPSource"_ustr, u"com.sun.star.sheet.DataPilotSource"_ustr ) +SC_SIMPLE_SERVICE_INFO( ScDPDimensions, u"ScDPDimensions"_ustr, u"com.sun.star.sheet.DataPilotSourceDimensions"_ustr ) +SC_SIMPLE_SERVICE_INFO( ScDPDimension, u"ScDPDimension"_ustr, u"com.sun.star.sheet.DataPilotSourceDimension"_ustr ) // Typos are on purpose here, quote from Eike Rathke (see https://gerrit.libreoffice.org/c/core/+/101116): // "The typo is exactly why the SC_SIMPLE_SERVICE_INFO_COMPAT() lists both service names, // the old with the typo and the new corrected one. Correcting the typo in the old name // will make all extensions fail that use it. This is not to be changed." -SC_SIMPLE_SERVICE_INFO_COMPAT( ScDPHierarchies, "ScDPHierarchies", - "com.sun.star.sheet.DataPilotSourceHierarchies", "com.sun.star.sheet.DataPilotSourceHierarcies" ) -SC_SIMPLE_SERVICE_INFO_COMPAT( ScDPHierarchy, "ScDPHierarchy", - "com.sun.star.sheet.DataPilotSourceHierarchy", "com.sun.star.sheet.DataPilotSourceHierarcy" ) - -SC_SIMPLE_SERVICE_INFO( ScDPLevels, "ScDPLevels", "com.sun.star.sheet.DataPilotSourceLevels" ) -SC_SIMPLE_SERVICE_INFO( ScDPLevel, "ScDPLevel", "com.sun.star.sheet.DataPilotSourceLevel" ) -SC_SIMPLE_SERVICE_INFO( ScDPMembers, "ScDPMembers", "com.sun.star.sheet.DataPilotSourceMembers" ) -SC_SIMPLE_SERVICE_INFO( ScDPMember, "ScDPMember", "com.sun.star.sheet.DataPilotSourceMember" ) +SC_SIMPLE_SERVICE_INFO_COMPAT( ScDPHierarchies, u"ScDPHierarchies"_ustr, + u"com.sun.star.sheet.DataPilotSourceHierarchies"_ustr, u"com.sun.star.sheet.DataPilotSourceHierarcies"_ustr ) +SC_SIMPLE_SERVICE_INFO_COMPAT( ScDPHierarchy, u"ScDPHierarchy"_ustr, + u"com.sun.star.sheet.DataPilotSourceHierarchy"_ustr, u"com.sun.star.sheet.DataPilotSourceHierarcy"_ustr ) + +SC_SIMPLE_SERVICE_INFO( ScDPLevels, u"ScDPLevels"_ustr, u"com.sun.star.sheet.DataPilotSourceLevels"_ustr ) +SC_SIMPLE_SERVICE_INFO( ScDPLevel, u"ScDPLevel"_ustr, u"com.sun.star.sheet.DataPilotSourceLevel"_ustr ) +SC_SIMPLE_SERVICE_INFO( ScDPMembers, u"ScDPMembers"_ustr, u"com.sun.star.sheet.DataPilotSourceMembers"_ustr ) +SC_SIMPLE_SERVICE_INFO( ScDPMember, u"ScDPMember"_ustr, u"com.sun.star.sheet.DataPilotSourceMember"_ustr ) // property maps for PropertySetInfo // DataDescription / NumberFormat are internal diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index 651d550935f9..63d320fe123d 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -147,7 +147,7 @@ OUString ScDPUtil::getDateGroupName( OSL_FAIL("invalid date part"); } - return "FIXME: unhandled value"; + return u"FIXME: unhandled value"_ustr; } double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rInfo) diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index c34cad1f28d5..40e63fd1ce49 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -297,12 +297,12 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, OUString _aName ) : SetStyleSheetPool(pDocument ? pDocument->GetStyleSheetPool() : new ScStyleSheetPool(rPool, pDocument)); SdrLayerAdmin& rAdmin = GetLayerAdmin(); - rAdmin.NewLayer("vorne", SC_LAYER_FRONT.get()); - rAdmin.NewLayer("hinten", SC_LAYER_BACK.get()); - rAdmin.NewLayer("intern", SC_LAYER_INTERN.get()); + rAdmin.NewLayer(u"vorne"_ustr, SC_LAYER_FRONT.get()); + rAdmin.NewLayer(u"hinten"_ustr, SC_LAYER_BACK.get()); + rAdmin.NewLayer(u"intern"_ustr, SC_LAYER_INTERN.get()); // tdf#140252 use same name as in ctor of SdrLayerAdmin rAdmin.NewLayer(rAdmin.GetControlLayerName(), SC_LAYER_CONTROLS.get()); - rAdmin.NewLayer("hidden", SC_LAYER_HIDDEN.get()); + rAdmin.NewLayer(u"hidden"_ustr, SC_LAYER_HIDDEN.get()); // Set link for URL-Fields ScModule* pScMod = SC_MOD(); diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 529ea73a7e6e..810a2c9984a5 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -4679,7 +4679,7 @@ bool ScFormulaCell::InterpretFormulaGroup(SCROW nStartOffset, SCROW nEndOffset) if (mxGroup->mbPartOfCycle) { - aScope.addMessage("This formula-group is part of a cycle"); + aScope.addMessage(u"This formula-group is part of a cycle"_ustr); return false; } @@ -4705,7 +4705,7 @@ bool ScFormulaCell::InterpretFormulaGroup(SCROW nStartOffset, SCROW nEndOffset) if (cMatrixFlag != ScMatrixMode::NONE) { mxGroup->meCalcState = sc::GroupCalcDisabled; - aScope.addMessage("matrix skipped"); + aScope.addMessage(u"matrix skipped"_ustr); return false; } @@ -4719,7 +4719,7 @@ bool ScFormulaCell::InterpretFormulaGroup(SCROW nStartOffset, SCROW nEndOffset) if( rDocument.GetFormulaCell( aPos ) != this ) { mxGroup->meCalcState = sc::GroupCalcDisabled; - aScope.addMessage("cell not in document"); + aScope.addMessage(u"cell not in document"_ustr); return false; } } @@ -4784,7 +4784,7 @@ bool ScFormulaCell::CheckComputeDependencies(sc::FormulaLogger::GroupScope& rSco if (mxGroup->mbPartOfCycle) { mxGroup->meCalcState = sc::GroupCalcDisabled; - rScope.addMessage("found circular formula-group dependencies"); + rScope.addMessage(u"found circular formula-group dependencies"_ustr); return false; } @@ -4797,14 +4797,14 @@ bool ScFormulaCell::CheckComputeDependencies(sc::FormulaLogger::GroupScope& rSco if (rRecursionHelper.IsInRecursionReturn()) { mxGroup->meCalcState = sc::GroupCalcDisabled; - rScope.addMessage("Recursion limit reached, cannot thread this formula group now"); + rScope.addMessage(u"Recursion limit reached, cannot thread this formula group now"_ustr); return false; } if (mxGroup->mbPartOfCycle) { mxGroup->meCalcState = sc::GroupCalcDisabled; - rScope.addMessage("found circular formula-group dependencies"); + rScope.addMessage(u"found circular formula-group dependencies"_ustr); return false; } @@ -4812,14 +4812,14 @@ bool ScFormulaCell::CheckComputeDependencies(sc::FormulaLogger::GroupScope& rSco { // This call resulted from a dependency calculation for a multigroup-threading attempt, // but found dependency among the groups. - rScope.addMessage("multi-group-dependency failed"); + rScope.addMessage(u"multi-group-dependency failed"_ustr); return false; } if (!bOKToParallelize) { mxGroup->meCalcState = sc::GroupCalcDisabled; - rScope.addMessage("could not do new dependencies calculation thing"); + rScope.addMessage(u"could not do new dependencies calculation thing"_ustr); return false; } @@ -5087,18 +5087,18 @@ bool ScFormulaCell::InterpretFormulaGroupOpenCL(sc::FormulaLogger::GroupScope& a // Not good. case FormulaVectorDisabledByOpCode: - aScope.addMessage("group calc disabled due to vector state (non-vector-supporting opcode)"); + aScope.addMessage(u"group calc disabled due to vector state (non-vector-supporting opcode)"_ustr); break; case FormulaVectorDisabledByStackVariable: - aScope.addMessage("group calc disabled due to vector state (non-vector-supporting stack variable)"); + aScope.addMessage(u"group calc disabled due to vector state (non-vector-supporting stack variable)"_ustr); break; case FormulaVectorDisabledNotInSubSet: - aScope.addMessage("group calc disabled due to vector state (opcode not in subset)"); + aScope.addMessage(u"group calc disabled due to vector state (opcode not in subset)"_ustr); break; case FormulaVectorDisabled: case FormulaVectorUnknown: default: - aScope.addMessage("group calc disabled due to vector state (unknown)"); + aScope.addMessage(u"group calc disabled due to vector state (unknown)"_ustr); return false; } @@ -5107,7 +5107,7 @@ bool ScFormulaCell::InterpretFormulaGroupOpenCL(sc::FormulaLogger::GroupScope& a if (!ScCalcConfig::isOpenCLEnabled()) { - aScope.addMessage("opencl not enabled"); + aScope.addMessage(u"opencl not enabled"_ustr); return false; } @@ -5203,7 +5203,7 @@ bool ScFormulaCell::InterpretFormulaGroupOpenCL(sc::FormulaLogger::GroupScope& a mxGroup->mpCode = std::move(xGroup->mpCode); } - aScope.addMessage("group token conversion failed"); + aScope.addMessage(u"group token conversion failed"_ustr); return false; } @@ -5227,7 +5227,7 @@ bool ScFormulaCell::InterpretFormulaGroupOpenCL(sc::FormulaLogger::GroupScope& a mxGroup->mpCode = std::move(xGroup->mpCode); } - aScope.addMessage("group interpretation unsuccessful"); + aScope.addMessage(u"group interpretation unsuccessful"_ustr); return false; } diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index f995f396c257..9a205aa3a279 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -842,18 +842,18 @@ ScFunctionList::ScFunctionList( bool bEnglishFunctionNames ) sal_uInt16 nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions // Interpretation of AddIn list - OUString aDefArgNameValue = "value"; - OUString aDefArgNameString = "string"; - OUString aDefArgNameValues = "values"; - OUString aDefArgNameStrings = "strings"; - OUString aDefArgNameCells = "cells"; - OUString aDefArgNameNone = "none"; - OUString aDefArgDescValue = "a value"; - OUString aDefArgDescString = "a string"; - OUString aDefArgDescValues = "array of values"; - OUString aDefArgDescStrings = "array of strings"; - OUString aDefArgDescCells = "range of cells"; - OUString aDefArgDescNone = "none"; + OUString aDefArgNameValue = u"value"_ustr; + OUString aDefArgNameString = u"string"_ustr; + OUString aDefArgNameValues = u"values"_ustr; + OUString aDefArgNameStrings = u"strings"_ustr; + OUString aDefArgNameCells = u"cells"_ustr; + OUString aDefArgNameNone = u"none"_ustr; + OUString aDefArgDescValue = u"a value"_ustr; + OUString aDefArgDescString = u"a string"_ustr; + OUString aDefArgDescValues = u"array of values"_ustr; + OUString aDefArgDescStrings = u"array of strings"_ustr; + OUString aDefArgDescCells = u"range of cells"_ustr; + OUString aDefArgDescNone = u"none"_ustr; OUString aArgName, aArgDesc; const LegacyFuncCollection& rLegacyFuncColl = *ScGlobal::GetLegacyFuncCollection(); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index a4f892b5c766..b81a73281256 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -867,7 +867,7 @@ void ScGlobal::OpenURL(const OUString& rURL, const OUString& rTarget, bool bIgno SfxStringItem aUrl( SID_FILE_NAME, aUrlName ); SfxStringItem aTarget( SID_TARGETNAME, rTarget ); if ( nScClickMouseModifier & KEY_SHIFT ) // control-click -> into new window - aTarget.SetValue("_blank"); + aTarget.SetValue(u"_blank"_ustr); SfxFrameItem aFrm( SID_DOCFRAME, pFrame ); SfxStringItem aReferer( SID_REFERER, aReferName ); diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index f31dc889e98b..c750a16af6d3 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -812,9 +812,9 @@ static void lcl_FormatAndInsertAuthorAndDatepara(SdrCaptionObj* pCaption, OUStri } else { - xBodyTextAppend->insertTextPortion(" -------- ", aArgs, xText->getStart()); + xBodyTextAppend->insertTextPortion(u" -------- "_ustr, aArgs, xText->getStart()); aArgs = { - comphelper::makePropertyValue("CharWeight", uno::Any(awt::FontWeight::BOLD)), + comphelper::makePropertyValue(u"CharWeight"_ustr, uno::Any(awt::FontWeight::BOLD)), }; xBodyTextAppend->insertTextPortion(aUserData.makeStringAndClear(), aArgs, xText->getStart()); } diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index f04bee9432f3..86c709f711c4 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -119,7 +119,7 @@ static bool SplitString( const OUString &sWhole, const OUString& sUser = ScGlobal::getLocaleData().getNumDecimalSep(); ParseResult aPRNum = ScGlobal::getCharClass().parsePredefinedToken( KParseType::ANY_NUMBER, sWhole, nPos, - KParseTokens::ANY_NUMBER, "", KParseTokens::ANY_NUMBER, sUser ); + KParseTokens::ANY_NUMBER, u""_ustr, KParseTokens::ANY_NUMBER, sUser ); if ( aPRNum.EndPos == nPos ) { diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 7d2bc0be9e65..55cb345a88bc 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -127,7 +127,7 @@ ScValidationData::~ScValidationData() bool ScValidationData::IsEmpty() const { - ScValidationData aDefault( SC_VALID_ANY, ScConditionMode::Equal, "", "", *GetDocument(), ScAddress() ); + ScValidationData aDefault( SC_VALID_ANY, ScConditionMode::Equal, u""_ustr, u""_ustr, *GetDocument(), ScAddress() ); return EqualEntries( aDefault ); } @@ -444,7 +444,7 @@ bool ScValidationData::IsDataValidCustom( SvNumberFormatter* pFormatter = nullptr; sal_uInt32 nFormat = 0; double nVal = 0.0; - OUString rStrResult = ""; + OUString rStrResult = u""_ustr; bool bIsVal = false; if (rTest[0] == '=') @@ -546,7 +546,7 @@ bool ScValidationData::IsDataValid( SvNumberFormatter* pFormatter = nullptr; sal_uInt32 nFormat = 0; double nVal = 0.0; - OUString rStrResult = ""; + OUString rStrResult = u""_ustr; bool bIsVal = false; if (rTest[0] == '=')
