RTL_CONSTASCII_USTRINGPARAM removals

Removed all occurences of RTL_CONSTASCII_USTRINGPARAM in chart2.

Change-Id: I0ab188e2d67a5fc17a3653e5213031f6e2c2581d
Reviewed-on: https://gerrit.libreoffice.org/2244
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

16 files changed, 42 insertions, 62 deletions

diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 6426170481ff..898699d50f19 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -48,8 +48,7 @@ using ::chart::impl::CachedDataSequence_Base;
 
 namespace
 {
-static const OUString lcl_aServiceName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.CachedDataSequence" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.CachedDataSequence" );
 
 enum
 {
@@ -365,17 +364,17 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X
 void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception)
 {
     ::comphelper::SequenceAsHashMap aMap(_aArguments);
-    m_aNumericalSequence = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSequence")),m_aNumericalSequence);
+    m_aNumericalSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aNumericalSequence);
     if ( m_aNumericalSequence.getLength() )
         m_eCurrentDataType = NUMERICAL;
     else
     {
-        m_aTextualSequence = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSequence")),m_aTextualSequence);
+        m_aTextualSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aTextualSequence);
         if ( m_aTextualSequence.getLength() )
             m_eCurrentDataType = TEXTUAL;
         else
         {
-            m_aMixedSequence = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSequence")),m_aMixedSequence);
+            m_aMixedSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aMixedSequence);
             if ( m_aMixedSequence.getLength() )
                 m_eCurrentDataType = MIXED;
         }
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 6167490401cb..f56ce504d80d 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -36,7 +36,7 @@ using ::rtl::OUString;
 namespace
 {
 
-static const OUString aSeriesPropName( RTL_CONSTASCII_USTRINGPARAM("Series"));
+static const OUString aSeriesPropName( "Series" );
 
 } // anonymous namespace
 
@@ -73,7 +73,7 @@ private:
 };
 
 ChartConfigItem::ChartConfigItem( ConfigItemListener & rListener ) :
