sc/qa/unit/tiledrendering/tiledrendering.cxx | 14 +++++++-------
sc/source/filter/excel/export/SparklineExt.cxx | 2 +-
sc/source/filter/excel/xeescher.cxx | 4 ++--
sc/source/filter/excel/xepivotxml.cxx | 14 +++++++-------
sc/source/filter/lotus/lotform.cxx | 2 +-
sc/source/ui/view/tabvwshc.cxx | 6 +++---
6 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit f4ce98bd1a1b183bb21c60b85e17dc6575f9ce98
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Nov 29 14:39:38 2023 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Nov 29 19:59:49 2023 +0100
Extended loplugin:ostr: sc
Change-Id: I2b69249d6e0e35945e37e04ea885bb8ab3e781f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160103
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index b27664e5df41..b33960af5f22 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -173,7 +173,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testRowColumnSelections)
// Check if all the rows from 5th to 10th get selected
aResult =
apitest::helper::transferable::getTextSelection(pModelObj->getSelection(),
"text/plain;charset=utf-8"_ostr);
- aExpected =
"1\t2\t3\t4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\n2\t3\t4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\n3\t4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\t23\n4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\t23\t24\n5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\t23\t24\t25\n6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\t23\t24\t25\t26\n";
+ aExpected =
"1\t2\t3\t4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\n2\t3\t4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\n3\t4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\t23\n4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\t23\t24\n5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\t23\t24\t25\n6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\t22\t23\t24\t25\t26\n"_ostr;
CPPUNIT_ASSERT_EQUAL(aExpected, aResult);
// Select the 10th row with ctrl modifier
@@ -218,7 +218,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testRowColumnSelections)
// only row 5 should remain selected
aResult =
apitest::helper::transferable::getTextSelection(pModelObj->getSelection(),
"text/plain;charset=utf-8"_ostr);
- aExpected =
"1\t2\t3\t4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\n";
+ aExpected =
"1\t2\t3\t4\t5\t6\t7\t8\t9\t10\t11\t12\t13\t14\t15\t16\t17\t18\t19\t20\t21\n"_ostr;
CPPUNIT_ASSERT_EQUAL(aExpected, aResult);
}
@@ -2305,7 +2305,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testDeleteCellMultilineContent)
ViewCallback aView1;
CPPUNIT_ASSERT(!lcl_hasEditView(*pViewData));
- aView1.m_sInvalidateHeader = "";
+ aView1.m_sInvalidateHeader = ""_ostr;
ScDocument& rDoc = pDocSh->GetDocument();
sal_uInt16 nRow1Height = rDoc.GetRowHeight(static_cast<SCROW>(0),
static_cast<SCTAB>(0), false);
@@ -2370,7 +2370,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testPasteIntoWrapTextCell)
// Go to A2 and paste.
pView->SetCursor(0, 1);
Scheduler::ProcessEventsToIdle();
- aView.m_sInvalidateSheetGeometry = "";
+ aView.m_sInvalidateSheetGeometry = ""_ostr;
pView->GetViewFrame().GetBindings().Execute(SID_PASTE);
Scheduler::ProcessEventsToIdle();
@@ -2399,7 +2399,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testPasteIntoWrapTextCell)
// Go to A3 and paste.
pView->SetCursor(0, 2);
Scheduler::ProcessEventsToIdle();
- aView.m_sInvalidateSheetGeometry = "";
+ aView.m_sInvalidateSheetGeometry = ""_ostr;
pView->GetViewFrame().GetBindings().Execute(SID_PASTE);
Scheduler::ProcessEventsToIdle();
@@ -2424,7 +2424,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testSortAscendingDescending)
pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEMOVE, 820, 1336, 1,
MOUSE_LEFT, 0);
pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, 820, 1359, 1,
MOUSE_LEFT, 0);
Scheduler::ProcessEventsToIdle();
- aView.m_sInvalidateSheetGeometry = "";
+ aView.m_sInvalidateSheetGeometry = ""_ostr;
// sort ascending
uno::Sequence<beans::PropertyValue> aArgs;
@@ -2439,7 +2439,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testSortAscendingDescending)
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL("rows"_ostr, aView.m_sInvalidateSheetGeometry);
- aView.m_sInvalidateSheetGeometry = "";
+ aView.m_sInvalidateSheetGeometry = ""_ostr;
// sort descending
dispatchCommand(mxComponent, ".uno:SortDescending", aArgs);
diff --git a/sc/source/filter/excel/export/SparklineExt.cxx
b/sc/source/filter/excel/export/SparklineExt.cxx
index fb5c98148323..684e358124e3 100644
--- a/sc/source/filter/excel/export/SparklineExt.cxx
+++ b/sc/source/filter/excel/export/SparklineExt.cxx
@@ -23,7 +23,7 @@ namespace xcl::exp
SparklineExt::SparklineExt(const XclExpRoot& rRoot)
: XclExpExt(rRoot)
{
- maURI = "{05C60535-1F16-4fd2-B633-F4F36F0B64E0}";
+ maURI = "{05C60535-1F16-4fd2-B633-F4F36F0B64E0}"_ostr;
}
void SparklineExt::SaveXml(XclExpXmlStream& rStream)
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 0ebf39f59cbf..4ed990be33d3 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1154,10 +1154,10 @@ void VmlFormControlExporter::EndShape(sal_Int32
nShapeElement)
switch (m_nObjType)
{
case EXC_OBJTYPE_CHECKBOX:
- aObjectType = "Checkbox";
+ aObjectType = "Checkbox"_ostr;
break;
case EXC_OBJTYPE_BUTTON:
- aObjectType = "Button";
+ aObjectType = "Button"_ostr;
break;
}
pVmlDrawing->startElement(FSNS(XML_x, XML_ClientData), XML_ObjectType,
aObjectType);
diff --git a/sc/source/filter/excel/xepivotxml.cxx
b/sc/source/filter/excel/xepivotxml.cxx
index f05174b1f1d7..fc8b118eae41 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -292,25 +292,25 @@ void XclExpXmlPivotCaches::SavePivotCacheXml(
XclExpXmlStream& rStrm, const Entr
switch (nDatePart)
{
case sheet::DataPilotFieldGroupBy::SECONDS:
- sGroupBy = "seconds";
+ sGroupBy = "seconds"_ostr;
break;
case sheet::DataPilotFieldGroupBy::MINUTES:
- sGroupBy = "minutes";
+ sGroupBy = "minutes"_ostr;
break;
case sheet::DataPilotFieldGroupBy::HOURS:
- sGroupBy = "hours";
+ sGroupBy = "hours"_ostr;
break;
case sheet::DataPilotFieldGroupBy::DAYS:
- sGroupBy = "days";
+ sGroupBy = "days"_ostr;
break;
case sheet::DataPilotFieldGroupBy::MONTHS:
- sGroupBy = "months";
+ sGroupBy = "months"_ostr;
break;
case sheet::DataPilotFieldGroupBy::QUARTERS:
- sGroupBy = "quarters";
+ sGroupBy = "quarters"_ostr;
break;
case sheet::DataPilotFieldGroupBy::YEARS:
- sGroupBy = "years";
+ sGroupBy = "years"_ostr;
break;
}
diff --git a/sc/source/filter/lotus/lotform.cxx
b/sc/source/filter/lotus/lotform.cxx
index 5442145dda3b..88ddfcfe251c 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -66,7 +66,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const
char* pExtString )
t = "L123_" + t;
}
else
- t = "#UNKNOWN FUNC NAME#";
+ t = "#UNKNOWN FUNC NAME#"_ostr;
if( eOc == ocNoName )
{
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index be6fddc26740..8e2e74e8e4fb 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -546,14 +546,14 @@ void
ScTabViewShell::notifyAllViewsHeaderInvalidation(const SfxViewShell* pForVi
switch (eHeaderType)
{
case COLUMN_HEADER:
- aPayload = "column";
+ aPayload = "column"_ostr;
break;
case ROW_HEADER:
- aPayload = "row";
+ aPayload = "row"_ostr;
break;
case BOTH_HEADERS:
default:
- aPayload = "all";
+ aPayload = "all"_ostr;
break;
}
