diff options
Diffstat (limited to 'chart2/source/model')
76 files changed, 171 insertions, 209 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 2555b25395e8..7ba2ca95da54 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -57,7 +57,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::osl::MutexGuard; // ---------------------------------------- @@ -90,7 +89,7 @@ LOCAL_CONST_STR( sXML_import_chart_oasis_meta_service, "com.sun.star.comp.C uno::Reference< embed::XStorage > lcl_getWriteStorage( const Sequence< beans::PropertyValue >& rMediaDescriptor, - const uno::Reference< uno::XComponentContext >& xContext,const ::rtl::OUString& _sMediaType) + const uno::Reference< uno::XComponentContext >& xContext,const OUString& _sMediaType) { uno::Reference< embed::XStorage > xStorage; try @@ -793,7 +792,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes rOutOASIS = aMDHelper.FilterName == "chart8"; } // ----------------------------------------------------------------------------- -::rtl::OUString XMLFilter::getMediaType(bool _bOasis) +OUString XMLFilter::getMediaType(bool _bOasis) { return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART; } @@ -809,7 +808,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue > rOutOASIS = aMDHelper.FilterName == "StarOffice XML (Base) Report Chart"; } // ----------------------------------------------------------------------------- -::rtl::OUString XMLReportFilterHelper::getMediaType(bool ) +OUString XMLReportFilterHelper::getMediaType(bool ) { return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART; } diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index c702c6db366b..cfa3e66c4ce5 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -37,9 +37,9 @@ public: virtual ~CartesianCoordinateSystem(); // ____ XCoordinateSystem ____ - virtual ::rtl::OUString SAL_CALL getCoordinateSystemType() + virtual OUString SAL_CALL getCoordinateSystemType() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getViewServiceName() + virtual OUString SAL_CALL getViewServiceName() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 6035d5ddc899..63fc3a7643d0 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -50,18 +50,18 @@ public: protected: // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< - ::rtl::OUString > SAL_CALL getAvailableServiceNames() + OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // ____ XChartTypeManager ____ diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index 1efe95e31ea7..f69d2b550306 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -37,9 +37,9 @@ public: virtual ~PolarCoordinateSystem(); // ____ XCoordinateSystem ____ - virtual ::rtl::OUString SAL_CALL getCoordinateSystemType() + virtual OUString SAL_CALL getCoordinateSystemType() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getViewServiceName() + virtual OUString SAL_CALL getViewServiceName() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 76f0ef19553e..ad8e32f35f19 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -91,10 +91,10 @@ protected: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - inline ::rtl::OUString getDocumentHandler() const { return m_sDocumentHandler; } - inline void setDocumentHandler(const ::rtl::OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } + inline OUString getDocumentHandler() const { return m_sDocumentHandler; } + inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } - virtual ::rtl::OUString getMediaType(bool _bOasis); + virtual OUString getMediaType(bool _bOasis); /** fills the oasis flag only when a filtername was set * @@ -114,8 +114,8 @@ private: ::com::sun::star::beans::PropertyValue > & aMediaDescriptor ); /// @return a warning code, or 0 for successful operation sal_Int32 impl_ImportStream( - const ::rtl::OUString & rStreamName, - const ::rtl::OUString & rServiceName, + const OUString & rStreamName, + const OUString & rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & xStorage, const ::com::sun::star::uno::Reference< @@ -134,8 +134,8 @@ private: ::com::sun::star::beans::PropertyValue > & aMediaDescriptor ); /// @return a warning code, or 0 for successful operation sal_Int32 impl_ExportStream( - const ::rtl::OUString & rStreamName, - const ::rtl::OUString & rServiceName, + const OUString & rStreamName, + const OUString & rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & xStorage, const ::com::sun::star::uno::Reference< @@ -152,7 +152,7 @@ private: ::com::sun::star::lang::XComponent > m_xTargetDoc; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSourceDoc; - ::rtl::OUString m_sDocumentHandler; // when set it will be set as doc handler + OUString m_sDocumentHandler; // when set it will be set as doc handler volatile bool m_bCancelOperation; ::osl::Mutex m_aMutex; @@ -179,7 +179,7 @@ public: return OUString( "com.sun.star.comp.chart2.report.XMLFilter" ); } protected: - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) { @@ -207,7 +207,7 @@ protected: XMLFilter::setSourceDocument(Document); } - virtual ::rtl::OUString getMediaType(bool _bOasis); + virtual OUString getMediaType(bool _bOasis); }; } // namespace chart diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index b7ff37ad9171..59e3d126ea2a 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -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/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 048f38d4e579..7067a4f33726 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -39,7 +39,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; namespace diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index db85d75bf644..e64a1ea40e13 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 0f15ee72ac11..e2157c4f2daa 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; using namespace ::com::sun::star; @@ -203,12 +202,12 @@ void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ ) // private methods //----------------------------------------------------------------- -::rtl::OUString ChartModel::impl_g_getLocation() +OUString ChartModel::impl_g_getLocation() { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) - return ::rtl::OUString(); //behave passive if already disposed or closed or throw exception @todo? + return OUString(); //behave passive if already disposed or closed or throw exception @todo? //mutex is acquired return m_aResource; } @@ -310,9 +309,9 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME) -uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static() +uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 3 ); + uno::Sequence< OUString > aSNS( 3 ); aSNS[0] = CHART_MODEL_SERVICE_NAME; aSNS[1] = "com.sun.star.document.OfficeDocument"; aSNS[2] = "com.sun.star.chart.ChartDocument"; @@ -324,7 +323,7 @@ uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static() // frame::XModel (required interface) //----------------------------------------------------------------- -sal_Bool SAL_CALL ChartModel::attachResource( const ::rtl::OUString& rURL +sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) throw(uno::RuntimeException) { @@ -350,7 +349,7 @@ sal_Bool SAL_CALL ChartModel::attachResource( const ::rtl::OUString& rURL return sal_True; } -::rtl::OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException) +OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException) { return impl_g_getLocation(); } @@ -508,7 +507,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr if ( xSelectionSupl.is() ) { uno::Any aSel = xSelectionSupl->getSelection(); - rtl::OUString aObjectCID; + OUString aObjectCID; if( aSel >>= aObjectCID ) xReturn.set( ObjectIdentifier::getObjectPropertySet( aObjectCID, Reference< XChartDocument >(this))); } @@ -1181,8 +1180,8 @@ enum eServiceType SERVICE_NAMESPACE_MAP }; -typedef ::std::map< ::rtl::OUString, enum eServiceType > tServiceNameMap; -typedef ::comphelper::MakeMap< ::rtl::OUString, enum eServiceType > tMakeServiceNameMap; +typedef ::std::map< OUString, enum eServiceType > tServiceNameMap; +typedef ::comphelper::MakeMap< OUString, enum eServiceType > tMakeServiceNameMap; tServiceNameMap & lcl_getStaticServiceNameMap() { @@ -1257,7 +1256,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments( Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aResult; + uno::Sequence< OUString > aResult; if( m_xOldModelAgg.is()) { @@ -1347,7 +1346,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM } //XDumper -rtl::OUString SAL_CALL ChartModel::dump() +OUString SAL_CALL ChartModel::dump() throw (uno::RuntimeException) { uno::Reference< qa::XDumper > xDumper( @@ -1355,7 +1354,7 @@ rtl::OUString SAL_CALL ChartModel::dump() if (xDumper.is()) return xDumper->dump(); - return rtl::OUString(); + return OUString(); } } // namespace chart diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index 1af220bce72b..f7d81b8dff92 100644 --- a/chart2/source/model/main/ChartModel.hxx +++ b/chart2/source/model/main/ChartModel.hxx @@ -122,7 +122,7 @@ private: sal_Int32 m_nInLoad; sal_Bool volatile m_bUpdateNotificationsPending; - ::rtl::OUString m_aResource; + OUString m_aResource; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aMediaDescriptor; ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocumentProperties; ::rtl::Reference< UndoManager > m_pUndoManager; @@ -174,7 +174,7 @@ private: private: //private methods - ::rtl::OUString impl_g_getLocation(); + OUString impl_g_getLocation(); sal_Bool impl_isControllerConnected( const com::sun::star::uno::Reference< @@ -248,12 +248,12 @@ public: //----------------------------------------------------------------- virtual sal_Bool SAL_CALL - attachResource( const ::rtl::OUString& rURL + attachResource( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getURL() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL @@ -346,7 +346,7 @@ public: virtual sal_Bool SAL_CALL hasLocation() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL @@ -357,14 +357,14 @@ public: , ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - storeAsURL( const ::rtl::OUString& rURL + storeAsURL( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::io::IOException , ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - storeToURL( const ::rtl::OUString& rURL + storeToURL( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::io::IOException @@ -468,7 +468,7 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getUsedRangeRepresentations() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData() throw (::com::sun::star::uno::RuntimeException); @@ -534,13 +534,13 @@ public: // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstance( const ::rtl::OUString& aServiceSpecifier ) + createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier + createInstanceWithArguments( const OUString& ServiceSpecifier , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // ____ XStorageBasedDocument ____ @@ -602,7 +602,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // XDumper - virtual rtl::OUString SAL_CALL dump() + virtual OUString SAL_CALL dump() throw (com::sun::star::uno::RuntimeException); }; diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 2bc5cde61bf1..2984fdb8c944 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::osl::MutexGuard; namespace @@ -223,7 +222,7 @@ sal_Bool SAL_CALL ChartModel::hasLocation() return !m_aResource.isEmpty(); } -::rtl::OUString SAL_CALL ChartModel::getLocation() +OUString SAL_CALL ChartModel::getLocation() throw(uno::RuntimeException) { return impl_g_getLocation(); @@ -244,7 +243,7 @@ void SAL_CALL ChartModel::store() if(!aGuard.startApiCall(sal_True)) //start LongLastingCall return; //behave passive if already disposed or closed or throw exception @todo? - ::rtl::OUString aLocation = m_aResource; + OUString aLocation = m_aResource; if( aLocation.isEmpty() ) throw io::IOException( "no location specified", static_cast< ::cppu::OWeakObject* >(this)); @@ -259,7 +258,7 @@ void SAL_CALL ChartModel::store() } void SAL_CALL ChartModel::storeAsURL( - const ::rtl::OUString& rURL, + const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) throw(io::IOException, uno::RuntimeException) { @@ -285,7 +284,7 @@ void SAL_CALL ChartModel::storeAsURL( } void SAL_CALL ChartModel::storeToURL( - const ::rtl::OUString& rURL, + const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) throw(io::IOException, uno::RuntimeException) @@ -618,7 +617,7 @@ void ChartModel::impl_loadGraphics( if( xGraphicsStorage.is() ) { - const uno::Sequence< ::rtl::OUString > aElementNames( + const uno::Sequence< OUString > aElementNames( xGraphicsStorage->getElementNames() ); for( int i = 0; i < aElementNames.getLength(); ++i ) diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 2537dba9f869..bcd7c4b02b75 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -37,7 +37,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; // ____________________________________________________________ diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index fb11ece86a93..de4f0b6e62f4 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -77,7 +77,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "TransparencyGradientName", PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -85,7 +85,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "GradientName", PROP_DATAPOINT_GRADIENT_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -101,7 +101,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "HatchName", PROP_DATAPOINT_HATCH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -109,7 +109,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "FillBitmapName", PROP_DATAPOINT_FILL_BITMAP_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -144,7 +144,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "BorderDashName", PROP_DATAPOINT_BORDER_DASH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( @@ -177,7 +177,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "LineDashName", LineProperties::PROP_LINE_DASH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); @@ -277,7 +277,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "LabelSeparator", PROP_DATAPOINT_LABEL_SEPARATOR, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -406,7 +406,7 @@ void DataPointProperties::AddDefaultsToMap( sal_False // ShowLegendSymbol )); - PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " ); + PropertyHelper::setPropertyValueDefault< OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " ); //@todo maybe choose a different one here -> should be dynamically that of the attached axis PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_X, uno::Reference< beans::XPropertySet >()); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index c292e1822a5f..e6632ec7e235 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -38,7 +38,6 @@ using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; // ---------------------------------------- diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index 74ca6183f34c..5a270fcbddac 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 1d0295a6c8a6..ec1637ba1f51 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -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/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index e21beed575df..9505b33d8d0e 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.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; @@ -127,14 +126,14 @@ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone() } // ____ XFormattedString ____ -::rtl::OUString SAL_CALL FormattedString::getString() +OUString SAL_CALL FormattedString::getString() throw (uno::RuntimeException) { MutexGuard aGuard( GetMutex()); return m_aString; } -void SAL_CALL FormattedString::setString( const ::rtl::OUString& String ) +void SAL_CALL FormattedString::setString( const OUString& String ) throw (uno::RuntimeException) { { diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 4f88a7af8996..c88fff0b21f1 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -68,9 +68,9 @@ protected: explicit FormattedString( const FormattedString & rOther ); // ____ XFormattedString ____ - virtual ::rtl::OUString SAL_CALL getString() + virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& String ) + virtual void SAL_CALL setString( const OUString& String ) throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ @@ -114,7 +114,7 @@ protected: void fireModifyEvent(); private: - ::rtl::OUString m_aString; + OUString m_aString; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index b810fe19febe..fd713a9aa5f2 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -35,7 +35,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; // ____________________________________________________________ diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 5edead84c863..2173f933c7be 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -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/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 050bbc05590b..5728f9c26fef 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -220,9 +220,9 @@ void PageBackground::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > PageBackground::getSupportedServiceNames_Static() +uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = "com.sun.star.chart2.PageBackground"; aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index df77dd7a8e8a..f50c7b31cd7f 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -58,13 +57,13 @@ PolarCoordinateSystem::~PolarCoordinateSystem() {} // ____ XCoordinateSystem ____ -::rtl::OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() +OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() throw (RuntimeException) { return CHART2_COOSYSTEM_POLAR_SERVICE_NAME; } -::rtl::OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() +OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() throw (RuntimeException) { return CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME; diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index ce97bd7db4b7..02d63f9bc7ef 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -232,9 +232,9 @@ void StockBar::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > StockBar::getSupportedServiceNames_Static() +uno::Sequence< OUString > StockBar::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = "com.sun.star.chart2.StockBar"; aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index c9ed149d4d9f..bd127e899ed9 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -373,9 +373,9 @@ void Title::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > Title::getSupportedServiceNames_Static() +uno::Sequence< OUString > Title::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 4 ); + uno::Sequence< OUString > aServices( 4 ); aServices[ 0 ] = "com.sun.star.chart2.Title"; aServices[ 1 ] = "com.sun.star.style.ParagraphProperties"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 82aae3668aea..4809510fbd45 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -143,7 +143,7 @@ namespace chart void UndoManager_Impl::checkDisposed_lck() { if ( m_bDisposed ) - throw DisposedException( ::rtl::OUString(), getThis() ); + throw DisposedException( OUString(), getThis() ); } //============================================================================================================== @@ -240,7 +240,7 @@ namespace chart } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL UndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard ); @@ -300,28 +300,28 @@ namespace chart } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentUndoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentRedoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllUndoActionTitles(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllRedoActionTitles(); @@ -395,7 +395,7 @@ namespace chart { UndoManagerMethodGuard aGuard( *m_pImpl ); (void)i_parent; - throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() ); + throw NoSupportException( OUString(), m_pImpl->getThis() ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx index c261b6c85024..2a1cf3035182 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -58,7 +58,7 @@ namespace chart void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -66,10 +66,10 @@ namespace chart virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index ab4570be985d..cc80cf6351a0 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -223,9 +223,9 @@ void Wall::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > Wall::getSupportedServiceNames_Static() +uno::Sequence< OUString > Wall::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = "com.sun.star.chart2.Wall"; aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; 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 { |