[Libreoffice-commits] core.git: chart2/source chart2/workbench
Krisztian Pinter
pin.terminator at gmail.com
Wed Feb 20 14:58:41 PST 2013
chart2/source/controller/dialogs/res_ErrorBar.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 2
chart2/source/controller/inc/ItemPropertyMap.hxx | 2
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 10 --
chart2/source/controller/main/DrawCommandDispatch.cxx | 22 ++--
chart2/source/controller/main/ElementSelector.cxx | 3
chart2/source/controller/main/ShapeToolbarController.cxx | 26 ++---
chart2/source/inc/chartview/servicenames_charttypes.hxx | 12 +-
chart2/source/inc/macros.hxx | 10 +-
chart2/source/inc/servicenames.hxx | 32 +++---
chart2/source/inc/servicenames_charttypes.hxx | 20 ++--
chart2/source/inc/servicenames_coosystems.hxx | 8 -
chart2/source/model/filter/XMLFilter.cxx | 10 +-
chart2/source/model/inc/XMLFilter.hxx | 8 -
chart2/source/model/main/Axis.cxx | 3
chart2/source/model/main/CartesianCoordinateSystem.cxx | 18 +--
chart2/source/model/main/ChartModel.cxx | 53 ++++++-----
chart2/source/model/main/ChartModel_Persistence.cxx | 7 -
chart2/source/model/main/GridProperties.cxx | 3
chart2/source/model/main/Legend.cxx | 3
chart2/source/model/main/PageBackground.cxx | 3
chart2/source/model/main/PolarCoordinateSystem.cxx | 14 +-
chart2/source/model/main/StockBar.cxx | 3
chart2/source/model/main/Title.cxx | 3
chart2/source/model/main/Wall.cxx | 3
chart2/source/model/template/AreaChartTypeTemplate.cxx | 3
chart2/source/model/template/BarChartTypeTemplate.cxx | 3
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 3
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 3
chart2/source/model/template/LineChartTypeTemplate.cxx | 3
chart2/source/model/template/NetChartTypeTemplate.cxx | 3
chart2/source/model/template/PieChartTypeTemplate.cxx | 5 -
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 3
chart2/source/model/template/StockChartTypeTemplate.cxx | 3
chart2/source/tools/CachedDataSequence.cxx | 9 -
chart2/source/tools/ConfigColorScheme.cxx | 4
chart2/source/tools/DataSeriesHelper.cxx | 8 -
chart2/source/tools/DataSource.cxx | 5 -
chart2/source/tools/ErrorBar.cxx | 3
chart2/source/tools/InternalDataProvider.cxx | 29 ++----
chart2/source/tools/MediaDescriptorHelper.cxx | 2
chart2/source/tools/NumberFormatterWrapper.cxx | 2
chart2/source/tools/OPropertySet.cxx | 2
chart2/source/tools/ReferenceSizeProvider.cxx | 4
chart2/source/tools/RegressionCurveCalculator.cxx | 4
chart2/source/tools/RegressionCurveHelper.cxx | 5 -
chart2/source/tools/RegressionEquation.cxx | 6 -
chart2/source/tools/RelativeSizeHelper.cxx | 6 -
chart2/source/tools/Scaling.cxx | 12 --
chart2/source/tools/UncachedDataSequence.cxx | 3
chart2/source/view/axes/DateScaling.cxx | 6 -
chart2/source/view/charttypes/CandleStickChart.cxx | 15 +--
chart2/source/view/main/ChartItemPool.cxx | 2
chart2/source/view/main/ChartView.cxx | 20 ++--
chart2/workbench/addin/sampleaddin.cxx | 46 ++++-----
55 files changed, 231 insertions(+), 271 deletions(-)
New commits:
commit d05287a9f1bd1aa82d4485013248bb24e692c6b6
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date: Mon Feb 18 18:45:17 2013 +0100
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 at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 3b1fb4f..4c18778 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -272,7 +272,7 @@ void ErrorBarResources::UpdateControlStates()
if( bIsPercentage )
{
- aCustomUnit = String( RTL_CONSTASCII_USTRINGPARAM( " %" ));
+ aCustomUnit = " %";
m_aMfPositive.SetDecimalDigits( 1 );
m_aMfPositive.SetSpinSize( 10 );
m_aMfNegative.SetDecimalDigits( 1 );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 257a277..af14ac4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -329,7 +329,7 @@ DataSourceTabPage::DataSourceTabPage(
// set symbol font for arrows
// note: StarSymbol is substituted to OpenSymbol for OOo
Font aSymbolFont( m_aBTN_UP.GetFont());
- aSymbolFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "StarSymbol" )));
+ aSymbolFont.SetName( "StarSymbol" );
m_aBTN_UP.SetControlFont( aSymbolFont );
m_aBTN_DOWN.SetControlFont( aSymbolFont );
diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx
index e8cb66f..de35b44 100644
--- a/chart2/source/controller/inc/ItemPropertyMap.hxx
+++ b/chart2/source/controller/inc/ItemPropertyMap.hxx
@@ -25,7 +25,7 @@
#define IPM_MAP_ENTRY(wid,uno,mid) (wid, ::std::make_pair< ::comphelper::ItemConverter::tPropertyNameType, ::comphelper::ItemConverter::tMemberIdType >(\
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(uno)), mid))
+ uno, mid))
namespace comphelper
{
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index ef10d58..72cdcf7 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -134,10 +134,9 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
delete pItem;
(void)ex;
OSL_FAIL(
- ::rtl::OUStringToOString(
+ OUStringToOString(
ex.Message +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- " - unknown Property: " )) + aProperty.first,
+ " - unknown Property: " + aProperty.first,
RTL_TEXTENCODING_ASCII_US ).getStr());
}
catch( const uno::Exception &ex )
@@ -206,10 +205,9 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
{
(void)ex;
OSL_FAIL(
- ::rtl::OUStringToOString(
+ OUStringToOString(
ex.Message +
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- " - unknown Property: " )) + aProperty.first,
+ " - unknown Property: " + aProperty.first,
RTL_TEXTENCODING_ASCII_US).getStr());
}
catch( const uno::Exception &ex )
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 6ab29b3..8dbd956 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -576,16 +576,16 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
return pObj;
}
-bool DrawCommandDispatch::parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId,
- ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType )
+bool DrawCommandDispatch::parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId,
+ OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType )
{
bool bFound = true;
sal_uInt16 nFeatureId = 0;
- ::rtl::OUString aBaseCommand;
- ::rtl::OUString aType;
+ OUString aBaseCommand;
+ OUString aType;
sal_Int32 nIndex = 1;
- ::rtl::OUString aToken = rCommandURL.getToken( 0, '.', nIndex );
+ OUString aToken = rCommandURL.getToken( 0, '.', nIndex );
if ( nIndex == -1 || aToken.isEmpty() )
{
aBaseCommand = rCommandURL;
@@ -598,32 +598,32 @@ bool DrawCommandDispatch::parseCommandURL( const ::rtl::OUString& rCommandURL, s
{
case COMMAND_ID_DRAWTBX_CS_BASIC:
{
- aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "diamond" ) );
+ aType = "diamond";
}
break;
case COMMAND_ID_DRAWTBX_CS_SYMBOL:
{
- aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "smiley" ) );
+ aType = "smiley";
}
break;
case COMMAND_ID_DRAWTBX_CS_ARROW:
{
- aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "left-right-arrow" ) );
+ aType = "left-right-arrow";
}
break;
case COMMAND_ID_DRAWTBX_CS_FLOWCHART:
{
- aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "flowchart-internal-storage" ) );
+ aType = "flowchart-internal-storage";
}
break;
case COMMAND_ID_DRAWTBX_CS_CALLOUT:
{
- aType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "round-rectangular-callout" ) );
+ aType = "round-rectangular-callout";
}
break;
case COMMAND_ID_DRAWTBX_CS_STAR:
{
- aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "star5" ) );
+ aType = "star5";
}
break;
default:
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 55132d7..b599455 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -48,8 +48,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.ElementSelectorToolbarController" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ElementSelectorToolbarController" );
}
//------------------------------------------------------------------------------
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index e56ce12..f310768 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -39,20 +39,20 @@ namespace chart
{
//.............................................................................
-::rtl::OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException)
+OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException)
{
return getImplementationName_Static();
}
-::rtl::OUString ShapeToolbarController::getImplementationName_Static() throw (uno::RuntimeException)
+OUString ShapeToolbarController::getImplementationName_Static() throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ShapeToolbarController" ) );
+ return OUString( "com.sun.star.comp.chart2.ShapeToolbarController" );
}
-Sequence< ::rtl::OUString > ShapeToolbarController::getSupportedServiceNames_Static() throw (uno::RuntimeException)
+Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() throw (uno::RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ShapeToolbarController" ) );
+ Sequence< OUString > aSupported(1);
+ aSupported.getArray()[0] = "com.sun.star.chart2.ShapeToolbarController";
return aSupported;
}
@@ -61,7 +61,7 @@ Sequence< ::rtl::OUString > ShapeToolbarController::getSupportedServiceNames_Sta
return ::comphelper::existsValue( ServiceName, getSupportedServiceNames_Static() );
}
-Sequence< ::rtl::OUString> ShapeToolbarController::getSupportedServiceNames() throw (uno::RuntimeException)
+Sequence< OUString > ShapeToolbarController::getSupportedServiceNames() throw (uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
@@ -128,37 +128,37 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments
}
if ( m_aCommandURL == ".uno:BasicShapes" )
{
- m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BasicShapes" ) ), sal_True ) );
+ m_aStates.insert( TCommandState::value_type( ".uno:BasicShapes", sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_BASIC;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
else if ( m_aCommandURL == ".uno:SymbolShapes" )
{
- m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SymbolShapes" ) ), sal_True ) );
+ m_aStates.insert( TCommandState::value_type( ".uno:SymbolShapes", sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_SYMBOL;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
else if ( m_aCommandURL == ".uno:ArrowShapes" )
{
- m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ArrowShapes" ) ), sal_True ) );
+ m_aStates.insert( TCommandState::value_type( ".uno:ArrowShapes", sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_ARROW;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox) );
}
else if ( m_aCommandURL == ".uno:FlowChartShapes" )
{
- m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FlowChartShapes" ) ), sal_True ) );
+ m_aStates.insert( TCommandState::value_type( ".uno:FlowChartShapes", sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_FLOWCHART;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
else if ( m_aCommandURL == ".uno:CalloutShapes" )
{
- m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CalloutShapes" ) ), sal_True ) );
+ m_aStates.insert( TCommandState::value_type( ".uno:CalloutShapes", sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_CALLOUT;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
else if ( m_aCommandURL == ".uno:StarShapes" )
{
- m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StarShapes" ) ), sal_True ) );
+ m_aStates.insert( TCommandState::value_type( ".uno:StarShapes" , sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_STAR;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
diff --git a/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx
index c6f5bab..37dea3c 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 e260832..e7554c7 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 9c7074f..7e02458 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 3959cb8..53741e2 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 0d5e1db..5f2f3d5 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
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 885bee0..2555b25 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -508,10 +508,10 @@ sal_Int32 XMLFilter::impl_ImportStream(
{
uno::Sequence< uno::Any > aArgs(2);
beans::NamedValue aValue;
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentHandler"));
+ aValue.Name = "DocumentHandler";
aValue.Value <<= xDocHandler;
aArgs[0] <<= aValue;
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model"));
+ aValue.Name = "Model";
aValue.Value <<= m_xTargetDoc;
aArgs[1] <<= aValue;
@@ -603,10 +603,10 @@ sal_Int32 XMLFilter::impl_Export(
{
uno::Sequence< uno::Any > aArgs(2);
beans::NamedValue aValue;
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentHandler"));
+ aValue.Name = "DocumentHandler";
aValue.Value <<= xDocHandler;
aArgs[0] <<= aValue;
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model"));
+ aValue.Name = "Model";
aValue.Value <<= xDocumentComp;
aArgs[1] <<= aValue;
@@ -637,7 +637,7 @@ sal_Int32 XMLFilter::impl_Export(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) );
SvtSaveOptions aSaveOpt;
- OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting"));
+ OUString sUsePrettyPrinting( "UsePrettyPrinting" );
sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) );
if( ! bOasis )
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 9850044..76f0ef1 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -174,9 +174,9 @@ public:
{
return (::cppu::OWeakObject *)new XMLReportFilterHelper( xContext );
}
- static ::rtl::OUString getImplementationName_Static()
+ static OUString getImplementationName_Static()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.report.XMLFilter" ));
+ return OUString( "com.sun.star.comp.chart2.report.XMLFilter" );
}
protected:
virtual ::rtl::OUString SAL_CALL
@@ -192,7 +192,7 @@ protected:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException)
{
- setDocumentHandler(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ImportDocumentHandler")));
+ setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" );
XMLFilter::setTargetDocument(Document);
}
@@ -203,7 +203,7 @@ protected:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException)
{
- setDocumentHandler(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ExportDocumentHandler")));
+ setDocumentHandler( "com.sun.star.comp.report.ExportDocumentHandler" );
XMLFilter::setSourceDocument(Document);
}
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index b949ece..b7ff37a 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -58,8 +58,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.Axis" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.Axis" );
enum
{
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 73d249b..db85d75 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -31,15 +31,11 @@ using ::rtl::OUString;
namespace
{
-static const ::rtl::OUString lcl_aServiceNameCartesian2d(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CartesianCoordinateSystem2d" ));
-static const ::rtl::OUString lcl_aServiceNameCartesian3d(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CartesianCoordinateSystem3d" ));
-
-static const ::rtl::OUString lcl_aImplementationNameCartesian2d(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.CartesianCoordinateSystem2d" ));
-static const ::rtl::OUString lcl_aImplementationNameCartesian3d(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.CartesianCoordinateSystem3d" ));
+static const OUString lcl_aServiceNameCartesian2d( "com.sun.star.chart2.CartesianCoordinateSystem2d" );
+static const OUString lcl_aServiceNameCartesian3d( "com.sun.star.chart2.CartesianCoordinateSystem3d" );
+
+static const OUString lcl_aImplementationNameCartesian2d( "com.sun.star.comp.chart2.CartesianCoordinateSystem2d" );
+static const OUString lcl_aImplementationNameCartesian3d( "com.sun.star.comp.chart2.CartesianCoordinateSystem3d" );
}
namespace chart
@@ -62,13 +58,13 @@ CartesianCoordinateSystem::~CartesianCoordinateSystem()
{}
// ____ XCoordinateSystem ____
-::rtl::OUString SAL_CALL CartesianCoordinateSystem::getCoordinateSystemType()
+OUString SAL_CALL CartesianCoordinateSystem::getCoordinateSystemType()
throw (RuntimeException)
{
return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
}
-::rtl::OUString SAL_CALL CartesianCoordinateSystem::getViewServiceName()
+OUString SAL_CALL CartesianCoordinateSystem::getViewServiceName()
throw (RuntimeException)
{
return CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME;
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 743e248..c53ac36 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -76,9 +76,9 @@ using namespace ::chart::CloneHelper;
namespace
{
const OUString lcl_aGDIMetaFileMIMEType(
- RTL_CONSTASCII_USTRINGPARAM("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\""));
+ "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"");
const OUString lcl_aGDIMetaFileMIMETypeHighContrast(
- RTL_CONSTASCII_USTRINGPARAM("application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\""));
+ "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"");
} // anonymous namespace
@@ -462,9 +462,9 @@ uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController()
{
LifeTimeGuard aGuard(m_aLifeTimeManager);
if(!aGuard.startApiCall())
- throw lang::DisposedException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "getCurrentController was called on an already disposed or closed model" ) )
- , static_cast< ::cppu::OWeakObject* >(this));
+ throw lang::DisposedException(
+ "getCurrentController was called on an already disposed or closed model",
+ static_cast< ::cppu::OWeakObject* >(this) );
return impl_getCurrentController();
}
@@ -474,15 +474,15 @@ void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XCo
{
LifeTimeGuard aGuard(m_aLifeTimeManager);
if(!aGuard.startApiCall())
- throw lang::DisposedException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "setCurrentController was called on an already disposed or closed model" ) )
- , static_cast< ::cppu::OWeakObject* >(this));
+ throw lang::DisposedException(
+ "setCurrentController was called on an already disposed or closed model",
+ static_cast< ::cppu::OWeakObject* >(this) );
//OSL_ENSURE( impl_isControllerConnected(xController), "setCurrentController is called with a Controller which is not connected" );
if(!impl_isControllerConnected(xController))
- throw container::NoSuchElementException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "setCurrentController is called with a Controller which is not connected" ) )
- , static_cast< ::cppu::OWeakObject* >(this));
+ throw container::NoSuchElementException(
+ "setCurrentController is called with a Controller which is not connected",
+ static_cast< ::cppu::OWeakObject* >(this) );
m_xCurrentController = xController;
@@ -493,9 +493,9 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr
{
LifeTimeGuard aGuard(m_aLifeTimeManager);
if(!aGuard.startApiCall())
- throw lang::DisposedException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "getCurrentSelection was called on an already disposed or closed model" ) )
- , static_cast< ::cppu::OWeakObject* >(this));
+ throw lang::DisposedException(
+ "getCurrentSelection was called on an already disposed or closed model",
+ static_cast< ::cppu::OWeakObject* >(this) );
uno::Reference< uno::XInterface > xReturn;
@@ -628,9 +628,8 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership )
//check whether we self can close
{
util::CloseVetoException aVetoException = util::CloseVetoException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "the model itself could not be closed" ) )
- , static_cast< ::cppu::OWeakObject* >(this));
+ "the model itself could not be closed",
+ static_cast< ::cppu::OWeakObject* >(this) );
if( m_aLifeTimeManager.g_close_isNeedToCancelLongLastingCalls( bDeliverOwnership, aVetoException ) )
{
@@ -753,7 +752,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
//init internal dataprovider
{
uno::Sequence< uno::Any > aArgs(1);
- beans::NamedValue aParam(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDefaultData")),uno::makeAny(sal_True));
+ beans::NamedValue aParam( "CreateDefaultData" ,uno::makeAny(sal_True) );
aArgs[0] <<= aParam;
xIni->initialize(aArgs);
}
@@ -763,14 +762,20 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
OUString( "CellRangeRepresentation" ), -1,
uno::makeAny( OUString("all") ), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )), -1,
- uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
+ "HasCategories",
+ -1,
+ uno::makeAny( true ),
+ beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstCellAsLabel" )), -1,
- uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
+ "FirstCellAsLabel",
+ -1,
+ uno::makeAny( true ),
+ beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), -1,
- uno::makeAny( ::com::sun::star::chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
+ "DataRowSource",
+ -1,
+ uno::makeAny( ::com::sun::star::chart::ChartDataRowSource_COLUMNS ),
+ beans::PropertyState_DIRECT_VALUE );
xDataSource = m_xInternalDataProvider->createDataSource( aArgs );
}
}
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index e0bf130..f2b5e70 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -148,7 +148,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
// find FilterName in MediaDescriptor
OUString aFilterName(
- lcl_getProperty< OUString >( rMediaDescriptor, OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ))));
+ lcl_getProperty< OUString >( rMediaDescriptor, "FilterName" ) );
// if FilterName was found, get Filter from factory
if( !aFilterName.isEmpty() )
@@ -166,7 +166,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
(aFilterProps >>= aProps))
{
OUString aFilterServiceName(
- lcl_getProperty< OUString >( aProps, OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterService" ))));
+ lcl_getProperty< OUString >( aProps, "FilterService" ) );
if( !aFilterServiceName.isEmpty())
{
@@ -376,7 +376,8 @@ void ChartModel::impl_store(
apphelper::MediaDescriptorHelper aMDHelper(rMediaDescriptor);
try
{
- xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SavedObject" )),
+ xPropSet->setPropertyValue(
+ "SavedObject",
uno::makeAny( aMDHelper.HierarchicalDocumentName ) );
}
catch ( const uno::Exception& )
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 77e009b..b810fe1 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -42,8 +42,7 @@ using ::rtl::OUString;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.GridProperties" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.GridProperties" );
enum
{
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 353d1e9..5edead8 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -48,8 +48,7 @@ using ::com::sun::star::beans::Property;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.Legend" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.Legend" );
enum
{
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 83a4c8e..050bbc0 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -40,8 +40,7 @@ using ::osl::MutexGuard;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.PageBackground" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.PageBackground" );
struct StaticPageBackgroundDefaults_Initializer
{
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index d82b093..df77dd7 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -31,15 +31,11 @@ using ::rtl::OUString;
namespace
{
-static const ::rtl::OUString lcl_aServiceNamePolar2d(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PolarCoordinateSystem2d" ));
-static const ::rtl::OUString lcl_aServiceNamePolar3d(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PolarCoordinateSystem3d" ));
-
-static const ::rtl::OUString lcl_aImplementationNamePolar2d(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.PolarCoordinateSystem2d" ));
-static const ::rtl::OUString lcl_aImplementationNamePolar3d(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.PolarCoordinateSystem3d" ));
+static const OUString lcl_aServiceNamePolar2d( "com.sun.star.chart2.PolarCoordinateSystem2d" );
+static const OUString lcl_aServiceNamePolar3d( "com.sun.star.chart2.PolarCoordinateSystem3d" );
+
+static const OUString lcl_aImplementationNamePolar2d( "com.sun.star.comp.chart2.PolarCoordinateSystem2d" );
+static const OUString lcl_aImplementationNamePolar3d( "com.sun.star.comp.chart2.PolarCoordinateSystem3d" );
}
namespace chart
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index f0d440f..ce97bd7 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -44,8 +44,7 @@ using ::osl::MutexGuard;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.StockBar" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.StockBar" );
struct StaticStockBarInfoHelper_Initializer
{
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 8295a39..c9ed149 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -46,8 +46,7 @@ using ::osl::MutexGuard;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.Title" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.Title" );
enum
{
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index 4947f25..ab4570b 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -46,8 +46,7 @@ using ::osl::MutexGuard;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.Wall" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.Wall" );
struct StaticWallDefaults_Initializer
{
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 695d662..27fccbb 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -41,8 +41,7 @@ using ::osl::MutexGuard;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.AreaChartTypeTemplate" );
enum
{
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 7f936b4..260b12e 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -41,8 +41,7 @@ using ::rtl::OUString;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BarChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.BarChartTypeTemplate" );
enum
{
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 79fef5d..e841a61 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -45,8 +45,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.BubbleChartTypeTemplate" );
void lcl_AddPropertiesToVector(
::std::vector< Property > & /*rOutProperties*/ )
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 28f9565..15028af 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -47,8 +47,7 @@ using ::osl::MutexGuard;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnLineChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.ColumnLineChartTypeTemplate" );
enum
{
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 5f264be..c4e3068 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -44,8 +44,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.LineChartTypeTemplate" );
enum
{
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index f7205f1..98bf625 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -39,8 +39,7 @@ using ::osl::MutexGuard;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.NetChartTypeTemplate" );
} // anonymous namespace
namespace chart
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 36c727a..ebf2c69 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -50,8 +50,7 @@ using ::osl::MutexGuard;
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.PieChartTypeTemplate" );
enum
{
@@ -469,7 +468,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
sal_Int32 nOuterSeriesIndex = 0; //@todo in future this will depend on Orientation of the radius axis scale
if( nSeriesIndex == nOuterSeriesIndex )
{
- const OUString aOffsetPropName( RTL_CONSTASCII_USTRINGPARAM("Offset"));
+ const OUString aOffsetPropName( "Offset" );
// get offset mode
chart2::PieChartOffsetMode ePieOffsetMode;
this->getFastPropertyValue( PROP_PIE_TEMPLATE_OFFSET_MODE ) >>= ePieOffsetMode;
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 57a48eb..e79d004 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -46,8 +46,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.ScatterChartTypeTemplate" );
enum
{
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index b203abd..951aba4 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -53,8 +53,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.StockChartTypeTemplate" ));
+static const OUString lcl_aServiceName( "com.sun.star.chart2.StockChartTypeTemplate" );
enum
{
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 6426170..898699d 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 6167490..f56ce50 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 ca39c3f9..f9a8b64 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 2509ba1..262e6fe 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 b9515b2..3e9a3d7 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 4c9b403..6479040 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 ae00aac..b777d7f 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 b37b114..918c73c 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 30d6ee5..a6f4376 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 4f63a5b..f039aa6 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 b64b02c..8d811ae 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 16a57e8..81941a6 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 dacbd2d..ef2c493 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 f93d9b0..53883ae 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 f11b994..04ce78c 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 4fe74ef..59c2675 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
{
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index 3fcab69..2839c4d 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -25,10 +25,8 @@
namespace
{
-static const ::rtl::OUString lcl_aServiceName_DateScaling(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DateScaling" ));
-static const ::rtl::OUString lcl_aServiceName_InverseDateScaling(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.InverseDateScaling" ));
+static const OUString lcl_aServiceName_DateScaling( "com.sun.star.chart2.DateScaling" );
+static const OUString lcl_aServiceName_InverseDateScaling( "com.sun.star.chart2.InverseDateScaling" );
static const double lcl_fNumberOfMonths = 12.0;//todo: this needs to be offered by basic tools Date class if it should be more generic
}
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index ad1a164..98ad906 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -250,8 +250,9 @@ void CandleStickChart::createShapes()
//create min-max line
if( isValidPosition(aPosMiddleMinimum) && isValidPosition(aPosMiddleMaximum) )
{
- uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.PolyLineShape" ) ) ), uno::UNO_QUERY );
+ uno::Reference< drawing::XShape > xShape(
+ m_xShapeFactory->createInstance( "com.sun.star.drawing.PolyLineShape" ),
+ uno::UNO_QUERY );
xPointGroupShape_Shapes->add(xShape);
uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
if(xProp.is())
@@ -268,8 +269,9 @@ void CandleStickChart::createShapes()
//create first-last shape
if(bJapaneseStyle && isValidPosition(aPosLeftFirst) && isValidPosition(aPosRightLast) )
{
- uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.RectangleShape" ) ) ), uno::UNO_QUERY );
+ uno::Reference< drawing::XShape > xShape(
+ m_xShapeFactory->createInstance( "com.sun.star.drawing.RectangleShape" ),
+ uno::UNO_QUERY );
xLossGainTarget->add(xShape);
xShape->setPosition( Position3DToAWTPoint( aPosLeftFirst ) );
@@ -309,8 +311,9 @@ void CandleStickChart::createShapes()
if( aPoly.SequenceX.getLength() )
{
- uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.PolyLineShape" ) ) ), uno::UNO_QUERY );
+ uno::Reference< drawing::XShape > xShape(
+ m_xShapeFactory->createInstance( "com.sun.star.drawing.PolyLineShape" ),
+ uno::UNO_QUERY );
xPointGroupShape_Shapes->add(xShape);
uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
if(xProp.is())
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index fdf6a3f..b383142 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -38,7 +38,7 @@ namespace chart
{
ChartItemPool::ChartItemPool():
- SfxItemPool( String( RTL_CONSTASCII_USTRINGPARAM( "ChartItemPool" )), SCHATTR_START, SCHATTR_END, NULL, NULL )
+ SfxItemPool( "ChartItemPool" , SCHATTR_START, SCHATTR_END, NULL, NULL )
{
/**************************************************************************
* PoolDefaults
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index fed30c5..f005938 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -229,10 +229,10 @@ void ChartView::impl_deleteCoordinateSystems()
// datatransfer::XTransferable
namespace
{
-const rtl::OUString lcl_aGDIMetaFileMIMEType(
- RTL_CONSTASCII_USTRINGPARAM("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\""));
-const rtl::OUString lcl_aGDIMetaFileMIMETypeHighContrast(
- RTL_CONSTASCII_USTRINGPARAM("application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\""));
+const OUString lcl_aGDIMetaFileMIMEType(
+ "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
+const OUString lcl_aGDIMetaFileMIMETypeHighContrast(
+ "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
} // anonymous namespace
void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStream
@@ -2986,12 +2986,12 @@ uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (un
{
uno::Sequence< ::rtl::OUString > aServiceNames( 6 );
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DashTable" ) );
- aServiceNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GradientTable" ) );
- aServiceNames[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.HatchTable" ) );
- aServiceNames[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.BitmapTable" ) );
- aServiceNames[4] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TransparencyGradientTable" ) );
- aServiceNames[5] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MarkerTable" ) );
+ aServiceNames[0] = "com.sun.star.drawing.DashTable";
+ aServiceNames[1] = "com.sun.star.drawing.GradientTable";
+ aServiceNames[2] = "com.sun.star.drawing.HatchTable";
+ aServiceNames[3] = "com.sun.star.drawing.BitmapTable";
+ aServiceNames[4] = "com.sun.star.drawing.TransparencyGradientTable";
+ aServiceNames[5] = "com.sun.star.drawing.MarkerTable";
return aServiceNames;
}
diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx
index 2bf6151..0131e06 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -42,9 +42,9 @@ sal_Bool SAL_CALL component_writeInfo(
{
try
{
- OUString aImpl( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+ OUString aImpl( "/" );
aImpl += SampleAddIn::getImplementationName_Static();
- aImpl += OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
+ aImpl += "/UNO/SERVICES";
uno::Reference< registry::XRegistryKey> xNewKey(
reinterpret_cast<registry::XRegistryKey*>( pRegistryKey )->createKey( aImpl ) );
@@ -123,9 +123,9 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
try
{
double fMin(0.0), fMax(0.0);
- uno::Any aAny = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Min" )));
+ uno::Any aAny = xProp->getPropertyValue( "Min" );
aAny >>= fMin;
- aAny = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" )));
+ aAny = xProp->getPropertyValue( "Max" );
aAny >>= fMax;
double fRange = fMax - fMin;
@@ -160,17 +160,17 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
OUString SampleAddIn::getImplementationName_Static()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "SampleAddIn" ));
+ return "SampleAddIn";
}
uno::Sequence< ::rtl::OUString > SampleAddIn::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSeq( 4 );
- aSeq[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisXSupplier" ));
- aSeq[ 1 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisYSupplier" ));
- aSeq[ 2 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.Diagram" ));
- aSeq[ 3 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddIn" ));
+ aSeq[ 0 ] = "com.sun.star.chart.ChartAxisXSupplier";
+ aSeq[ 1 ] = "com.sun.star.chart.ChartAxisYSupplier";
+ aSeq[ 2 ] = "com.sun.star.chart.Diagram";
+ aSeq[ 3 ] = "com.sun.star.chart.SampleAddIn";
return aSeq;
}
@@ -202,10 +202,10 @@ void SAL_CALL SampleAddIn::initialize( const uno::Sequence< uno::Any >& aArgumen
if( xDocProp.is())
{
uno::Any aBaseType;
- aBaseType <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ));
+ aBaseType <<= "com.sun.star.chart.XYDiagram";
try
{
- xDocProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseDiagram" )), aBaseType );
+ xDocProp->setPropertyValue( "BaseDiagram" , aBaseType );
}
catch( ... )
{}
@@ -222,8 +222,8 @@ void SAL_CALL SampleAddIn::initialize( const uno::Sequence< uno::Any >& aArgumen
{
uno::Any aAny;
aAny <<= (sal_Int32)( 0xe0e0f0 );
- xDiaProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
- xLegendProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
+ xDiaProp->setPropertyValue( "FillColor" , aAny );
+ xLegendProp->setPropertyValue( "FillColor" , aAny );
}
}
}
@@ -271,7 +271,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
if( ! mxMyRedLine.is())
{
mxMyRedLine = uno::Reference< drawing::XShape >(
- xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineShape" ))),
+ xFactory->createInstance( "com.sun.star.drawing.LineShape" ),
uno::UNO_QUERY );
xPage->add( mxMyRedLine );
@@ -284,8 +284,8 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
aWidth <<= (sal_Int32)(50); // 0.5 mm
try
{
- xShapeProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aColor );
- xShapeProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aWidth );
+ xShapeProp->setPropertyValue( "LineColor" , aColor );
+ xShapeProp->setPropertyValue( "LineWidth" , aWidth );
}
catch( ... )
{}
@@ -295,12 +295,12 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
if( ! mxMyText.is())
{
mxMyText = uno::Reference< drawing::XShape >(
- xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TextShape" ))),
+ xFactory->createInstance( "com.sun.star.drawing.TextShape" ),
uno::UNO_QUERY );
xPage->add( mxMyText );
// change text
- OUString aText(RTL_CONSTASCII_USTRINGPARAM( "Little Example" ));
+ OUString aText( "Little Example" );
uno::Reference< beans::XPropertySet > xTextProp( mxMyText, uno::UNO_QUERY );
if( xTextProp.is())
{
@@ -308,7 +308,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
aTrueAny <<= (sal_Bool)(sal_True);
try
{
- xTextProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowWidth" )), aTrueAny );
+ xTextProp->setPropertyValue( "TextAutoGrowWidth" , aTrueAny );
}
catch( ... )
{}
@@ -360,7 +360,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
{
uno::Any aAny;
aAny <<= aPtSeq;
- xShapeProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" )), aAny );
+ xShapeProp->setPropertyValue( "PolyPolygon" , aAny );
}
}
if( mxMyText.is())
@@ -393,7 +393,7 @@ void SAL_CALL SampleAddIn::removeRefreshListener( const uno::Reference< util::XR
// XDiagram
OUString SAL_CALL SampleAddIn::getDiagramType() throw( uno::RuntimeException )
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleDiagram" ));
+ return "com.sun.star.chart.SampleDiagram";
}
// the following methods just delegate to the "parent diagram" (which in the future might no longer exist)
@@ -478,7 +478,7 @@ void SAL_CALL SampleAddIn::setPosition( const awt::Point& aPos )
// XShapeDescriptor ( ::XShape ::XDiagram )
rtl::OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException )
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddinShape" ));
+ return "com.sun.star.chart.SampleAddinShape";
}
// XAxisXSupplier
@@ -630,7 +630,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL SampleAddIn::getMinMaxLine()
// XServiceName
OUString SAL_CALL SampleAddIn::getServiceName() throw( uno::RuntimeException )
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddIn" ));
+ return "com.sun.star.chart.SampleAddIn";
}
// XServiceInfo
More information about the Libreoffice-commits
mailing list