sc/source/core/tool/dbdata.cxx | 10 +++++----- sc/source/filter/oox/stylesbuffer.cxx | 22 +++++++++++----------- sc/source/ui/inc/gridwin.hxx | 4 ++-- sc/source/ui/view/tabvwsh4.cxx | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-)
New commits: commit bc8b501686eef1e08ef283218152e37b516899a8 Author: Balazs Varga <[email protected]> AuthorDate: Mon Nov 17 21:37:22 2025 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Tue Nov 18 10:23:17 2025 +0100 Table styles: loplugin:ustr add missing ustr Change-Id: I4a13ca3434147396243fec5719acc888b68dfb13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194135 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Balazs Varga <[email protected]> diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 6044c8911fd8..41dc18afdd24 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -746,7 +746,7 @@ void ScDBData::ImportTotalRowParam(ScSubTotalParam& rSubTotalParam, { ScDocument& rDoc = mpContainer->GetDocument(); const OUString& sFuncName = rxTableColumn.maTotalsFunction.value(); - if (sFuncName == u"custom") + if (sFuncName == u"custom"_ustr) { if (rxTableColumn.maCustomFunction.has_value()) { @@ -880,7 +880,7 @@ std::vector<TableColumnAttributes> ScDBData::GetTotalRowAttributes(formula::Form if (bSubTotal && pTokens) { OUString aFunctype = GetSimpleSubTotalFunction(pTokens, nCol, rParam.nRow1); - if (aFunctype != u"custom") + if (aFunctype != u"custom"_ustr) aNameAttr.maTotalsFunction = aFunctype; else bSubTotal = false; // fallback to custom @@ -893,7 +893,7 @@ std::vector<TableColumnAttributes> ScDBData::GetTotalRowAttributes(formula::Form OUStringBuffer aBuf; aComp.CreateStringFromTokenArray(aBuf); OUString aFormula = aBuf.makeStringAndClear(); - aNameAttr.maTotalsFunction = "custom"; + aNameAttr.maTotalsFunction = u"custom"_ustr; aNameAttr.maCustomFunction = aFormula; } } @@ -933,7 +933,7 @@ std::vector<TableColumnAttributes> ScDBData::GetTotalRowAttributes(formula::Form if (bSubTotal) { OUString aFunctype = GetSimpleSubTotalFunction(pTokens, nCol, rParam.nRow1); - if (aFunctype != u"custom") + if (aFunctype != u"custom"_ustr) { SCCOL nPos = nCol - rParam.nCol1; if (nPos < nEntryCount) @@ -962,7 +962,7 @@ std::vector<TableColumnAttributes> ScDBData::GetTotalRowAttributes(formula::Form SCCOL nPos = nCol - rParam.nCol1; if (nPos < nEntryCount) { - aAttributesVector[nPos].maTotalsFunction = "custom"; + aAttributesVector[nPos].maTotalsFunction = u"custom"_ustr; aAttributesVector[nPos].maCustomFunction = aFormula; } else diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index bca26fb941ed..6d71ecbd3d3a 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2572,17 +2572,17 @@ void TableStyle::importTableStyleElement(const AttributeList& rAttribs) aInfo.mnDxfID = rAttribs.getInteger(XML_dxfId, -1); OUString aTableStyleElementName = rAttribs.getString(XML_type, OUString()); static const std::unordered_map<OUString, ScTableStyleElement> aTableStyleElementMap - = { { "wholeTable", ScTableStyleElement::WholeTable }, - { "firstColumnStripe", ScTableStyleElement::FirstColumnStripe }, - { "secondColumnStripe", ScTableStyleElement::SecondColumnStripe }, - { "firstRowStripe", ScTableStyleElement::FirstRowStripe }, - { "secondRowStripe", ScTableStyleElement::SecondRowStripe }, - { "firstColumn", ScTableStyleElement::FirstColumn }, - { "lastColumn", ScTableStyleElement::LastColumn }, - { "headerRow", ScTableStyleElement::HeaderRow }, - { "totalRow", ScTableStyleElement::TotalRow }, - { "firstHeaderCell", ScTableStyleElement::FirstHeaderCell }, - { "lastHeaderCell", ScTableStyleElement::LastHeaderCell } + = { { u"wholeTable"_ustr, ScTableStyleElement::WholeTable }, + { u"firstColumnStripe"_ustr, ScTableStyleElement::FirstColumnStripe }, + { u"secondColumnStripe"_ustr, ScTableStyleElement::SecondColumnStripe }, + { u"firstRowStripe"_ustr, ScTableStyleElement::FirstRowStripe }, + { u"secondRowStripe"_ustr, ScTableStyleElement::SecondRowStripe }, + { u"firstColumn"_ustr, ScTableStyleElement::FirstColumn }, + { u"lastColumn"_ustr, ScTableStyleElement::LastColumn }, + { u"headerRow"_ustr, ScTableStyleElement::HeaderRow }, + { u"totalRow"_ustr, ScTableStyleElement::TotalRow }, + { u"firstHeaderCell"_ustr, ScTableStyleElement::FirstHeaderCell }, + { u"lastHeaderCell"_ustr, ScTableStyleElement::LastHeaderCell } }; auto aElementItr = aTableStyleElementMap.find(aTableStyleElementName); if (aElementItr == aTableStyleElementMap.end()) diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 9b06a208fd9a..077b912e72b4 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -502,8 +502,8 @@ public: void UpdateCursorOverlay(); void DeleteSelectionOverlay(); void UpdateSelectionOverlay(); - void UpdateDatabaseOverlay(); - void DeleteDatabaseOverlay(); + void UpdateDatabaseOverlay(); + void DeleteDatabaseOverlay(); void UpdateHighlightOverlay(); void DeleteAutoFillOverlay(); void UpdateAutoFillOverlay(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 2afa9a90042e..86acd82e4701 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1797,17 +1797,17 @@ void SAL_CALL ScViewOptiChangesListener::changesOccurred(const util::ChangesEven OUString sChangedEntry; if (change.Accessor >>= sChangedEntry) { - if (sChangedEntry == "ColumnRowHighlighting") + if (sChangedEntry == u"ColumnRowHighlighting"_ustr) { mrViewShell.HighlightOverlay(); } - else if (sChangedEntry == "ColorSchemes/org.openoffice.Office.UI:ColorScheme['COLOR_SCHEME_LIBREOFFICE_AUTOMATIC']/CalcCellFocus/Color") + else if (sChangedEntry == u"ColorSchemes/org.openoffice.Office.UI:ColorScheme['COLOR_SCHEME_LIBREOFFICE_AUTOMATIC']/CalcCellFocus/Color"_ustr) { mrViewShell.GetActiveWin()->UpdateCursorOverlay(); mrViewShell.GetActiveWin()->UpdateAutoFillOverlay(); mrViewShell.GetActiveWin()->UpdateHighlightOverlay(); } - else if (sChangedEntry == "ColorSchemes/org.openoffice.Office.UI:ColorScheme['COLOR_SCHEME_LIBREOFFICE_AUTOMATIC']/CalcDBFocus/Color") + else if (sChangedEntry == u"ColorSchemes/org.openoffice.Office.UI:ColorScheme['COLOR_SCHEME_LIBREOFFICE_AUTOMATIC']/CalcDBFocus/Color"_ustr) { mrViewShell.GetActiveWin()->UpdateDatabaseOverlay(); }
