[Libreoffice-commits] .: chart2/source

[Caolán McNamara]

 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx   |   40 +++++-----
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx |    8 +-
 chart2/source/controller/main/ChartController.cxx             |    2 
 3 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit deed86a648da07a0cee8dd7f328e534722f06986
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sat Oct 30 16:52:27 2010 +0100

    Use RTL_CONSTASCII_USTRINGPARAM macro

diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index c4a5512..f8d5e47 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -576,35 +576,35 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap()
 {
     static tMakeStringStringMap g_aChartTypeNameMap =
         tMakeStringStringMap
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.LineChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.LineDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.LineDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.AreaChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.AreaDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.AreaDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ColumnChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.BarDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BarDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.PieChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.PieDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.PieDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.DonutChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.DonutDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DonutChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.DonutDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ScatterChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.XYDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.FilledNetChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.FilledNetDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.FilledNetDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.NetChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.NetDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.NetDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.CandleStickChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.StockDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.StockDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.BubbleChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.BubbleDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BubbleDiagram" ) ) )
         
         ;
     return g_aChartTypeNameMap;
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 5b42b18..e638032 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -387,10 +387,10 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const
 Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 4 );
-    aServices[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartArea" );
-    aServices[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.LineProperties" );
-    aServices[ 2 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.FillProperties" );
-    aServices[ 3 ] = ::rtl::OUString::createFromAscii( "com.sun.star.xml.UserDefinedAttributeSupplier" );
+    aServices[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.ChartArea"));
+    aServices[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineProperties"));
+    aServices[ 2 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.FillProperties"));
+    aServices[ 3 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.UserDefinedAttributeSupplier"));
 
     return aServices;
 }
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index e4983d0..d5cbb4d 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -346,7 +346,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
 {
     uno::Sequence< rtl::OUString > aSNS( 2 );
     aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME;
-    aSNS.getArray()[ 1 ] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Controller");
+    aSNS.getArray()[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Controller" ) );
     //// @todo : add additional services if you support any further
     return aSNS;
 }