Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: chart2

Change-Id: Ifcb57548a594cbbaf70df8d9da17cf94a96667db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158146
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

10 files changed, 21 insertions, 21 deletions

diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index d0f4c93ee848..23f5add5f85f 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -39,7 +39,7 @@ using ::chart::impl::CachedDataSequence_Base;
 
 namespace
 {
-constexpr OUStringLiteral lcl_aServiceName = u"com.sun.star.comp.chart.CachedDataSequence";
+constexpr OUString lcl_aServiceName = u"com.sun.star.comp.chart.CachedDataSequence"_ustr;
 
 enum
 {
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index b3b77ac2a212..24ee5facb60e 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -34,7 +34,7 @@ using ::com::sun::star::uno::Sequence;
 namespace
 {
 
-constexpr OUStringLiteral aSeriesPropName = u"Series";
+constexpr OUString aSeriesPropName = u"Series"_ustr;
 
 } // anonymous namespace
 
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index f8581580dfc2..3d049a44527f 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
 namespace
 {
 
-constexpr OUStringLiteral lcl_aServiceName = u"com.sun.star.comp.chart2.ErrorBar";
+constexpr OUString lcl_aServiceName = u"com.sun.star.comp.chart2.ErrorBar"_ustr;
 
 bool lcl_isInternalData( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq )
 {
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index a07832babd24..883920daa9fb 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -60,12 +60,12 @@ namespace chart
 namespace
 {
 
-constexpr OUStringLiteral lcl_aCategoriesRangeName = u"categories";
+constexpr OUString lcl_aCategoriesRangeName = u"categories"_ustr;
 const char lcl_aCategoriesLevelRangeNamePrefix[] = "categoriesL "; //L <-> level
 const char lcl_aCategoriesPointRangeNamePrefix[] = "categoriesP "; //P <-> point
-constexpr OUStringLiteral lcl_aCategoriesRoleName = u"categories";
+constexpr OUString lcl_aCategoriesRoleName = u"categories"_ustr;
 const char lcl_aLabelRangePrefix[] = "label ";
-constexpr OUStringLiteral lcl_aCompleteRange = u"all";
+constexpr OUString lcl_aCompleteRange = u"all"_ustr;
 
 typedef std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > >
     lcl_tSequenceMap;
@@ -787,7 +787,7 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
 {
     Sequence< beans::PropertyValue > aArguments{
         beans::PropertyValue(
-            "CellRangeRepresentation", -1, uno::Any( OUString(lcl_aCompleteRange) ),
+            "CellRangeRepresentation", -1, uno::Any( lcl_aCompleteRange ),
             beans::PropertyState_DIRECT_VALUE ),
         beans::PropertyValue(
             "DataRowSource", -1, uno::Any(
@@ -1245,7 +1245,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
         return "";
     }
 
-    static constexpr OUStringLiteral aPivotTableID(u"PT@");
+    static constexpr OUString aPivotTableID(u"PT@"_ustr);
     if (aXMLRange.startsWith(aPivotTableID))
         return aXMLRange.copy(aPivotTableID.getLength());
 
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index a9e155a3e8c6..6e7631c8a9e4 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -58,10 +58,10 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 
-constexpr OUStringLiteral m_aMultiClick = u"MultiClick";
-constexpr OUStringLiteral m_aDragMethodEquals = u"DragMethod=";
-constexpr OUStringLiteral m_aDragParameterEquals = u"DragParameter=";
-constexpr OUStringLiteral m_aProtocol = u"CID/";
+constexpr OUString m_aMultiClick = u"MultiClick"_ustr;
+constexpr OUString m_aDragMethodEquals = u"DragMethod="_ustr;
+constexpr OUString m_aDragParameterEquals = u"DragParameter="_ustr;
+constexpr OUString m_aProtocol = u"CID/"_ustr;
 constexpr OUString m_aPieSegmentDragMethodServiceName(u"PieSegmentDragging"_ustr);
 
 namespace
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index f7d6f3525c48..b1ca0b429a7b 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -133,7 +133,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
     if( ! xProp.is())
         return;
 
-    static constexpr OUStringLiteral aRefSizeName = u"ReferencePageSize";
+    static constexpr OUString aRefSizeName = u"ReferencePageSize"_ustr;
 
     try
     {
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 65e6b13ac0a0..0277e61a44f1 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -851,7 +851,7 @@ void RegressionCurveHelper::resetEquationPosition(
 
     try
     {
-        static constexpr OUStringLiteral aPosPropertyName( u"RelativePosition" );
+        static constexpr OUString aPosPropertyName( u"RelativePosition"_ustr );
         Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties()); // since m233: , uno::UNO_SET_THROW );
         if( xEqProp->getPropertyValue( aPosPropertyName ).hasValue())
             xEqProp->setPropertyValue( aPosPropertyName, uno::Any());
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index b49dab6d6fb9..b7179537c43b 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -29,10 +29,10 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace
 {
 
-constexpr OUStringLiteral lcl_aServiceName_Logarithmic = u"com.sun.star.chart2.LogarithmicScaling";
-constexpr OUStringLiteral lcl_aServiceName_Exponential = u"com.sun.star.chart2.ExponentialScaling";
-constexpr OUStringLiteral lcl_aServiceName_Linear = u"com.sun.star.chart2.LinearScaling";
-constexpr OUStringLiteral lcl_aServiceName_Power = u"com.sun.star.chart2.PowerScaling";
+constexpr OUString lcl_aServiceName_Logarithmic = u"com.sun.star.chart2.LogarithmicScaling"_ustr;
+constexpr OUString lcl_aServiceName_Exponential = u"com.sun.star.chart2.ExponentialScaling"_ustr;
+constexpr OUString lcl_aServiceName_Linear = u"com.sun.star.chart2.LinearScaling"_ustr;
+constexpr OUString lcl_aServiceName_Power = u"com.sun.star.chart2.PowerScaling"_ustr;
 
 }
 
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 95fa4464ad52..64ce94f3b179 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -144,7 +144,7 @@ void lcl_setXMLRangePropertyAtDataSequence(
 {
     try
     {
-        static constexpr OUStringLiteral aXMLRangePropName( u"CachedXMLRange");
+        static constexpr OUString aXMLRangePropName( u"CachedXMLRange"_ustr);
         Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW );
         Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo());
         if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName ))
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 0e9f654cec95..7211daedba6f 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -41,7 +41,7 @@ using ::chart::impl::UncachedDataSequence_Base;
 
 namespace
 {
-constexpr OUStringLiteral lcl_aServiceName = u"com.sun.star.comp.chart.UncachedDataSequence";
+constexpr OUString lcl_aServiceName = u"com.sun.star.comp.chart.UncachedDataSequence"_ustr;
 
 enum
 {
@@ -212,7 +212,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data:
     // auto-generated label
     sal_Int32 nSeries = m_aSourceRepresentation.toInt32() + 1;
     OUString aResString(::chart::SchResId(STR_DATA_UNNAMED_SERIES_WITH_INDEX));
-    static constexpr OUStringLiteral aReplacementStr(u"%NUMBER");
+    static constexpr OUString aReplacementStr(u"%NUMBER"_ustr);
     sal_Int32 nIndex = aResString.indexOf(aReplacementStr);
     OUString aName;
     if( nIndex != -1 )