-        ::utl::ConfigItem( "Office.Chart/DefaultColor"),
+        ::utl::ConfigItem( "Office.Chart/DefaultColor" ),
     m_rListener( rListener )
 {}
 
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index ca39c3f92739..f9a8b64dc792 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -73,13 +73,11 @@ public:
 
         if( m_bMatchPrefix )
             return ( xProp.is() &&
-                     (xProp->getPropertyValue(
-                         OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" )) ) >>= aRole ) &&
+                     (xProp->getPropertyValue( "Role" ) >>= aRole ) &&
                      aRole.match( m_aRole ));
 
         return ( xProp.is() &&
-                 (xProp->getPropertyValue(
-                     OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" )) ) >>= aRole ) &&
+                 (xProp->getPropertyValue( "Role" ) >>= aRole ) &&
                  m_aRole.equals( aRole ));
     }
 
@@ -388,7 +386,7 @@ void setStackModeAtSeries(
     if( eStackMode == StackMode_AMBIGUOUS )
         return;
 
-    const OUString aPropName( RTL_CONSTASCII_USTRINGPARAM( "StackingDirection" ));
+    const OUString aPropName( "StackingDirection" );
     const uno::Any aPropValue = uno::makeAny(
         ( (eStackMode == StackMode_Y_STACKED) ||
           (eStackMode == StackMode_Y_STACKED_PERCENT) )
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 2509ba1460e9..262e6fe2e11e 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -32,8 +32,7 @@ using namespace ::com::sun::star;
 
 namespace
 {
-static const ::rtl::OUString lcl_aServiceName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.DataSource" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.DataSource" );
 }  // anonymous namespace
 
 namespace chart
@@ -70,7 +69,7 @@ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLab
 Sequence< OUString > DataSource::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 1 );
-    aServices[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.DataSource" ));
+    aServices[ 0 ] = "com.sun.star.chart2.data.DataSource";
     return aServices;
 }
 
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index b9515b222862..3e9a3d7c5e38 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -40,8 +40,7 @@ using ::osl::MutexGuard;
 
 namespace
 {
-static const OUString lcl_aServiceName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ErrorBar" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.ErrorBar" );
 
 enum
 {
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 4c9b4030d4e9..647904049d4a 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -64,21 +64,14 @@ namespace
 {
 
 // note: in xmloff this name is used to indicate usage of own data
-static const ::rtl::OUString lcl_aServiceName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.InternalDataProvider" ));
-
-static const ::rtl::OUString lcl_aCategoriesRangeName(
-    RTL_CONSTASCII_USTRINGPARAM( "categories" ));
-static const ::rtl::OUString lcl_aCategoriesLevelRangeNamePrefix(
-    RTL_CONSTASCII_USTRINGPARAM( "categoriesL " )); //L <-> level
-static const ::rtl::OUString lcl_aCategoriesPointRangeNamePrefix(
-    RTL_CONSTASCII_USTRINGPARAM( "categoriesP " )); //P <-> point
-static const ::rtl::OUString lcl_aCategoriesRoleName(
-    RTL_CONSTASCII_USTRINGPARAM( "categories" ));
-static const ::rtl::OUString lcl_aLabelRangePrefix(
-    RTL_CONSTASCII_USTRINGPARAM( "label " ));
-static const ::rtl::OUString lcl_aCompleteRange(
-    RTL_CONSTASCII_USTRINGPARAM( "all" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.InternalDataProvider" );
+
+static const OUString lcl_aCategoriesRangeName( "categories" );
+static const OUString lcl_aCategoriesLevelRangeNamePrefix( "categoriesL " ); //L <-> level
+static const OUString lcl_aCategoriesPointRangeNamePrefix( "categoriesP " ); //P <-> point
+static const OUString lcl_aCategoriesRoleName( "categories" );
+static const OUString lcl_aLabelRangePrefix( "label " );
+static const OUString lcl_aCompleteRange( "all" );
 
 typedef ::std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > >
     lcl_tSequenceMap;
@@ -1104,7 +1097,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang
            uno::RuntimeException)
 {
     XMLRangeHelper::CellRange aRange;
-    aRange.aTableName = OUString(RTL_CONSTASCII_USTRINGPARAM("local-table"));
+    aRange.aTableName = OUString( "local-table" );
 
     // attention: this data provider has the limitation that it stores
     // internally if data comes from columns or rows. It is intended for
@@ -1459,7 +1452,7 @@ double SAL_CALL InternalDataProvider::getNotANumber()
 void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception)
 {
     comphelper::SequenceAsHashMap aArgs(_aArguments);
-    if ( aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDefaultData")),sal_False) )
+    if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData" ,sal_False) )
         createDefaultData();
 }
 // ____ XCloneable ____
@@ -1475,7 +1468,7 @@ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone()
 Sequence< OUString > InternalDataProvider::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 1 );
-    aServices[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.DataProvider" ));
+    aServices[ 0 ] = "com.sun.star.chart2.data.DataProvider";
     return aServices;
 }
 
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index ae00aacc9ecb..b777d7fb96ee 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -29,7 +29,7 @@ const short FLAG_DEPRECATED =1;
 const short FLAG_MODEL      =2;
 
 #define WRITE_PROPERTY( MediaName, nFlags )             \
-if(rProp.Name.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#MediaName)))) \
+if(rProp.Name.equals(#MediaName)) \
 {                                                       \
     if( rProp.Value >>= MediaName )                     \
         ISSET_##MediaName = sal_True;                   \
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index b37b114258ef..918c73c46dcf 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -62,7 +62,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum
 
 {
     uno::Reference<beans::XPropertySet> xProp(m_xNumberFormatsSupplier,uno::UNO_QUERY);
-    rtl::OUString sNullDate( RTL_CONSTASCII_USTRINGPARAM("NullDate"));
+    rtl::OUString sNullDate( "NullDate" );
     if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sNullDate) )
         m_aNullDate = xProp->getPropertyValue(sNullDate);
     SvNumberFormatsSupplierObj* pSupplierObj = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 30d6ee5560c8..a6f437686add 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -398,7 +398,7 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle )
 {
     if( ! m_pImplProperties->SetStyle( xStyle ))
         throw lang::IllegalArgumentException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "Empty Style" )),
+            "Empty Style",
             static_cast< beans::XPropertySet * >( this ),
             0 );
 }
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 4f63a5b45fd5..f039aa67f7ce 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -147,7 +147,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
     if( ! xProp.is())
         return;
 
-    static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
+    static const OUString aRefSizeName( "ReferencePageSize" );
 
     try
     {
@@ -182,7 +182,7 @@ void ReferenceSizeProvider::getAutoResizeFromPropSet(
     const Reference< beans::XPropertySet > & xProp,
     ReferenceSizeProvider::AutoResizeState & rInOutState )
 {
-    static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
+    static const OUString aRefSizeName( "ReferencePageSize" );
     AutoResizeState eSingleState = AUTO_RESIZE_UNKNOWN;
 
     if( xProp.is())
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index b64b02cb55aa..8d811aef8f7d 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -52,7 +52,7 @@ bool RegressionCurveCalculator::isLinearScaling(
     // no scaling means linear
     if( !xScaling.is())
         return true;
-    static OUString aLinScalingServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LinearScaling" ));
+    static OUString aLinScalingServiceName( "com.sun.star.chart2.LinearScaling" );
     uno::Reference< lang::XServiceName > xServiceName( xScaling, uno::UNO_QUERY );
     return (xServiceName.is() && xServiceName->getServiceName().equals( aLinScalingServiceName ));
 }
@@ -60,7 +60,7 @@ bool RegressionCurveCalculator::isLinearScaling(
 bool RegressionCurveCalculator::isLogarithmicScaling(
     const Reference< chart2::XScaling > & xScaling )
 {
-    static OUString aLogScalingServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LogarithmicScaling" ));
+    static OUString aLogScalingServiceName( "com.sun.star.chart2.LogarithmicScaling" );
     uno::Reference< lang::XServiceName > xServiceName( xScaling, uno::UNO_QUERY );
     return (xServiceName.is() && xServiceName->getServiceName().equals( aLogScalingServiceName ));
 }
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 16a57e838249..81941a608451 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -167,8 +167,7 @@ void RegressionCurveHelper::initializeCurveCalculator(
             Reference< data::XDataSequence > xSeq( aDataSeqs[i]->getValues());
             Reference< XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
             ::rtl::OUString aRole;
-            if( xProp->getPropertyValue(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole )
+            if( xProp->getPropertyValue( "Role" ) >>= aRole )
             {
                 if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" )
                 {
@@ -630,7 +629,7 @@ void RegressionCurveHelper::resetEquationPosition(
     {
         try
         {
-            const OUString aPosPropertyName( RTL_CONSTASCII_USTRINGPARAM( "RelativePosition" ));
+            const OUString aPosPropertyName( "RelativePosition" );
             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/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index dacbd2d90d6f..ef2c4934d93c 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -47,10 +47,8 @@ using ::osl::MutexGuard;
 namespace
 {
 
-static const ::rtl::OUString lcl_aImplementationName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.RegressionEquation" ));
-static const ::rtl::OUString lcl_aServiceName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.RegressionEquation" ));
+static const OUString lcl_aImplementationName( "com.sun.star.comp.chart2.RegressionEquation" );
+static const OUString lcl_aServiceName( "com.sun.star.chart2.RegressionEquation" );
 
 enum
 {
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index f93d9b0dd81b..53883ae0c1f7 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -61,9 +61,9 @@ void RelativeSizeHelper::adaptFontSizes(
     float fFontHeight = 0;
 
     vector< OUString > aProperties;
-    aProperties.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" )));
-    aProperties.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeightAsian" )));
-    aProperties.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeightComplex" )));
+    aProperties.push_back( "CharHeight" );
+    aProperties.push_back( "CharHeightAsian" );
+    aProperties.push_back( "CharHeightComplex" );
 
     for( vector< OUString >::const_iterator aIt = aProperties.begin();
          aIt != aProperties.end(); ++aIt )
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index f11b994d2968..04ce78c5fcb8 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -24,14 +24,10 @@
 namespace
 {
 
-static const ::rtl::OUString lcl_aServiceName_Logarithmic(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LogarithmicScaling" ));
-static const ::rtl::OUString lcl_aServiceName_Exponential(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ExponentialScaling" ));
-static const ::rtl::OUString lcl_aServiceName_Linear(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LinearScaling" ));
-static const ::rtl::OUString lcl_aServiceName_Power(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PowerScaling" ));
+static const OUString lcl_aServiceName_Logarithmic( "com.sun.star.chart2.LogarithmicScaling" );
+static const OUString lcl_aServiceName_Exponential( "com.sun.star.chart2.ExponentialScaling" );
+static const OUString lcl_aServiceName_Linear( "com.sun.star.chart2.LinearScaling" );
+static const OUString lcl_aServiceName_Power( "com.sun.star.chart2.PowerScaling" );
 
 }
 
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 4fe74ef72d23..59c26759add0 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -42,8 +42,7 @@ using ::chart::impl::UncachedDataSequence_Base;
 
 namespace
 {
-static const OUString lcl_aServiceName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.UncachedDataSequence" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.UncachedDataSequence" );
 
 enum
 {