From 9f1701d01d9f664828356976d8592492f85b30f5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Apr 2022 11:14:11 +0200 Subject: use more o3tl::getToken found by inspecting call sites of OUString::getToken Change-Id: I4269c7476c7aa46fac39528227e350568f0eb34a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132644 Tested-by: Jenkins Reviewed-by: Noel Grandin --- reportdesign/source/filter/xml/xmlExport.cxx | 17 ++++++++------- reportdesign/source/filter/xml/xmlGroup.cxx | 25 +++++++++++----------- reportdesign/source/ui/report/ReportController.cxx | 20 ++++++++--------- 3 files changed, 32 insertions(+), 30 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index a2216564cf55..7472b549e52e 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #define DEFAULT_LINE_WIDTH 2 @@ -1351,7 +1352,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor if ( Reference(_xReportElement,uno::UNO_QUERY).is() ) { OUString sFieldData = _xReportElement->getDataField(); - static const char s_sPageNumber[] = "PageNumber()"; + static const sal_Unicode s_sPageNumber[] = u"PageNumber()"; static const char s_sReportPrefix[] = "rpt:"; sFieldData = sFieldData.copy(strlen(s_sReportPrefix)); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); @@ -1360,9 +1361,9 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor sal_Int32 nIndex = 0; do { - OUString sToken = sFieldData.getToken( 0, '&', nIndex ); - sToken = sToken.trim(); - if ( !sToken.isEmpty() ) + std::u16string_view sToken = o3tl::getToken(sFieldData, 0, '&', nIndex ); + sToken = o3tl::trim(sToken); + if ( !sToken.empty() ) { if ( sToken == s_sPageNumber ) { @@ -1370,7 +1371,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, false, false); Characters("1"); } - else if ( sToken == "PageCount()" ) + else if ( sToken == u"PageCount()" ) { SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_COUNT, false, false); Characters("1"); @@ -1378,11 +1379,11 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor else { - if ( sToken.startsWith("\"") && sToken.endsWith("\"") ) - sToken = sToken.copy(1,sToken.getLength()-2); + if ( o3tl::starts_with(sToken, u"\"") && o3tl::ends_with(sToken, u"\"") ) + sToken = sToken.substr(1, sToken.size() - 2); bool bPrevCharIsSpace = false; - GetTextParagraphExport()->exportCharacterData(sToken, bPrevCharIsSpace); + GetTextParagraphExport()->exportCharacterData(OUString(sToken), bPrevCharIsSpace); } } } diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index edb50cff04dd..249a27229d15 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -28,6 +28,7 @@ #include "xmlEnums.hxx" #include #include +#include #include #include @@ -104,19 +105,19 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport OUString sExpression = sCompleteFormula.getToken(1,'['); sExpression = sExpression.getToken(0,']'); sal_Int32 nIndex = 0; - const OUString sFormula = sCompleteFormula.getToken(0,'(',nIndex); + const std::u16string_view sFormula = o3tl::getToken(sCompleteFormula, 0,'(',nIndex); ::sal_Int16 nGroupOn = report::GroupOn::DEFAULT; - if ( sFormula == "rpt:LEFT") + if ( sFormula == u"rpt:LEFT") { nGroupOn = report::GroupOn::PREFIX_CHARACTERS; - OUString sInterval = sCompleteFormula.getToken(1,';',nIndex); - sInterval = sInterval.getToken(0,')'); - m_xGroup->setGroupInterval(sInterval.toInt32()); + std::u16string_view sInterval = o3tl::getToken(sCompleteFormula, 1,';',nIndex); + sInterval = o3tl::getToken(sInterval, 0,')'); + m_xGroup->setGroupInterval(o3tl::toInt32(sInterval)); } - else if ( sFormula == "rpt:YEAR") + else if ( sFormula == u"rpt:YEAR") nGroupOn = report::GroupOn::YEAR; - else if ( sFormula == "rpt:MONTH") + else if ( sFormula == u"rpt:MONTH") { nGroupOn = report::GroupOn::MONTH; } @@ -125,15 +126,15 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport { nGroupOn = report::GroupOn::QUARTAL; } - else if ( sFormula == "rpt:WEEK") + else if ( sFormula == u"rpt:WEEK") nGroupOn = report::GroupOn::WEEK; - else if ( sFormula == "rpt:DAY") + else if ( sFormula == u"rpt:DAY") nGroupOn = report::GroupOn::DAY; - else if ( sFormula == "rpt:HOUR") + else if ( sFormula == u"rpt:HOUR") nGroupOn = report::GroupOn::HOUR; - else if ( sFormula == "rpt:MINUTE") + else if ( sFormula == u"rpt:MINUTE") nGroupOn = report::GroupOn::MINUTE; - else if ( sFormula == "rpt:INT") + else if ( sFormula == u"rpt:INT") { nGroupOn = report::GroupOn::INTERVAL; _rImport.removeFunction(sExpression); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 4935ac250074..6fad529c3b9a 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1353,34 +1353,34 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { URL aUrl = getURLForId(_nId); sal_Int32 nIndex = 1; - OUString sType = aUrl.Complete.getToken(0,'.',nIndex); - if ( nIndex == -1 || sType.isEmpty() ) + std::u16string_view sType = o3tl::getToken(aUrl.Complete, 0,'.',nIndex); + if ( nIndex == -1 || sType.empty() ) { switch(_nId) { case SID_DRAWTBX_CS_SYMBOL: - sType = "smiley"; + sType = u"smiley"; break; case SID_DRAWTBX_CS_ARROW: - sType = "left-right-arrow"; + sType = u"left-right-arrow"; break; case SID_DRAWTBX_CS_FLOWCHART: - sType = "flowchart-internal-storage"; + sType = u"flowchart-internal-storage"; break; case SID_DRAWTBX_CS_CALLOUT: - sType = "round-rectangular-callout"; + sType = u"round-rectangular-callout"; break; case SID_DRAWTBX_CS_STAR: - sType = "star5"; + sType = u"star5"; break; default: - sType = "diamond"; + sType = u"diamond"; } } else - sType = aUrl.Complete.getToken(0,'.',nIndex); + sType = o3tl::getToken(aUrl.Complete, 0,'.',nIndex); - getDesignView()->SetInsertObj( SdrObjKind::CustomShape ,sType); + getDesignView()->SetInsertObj( SdrObjKind::CustomShape, OUString(sType)); createDefaultControl(aArgs); } InvalidateAll(); -- cgit