summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-10-01 09:09:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-10-11 14:22:22 +0200
commit4f5b3e4bd53d6d61df1f65f496f7bc8dc525c8a1 (patch)
treee0ac44b8f22f944f3303bac8e494da41d6c7b164 /xmloff
parent5f84c44e3d5ff19b800b6358e61228546e318d4f (diff)
In O[U]StringBuffer, make string_view params replacements for OUString ones
...for LIBO_INTERNAL_ONLY, instead of having them as additional overloads. That way, loplugin:bufferadd and loplugin:stringviewparam found many further opportunities for simplification (all addressed here). Some notes: * There is no longer an implicit conversion from O[U]String to O[U]StringBuffer (as that goes via user-defined conversions through string_view now), which was most noticeable in copy initializations like OStringBuffer buf = someStr; that had to be changed to direct initialization, OStringBuffer buf(someStr); But then again, it wasn't too many places that were affected and I think we can live with that. * I made the O[U]StringBuffer ctors taking string_view non-explicit, mainly to get them in line with their counterparts taking O[U]String. * I added an OUStringBuffer::lastIndexOf string_view overload that was missing (relative to OUStringBuffer::indexOf). * loplugin:stringconstant needed some addition to keep the compilerplugins/clang/test/stringconstant.cxx checks related to OStringBuffer::append and OStringBuffer::insert working. * loplugin:stringviewparam no longer needs the special O[U]StringBuffer-related code that had been introduced in 1250aecd71fabde4dba990bfceb61bbe8e06b8ea "loplugin:stringviewparam extend to new.." Change-Id: Ib1bb8c4632d99b744e742605a9fef6eae959fd72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122904 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmlimp.cxx4
-rw-r--r--xmloff/source/style/xmlnumfi.cxx6
-rw-r--r--xmloff/source/text/txtvfldi.cxx7
3 files changed, 8 insertions, 9 deletions
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 3c2ae8ea7a61..7ba2c127fb3b 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1692,7 +1692,7 @@ sal_Unicode SvXMLImport::ConvStarBatsCharToStarSymbol( sal_Unicode c )
sal_Unicode cNew = c;
if( !mpImpl->hBatsFontConv )
{
- mpImpl->hBatsFontConv = CreateFontToSubsFontConverter( "StarBats",
+ mpImpl->hBatsFontConv = CreateFontToSubsFontConverter( u"StarBats",
FontToSubsFontFlags::IMPORT );
SAL_WARN_IF( !mpImpl->hBatsFontConv, "xmloff.core", "Got no symbol font converter" );
}
@@ -1709,7 +1709,7 @@ sal_Unicode SvXMLImport::ConvStarMathCharToStarSymbol( sal_Unicode c )
sal_Unicode cNew = c;
if( !mpImpl->hMathFontConv )
{
- mpImpl->hMathFontConv = CreateFontToSubsFontConverter( "StarMath",
+ mpImpl->hMathFontConv = CreateFontToSubsFontConverter( u"StarMath",
FontToSubsFontFlags::IMPORT );
SAL_WARN_IF( !mpImpl->hMathFontConv, "xmloff.core", "Got no symbol font converter" );
}
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 39d6c2763c6a..823cdf79e904 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1027,7 +1027,7 @@ void SvXMLNumFmtElementContext::endFastElement(sal_Int32 )
// add integer part only if min-integer-digits attribute is there
aNumInfo.nDecimals = 0;
rParent.AddNumber( aNumInfo ); // number without decimals
- OUStringBuffer sIntegerFractionDelimiter = aNumInfo.aIntegerFractionDelimiter;
+ OUStringBuffer sIntegerFractionDelimiter(aNumInfo.aIntegerFractionDelimiter);
lcl_EnquoteIfNecessary( sIntegerFractionDelimiter, rParent );
rParent.AddToCode( sIntegerFractionDelimiter.makeStringAndClear() ); // default is ' '
}
@@ -1704,8 +1704,8 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo )
bGrouping = false; // grouping and embedded characters can't be used together
sal_uInt32 nStdIndex = pFormatter->GetStandardIndex( nFormatLang );
- OUStringBuffer aNumStr = pFormatter->GenerateFormat( nStdIndex, nFormatLang,
- bGrouping, false, nGenPrec, nLeading );
+ OUStringBuffer aNumStr(pFormatter->GenerateFormat( nStdIndex, nFormatLang,
+ bGrouping, false, nGenPrec, nLeading ));
if ( rInfo.nExpDigits >= 0 && nLeading == 0 && !bGrouping && nEmbeddedCount == 0 )
{
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index bc99e1cc3750..35dcd65b5528 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -864,12 +864,11 @@ bool XMLVariableDeclImportContext::FindFieldMaster(
xFactory(rImport.GetModel(),UNO_QUERY);
if( xFactory.is() ) {
- OUStringBuffer sService;
- sService.append(sAPI_fieldmaster_prefix);
- sService.append((eVarType==VarTypeUserField) ?
+ OUString sService = sAPI_fieldmaster_prefix
+ + ((eVarType==VarTypeUserField) ?
OUString(sAPI_user) : OUString(sAPI_set_expression));
Reference<XInterface> xIfc =
- xFactory->createInstance( sService.makeStringAndClear() );
+ xFactory->createInstance( sService );
if (xIfc.is()) {
Reference<XPropertySet> xTmp( xIfc, UNO_QUERY );
xMaster = xTmp;