diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-25 09:53:33 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-25 10:06:26 +0100 |
commit | a0656ec6fc2b41e65f1b40dbd64f546175e2762f (patch) | |
tree | c0d3443a27d9dc10266760110e96b50cce46ef02 /filter | |
parent | e9c6fd6b4d09ee59b6a86942cbf001f2ba9782e6 (diff) |
const OUString -> const OUStringLiteral
Mostly automated rewrite
Change-Id: Ie020a083f898bc126b8fb039d4ecb2e687172da1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112965
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 18 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 12 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 8 | ||||
-rw-r--r-- | filter/source/xsltdialog/typedetectionexport.cxx | 40 |
5 files changed, 41 insertions, 41 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 536b94ce8cf6..64bfe3e0d9de 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -600,7 +600,7 @@ void EscherPropertyContainer::CreateFillProperties( uno::Any aAny; AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone ); AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle ); - const OUString aPropName( "FillStyle" ); + static const OUStringLiteral aPropName( u"FillStyle" ); if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, aPropName ) ) @@ -2592,14 +2592,14 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT if ( !(aGeoPropSet >>= aGeoPropSeq) ) return; - const OUString sViewBox ( "ViewBox" ); - const OUString sTextRotateAngle ( "TextRotateAngle" ); - const OUString sExtrusion ( "Extrusion" ); - const OUString sEquations ( "Equations" ); - const OUString sPath ( "Path" ); - const OUString sTextPath ( "TextPath" ); - const OUString sHandles ( "Handles" ); - const OUString sAdjustmentValues ( "AdjustmentValues" ); + static const OUStringLiteral sViewBox ( u"ViewBox" ); + static const OUStringLiteral sTextRotateAngle ( u"TextRotateAngle" ); + static const OUStringLiteral sExtrusion ( u"Extrusion" ); + static const OUStringLiteral sEquations ( u"Equations" ); + static const OUStringLiteral sPath ( u"Path" ); + static const OUStringLiteral sTextPath ( u"TextPath" ); + static const OUStringLiteral sHandles ( u"Handles" ); + static const OUStringLiteral sAdjustmentValues ( u"AdjustmentValues" ); bool bAdjustmentValuesProp = false; uno::Any aAdjustmentValuesProp; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 91b36b230129..5ed426de2ab6 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -601,7 +601,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) { const SfxPoolItem& aCustomShape = static_cast<SdrObjCustomShape*>(pO)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(aCustomShape) ); - const OUString sPath( "Path" ); + static const OUStringLiteral sPath( u"Path" ); sal_Int16 nGluePointType = EnhancedCustomShapeGluePointType::SEGMENTS; css::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sPath, "GluePointType" ); if ( pAny ) @@ -723,7 +723,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) sal_Int32 nX = 0, nY = 0; if ( ( rPara.First.Value >>= nX ) && ( rPara.Second.Value >>= nY ) ) { - const OUString sGluePoints( "GluePoints" ); + static const OUStringLiteral sGluePoints( u"GluePoints" ); css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aGluePoints; pAny = aGeometryItem.GetPropertyValueByName( sPath, sGluePoints ); if ( pAny ) @@ -2762,7 +2762,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem const css::uno::Any* pAny; SdrCustomShapeGeometryItem aGeometryItem(rSet.Get( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - const OUString sTextRotateAngle( "TextRotateAngle" ); + static const OUStringLiteral sTextRotateAngle( u"TextRotateAngle" ); pAny = aGeometryItem.GetPropertyValueByName( sTextRotateAngle ); double fExtraTextRotateAngle = 0.0; if ( pAny ) @@ -4506,9 +4506,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r // applies only if importing arcs from MS Office. if ( aObjData.eShapeType == mso_sptArc ) { - const OUString sAdjustmentValues( "AdjustmentValues" ); - const OUString sViewBox( "ViewBox" ); - const OUString sPath( "Path" ); + static const OUStringLiteral sAdjustmentValues( u"AdjustmentValues" ); + static const OUStringLiteral sViewBox( u"ViewBox" ); + static const OUStringLiteral sPath( u"Path" ); SdrCustomShapeGeometryItem aGeometryItem( static_cast<SdrObjCustomShape*>(pRet)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); PropertyValue aPropVal; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 5af0c03775c8..d3452998c7bd 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -893,9 +893,9 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& } bool bExportNotesPages = false; bool bReChangeToNormalView = false; - const OUString sShowOnlineLayout( "ShowOnlineLayout" ); + static const OUStringLiteral sShowOnlineLayout( u"ShowOnlineLayout" ); bool bReHideWhitespace = false; - const OUString sHideWhitespace("HideWhitespace"); + static const OUStringLiteral sHideWhitespace(u"HideWhitespace"); uno::Reference< beans::XPropertySet > xViewProperties; if ( aCreator == "Writer" ) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 47dbce93bbd5..c3ec4a8971d4 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1152,8 +1152,8 @@ bool SVGTextWriter::nextTextPortion() Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { - const OUString sServicePrefix("com.sun.star.text.textfield."); - const OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); + static const OUStringLiteral sServicePrefix(u"com.sun.star.text.textfield."); + static const OUStringLiteral sPresentationServicePrefix(u"com.sun.star.presentation.TextField."); Reference< XServiceInfo > xService( xTextField, UNO_QUERY ); const Sequence< OUString > aServices = xService->getSupportedServiceNames(); @@ -1870,8 +1870,8 @@ tools::PolyPolygon& SVGActionWriter::ImplMap( const tools::PolyPolygon& rPolyPol OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine ) { OUStringBuffer aPathData; - const OUString aBlank( " " ); - const OUString aComma( "," ); + static const OUStringLiteral aBlank( u" " ); + static const OUStringLiteral aComma( u"," ); Point aPolyPoint; for( tools::Long i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ ) diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index 51be4018fef7..300d4a0fb6d8 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -79,18 +79,18 @@ void TypeDetectionExporter::doExport( const Reference< XOutputStream >& xOS, co { try { - const OUString sComponentData ( "oor:component-data" ); - const OUString sNode ( "node" ); - const OUString sName ( "oor:name" ); - const OUString sWhiteSpace ( " " ); - const OUString sUIName ( "UIName" ); - const OUString sComma ( "," ); - const OUString sDelim ( ";" ); - const OUString sData ( "Data" ); - const OUString sDocTypePrefix ( "doctype:" ); - const OUString sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" ); - const OUString sXSLTFilterService ( "com.sun.star.documentconversion.XSLTFilter" ); - const OUString sCdataAttribute ( "CDATA" ); + static const OUStringLiteral sComponentData ( u"oor:component-data" ); + static const OUStringLiteral sNode ( u"node" ); + static const OUStringLiteral sName ( u"oor:name" ); + static const OUStringLiteral sWhiteSpace ( u" " ); + static const OUStringLiteral sUIName ( u"UIName" ); + static const OUStringLiteral sComma ( u"," ); + static const OUStringLiteral sDelim ( u";" ); + static const OUStringLiteral sData ( u"Data" ); + static const OUStringLiteral sDocTypePrefix ( u"doctype:" ); + static const OUStringLiteral sFilterAdaptorService( u"com.sun.star.comp.Writer.XmlFilterAdaptor" ); + static const OUStringLiteral sXSLTFilterService ( u"com.sun.star.documentconversion.XSLTFilter" ); + static const OUStringLiteral sCdataAttribute ( u"CDATA" ); // set up sax writer and connect to given output stream @@ -208,10 +208,10 @@ void TypeDetectionExporter::addProperty( const Reference< XWriter >& xHandler, c { try { - const OUString sCdataAttribute( "CDATA" ); - const OUString sProp( "prop" ); - const OUString sValue( "value" ); - const OUString sWhiteSpace ( " " ); + static const OUStringLiteral sCdataAttribute( u"CDATA" ); + static const OUStringLiteral sProp( u"prop" ); + static const OUStringLiteral sValue( u"value" ); + static const OUStringLiteral sWhiteSpace ( u" " ); rtl::Reference<::comphelper::AttributeList>pAttrList = new ::comphelper::AttributeList; pAttrList->AddAttribute ( "oor:name", sCdataAttribute, rName ); @@ -236,10 +236,10 @@ void TypeDetectionExporter::addLocaleProperty( const Reference< XWriter >& xHand { try { - const OUString sCdataAttribute( "CDATA" ); - const OUString sProp( "prop" ); - const OUString sValue( "value" ); - const OUString sWhiteSpace ( " " ); + static const OUStringLiteral sCdataAttribute( u"CDATA" ); + static const OUStringLiteral sProp( u"prop" ); + static const OUStringLiteral sValue( u"value" ); + static const OUStringLiteral sWhiteSpace ( u" " ); rtl::Reference<::comphelper::AttributeList> pAttrList = new ::comphelper::AttributeList; pAttrList->AddAttribute ( "oor:name", sCdataAttribute, rName ); |