filter/source/msfilter/escherex.cxx | 6 -
filter/source/msfilter/msdffimp.cxx | 14 +--
filter/source/msfilter/msocximex.cxx | 2
filter/source/msfilter/msvbahelper.cxx | 4 -
filter/source/pdf/pdfexport.cxx | 4 -
filter/source/svg/svgexport.cxx | 28 +++----
filter/source/svg/svgwriter.cxx | 82 +++++++++++------------
filter/source/textfilterdetect/filterdetect.cxx | 16 ++--
filter/source/xsltdialog/typedetectionexport.cxx | 28 +++----
filter/source/xsltdialog/xmlfilterjar.cxx | 2
10 files changed, 93 insertions(+), 93 deletions(-)
New commits:
commit 24655ccaeb7d36cf024b31ad5925244ac7016351
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 19 10:30:14 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Oct 19 20:53:37 2023 +0200
Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: filter
Change-Id: I1dd21c1dc2a7aed54fa1c03036ad75d2e0eade87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158193
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 112d468e90db..caf07865941e 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -598,7 +598,7 @@ void EscherPropertyContainer::CreateFillProperties(
uno::Any aAny;
AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone );
AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
- static constexpr OUStringLiteral aPropName( u"FillStyle" );
+ static constexpr OUString aPropName( u"FillStyle"_ustr );
if ( EscherPropertyValueHelper::GetPropertyValue(
aAny, rXPropSet, aPropName ) )
@@ -2598,10 +2598,10 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
static constexpr OUStringLiteral sViewBox ( u"ViewBox" );
static constexpr OUStringLiteral sTextRotateAngle ( u"TextRotateAngle"
);
- static constexpr OUStringLiteral sExtrusion ( u"Extrusion" );
+ static constexpr OUString sExtrusion ( u"Extrusion"_ustr );
static constexpr OUStringLiteral sEquations ( u"Equations" );
static constexpr OUStringLiteral sPath ( u"Path" );
- static constexpr OUStringLiteral sTextPath ( u"TextPath" );
+ static constexpr OUString sTextPath ( u"TextPath"_ustr );
static constexpr OUStringLiteral sHandles ( u"Handles" );
static constexpr OUStringLiteral sAdjustmentValues ( u"AdjustmentValues"
);
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 058b61e1253d..6f2f29665ee0 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -171,7 +171,7 @@ using namespace container ;
// static counter for OLE-Objects
static sal_uInt32 nMSOleObjCntr = 0;
-constexpr OUStringLiteral MSO_OLE_Obj = u"MSO_OLE_Obj";
+constexpr OUString MSO_OLE_Obj = u"MSO_OLE_Obj"_ustr;
namespace {
/* Office File Formats - 2.2.23 */
@@ -615,7 +615,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) );
- static constexpr OUStringLiteral sPath(
u"Path" );
+ static constexpr OUString sPath( u"Path"_ustr
);
sal_Int16 nGluePointType =
EnhancedCustomShapeGluePointType::SEGMENTS;
css::uno::Any* pAny =
aGeometryItem.GetPropertyValueByName( sPath, "GluePointType" );
if ( pAny )
@@ -737,7 +737,7 @@ void SvxMSDffManager::SolveSolver( const
SvxMSDffSolverContainer& rSolver )
sal_Int32 nX = 0, nY = 0;
if ( ( rPara.First.Value >>= nX )
&& ( rPara.Second.Value >>= nY ) )
{
- static constexpr
OUStringLiteral sGluePoints( u"GluePoints" );
+ static constexpr OUString
sGluePoints( u"GluePoints"_ustr );
css::uno::Sequence<
css::drawing::EnhancedCustomShapeParameterPair > aGluePoints;
pAny =
aGeometryItem.GetPropertyValueByName( sPath, sGluePoints );
if ( pAny )
@@ -2833,7 +2833,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation(
SvStream& rIn, SfxItem
const css::uno::Any* pAny;
SdrCustomShapeGeometryItem aGeometryItem(rSet.Get(
SDRATTR_CUSTOMSHAPE_GEOMETRY ));
- static constexpr OUStringLiteral sTextRotateAngle( u"TextRotateAngle" );
+ static constexpr OUString sTextRotateAngle( u"TextRotateAngle"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sTextRotateAngle );
double fExtraTextRotateAngle = 0.0;
if ( pAny )
@@ -4612,9 +4612,9 @@ rtl::Reference<SdrObject> SvxMSDffManager::ImportShape(
const DffRecordHeader& r
// applies only if importing arcs from MS Office.
if ( aObjData.eShapeType == mso_sptArc )
{
- static constexpr OUStringLiteral sAdjustmentValues(
u"AdjustmentValues" );
- static constexpr OUStringLiteral sViewBox( u"ViewBox"
);
- static constexpr OUStringLiteral sPath( u"Path" );
+ static constexpr OUString sAdjustmentValues(
u"AdjustmentValues"_ustr );
+ static constexpr OUString sViewBox( u"ViewBox"_ustr );
+ static constexpr OUString sPath( u"Path"_ustr );
SdrCustomShapeGeometryItem aGeometryItem(
static_cast<SdrObjCustomShape*>(xRet.get())->GetMergedItem(
SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
PropertyValue aPropVal;
diff --git a/filter/source/msfilter/msocximex.cxx
b/filter/source/msfilter/msocximex.cxx
index e3ccf6524471..f57f3d25bd08 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -32,7 +32,7 @@
using namespace ::com::sun::star;
-constexpr OUStringLiteral sWW8_form( u"WW-Standard" );
+constexpr OUString sWW8_form( u"WW-Standard"_ustr );
SvxMSConvertOCXControls::SvxMSConvertOCXControls( uno::Reference<
frame::XModel > xModel) : mxModel(std::move(xModel))
{
diff --git a/filter/source/msfilter/msvbahelper.cxx
b/filter/source/msfilter/msvbahelper.cxx
index d3fc42af8c2d..17282aebf61a 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -50,8 +50,8 @@ using namespace ::com::sun::star;
namespace ooo::vba {
-constexpr OUStringLiteral sUrlPart0( u"vnd.sun.star.script:" );
-constexpr OUStringLiteral sUrlPart1( u"?language=Basic&location=document" );
+constexpr OUString sUrlPart0( u"vnd.sun.star.script:"_ustr );
+constexpr OUString sUrlPart1( u"?language=Basic&location=document"_ustr );
OUString makeMacroURL( std::u16string_view sMacroName )
{
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 940d6145ceb6..0bb6131c582a 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -999,9 +999,9 @@ bool PDFExport::Export( const OUString& rFile, const
Sequence< PropertyValue >&
}
bool bExportNotesPages = false;
bool bReChangeToNormalView = false;
- static constexpr OUStringLiteral sShowOnlineLayout(
u"ShowOnlineLayout" );
+ static constexpr OUString sShowOnlineLayout(
u"ShowOnlineLayout"_ustr );
bool bReHideWhitespace = false;
- static constexpr OUStringLiteral
sHideWhitespace(u"HideWhitespace");
+ static constexpr OUString
sHideWhitespace(u"HideWhitespace"_ustr);
uno::Reference< beans::XPropertySet > xViewProperties;
if ( aCreator == "Writer" )
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 1e7756b8657a..b7b2044cbce1 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -90,25 +90,25 @@ constexpr OUStringLiteral SVG_PROP_OPACITY = u"Opacity";
constexpr OUStringLiteral SVG_PROP_POSITIONED_CHARACTERS =
u"UsePositionedCharacters";
// ooo xml elements
-constexpr OUStringLiteral aOOOElemTextField = NSPREFIX "text_field";
+constexpr OUString aOOOElemTextField = NSPREFIX "text_field"_ustr;
// ooo xml attributes for meta_slide
-constexpr OUStringLiteral aOOOAttrSlide = NSPREFIX "slide";
-constexpr OUStringLiteral aOOOAttrMaster = NSPREFIX "master";
+constexpr OUString aOOOAttrSlide = NSPREFIX "slide"_ustr;
+constexpr OUString aOOOAttrMaster = NSPREFIX "master"_ustr;
constexpr OUStringLiteral aOOOAttrHasCustomBackground = NSPREFIX
"has-custom-background";
constexpr OUStringLiteral aOOOAttrDisplayName = NSPREFIX "display-name";
-constexpr OUStringLiteral aOOOAttrBackgroundVisibility = NSPREFIX
"background-visibility";
-constexpr OUStringLiteral aOOOAttrMasterObjectsVisibility = NSPREFIX
"master-objects-visibility";
+constexpr OUString aOOOAttrBackgroundVisibility = NSPREFIX
"background-visibility"_ustr;
+constexpr OUString aOOOAttrMasterObjectsVisibility = NSPREFIX
"master-objects-visibility"_ustr;
constexpr OUStringLiteral aOOOAttrSlideDuration = NSPREFIX "slide-duration";
-constexpr OUStringLiteral aOOOAttrDateTimeField = NSPREFIX "date-time-field";
-constexpr OUStringLiteral aOOOAttrFooterField = NSPREFIX "footer-field";
-constexpr OUStringLiteral aOOOAttrHasTransition = NSPREFIX "has-transition";
+constexpr OUString aOOOAttrDateTimeField = NSPREFIX "date-time-field"_ustr;
+constexpr OUString aOOOAttrFooterField = NSPREFIX "footer-field"_ustr;
+constexpr OUString aOOOAttrHasTransition = NSPREFIX "has-transition"_ustr;
// ooo xml attributes for pages and shapes
-constexpr OUStringLiteral aOOOAttrName = NSPREFIX "name";
+constexpr OUString aOOOAttrName = NSPREFIX "name"_ustr;
-constexpr OUStringLiteral constSvgNamespace = u"http://www.w3.org/2000/svg";;
+constexpr OUString constSvgNamespace = u"http://www.w3.org/2000/svg"_ustr;
/** Text Field Class Hierarchy
@@ -211,7 +211,7 @@ public:
}
virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets )
const override
{
- static constexpr OUStringLiteral sFieldId = aOOOAttrFooterField;
+ static constexpr OUString sFieldId = aOOOAttrFooterField;
implGrowCharSet( aTextFieldCharSets, text, sFieldId );
}
};
@@ -2709,9 +2709,9 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*,
pInfo, void )
}
bool bHasCharSetMap = mTextFieldCharSets.find(
mCreateOjectsCurrentMasterPage ) != mTextFieldCharSets.end();
- static constexpr OUStringLiteral aHeaderId( NSPREFIX
"header-field" );
- static constexpr OUStringLiteral aFooterId( aOOOAttrFooterField );
- static constexpr OUStringLiteral aDateTimeId(
aOOOAttrDateTimeField );
+ static constexpr OUString aHeaderId( NSPREFIX "header-field"_ustr
);
+ static constexpr OUString aFooterId( aOOOAttrFooterField );
+ static constexpr OUString aDateTimeId( aOOOAttrDateTimeField );
static const OUString aVariableDateTimeId( aOOOAttrDateTimeField +
"-variable" );
const UCharSet * pCharSet = nullptr;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index c227408f01df..e2079304abbc 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -53,43 +53,43 @@
#include <memory>
-constexpr OUStringLiteral aPrefixClipPathId = u"clip_path_";
-
-constexpr OUStringLiteral aXMLElemG = u"g";
-constexpr OUStringLiteral aXMLElemDefs = u"defs";
-constexpr OUStringLiteral aXMLElemText = u"text";
-constexpr OUStringLiteral aXMLElemTspan = u"tspan";
-constexpr OUStringLiteral aXMLElemLinearGradient = u"linearGradient";
-constexpr OUStringLiteral aXMLElemStop = u"stop";
-
-constexpr OUStringLiteral aXMLAttrTransform = u"transform";
-constexpr OUStringLiteral aXMLAttrStyle = u"style";
-constexpr OUStringLiteral aXMLAttrId = u"id";
-constexpr OUStringLiteral aXMLAttrX = u"x";
-constexpr OUStringLiteral aXMLAttrY = u"y";
-constexpr OUStringLiteral aXMLAttrX1 = u"x1";
-constexpr OUStringLiteral aXMLAttrY1 = u"y1";
-constexpr OUStringLiteral aXMLAttrX2 = u"x2";
-constexpr OUStringLiteral aXMLAttrY2 = u"y2";
-constexpr OUStringLiteral aXMLAttrCX = u"cx";
-constexpr OUStringLiteral aXMLAttrCY = u"cy";
-constexpr OUStringLiteral aXMLAttrRX = u"rx";
-constexpr OUStringLiteral aXMLAttrRY = u"ry";
-constexpr OUStringLiteral aXMLAttrWidth = u"width";
-constexpr OUStringLiteral aXMLAttrHeight = u"height";
-constexpr OUStringLiteral aXMLAttrStrokeWidth = u"stroke-width";
-constexpr OUStringLiteral aXMLAttrFill = u"fill";
-constexpr OUStringLiteral aXMLAttrFontFamily = u"font-family";
-constexpr OUStringLiteral aXMLAttrFontSize = u"font-size";
-constexpr OUStringLiteral aXMLAttrFontStyle = u"font-style";
-constexpr OUStringLiteral aXMLAttrFontWeight = u"font-weight";
-constexpr OUStringLiteral aXMLAttrTextDecoration = u"text-decoration";
-constexpr OUStringLiteral aXMLAttrXLinkHRef = u"xlink:href";
-constexpr OUStringLiteral aXMLAttrGradientUnits = u"gradientUnits";
-constexpr OUStringLiteral aXMLAttrOffset = u"offset";
-constexpr OUStringLiteral aXMLAttrStopColor = u"stop-color";
-constexpr OUStringLiteral aXMLAttrStrokeLinejoin = u"stroke-linejoin";
-constexpr OUStringLiteral aXMLAttrStrokeLinecap = u"stroke-linecap";
+constexpr OUString aPrefixClipPathId = u"clip_path_"_ustr;
+
+constexpr OUString aXMLElemG = u"g"_ustr;
+constexpr OUString aXMLElemDefs = u"defs"_ustr;
+constexpr OUString aXMLElemText = u"text"_ustr;
+constexpr OUString aXMLElemTspan = u"tspan"_ustr;
+constexpr OUString aXMLElemLinearGradient = u"linearGradient"_ustr;
+constexpr OUString aXMLElemStop = u"stop"_ustr;
+
+constexpr OUString aXMLAttrTransform = u"transform"_ustr;
+constexpr OUString aXMLAttrStyle = u"style"_ustr;
+constexpr OUString aXMLAttrId = u"id"_ustr;
+constexpr OUString aXMLAttrX = u"x"_ustr;
+constexpr OUString aXMLAttrY = u"y"_ustr;
+constexpr OUString aXMLAttrX1 = u"x1"_ustr;
+constexpr OUString aXMLAttrY1 = u"y1"_ustr;
+constexpr OUString aXMLAttrX2 = u"x2"_ustr;
+constexpr OUString aXMLAttrY2 = u"y2"_ustr;
+constexpr OUString aXMLAttrCX = u"cx"_ustr;
+constexpr OUString aXMLAttrCY = u"cy"_ustr;
+constexpr OUString aXMLAttrRX = u"rx"_ustr;
+constexpr OUString aXMLAttrRY = u"ry"_ustr;
+constexpr OUString aXMLAttrWidth = u"width"_ustr;
+constexpr OUString aXMLAttrHeight = u"height"_ustr;
+constexpr OUString aXMLAttrStrokeWidth = u"stroke-width"_ustr;
+constexpr OUString aXMLAttrFill = u"fill"_ustr;
+constexpr OUString aXMLAttrFontFamily = u"font-family"_ustr;
+constexpr OUString aXMLAttrFontSize = u"font-size"_ustr;
+constexpr OUString aXMLAttrFontStyle = u"font-style"_ustr;
+constexpr OUString aXMLAttrFontWeight = u"font-weight"_ustr;
+constexpr OUString aXMLAttrTextDecoration = u"text-decoration"_ustr;
+constexpr OUString aXMLAttrXLinkHRef = u"xlink:href"_ustr;
+constexpr OUString aXMLAttrGradientUnits = u"gradientUnits"_ustr;
+constexpr OUString aXMLAttrOffset = u"offset"_ustr;
+constexpr OUString aXMLAttrStopColor = u"stop-color"_ustr;
+constexpr OUString aXMLAttrStrokeLinejoin = u"stroke-linejoin"_ustr;
+constexpr OUString aXMLAttrStrokeLinecap = u"stroke-linecap"_ustr;
vcl::PushFlags SVGContextHandler::getPushFlags() const
@@ -1164,8 +1164,8 @@ bool SVGTextWriter::nextTextPortion()
Reference < XTextField > xTextField(
xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY );
if( xTextField.is() )
{
- static constexpr OUStringLiteral
sServicePrefix(u"com.sun.star.text.textfield.");
- static constexpr OUStringLiteral
sPresentationServicePrefix(u"com.sun.star.presentation.TextField.");
+ static constexpr OUString
sServicePrefix(u"com.sun.star.text.textfield."_ustr);
+ static constexpr OUString
sPresentationServicePrefix(u"com.sun.star.presentation.TextField."_ustr);
Reference< XServiceInfo > xService( xTextField, UNO_QUERY );
const Sequence< OUString > aServices =
xService->getSupportedServiceNames();
@@ -1893,8 +1893,8 @@ tools::PolyPolygon& SVGActionWriter::ImplMap( const
tools::PolyPolygon& rPolyPol
OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly,
bool bLine )
{
OUStringBuffer aPathData;
- static constexpr OUStringLiteral aBlank( u" " );
- static constexpr OUStringLiteral aComma( u"," );
+ static constexpr OUString aBlank( u" "_ustr );
+ static constexpr OUString aComma( u","_ustr );
Point aPolyPoint;
for( tools::Long i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ )
diff --git a/filter/source/textfilterdetect/filterdetect.cxx
b/filter/source/textfilterdetect/filterdetect.cxx
index 9d25e289ec89..898728af434f 100644
--- a/filter/source/textfilterdetect/filterdetect.cxx
+++ b/filter/source/textfilterdetect/filterdetect.cxx
@@ -21,15 +21,15 @@
#include <cppuhelper/supportsservice.hxx>
#include <memory>
-constexpr OUStringLiteral WRITER_TEXT_FILTER = u"Text";
-constexpr OUStringLiteral CALC_TEXT_FILTER = u"Text - txt - csv (StarCalc)";
+constexpr OUString WRITER_TEXT_FILTER = u"Text"_ustr;
+constexpr OUString CALC_TEXT_FILTER = u"Text - txt - csv (StarCalc)"_ustr;
constexpr OUStringLiteral WEB_HTML_FILTER = u"HTML";
constexpr OUStringLiteral WRITER_HTML_FILTER = u"HTML (StarWriter)";
constexpr OUStringLiteral CALC_HTML_FILTER = u"calc_HTML_WebQuery";
-constexpr OUStringLiteral WRITER_DOCSERVICE =
u"com.sun.star.text.TextDocument";
-constexpr OUStringLiteral CALC_DOCSERVICE =
u"com.sun.star.sheet.SpreadsheetDocument";
+constexpr OUString WRITER_DOCSERVICE = u"com.sun.star.text.TextDocument"_ustr;
+constexpr OUString CALC_DOCSERVICE =
u"com.sun.star.sheet.SpreadsheetDocument"_ustr;
using namespace ::com::sun::star;
using utl::MediaDescriptor;
@@ -188,13 +188,13 @@ OUString SAL_CALL
PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal
// then on extension if that's not available.
if (aDocService == CALC_DOCSERVICE)
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(CALC_TEXT_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<= CALC_TEXT_FILTER;
else if (aDocService == WRITER_DOCSERVICE)
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(WRITER_TEXT_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
WRITER_TEXT_FILTER;
else if (aExt == "csv" || aExt == "tsv" || aExt == "tab" || aExt ==
"xls" || aName.endsWith(".csv.gz"))
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(CALC_TEXT_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<= CALC_TEXT_FILTER;
else
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(WRITER_TEXT_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
WRITER_TEXT_FILTER;
}
else
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx
b/filter/source/xsltdialog/typedetectionexport.cxx
index 6fc2f26380d2..6912bb407c0b 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -79,14 +79,14 @@ void TypeDetectionExporter::doExport( const Reference<
XOutputStream >& xOS, co
{
try
{
- static constexpr OUStringLiteral sComponentData (
u"oor:component-data" );
- static constexpr OUStringLiteral sNode ( u"node" );
- static constexpr OUStringLiteral sName ( u"oor:name" );
- static constexpr OUStringLiteral sWhiteSpace ( u" " );
- static constexpr OUStringLiteral sUIName ( u"UIName" );
- static constexpr OUStringLiteral sComma ( u"," );
- static constexpr OUStringLiteral sDelim ( u";" );
- static constexpr OUStringLiteral sData ( u"Data" );
+ static constexpr OUString sComponentData (
u"oor:component-data"_ustr );
+ static constexpr OUString sNode ( u"node"_ustr );
+ static constexpr OUString sName ( u"oor:name"_ustr );
+ static constexpr OUString sWhiteSpace ( u" "_ustr );
+ static constexpr OUString sUIName ( u"UIName"_ustr );
+ static constexpr OUString sComma ( u","_ustr );
+ static constexpr OUString sDelim ( u";"_ustr );
+ static constexpr OUString sData ( u"Data"_ustr );
static constexpr OUStringLiteral sDocTypePrefix ( u"doctype:" );
static constexpr OUStringLiteral sFilterAdaptorService(
u"com.sun.star.comp.Writer.XmlFilterAdaptor" );
static constexpr OUStringLiteral sXSLTFilterService (
u"com.sun.star.documentconversion.XSLTFilter" );
@@ -206,9 +206,9 @@ void TypeDetectionExporter::addProperty( const Reference<
XWriter >& xHandler, c
{
try
{
- static constexpr OUStringLiteral sProp( u"prop" );
- static constexpr OUStringLiteral sValue( u"value" );
- static constexpr OUStringLiteral sWhiteSpace ( u" " );
+ static constexpr OUString sProp( u"prop"_ustr );
+ static constexpr OUString sValue( u"value"_ustr );
+ static constexpr OUString sWhiteSpace ( u" "_ustr );
rtl::Reference<::comphelper::AttributeList>pAttrList = new
::comphelper::AttributeList;
pAttrList->AddAttribute ( "oor:name", rName );
@@ -233,9 +233,9 @@ void TypeDetectionExporter::addLocaleProperty( const
Reference< XWriter >& xHand
{
try
{
- static constexpr OUStringLiteral sProp( u"prop" );
- static constexpr OUStringLiteral sValue( u"value" );
- static constexpr OUStringLiteral sWhiteSpace ( u" " );
+ static constexpr OUString sProp( u"prop"_ustr );
+ static constexpr OUString sValue( u"value"_ustr );
+ static constexpr OUString sWhiteSpace ( u" "_ustr );
rtl::Reference<::comphelper::AttributeList> pAttrList = new
::comphelper::AttributeList;
pAttrList->AddAttribute ( "oor:name", rName );
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx
b/filter/source/xsltdialog/xmlfilterjar.cxx
index 5177606ee2de..880a5618bf13 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -60,7 +60,7 @@ using namespace com::sun::star::io;
using ::rtl::Uri;
-constexpr OUStringLiteral sVndSunStarPackage(u"vnd.sun.star.Package:");
+constexpr OUString sVndSunStarPackage(u"vnd.sun.star.Package:"_ustr);
XMLFilterJarHelper::XMLFilterJarHelper( const Reference< XComponentContext >&
rxContext )
: mxContext( rxContext ),
