diff options
Diffstat (limited to 'chart2/source/model/template')
49 files changed, 87 insertions, 111 deletions
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index 2a06ac188695..ef0b11485072 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -46,15 +46,15 @@ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL AreaChartType::getChartType() +OUString SAL_CALL AreaChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_AREA; } -uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index dcfffca24506..00a1fc10585f 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -42,7 +42,7 @@ protected: explicit AreaChartType( const AreaChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 27fccbb09058..6bd6e5d89e5e 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -126,7 +125,7 @@ namespace chart AreaChartTypeTemplate::AreaChartTypeTemplate( uno::Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, sal_Int32 nDim /* = 2 */ ) : ChartTypeTemplate( xContext, rServiceName ), @@ -248,9 +247,9 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN // ---------------------------------------- -uno::Sequence< ::rtl::OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static() +uno::Sequence< OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index d7f347b7fcb7..92fd4b86f054 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -38,7 +38,7 @@ public: explicit AreaChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, sal_Int32 nDim = 2 ); virtual ~AreaChartTypeTemplate(); diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index cec160893c6c..3193cf60b35a 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -47,15 +47,15 @@ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL BarChartType::getChartType() +OUString SAL_CALL BarChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_BAR; } -uno::Sequence< ::rtl::OUString > BarChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 649daabbcfe0..3495c6e7560e 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -42,7 +42,7 @@ protected: explicit BarChartType( const BarChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 1c1ec10e069b..3cb469b1c400 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -36,7 +36,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -using ::rtl::OUString; namespace { diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index 68744a4e13af..e8f606169bf7 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -44,7 +44,7 @@ public: explicit BarChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, BarDirection eDirection, sal_Int32 nDim = 2 ); diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index d18219356b6a..dc8302aa6de1 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -158,16 +157,16 @@ Reference< chart2::XCoordinateSystem > SAL_CALL return xResult; } -::rtl::OUString SAL_CALL BubbleChartType::getChartType() +OUString SAL_CALL BubbleChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; } -uno::Sequence< ::rtl::OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() +uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aMandRolesSeq(4); + uno::Sequence< OUString > aMandRolesSeq(4); aMandRolesSeq.realloc( 4 ); aMandRolesSeq[0] = "label"; aMandRolesSeq[1] = "values-x"; @@ -206,9 +205,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS return *StaticBubbleChartTypeInfo::get(); } -uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index e648f1479f79..c3e25e8c145f 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -43,16 +43,16 @@ protected: explicit BubbleChartType( const BubbleChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel() + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index c85b12ee6ba3..3fd97691c2f1 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index 867db887a984..4eca50973328 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -36,7 +36,7 @@ public: explicit BubbleChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName ); + const OUString & rServiceName ); virtual ~BubbleChartTypeTemplate(); /// XServiceInfo declarations diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 8dc2ff9b1742..462da8a22d50 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -34,7 +34,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index d1ccc532ef0e..f5b723ffcca1 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -216,13 +215,13 @@ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL CandleStickChartType::getChartType() +OUString SAL_CALL CandleStickChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; } -uno::Sequence< ::rtl::OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() +uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() throw (uno::RuntimeException) { bool bShowFirst = true; @@ -328,9 +327,9 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( ::property::OPropertySet::setFastPropertyValue_NoBroadcast( nHandle, rValue ); } -uno::Sequence< ::rtl::OUString > CandleStickChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index a05890f19689..75df4c24a8e8 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -42,15 +42,15 @@ protected: explicit CandleStickChartType( const CandleStickChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel() + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index d78d16ed0e89..bf8002dbaa12 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index c153a261a349..96f3b8a64c49 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -66,19 +66,19 @@ protected: // ____ XChartType ____ // still abstract ! implement ! - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel() + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() throw (::com::sun::star::uno::RuntimeException); // ____ XDataSeriesContainer ____ diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index c72abbe06993..187d1c4f2717 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 7858edf87cac..2312dc9a0725 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; @@ -130,7 +129,7 @@ namespace chart ChartTypeTemplate::ChartTypeTemplate( Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName ) : + const OUString & rServiceName ) : m_xContext( xContext ), m_aServiceName( rServiceName ) { @@ -523,7 +522,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram } // ____ XServiceName ____ - ::rtl::OUString SAL_CALL ChartTypeTemplate::getServiceName() + OUString SAL_CALL ChartTypeTemplate::getServiceName() throw (uno::RuntimeException) { return m_aServiceName; diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 5e855b4ec5a6..061647d764ff 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -79,7 +79,7 @@ public: explicit ChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName ); + const OUString & rServiceName ); virtual ~ChartTypeTemplate(); APPHELPER_XSERVICEINFO_DECL() @@ -126,7 +126,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); // Methods to overload for automatic creation @@ -265,7 +265,7 @@ protected: ::com::sun::star::chart2::XDataInterpreter > m_xDataInterpreter; private: - const ::rtl::OUString m_aServiceName; + const OUString m_aServiceName; private: /** modifies the given diagram diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 90bf825e42de..0427a844967a 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -148,7 +148,7 @@ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL ColumnChartType::getChartType() +OUString SAL_CALL ColumnChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; @@ -178,9 +178,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS } -uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 80f9255000c6..068260d3b545 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -42,7 +42,7 @@ protected: explicit ColumnChartType( const ColumnChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 3355d9ee33a5..1013c0ef96e1 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; @@ -131,7 +130,7 @@ namespace chart ColumnLineChartTypeTemplate::ColumnLineChartTypeTemplate( Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, sal_Int32 nNumberOfLines ) : ChartTypeTemplate( xContext, rServiceName ), @@ -419,9 +418,9 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter // ---------------------------------------- -uno::Sequence< ::rtl::OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static() +uno::Sequence< OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index 14d7a2194e5e..2363a6140b1d 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -38,7 +38,7 @@ public: explicit ColumnLineChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, sal_Int32 nNumberOfLines ); virtual ~ColumnLineChartTypeTemplate(); diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 51fbaf39690f..a111954387b2 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -36,7 +36,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 696e2a1b1c99..5078346a6cc0 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -39,7 +39,6 @@ using namespace ::chart::ContainerHelper; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; #if OSL_DEBUG_LEVEL > 1 namespace diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index f250fd970696..bba38e48e7e9 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -44,19 +44,19 @@ public: APPHELPER_XSERVICEINFO_DECL() // convenience methods - static ::rtl::OUString GetRole( + static OUString GetRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xSeq ); static void SetRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xSeq, - const ::rtl::OUString & rRole ); + const OUString & rRole ); static ::com::sun::star::uno::Any GetProperty( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aArguments, - const ::rtl::OUString & rName ); + const OUString & rName ); static bool HasCategories( const ::com::sun::star::uno::Sequence< diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 4c267fe40679..4a71becbcaa3 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -62,15 +61,15 @@ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL FilledNetChartType::getChartType() +OUString SAL_CALL FilledNetChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; } -uno::Sequence< ::rtl::OUString > FilledNetChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > FilledNetChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 4a52aee0c929..0c5aeac28d0d 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -41,7 +41,7 @@ protected: explicit FilledNetChartType( const FilledNetChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index d35dde6fe776..e7616c76a76e 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -159,7 +158,7 @@ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL LineChartType::getChartType() +OUString SAL_CALL LineChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_LINE; @@ -189,9 +188,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySet return *StaticLineChartTypeInfo::get(); } -uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > LineChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_LINE; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index df54fb70a974..2df426d13ca0 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -43,7 +43,7 @@ protected: explicit LineChartType( const LineChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index a0d370d36f7d..1b9d635c296d 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; @@ -148,7 +147,7 @@ namespace chart LineChartTypeTemplate::LineChartTypeTemplate( uno::Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, bool bSymbols, bool bHasLines /* = true */, diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index 66dda4a24ccd..b0ed7dd2d7b2 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -38,7 +38,7 @@ public: explicit LineChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, bool bSymbols, bool bHasLines = true, diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index ca3ddc545056..fd593daa6b51 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -168,15 +167,15 @@ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL NetChartType::getChartType() +OUString SAL_CALL NetChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_NET; } -uno::Sequence< ::rtl::OUString > NetChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > NetChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_NET; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 210df23e8d91..e4b1a25f2d9d 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -71,7 +71,7 @@ protected: explicit NetChartType( const NetChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 13f01f50fe9b..1672ba23f907 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; @@ -46,7 +45,7 @@ namespace chart NetChartTypeTemplate::NetChartTypeTemplate( Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, bool bSymbols, bool bHasLines , diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index 683950f36cd6..2462f200a6f0 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -31,7 +31,7 @@ public: explicit NetChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, bool bSymbols, bool bHasLines = true, diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index b54d9769d41f..99d01bc8e938 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -152,7 +151,7 @@ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL PieChartType::getChartType() +OUString SAL_CALL PieChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_PIE; @@ -220,9 +219,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetI return *StaticPieChartTypeInfo::get(); } -uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > PieChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_PIE; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index a737ae12ecbf..962da335231f 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -43,7 +43,7 @@ protected: explicit PieChartType( const PieChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index ebf2c690568f..2fe296658cdb 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -159,7 +158,7 @@ namespace chart PieChartTypeTemplate::PieChartTypeTemplate( uno::Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, chart2::PieChartOffsetMode eMode, bool bRings /* = false */, sal_Int32 nDim /* = 2 */ ) : @@ -620,9 +619,9 @@ void PieChartTypeTemplate::adaptDiagram( const uno::Reference< chart2::XDiagram // ---------------------------------------- -uno::Sequence< ::rtl::OUString > PieChartTypeTemplate::getSupportedServiceNames_Static() +uno::Sequence< OUString > PieChartTypeTemplate::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index f0a876c58ac2..697a00f8ab6c 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -38,7 +38,7 @@ public: PieChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, ::com::sun::star::chart2::PieChartOffsetMode eMode, bool bRings = false, sal_Int32 nDim = 2 ); diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 20e89cb15ff7..d4dd2014d8a4 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -208,26 +207,26 @@ Reference< chart2::XCoordinateSystem > SAL_CALL return xResult; } -::rtl::OUString SAL_CALL ScatterChartType::getChartType() +OUString SAL_CALL ScatterChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; } -uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() +uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aMandRolesSeq(3); + uno::Sequence< OUString > aMandRolesSeq(3); aMandRolesSeq[0] = "label"; aMandRolesSeq[1] = "values-x"; aMandRolesSeq[2] = "values-y"; return aMandRolesSeq; } -uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles() +uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles() throw (uno::RuntimeException) { - return uno::Sequence< ::rtl::OUString >(); + return uno::Sequence< OUString >(); } @@ -255,9 +254,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getProperty return *StaticScatterChartTypeInfo::get(); } -uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > ScatterChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 8e0ea71642a7..e39265e9497c 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -47,12 +47,12 @@ protected: explicit ScatterChartType( const ScatterChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 7496a5314ba2..da73968d3a15 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index ff26084d9b12..ef7afc26a7b2 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -37,7 +37,7 @@ public: explicit ScatterChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, bool bSymbols, bool bHasLines = true, sal_Int32 nDim = 2 ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 951aba452e20..8fb076771ea8 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; @@ -162,7 +161,7 @@ namespace chart StockChartTypeTemplate::StockChartTypeTemplate( uno::Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StockVariant eVariant, bool bJapaneseStyle ) : ChartTypeTemplate( xContext, rServiceName ), diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 26b0f217e951..6c203d92d467 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -52,7 +52,7 @@ public: explicit StockChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StockVariant eVariant, bool bJapaneseStyle ); virtual ~StockChartTypeTemplate(); diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 0cafbd98a14a..ba55fbd2f79d 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -37,7 +37,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using namespace ::chart::ContainerHelper; namespace chart diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 48d742421d83..3876d2a29d9c 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -34,7 +34,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { |