diff options
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/text/txtvfldi.cxx | 7 |
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; |