From d05287a9f1bd1aa82d4485013248bb24e692c6b6 Mon Sep 17 00:00:00 2001 From: Krisztian Pinter Date: Mon, 18 Feb 2013 18:45:17 +0100 Subject: 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 Tested-by: Michael Stahl --- chart2/source/model/main/Axis.cxx | 3 +- .../model/main/CartesianCoordinateSystem.cxx | 18 +++----- chart2/source/model/main/ChartModel.cxx | 53 ++++++++++++---------- .../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 +- 11 files changed, 52 insertions(+), 61 deletions(-) (limited to 'chart2/source/model/main') diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index b949ece25b14..b7ff37ad9171 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 73d249bac593..db85d75bf644 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 743e248a2b3c..c53ac361d8be 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 e0bf13019595..f2b5e702dacf 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 77e009be2f2c..b810fe19febe 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 353d1e9eeb0c..5edead84c863 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 83a4c8e02ea8..050bbc05590b 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 d82b09369e7c..df77dd7a8e8a 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 f0d440f6f36f..ce97bd7db4b7 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 8295a390926f..c9ed149d4d9f 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 4947f259e180..ab4570be985d 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 { -- cgit