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>

5 files changed, 41 insertions, 41 deletions

diff --git a/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx
index c6f5bab1611c..37dea3c8fecb 100644
--- a/chart2/source/inc/chartview/servicenames_charttypes.hxx
+++ b/chart2/source/inc/chartview/servicenames_charttypes.hxx
@@ -24,14 +24,14 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.BarChart_Impl" ))
-#define CHART2_VIEW_BARCHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.BarChart" ))
+#define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME "com.sun.star.chart2.view.BarChart_Impl"
+#define CHART2_VIEW_BARCHART_SERVICE_NAME "com.sun.star.chart2.view.BarChart"
 
-#define CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.PieChart_Impl" ))
-#define CHART2_VIEW_PIECHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.PieChart" ))
+#define CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME "com.sun.star.chart2.view.PieChart_Impl"
+#define CHART2_VIEW_PIECHART_SERVICE_NAME "com.sun.star.chart2.view.PieChart"
 
-#define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.AreaChart_Impl" ))
-#define CHART2_VIEW_AREACHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.AreaChart" ))
+#define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME "com.sun.star.chart2.view.AreaChart_Impl"
+#define CHART2_VIEW_AREACHART_SERVICE_NAME "com.sun.star.chart2.view.AreaChart"
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index e260832bf6ee..e7554c755fec 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -26,17 +26,17 @@
 */
 #if OSL_DEBUG_LEVEL > 0
 #define ASSERT_EXCEPTION(ex)                   \
-  OSL_FAIL( ::rtl::OUStringToOString( \
-    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +\
-    ::rtl::OUString::createFromAscii( typeid( ex ).name()) +\
-    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +\
+  OSL_FAIL( OUStringToOString( \
+    "Exception caught. Type: " +\
+    OUString::createFromAscii( typeid( ex ).name()) +\
+    ", Message: " +\
     ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr())
 #else
 //avoid compilation warnings
 #define ASSERT_EXCEPTION(ex) (void)(ex)
 #endif
 
-#define U2C(ouString) (::rtl::OUStringToOString(ouString,RTL_TEXTENCODING_ASCII_US).getStr())
+#define U2C(ouString) (OUStringToOString(ouString,RTL_TEXTENCODING_ASCII_US).getStr())
 
 // CHART_MACROS_HXX
 #endif
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index 9c7074f2b89b..7e024583b453 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -24,33 +24,33 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartModel" ))
-#define CHART_MODEL_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartDocument" ))
+#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartModel" )
+#define CHART_MODEL_SERVICE_NAME OUString( "com.sun.star.chart2.ChartDocument" )
 //@todo create your own service containing the service com.sun.star.document.OfficeDocument
 
-#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartController" ))
-#define CHART_CONTROLLER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartController" ))
+#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartController" )
+#define CHART_CONTROLLER_SERVICE_NAME OUString( "com.sun.star.chart2.ChartController" )
 //@todo create your own service containing the service com.sun.star.frame.Controller
 
-#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartView" ))
-#define CHART_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartView" ))
+#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartView" )
+#define CHART_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.ChartView" )
 
-#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartFrameLoader" ))
-#define CHART_FRAMELOADER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" ))
+#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartFrameLoader" )
+#define CHART_FRAMELOADER_SERVICE_NAME OUString( "com.sun.star.frame.SynchronousFrameLoader" )
 
-#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.WizardDialog" ))
-#define CHART_WIZARD_DIALOG_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.WizardDialog" ))
+#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.WizardDialog" )
+#define CHART_WIZARD_DIALOG_SERVICE_NAME OUString( "com.sun.star.chart2.WizardDialog" )
 
-#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartTypeDialog" ))
-#define CHART_TYPE_DIALOG_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartTypeDialog" ))
+#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartTypeDialog" )
+#define CHART_TYPE_DIALOG_SERVICE_NAME OUString( "com.sun.star.chart2.ChartTypeDialog" )
 
 // wrapper for old UNO API (com.sun.star.chart)
-#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartDocumentWrapper" ))
-#define CHART_CHARTAPIWRAPPER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartDocumentWrapper" ))
+#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartDocumentWrapper" )
+#define CHART_CHARTAPIWRAPPER_SERVICE_NAME OUString( "com.sun.star.chart2.ChartDocumentWrapper" )
 
 // accessibility
-#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.AccessibleTextComponent" ))
-#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleTextComponent" ))
+#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.AccessibleTextComponent" )
+#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME OUString( "com.sun.star.accessibility.AccessibleTextComponent" )
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx
index 3959cb8cd98a..53741e2129fb 100644
--- a/chart2/source/inc/servicenames_charttypes.hxx
+++ b/chart2/source/inc/servicenames_charttypes.hxx
@@ -24,16 +24,16 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_SERVICE_NAME_CHARTTYPE_AREA ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_BAR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BarChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_LINE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_PIE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_NET ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ))
-#define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_AREA OUString( "com.sun.star.chart2.AreaChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_BAR OUString( "com.sun.star.chart2.BarChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN OUString( "com.sun.star.chart2.ColumnChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_LINE OUString( "com.sun.star.chart2.LineChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER OUString( "com.sun.star.chart2.ScatterChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_PIE OUString( "com.sun.star.chart2.PieChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_NET OUString( "com.sun.star.chart2.NetChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET OUString( "com.sun.star.chart2.FilledNetChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK OUString( "com.sun.star.chart2.CandleStickChartType" )
+#define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE OUString( "com.sun.star.chart2.BubbleChartType" )
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx
index 0d5e1db7f3f6..5f2f3d5c42f0 100644
--- a/chart2/source/inc/servicenames_coosystems.hxx
+++ b/chart2/source/inc/servicenames_coosystems.hxx
@@ -24,10 +24,10 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.Cartesian" ))
-#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.CartesianView" ))
-#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.Polar" ))
-#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.PolarView" ))
+#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.Cartesian" )
+#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.CartesianView" )
+#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.Polar" )
+#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.PolarView" )
 
 //.............................................................................
 } //namespace chart