diff options
Diffstat (limited to 'xmloff/source')
21 files changed, 86 insertions, 86 deletions
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index b02d35c331b8..544616846338 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -884,7 +884,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe // this property) bool bHasErrorBarRangesFromData = false; { - const OUString aErrorBarStylePropName( "ErrorBarStyle"); + static const OUStringLiteral aErrorBarStylePropName( u"ErrorBarStyle"); uno::Any aErrorBarStyle( SchXMLTools::getPropertyFromContext( aErrorBarStylePropName, pPropStyleContext, pStylesCtxt )); if( aErrorBarStyle.hasValue()) diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 01ebb74b84bd..6b86ad529daf 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -104,7 +104,7 @@ void lcl_fillRangeMapping( sal_Int32 nColOffset = ( rTable.bHasHeaderColumn ? 1 : 0 ); const OUString lcl_aCategoriesRange(aCategoriesRange); - const OUString lcl_aLabelPrefix("label "); + static const OUStringLiteral lcl_aLabelPrefix(u"label "); // Fill range mapping const size_t nTableRowCount( rTable.aData.size()); diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 4f9a161b3273..db6a2e6a68ee 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -90,7 +90,7 @@ sal_Int32 lcl_getBuildIDFromGenerator( const OUString& rGenerator ) { //returns -1 if nothing found sal_Int32 nBuildId = -1; - const OUString sBuildCompare( "$Build-" ); + static const OUStringLiteral sBuildCompare( u"$Build-" ); sal_Int32 nBegin = rGenerator.indexOf( sBuildCompare ); if( nBegin >= 0 ) { @@ -630,7 +630,7 @@ void setXMLRangePropertyAtDataSequence( return; try { - const OUString aXMLRangePropName( "CachedXMLRange" ); + static const OUStringLiteral aXMLRangePropName( u"CachedXMLRange" ); Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo()); if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName )) @@ -652,7 +652,7 @@ bool getXMLRangePropertyFromDataSequence( { try { - const OUString aXMLRangePropName( "CachedXMLRange" ); + static const OUStringLiteral aXMLRangePropName( u"CachedXMLRange" ); Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo()); bResult = @@ -838,7 +838,7 @@ Reference< chart2::data::XDataProvider > getDataProviderFromParent( const Refere Reference< lang::XMultiServiceFactory > xFact( xChild->getParent(), uno::UNO_QUERY ); if( xFact.is() ) { - const OUString aDataProviderServiceName( "com.sun.star.chart2.data.DataProvider"); + static const OUStringLiteral aDataProviderServiceName( u"com.sun.star.chart2.data.DataProvider"); const uno::Sequence< OUString > aServiceNames( xFact->getAvailableServiceNames()); const OUString * pBegin = aServiceNames.getConstArray(); const OUString * pEnd = pBegin + aServiceNames.getLength(); diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index 202e3322226f..f2cdf55ce9fd 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -286,16 +286,16 @@ void XMLSettingsExportHelper::exportSymbolDescriptors( { uno::Reference< container::XIndexContainer > xBox = document::IndexedPropertyValues::create(m_rContext.GetComponentContext()); - const OUString sName ( "Name" ); - const OUString sExportName ( "ExportName" ); - const OUString sSymbolSet ( "SymbolSet" ); - const OUString sCharacter ( "Character" ); - const OUString sFontName ( "FontName" ); - const OUString sCharSet ( "CharSet" ); - const OUString sFamily ( "Family" ); - const OUString sPitch ( "Pitch" ); - const OUString sWeight ( "Weight" ); - const OUString sItalic ( "Italic" ); + static const OUStringLiteral sName ( u"Name" ); + static const OUStringLiteral sExportName ( u"ExportName" ); + static const OUStringLiteral sSymbolSet ( u"SymbolSet" ); + static const OUStringLiteral sCharacter ( u"Character" ); + static const OUStringLiteral sFontName ( u"FontName" ); + static const OUStringLiteral sCharSet ( u"CharSet" ); + static const OUStringLiteral sFamily ( u"Family" ); + static const OUStringLiteral sPitch ( u"Pitch" ); + static const OUStringLiteral sWeight ( u"Weight" ); + static const OUStringLiteral sItalic ( u"Italic" ); sal_Int32 nCount = rProps.getLength(); const formula::SymbolDescriptor *pDescriptor = rProps.getConstArray(); @@ -426,11 +426,11 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( * xmloff/source/core/DocumentSettingsContext.cxx * XMLConfigItemMapIndexedContext::EndElement() */ - const OUString sLanguage ( "Language" ); - const OUString sCountry ( "Country" ); - const OUString sVariant ( "Variant" ); - const OUString sBeginLine ( "BeginLine" ); - const OUString sEndLine ( "EndLine" ); + static const OUStringLiteral sLanguage ( u"Language" ); + static const OUStringLiteral sCountry ( u"Country" ); + static const OUStringLiteral sVariant ( u"Variant" ); + static const OUStringLiteral sBeginLine ( u"BeginLine" ); + static const OUStringLiteral sEndLine ( u"EndLine" ); sal_Int32 nPos = 0; for( const auto& rLocale : aLocales ) diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index a6b22c178729..3d20d3e33f41 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -716,8 +716,8 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen mpImpl->mStreamName = sName; // Note: may be empty (XSLT) // Written OpenDocument file format doesn't fit to the created text document (#i69627#) - const OUString sOutlineStyleAsNormalListStyle( - "OutlineStyleAsNormalListStyle" ); + static const OUStringLiteral sOutlineStyleAsNormalListStyle( + u"OutlineStyleAsNormalListStyle" ); if( xPropertySetInfo->hasPropertyByName( sOutlineStyleAsNormalListStyle ) ) { uno::Any aAny = mxExportInfo->getPropertyValue( sOutlineStyleAsNormalListStyle ); @@ -728,8 +728,8 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen if( xPropertySetInfo->hasPropertyByName( sTargetStorage ) ) mxExportInfo->getPropertyValue( sTargetStorage ) >>= mpImpl->mxTargetStorage; - const OUString sExportTextNumberElement( - "ExportTextNumberElement" ); + static const OUStringLiteral sExportTextNumberElement( + u"ExportTextNumberElement" ); if( xPropertySetInfo->hasPropertyByName( sExportTextNumberElement ) ) { uno::Any aAny = mxExportInfo->getPropertyValue( sExportTextNumberElement ); diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index c6c07e27ebcc..2224b236c7aa 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -122,7 +122,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() ) ) bWordWrapDefault = false; - const OUString sTextWordWrap( "TextWordWrap" ); + static const OUStringLiteral sTextWordWrap( u"TextWordWrap" ); Reference< XPropertySetInfo > xInfo( xDefaults->getPropertySetInfo() ); if ( xInfo->hasPropertyByName( sTextWordWrap ) ) xDefaults->setPropertyValue( sTextWordWrap, Any( bWordWrapDefault ) ); diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index 36f74ba5696d..9ac924e92c6c 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -53,12 +53,12 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) if( nCount == 0 ) return; - const OUString strName( "Name" ); - const OUString strTitle( "Title" ); - const OUString strDescription( "Description" ); - const OUString strIsVisible( "IsVisible"); - const OUString strIsPrintable( "IsPrintable"); - const OUString strIsLocked( "IsLocked" ); + static const OUStringLiteral strName( u"Name" ); + static const OUStringLiteral strTitle( u"Title" ); + static const OUStringLiteral strDescription( u"Description" ); + static const OUStringLiteral strIsVisible( u"IsVisible"); + static const OUStringLiteral strIsPrintable( u"IsPrintable"); + static const OUStringLiteral strIsLocked( u"IsLocked" ); OUString sTmp; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 515644f953cd..bab2dc2aa27f 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1373,7 +1373,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons OUString aStrText; - const OUString aStrHeaderTextProp( "HeaderText" ); + static const OUStringLiteral aStrHeaderTextProp( u"HeaderText" ); if( xInfo->hasPropertyByName( aStrHeaderTextProp ) ) { xSet->getPropertyValue( aStrHeaderTextProp ) >>= aStrText; @@ -1381,7 +1381,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons aSettings.maStrHeaderDeclName = findOrAppendImpl( maHeaderDeclsVector, aStrText, gpStrHeaderTextPrefix ); } - const OUString aStrFooterTextProp( "FooterText" ); + static const OUStringLiteral aStrFooterTextProp( u"FooterText" ); if( xInfo->hasPropertyByName( aStrFooterTextProp ) ) { xSet->getPropertyValue( aStrFooterTextProp ) >>= aStrText; @@ -1389,7 +1389,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons aSettings.maStrFooterDeclName = findOrAppendImpl( maFooterDeclsVector, aStrText, gpStrFooterTextPrefix ); } - const OUString aStrDateTimeTextProp( "DateTimeText" ); + static const OUStringLiteral aStrDateTimeTextProp( u"DateTimeText" ); if( xInfo->hasPropertyByName( aStrDateTimeTextProp ) ) { bool bFixed = false; @@ -1507,7 +1507,7 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( const Reference<XDrawPage>& xD // which itself is a property of the pages property set // we now merge these two propertysets if possible to simulate // a single propertyset with all draw page properties - const OUString aBackground("Background"); + static const OUStringLiteral aBackground(u"Background"); Reference< beans::XPropertySet > xPropSet2; Reference< beans::XPropertySetInfo > xInfo( xPropSet1->getPropertySetInfo() ); if( xInfo.is() && xInfo->hasPropertyByName( aBackground ) ) diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 27f280d7ed9b..823f4dbefb3a 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2345,7 +2345,7 @@ namespace OUString getNameFromStreamURL(OUString const & rURL) { - const OUString sPackageURL("vnd.sun.star.Package:"); + static const OUStringLiteral sPackageURL(u"vnd.sun.star.Package:"); OUString sResult; @@ -3017,7 +3017,7 @@ void XMLShapeExport::ImpExportPageShape( // export page number used for this page uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); - const OUString aPageNumberStr("PageNumber"); + static const OUStringLiteral aPageNumberStr(u"PageNumber"); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(aPageNumberStr)) { sal_Int32 nPageNumber = 0; @@ -3338,14 +3338,14 @@ void XMLShapeExport::ImpExportMediaShape( const OUString aFalseStr( "false" ), aTrueStr( "true" ); bool bLoop = false; - const OUString aLoopStr( "Loop" ); + static const OUStringLiteral aLoopStr( u"Loop" ); xPropSet->getPropertyValue( aLoopStr ) >>= bLoop; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aLoopStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bLoop ? aTrueStr : aFalseStr ); delete new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ); bool bMute = false; - const OUString aMuteStr( "Mute" ); + static const OUStringLiteral aMuteStr( u"Mute" ); xPropSet->getPropertyValue( aMuteStr ) >>= bMute; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aMuteStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bMute ? aTrueStr : aFalseStr ); @@ -3709,9 +3709,9 @@ void XMLShapeExport::export3DLamps( const css::uno::Reference< css::beans::XProp OUString aStr; OUStringBuffer sStringBuffer; - const OUString aColorPropName("D3DSceneLightColor"); - const OUString aDirectionPropName("D3DSceneLightDirection"); - const OUString aLightOnPropName("D3DSceneLightOn"); + static const OUStringLiteral aColorPropName(u"D3DSceneLightColor"); + static const OUStringLiteral aDirectionPropName(u"D3DSceneLightDirection"); + static const OUStringLiteral aLightOnPropName(u"D3DSceneLightOn"); ::basegfx::B3DVector aLightDirection; drawing::Direction3D aLightDir; @@ -4163,7 +4163,7 @@ static void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Referenc uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); // geometry - const OUString sCustomShapeGeometry( "CustomShapeGeometry" ); + static const OUStringLiteral sCustomShapeGeometry( u"CustomShapeGeometry" ); if ( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName( sCustomShapeGeometry ) ) { uno::Any aGeoPropSet( xPropSet->getPropertyValue( sCustomShapeGeometry ) ); diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index ce3eeac8d45f..c8e7f51bb403 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -357,12 +357,12 @@ void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConver const OUString aStr = msString; const sal_Int32 nLen(aStr.getLength()); - const OUString aString_rotate( "rotate" ); - const OUString aString_scale( "scale" ); - const OUString aString_translate( "translate" ); - const OUString aString_skewX( "skewX" ); - const OUString aString_skewY( "skewY" ); - const OUString aString_matrix( "matrix" ); + static const OUStringLiteral aString_rotate( u"rotate" ); + static const OUStringLiteral aString_scale( u"scale" ); + static const OUStringLiteral aString_translate( u"translate" ); + static const OUStringLiteral aString_skewX( u"skewX" ); + static const OUStringLiteral aString_skewY( u"skewY" ); + static const OUStringLiteral aString_matrix( u"matrix" ); sal_Int32 nPos(0); @@ -764,12 +764,12 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver const OUString aStr = msString; const sal_Int32 nLen(aStr.getLength()); - const OUString aString_rotatex( "rotatex" ); - const OUString aString_rotatey( "rotatey" ); - const OUString aString_rotatez( "rotatez" ); - const OUString aString_scale( "scale" ); - const OUString aString_translate( "translate" ); - const OUString aString_matrix( "matrix" ); + static const OUStringLiteral aString_rotatex( u"rotatex" ); + static const OUStringLiteral aString_rotatey( u"rotatey" ); + static const OUStringLiteral aString_rotatez( u"rotatez" ); + static const OUStringLiteral aString_scale( u"scale" ); + static const OUStringLiteral aString_translate( u"translate" ); + static const OUStringLiteral aString_matrix( u"matrix" ); sal_Int32 nPos(0); diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index be6732d5fe96..c6777d015236 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -286,7 +286,7 @@ void SdXMLGenericPageContext::endFastElement(sal_Int32 ) if( !maUseHeaderDeclName.isEmpty() ) { - const OUString aStrHeaderTextProp( "HeaderText" ); + static const OUStringLiteral aStrHeaderTextProp( u"HeaderText" ); if( xInfo->hasPropertyByName( aStrHeaderTextProp ) ) xSet->setPropertyValue( aStrHeaderTextProp, makeAny( GetSdImport().GetHeaderDecl( maUseHeaderDeclName ) ) ); @@ -294,7 +294,7 @@ void SdXMLGenericPageContext::endFastElement(sal_Int32 ) if( !maUseFooterDeclName.isEmpty() ) { - const OUString aStrFooterTextProp( "FooterText" ); + static const OUStringLiteral aStrFooterTextProp( u"FooterText" ); if( xInfo->hasPropertyByName( aStrFooterTextProp ) ) xSet->setPropertyValue( aStrFooterTextProp, makeAny( GetSdImport().GetFooterDecl( maUseFooterDeclName ) ) ); @@ -302,7 +302,7 @@ void SdXMLGenericPageContext::endFastElement(sal_Int32 ) if( !maUseDateTimeDeclName.isEmpty() ) { - const OUString aStrDateTimeTextProp( "DateTimeText" ); + static const OUStringLiteral aStrDateTimeTextProp( u"DateTimeText" ); if( xInfo->hasPropertyByName( aStrDateTimeTextProp ) ) { bool bFixed; @@ -369,7 +369,7 @@ void SdXMLGenericPageContext::SetStyle( OUString const & rStyleName ) Reference< beans::XPropertySet > xPropSet( xPropSet1 ); Reference< beans::XPropertySet > xBackgroundSet; - const OUString aBackground("Background"); + static const OUStringLiteral aBackground(u"Background"); if( xPropSet1->getPropertySetInfo()->hasPropertyByName( aBackground ) ) { Reference< beans::XPropertySetInfo > xInfo( xPropSet1->getPropertySetInfo() ); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 1e2d11f6e850..a1fdad1cc41c 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2158,7 +2158,7 @@ void SdXMLPageShapeContext::startFastElement (sal_Int32 nElement, if(xPropSet.is()) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); - const OUString aPageNumberStr("PageNumber"); + static const OUStringLiteral aPageNumberStr(u"PageNumber"); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(aPageNumberStr)) xPropSet->setPropertyValue(aPageNumberStr, uno::makeAny( mnPageNumber )); } @@ -2585,7 +2585,7 @@ void SdXMLObjectShapeContext::startFastElement (sal_Int32 /*nElement*/, if ( GetImport().IsPackageURL( maHref ) ) { - const OUString sURL( "vnd.sun.star.EmbeddedObject:" ); + static const OUStringLiteral sURL( u"vnd.sun.star.EmbeddedObject:" ); if ( aPersistName.startsWith( sURL ) ) aPersistName = aPersistName.copy( sURL.getLength() ); @@ -2633,7 +2633,7 @@ void SdXMLObjectShapeContext::endFastElement(sal_Int32 nElement) if( mxBase64Stream.is() ) { OUString aPersistName( GetImport().ResolveEmbeddedObjectURLFromBase64() ); - const OUString sURL( "vnd.sun.star.EmbeddedObject:" ); + static const OUStringLiteral sURL( u"vnd.sun.star.EmbeddedObject:" ); aPersistName = aPersistName.copy( sURL.getLength() ); @@ -2942,7 +2942,7 @@ void SdXMLPluginShapeContext::endFastElement(sal_Int32 nElement) { if ( maSize.Width && maSize.Height ) { - const OUString sVisibleArea( "VisibleArea" ); + static const OUStringLiteral sVisibleArea( u"VisibleArea" ); uno::Reference< beans::XPropertySetInfo > aXPropSetInfo( xProps->getPropertySetInfo() ); if ( !aXPropSetInfo.is() || aXPropSetInfo->hasPropertyByName( sVisibleArea ) ) { @@ -3588,10 +3588,10 @@ void SdXMLCustomShapeContext::endFastElement(sal_Int32 nElement) if (aScale.getX() < 0.0) { - const OUString sName("MirroredX"); + static const OUStringLiteral sName(u"MirroredX"); //fdo#84043 Merge, if property exists, otherwise append it auto aI = std::find_if(maCustomShapeGeometry.begin(), maCustomShapeGeometry.end(), - [&sName](beans::PropertyValue& rValue) { return rValue.Name == sName; }); + [](beans::PropertyValue& rValue) { return rValue.Name == sName; }); if (aI != maCustomShapeGeometry.end()) { beans::PropertyValue& rItem = *aI; @@ -3614,10 +3614,10 @@ void SdXMLCustomShapeContext::endFastElement(sal_Int32 nElement) if (aScale.getY() < 0.0) { - const OUString sName("MirroredY"); + static const OUStringLiteral sName(u"MirroredY"); //fdo#84043 Merge, if property exists, otherwise append it auto aI = std::find_if(maCustomShapeGeometry.begin(), maCustomShapeGeometry.end(), - [&sName](beans::PropertyValue& rValue) { return rValue.Name == sName; }); + [](beans::PropertyValue& rValue) { return rValue.Name == sName; }); if (aI != maCustomShapeGeometry.end()) { beans::PropertyValue& rItem = *aI; diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index a4d67dd92374..89dbc505fac5 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -245,8 +245,8 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const& i_rBuildId, const uno: { OUStringBuffer sBuffer( i_rBuildId.subView( nBegin+1, nEnd-nBegin-1 ) ); - const OUString sBuildCompare( - "$Build-" ); + static const OUStringLiteral sBuildCompare( + u"$Build-" ); nBegin = i_rBuildId.indexOf( sBuildCompare, nEnd ); if ( nBegin != -1 ) { @@ -305,7 +305,7 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const& i_rBuildId, const uno: { if( xImportInfo.is() ) { - const OUString aPropName("BuildId"); + static const OUStringLiteral aPropName(u"BuildId"); uno::Reference< beans::XPropertySetInfo > xSetInfo( xImportInfo->getPropertySetInfo()); if( xSetInfo.is() && xSetInfo->hasPropertyByName( aPropName ) ) diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 640e11b7094d..140b2d31a60e 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -215,7 +215,7 @@ XMLPageExport::XMLPageExport(SvXMLExport & rExp) "getStyleFamilies() from XModel failed for export!" ); if( xFamilies.is() ) { - const OUString aPageStyleName("PageStyles"); + static const OUStringLiteral aPageStyleName(u"PageStyles"); if( xFamilies->hasByName( aPageStyleName ) ) { diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 6c619fbc3b9c..b676d26e898c 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -792,7 +792,7 @@ void SvxXMLNumRuleExport::exportStyles( bool bUsed, if( !xFamilies.is() ) return; - const OUString aNumberStyleName( "NumberingStyles" ); + static const OUStringLiteral aNumberStyleName( u"NumberingStyles" ); Reference< XIndexAccess > xStyles; if( !xFamilies->hasByName( aNumberStyleName ) ) diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index 203f25425816..9f1bcd88ff2e 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -689,7 +689,7 @@ void XMLCellStyleExport::exportStyleAttributes(const Reference<XStyle>& rStyle) return; Reference<XPropertySetInfo> xPropSetInfo(xPropSet->getPropertySetInfo()); - const OUString sNumberFormat("NumberFormat"); + static const OUStringLiteral sNumberFormat(u"NumberFormat"); if (xPropSetInfo->hasPropertyByName(sNumberFormat)) { Reference<XPropertyState> xPropState(xPropSet, UNO_QUERY); diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 6ee77829170f..ca9ab26a9d42 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -1573,7 +1573,7 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport) if ( !xTextFieldsSupp.is() ) return; - const OUString sFieldMaster_Bibliography("com.sun.star.text.FieldMaster.Bibliography"); + static const OUStringLiteral sFieldMaster_Bibliography(u"com.sun.star.text.FieldMaster.Bibliography"); // get bibliography field master Reference<XNameAccess> xMasters = diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 0e482c031838..39bbf597f9a5 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -305,14 +305,14 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl( xPropSet->setPropertyValue( sContourPolyPolygon, Any(aPointSequenceSequence) ); } - const OUString sIsPixelContour("IsPixelContour"); + static const OUStringLiteral sIsPixelContour(u"IsPixelContour"); if( xPropSetInfo->hasPropertyByName( sIsPixelContour ) ) { xPropSet->setPropertyValue( sIsPixelContour, Any(bPixelWidth) ); } - const OUString sIsAutomaticContour("IsAutomaticContour"); + static const OUStringLiteral sIsAutomaticContour(u"IsAutomaticContour"); if( xPropSetInfo->hasPropertyByName( sIsAutomaticContour ) ) { diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index 356e50f7260e..9c176c7f4f47 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -69,7 +69,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, } if (bFirst) { - const OUString sShareContentFirst( "FirstIsShared" ); + static const OUStringLiteral sShareContentFirst( u"FirstIsShared" ); aAny = xPropSet->getPropertyValue( sShareContentFirst ); bool bSharedFirst = bool(); if (!(aAny >>= bSharedFirst)) diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index e88d5ed8b2e8..4d521f295b95 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -456,42 +456,42 @@ XMLTextImportHelper::XMLTextImportHelper( { Reference< XNameAccess > xFamilies(xFamiliesSupp->getStyleFamilies()); - const OUString aParaStyles("ParagraphStyles"); + static const OUStringLiteral aParaStyles(u"ParagraphStyles"); if( xFamilies->hasByName( aParaStyles ) ) { m_xImpl->m_xParaStyles.set(xFamilies->getByName(aParaStyles), UNO_QUERY); } - const OUString aCharStyles("CharacterStyles"); + static const OUStringLiteral aCharStyles(u"CharacterStyles"); if( xFamilies->hasByName( aCharStyles ) ) { m_xImpl->m_xTextStyles.set(xFamilies->getByName(aCharStyles), UNO_QUERY); } - const OUString aNumStyles("NumberingStyles"); + static const OUStringLiteral aNumStyles(u"NumberingStyles"); if( xFamilies->hasByName( aNumStyles ) ) { m_xImpl->m_xNumStyles.set(xFamilies->getByName(aNumStyles), UNO_QUERY); } - const OUString aFrameStyles("FrameStyles"); + static const OUStringLiteral aFrameStyles(u"FrameStyles"); if( xFamilies->hasByName( aFrameStyles ) ) { m_xImpl->m_xFrameStyles.set(xFamilies->getByName(aFrameStyles), UNO_QUERY); } - const OUString aPageStyles("PageStyles"); + static const OUStringLiteral aPageStyles(u"PageStyles"); if( xFamilies->hasByName( aPageStyles ) ) { m_xImpl->m_xPageStyles.set(xFamilies->getByName(aPageStyles), UNO_QUERY); } - const OUString aCellStyles("CellStyles"); + static const OUStringLiteral aCellStyles(u"CellStyles"); if( xFamilies->hasByName( aCellStyles ) ) { m_xImpl->m_xCellStyles.set(xFamilies->getByName(aCellStyles), diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index d787537e26f0..bc12e93ba4be 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -379,8 +379,8 @@ void BoundFrames::Fill(const filter_t& rFilter) const Reference< XEnumeration > xEnum = m_xEnumAccess->createEnumeration(); if(!xEnum.is()) return; - const OUString our_sAnchorType("AnchorType"); - const OUString our_sAnchorFrame("AnchorFrame"); + static const OUStringLiteral our_sAnchorType(u"AnchorType"); + static const OUStringLiteral our_sAnchorFrame(u"AnchorFrame"); while(xEnum->hasMoreElements()) { Reference<XPropertySet> xPropSet(xEnum->nextElement(), UNO_QUERY); |