summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-10-30 16:52:27 +0100
committerCaolán McNamara <caolanm@redhat.com>2010-10-30 16:52:27 +0100
commitb4b9fbd72bdc6faa49cd972bd907ece8aaafbe5a (patch)
tree4e55a9296293c91dce88684517304101a75efeb6 /chart2
parentb25ab5aef6f68beccb7e5dd362d2eaf54cb43e23 (diff)
Use RTL_CONSTASCII_USTRINGPARAM macro
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx40
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx8
-rw-r--r--chart2/source/controller/main/ChartController.cxx2
3 files changed, 25 insertions, 25 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index b7a4717636a3..4aad2d46f186 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 ea66d775c7cc..48f26fef00d3 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 c12966e17d62..cb04fae0769e 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;
}