diff options
Diffstat (limited to 'chart2/source/controller')
118 files changed, 347 insertions, 391 deletions
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx index 8dae44486eae..e738c75ab10a 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx @@ -34,10 +34,10 @@ public: virtual ~AccStatisticsObject(); // ________ XAccessibleContext ________ - virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); // ________ XServiceInfo ________ - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); }; } // accessibility diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index 4d58186cde4f..21d22b3fae05 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -85,17 +85,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleContext ________ - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText() + virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText() + virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException); // the following interface is implemented in AccessibleBase, however it is @@ -114,7 +114,7 @@ public: virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException); // ________ XServiceInfo ________ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index a2e206a49929..d6827e30fe80 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -50,7 +50,7 @@ public: virtual ~AccessibleChartShape(); // ________ XServiceInfo ________ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleContext ________ @@ -62,9 +62,9 @@ public: ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleComponent ________ @@ -81,9 +81,9 @@ public: // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText() + virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText() + virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 946cc3735e75..3b1be85ad49b 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -48,7 +48,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::WeakReference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using osl::MutexGuard; //............................................................................. diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 039b38520cb2..6a2b04235f5c 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 8fec5d533bf8..feac067d1f62 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -66,7 +66,7 @@ public: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XComponent ____ diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 65ef53cac25c..f6290969a2a9 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -102,7 +102,7 @@ public: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XNumberFormatsSupplier ____ diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 13d5316f5c67..f892059f2ea9 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { @@ -233,7 +232,7 @@ awt::Size Chart2ModelContact::GetLegendSize() const if( pProvider ) { uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( m_xChartModel ) ); - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) ); aSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); } return aSize; @@ -246,7 +245,7 @@ awt::Point Chart2ModelContact::GetLegendPosition() const if( pProvider ) { uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( m_xChartModel ) ); - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) ); aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) ); } return aPoint; @@ -259,7 +258,7 @@ awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference< ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xTitle.is() ) { - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) ); aSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); } return aSize; @@ -272,7 +271,7 @@ awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference< ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xTitle.is() ) { - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) ); aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) ); } return aPoint; @@ -285,7 +284,7 @@ awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference< ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xAxis.is() ) { - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) ); aSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); } return aSize; @@ -298,7 +297,7 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference< ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xAxis.is() ) { - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) ); aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) ); } return aPoint; diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index a56ee6a07d06..86d9128df4d3 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -149,7 +149,7 @@ private: //member mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xChartView; - typedef std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc. + typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc. tTableMap m_aTableMap; }; diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 44e22077c7e9..0ff551e9d61d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -77,17 +77,17 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) + ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) + ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ @@ -100,16 +100,16 @@ protected: double > >& aData ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< - ::rtl::OUString > SAL_CALL getRowDescriptions() + OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aRowDescriptions ) + OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< - ::rtl::OUString > SAL_CALL getColumnDescriptions() + OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aColumnDescriptions ) + OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartData (base of XChartDataArray) ____ diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index af34ef0dc924..48c39c180279 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -73,7 +73,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/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index e3dd0f8ca647..09d5596979ed 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -104,14 +104,14 @@ protected: // ____ WrappedPropertySet ____ virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //own methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeries(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index d7013539cdc6..edb3289c1cce 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -74,7 +74,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::com::sun::star::chart::XAxis; using ::osl::MutexGuard; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index ee3a69017618..87323b186689 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -95,7 +95,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // ____ XDiagram ____ - virtual ::rtl::OUString SAL_CALL getDiagramType() + virtual OUString SAL_CALL getDiagramType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) @@ -118,7 +118,7 @@ public: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XAxisSupplier ____ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 96ccd65e3edf..563817814c09 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -50,7 +50,6 @@ using ::osl::MutexGuard; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //----------------------------------------------------------------------------- diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 1aed315740a2..94e05bf431b2 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -74,7 +74,7 @@ public: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XComponent ____ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index d2b072c98874..29ecbf883db7 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -77,33 +77,33 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 9c3d4a23f5a7..34af3c4d89f5 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index f8ca9a575468..5a437115de86 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -74,7 +74,7 @@ protected: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XComponent ____ @@ -93,16 +93,16 @@ protected: throw (::com::sun::star::uno::Exception); // ____ WrappedPropertySet ____ - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index d80169a0a3c6..ed66e266a63f 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -39,7 +39,6 @@ using ::osl::MutexGuard; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index abb5b49ec779..cc63338de0dd 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -76,33 +76,33 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); @@ -111,7 +111,7 @@ private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; - rtl::OUString m_aPropertySetName; + OUString m_aPropertySetName; }; } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index c905e665b442..af7f07e34c33 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -23,7 +23,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using namespace ::com::sun::star; //............................................................................. @@ -72,7 +71,7 @@ WrappedBaseDiagramProperty::~WrappedBaseDiagramProperty() void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - rtl::OUString aBaseDiagram; + OUString aBaseDiagram; if( ! (rOuterValue >>= aBaseDiagram) ) throw lang::IllegalArgumentException( "BaseDiagram properties require type OUString", 0, 0 ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 5fcdf8cde1f2..4bdb59ac315c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -29,7 +29,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart @@ -52,7 +51,7 @@ public: }; WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() - : ::chart::WrappedProperty( "AutomaticPosition" , rtl::OUString() ) + : ::chart::WrappedProperty( "AutomaticPosition" , OUString() ) { } WrappedAutomaticPositionProperty::~WrappedAutomaticPositionProperty() diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 5701dc58b87e..d21f485166fe 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //............................................................................. namespace chart @@ -286,7 +285,7 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue if( bNewValue ) { - rtl::OUString aTitleText; + OUString aTitleText; TitleHelper::createTitle( m_eTitleType, aTitleText , m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 1c82ac132c68..a8923502b4c7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index 54d247f07da9..4f40de00153d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -34,7 +34,7 @@ class ReferenceSizePropertyProvider; class WrappedCharacterHeightProperty_Base : public WrappedProperty { public: - WrappedCharacterHeightProperty_Base( const ::rtl::OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider ); + WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider ); virtual ~WrappedCharacterHeightProperty_Base(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index 6e34e4f7b6d8..5c4765297777 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -31,7 +31,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 67c8f31558fe..77083d950958 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index c2490cd9bd23..e018e72af6f0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -33,8 +33,8 @@ class WrappedBarPositionProperty_Base : public WrappedDefaultProperty { public: WrappedBarPositionProperty_Base( - const ::rtl::OUString& rOuterName - , const ::rtl::OUString& rInnerSequencePropertyName + const OUString& rOuterName + , const OUString& rInnerSequencePropertyName , sal_Int32 nDefaultValue , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedBarPositionProperty_Base(); @@ -53,7 +53,7 @@ protected: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; sal_Int32 m_nDefaultValue; - ::rtl::OUString m_InnerSequencePropertyName; + OUString m_InnerSequencePropertyName; mutable ::com::sun::star::uno::Any m_aOuterValue; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index cc0e6c262587..53ec6a5b08bb 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. namespace chart @@ -105,7 +104,7 @@ Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPr //----------------------------------------------------------------------------- WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( WrappedNumberFormatProperty* pWrappedNumberFormatProperty ) - : WrappedProperty( "LinkNumberFormatToSource", rtl::OUString() ) + : WrappedProperty( "LinkNumberFormatToSource", OUString() ) , m_pWrappedNumberFormatProperty( pWrappedNumberFormatProperty ) { if( m_pWrappedNumberFormatProperty ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 175adf65b8ae..e3ffbea7331e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -31,7 +31,6 @@ using ::com::sun::star::uno::Any; 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::chart::TimeIncrement; //............................................................................. diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 19bdcc0312bf..43fc6ba744dc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -29,7 +29,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart @@ -55,7 +54,7 @@ private: }; WrappedScaleTextProperty::WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) - : ::chart::WrappedProperty( "ScaleText" , rtl::OUString() ) + : ::chart::WrappedProperty( "ScaleText" , OUString() ) , m_spChart2ModelContact( spChart2ModelContact ) { } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index f2cacc74cf8f..621593c4a878 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx index 327cc7ce3cd7..f31f14cfeb07 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx @@ -23,7 +23,6 @@ #include "macros.hxx" using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx index b2cfa390925a..9051aded4905 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx @@ -31,17 +31,17 @@ class DataSeriesPointWrapper; class WrappedSeriesAreaOrLineProperty : public WrappedProperty { public: - WrappedSeriesAreaOrLineProperty( const ::rtl::OUString& rOuterName - , const ::rtl::OUString& rInnerAreaTypeName, const ::rtl::OUString& rInnerLineTypeName + WrappedSeriesAreaOrLineProperty( const OUString& rOuterName + , const OUString& rInnerAreaTypeName, const OUString& rInnerLineTypeName , DataSeriesPointWrapper* pDataSeriesPointWrapper ); virtual ~WrappedSeriesAreaOrLineProperty(); - virtual ::rtl::OUString getInnerName() const; + virtual OUString getInnerName() const; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; - ::rtl::OUString m_aInnerAreaTypeName; - ::rtl::OUString m_aInnerLineTypeName; + OUString m_aInnerAreaTypeName; + OUString m_aInnerLineTypeName; }; } //namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 5caee3847f46..3934c8e8bcf0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -49,10 +49,10 @@ public: virtual PROPERTYTYPE getValueFromSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet ) const =0; virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, PROPERTYTYPE aNewValue ) const =0; - explicit WrappedSeriesOrDiagramProperty( const ::rtl::OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue + explicit WrappedSeriesOrDiagramProperty( const OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedProperty(rName,::rtl::OUString()) + : WrappedProperty(rName,OUString()) , m_spChart2ModelContact(spChart2ModelContact) , m_aOuterValue(rDefaulValue) , m_aDefaultValue(rDefaulValue) diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 846dd0a5e489..2b0294107fff 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -30,7 +30,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 88dc00d6cfd3..23e7de1fbb19 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -40,7 +40,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 76a461a3d14e..fc8096067b9f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -32,7 +32,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index 9d9ba85a39dd..96fedf6f9b20 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 43ee9d836df4..d751df52992a 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -86,7 +86,7 @@ public: bool bSortByXValues; }; -typedef ::comphelper::MakeMap< ::rtl::OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap; +typedef ::comphelper::MakeMap< OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap; class ChartTypeDialogController : public ChangingResource { @@ -114,13 +114,13 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); - virtual bool isSubType( const rtl::OUString& rServiceName ); - virtual ChartTypeParameter getChartTypeParameterForService( const rtl::OUString& rServiceName, const ::com::sun::star::uno::Reference< + virtual bool isSubType( const OUString& rServiceName ); + virtual ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ); virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter );//if you have different counts of subtypes you may need to adjust the index virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - virtual rtl::OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; + virtual OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; virtual bool commitToModel( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel ); virtual ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 3d5a5b88a586..a5bfad071e96 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -85,7 +85,7 @@ public: */ double GetCellNumber( long nRow, sal_uInt16 nColumnId ) const; - bool isDateString( rtl::OUString aInputString, double& fOutDateValue ); + bool isDateString( OUString aInputString, double& fOutDateValue ); // Window virtual void Resize(); diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index 83d0be282947..62e3e2ff1af0 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -77,21 +77,21 @@ public: eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow ) const; /// If getCellType( nAtColumn, nAtRow ) returns TEXT, the result will be Nan double getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow ); - ::rtl::OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow ); + OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow ); ::com::sun::star::uno::Any getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow ); sal_uInt32 getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 nAtRow ); /// returns </sal_True> if the number could successfully be set at the given position bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue ); /// returns </sal_True> if the text could successfully be set at the given position - bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText ); + bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText ); bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue ); sal_Int32 getColumnCount() const; sal_Int32 getMaxRowCount() const; // returns the UI string of the corresponding role - ::rtl::OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const; + OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const; bool isCategoriesColumn( sal_Int32 nColumnIndex ) const; struct tDataHeader diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index dc99c398c969..cc0b5aeb29d7 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -56,14 +56,14 @@ public: ~DialogModel(); typedef ::std::pair< - ::rtl::OUString, + OUString, ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > > tSeriesWithChartTypeByName; - typedef ::std::map< ::rtl::OUString, ::rtl::OUString > + typedef ::std::map< OUString, OUString > tRolesWithRanges; void setTemplate( @@ -91,7 +91,7 @@ public: tRolesWithRanges getRolesWithRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::rtl::OUString & aRoleOfSequenceForLabel, + const OUString & aRoleOfSequenceForLabel, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > & xChartType ) const; @@ -127,12 +127,12 @@ public: void setCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories ); - ::rtl::OUString getCategoriesRange() const; + OUString getCategoriesRange() const; bool isCategoryDiagram() const; void detectArguments( - ::rtl::OUString & rOutRangeString, + OUString & rOutRangeString, bool & rOutUseColumns, bool & rOutFirstCellAsLabel, bool & rOutHasCategories ) const; bool allArgumentsForRectRangeDetected() const; @@ -142,12 +142,12 @@ public: void startControllerLockTimer(); - static ::rtl::OUString ConvertRoleFromInternalToUI( const ::rtl::OUString & rRoleString ); - static ::rtl::OUString GetRoleDataLabel(); + static OUString ConvertRoleFromInternalToUI( const OUString & rRoleString ); + static OUString GetRoleDataLabel(); // pass a role string (not translated) and get an index that serves for // relative ordering, to get e.g. x-values and y-values in the right order - static sal_Int32 GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString ); + static sal_Int32 GetRoleIndexForSorting( const OUString & rInternalRoleString ); private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index 032f0b528760..2662c1d20d9a 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 5fb035bfde94..9406c3bad501 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace chart diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index e7ed3a36cd49..80bc72355acf 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -39,7 +39,6 @@ using namespace ::chart; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // -------------------------------------------------------------------------------- diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 28075c5df2f7..4112ee228dbe 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XDiagram.hpp> -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 11a98c6efe2f..73dd06b475c2 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -316,7 +316,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) else { m_aED_CrossesAtCategory.SetNoSelection(); - m_aED_CrossesAt.SetTextValue(rtl::OUString()); + m_aED_CrossesAt.SetTextValue(OUString()); } } else @@ -438,7 +438,7 @@ void AxisPositionsTabPage::SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCa m_bCrossingAxisIsCategoryAxis = bCrossingAxisIsCategoryAxis; } -void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< rtl::OUString >& rCategories ) +void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories ) { m_aCategories = rCategories; } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 7e05ca19d094..aed839bf350b 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -46,7 +46,7 @@ public: void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCategoryAxis ); - void SetCategories( const ::com::sun::star::uno::Sequence< rtl::OUString >& rCategories ); + void SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories ); void SupportAxisPositioning( bool bSupportAxisPositioning ); @@ -91,7 +91,7 @@ private: //member: SvNumberFormatter* m_pNumFormatter; bool m_bCrossingAxisIsCategoryAxis; - ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories; + ::com::sun::star::uno::Sequence< OUString > m_aCategories; bool m_bSupportAxisPositioning; }; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 9413046a7d15..13a2fe4517e9 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -50,8 +50,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // -------------------------------------------------------------------------------- diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 8eed40cfe86d..c83e86cdd773 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -93,7 +93,7 @@ protected: DECL_LINK( DownButtonClickedHdl, void* ); // ____ RangeSelectionListenerParent ____ - virtual void listeningFinished( const ::rtl::OUString & rNewRange ); + virtual void listeningFinished( const OUString & rNewRange ); virtual void disposingRangeSelection(); void updateControlState(); @@ -146,7 +146,7 @@ private: RangeEdit m_aEDT_CATEGORIES; RangeSelectionButton m_aIMB_RANGE_CAT; - ::rtl::OUString m_aFixedTextRange; + OUString m_aFixedTextRange; ChartTypeTemplateProvider * m_pTemplateProvider; DialogModel & m_rDialogModel; diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index 602831e464ce..f193943fe60a 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 2f0bc8d683bf..1cff9464e6e5 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -56,7 +56,7 @@ public: virtual ~RangeChooserTabPage(); //RangeSelectionListenerParent - virtual void listeningFinished( const ::rtl::OUString & rNewRange ); + virtual void listeningFinished( const OUString & rNewRange ); virtual void disposingRangeSelection(); void commitPage(); diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 00f2231757d4..ea2ca55ebe38 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -254,7 +254,7 @@ protected: virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); // has to be implemented by derived classes -// virtual ::rtl::OUString SAL_CALL getAccessibleName() +// virtual OUString SAL_CALL getAccessibleName() // throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() @@ -266,7 +266,7 @@ protected: throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); // has to be implemented by derived classes -// virtual ::rtl::OUString SAL_CALL getAccessibleDescription() +// virtual OUString SAL_CALL getAccessibleDescription() // throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleComponent ________ @@ -293,12 +293,12 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ________ XServiceInfo ________ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // ________ XEventListener ________ diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 2dc75d4ceaa9..205f0257ec05 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -88,13 +88,13 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleContext ________ - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 7683449b8526..008ac83da0b0 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -82,9 +82,9 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 419f642a2b4a..6acda96287ab 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -45,7 +45,7 @@ public: ::com::sun::star::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize, - const ::rtl::OUString & rRefSizePropertyName, + const OUString & rRefSizePropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rRefSizePropSet = ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ); @@ -68,7 +68,7 @@ private: SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::com::sun::star::awt::Size > m_pRefSize; SAL_WNODEPRECATED_DECLARATIONS_POP - ::rtl::OUString m_aRefSizePropertyName; + OUString m_aRefSizePropertyName; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xRefSizePropSet; }; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 685f1e40ab7d..fd9f75ca706c 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -74,8 +74,8 @@ public: void setUpdateAddIn( sal_Bool bUpdateAddIn ); sal_Bool getUpdateAddIn() const; - void setBaseDiagram( const rtl::OUString& rBaseDiagram ); - rtl::OUString getBaseDiagram() const; + void setBaseDiagram( const OUString& rBaseDiagram ); + OUString getBaseDiagram() const; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getAdditionalShapes() const; @@ -112,10 +112,10 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XModel ____ - virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< + virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL() + virtual OUString SAL_CALL getURL() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs() @@ -167,17 +167,17 @@ 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); // ____ XAggregation ____ @@ -209,7 +209,7 @@ private: //member ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xArea; ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xAddIn; - rtl::OUString m_aBaseDiagram; + OUString m_aBaseDiagram; sal_Bool m_bUpdateAddIn; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView; diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 41434d629379..5831a2351909 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -82,7 +82,7 @@ public: SfxItemSet getPositionAndSizeItemSetFromMarkedObject() const; - SdrObject* getNamedSdrObject( const rtl::OUString& rName ) const; + SdrObject* getNamedSdrObject( const OUString& rName ) const; bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 6f2eca96f514..d8762bac9c5d 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -82,7 +82,7 @@ public: // typedefs ------------------------------- typedef sal_uInt16 tWhichIdType; - typedef ::rtl::OUString tPropertyNameType; + typedef OUString tPropertyNameType; typedef sal_uInt8 tMemberIdType; typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId; diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx index 6c7f066bbec7..2ff51e53f754 100644 --- a/chart2/source/controller/inc/ObjectNameProvider.hxx +++ b/chart2/source/controller/inc/ObjectNameProvider.hxx @@ -37,40 +37,40 @@ namespace chart class ObjectNameProvider { public: - static rtl::OUString getName( ObjectType eObjectType, bool bPlural=false ); - static rtl::OUString getAxisName( const rtl::OUString& rObjectCID + static OUString getName( ObjectType eObjectType, bool bPlural=false ); + static OUString getAxisName( const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString getGridName( const rtl::OUString& rObjectCID + static OUString getGridName( const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString getTitleName( const rtl::OUString& rObjectCID + static OUString getTitleName( const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString getTitleNameByType( TitleHelper::eTitleType eType ); + static OUString getTitleNameByType( TitleHelper::eTitleType eType ); - static rtl::OUString getNameForCID( - const rtl::OUString& rObjectCID, + static OUString getNameForCID( + const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); - static rtl::OUString getName_ObjectForSeries( + static OUString getName_ObjectForSeries( ObjectType eObjectType, - const rtl::OUString& rSeriesCID, + const OUString& rSeriesCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); - static rtl::OUString getName_ObjectForAllSeries( ObjectType eObjectType ); + static OUString getName_ObjectForAllSeries( ObjectType eObjectType ); /** Provides help texts for the various chart elements. The parameter rObjectCID has to be a ClassifiedIdentifier - see class ObjectIdentifier. */ - static rtl::OUString getHelpText( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false ); - static rtl::OUString getHelpText( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false ); + static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false ); + static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false ); /** This is used for showing the currently selected object in the status bar (command "Context") */ - static rtl::OUString getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); + static OUString getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); }; //............................................................................. diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index 0b246f432c58..07f9250259c8 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -40,7 +40,7 @@ public: , const ::com::sun::star::awt::Rectangle& rNewPositionAndSize , const ::com::sun::star::awt::Rectangle& rPageRectangle ); - static bool moveObject( const rtl::OUString& rObjectCID + static bool moveObject( const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::awt::Rectangle& rNewPositionAndSize , const ::com::sun::star::awt::Rectangle& rPageRectangle ); diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx index f3016fc8f991..3d1456703823 100644 --- a/chart2/source/controller/inc/RangeSelectionHelper.hxx +++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx @@ -48,11 +48,11 @@ public: ::com::sun::star::sheet::XRangeSelection > getRangeSelection(); void raiseRangeSelectionDocument(); bool chooseRange( - const ::rtl::OUString & aCurrentRange, - const ::rtl::OUString & aUIString, + const OUString & aCurrentRange, + const OUString & aUIString, RangeSelectionListenerParent & rListenerParent ); void stopRangeListening( bool bRemoveListener = true ); - bool verifyCellRange( const ::rtl::OUString & rRangeStr ); + bool verifyCellRange( const OUString & rRangeStr ); bool verifyArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments ); private: diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 4b0c72d679d6..79364423f35c 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -30,7 +30,7 @@ namespace chart class RangeSelectionListenerParent { public: - virtual void listeningFinished( const ::rtl::OUString & rNewRange ) = 0; + virtual void listeningFinished( const OUString & rNewRange ) = 0; virtual void disposingRangeSelection() = 0; protected: @@ -46,7 +46,7 @@ class RangeSelectionListener : public public: explicit RangeSelectionListener( RangeSelectionListenerParent & rParent, - const ::rtl::OUString & rInitialRange, + const OUString & rInitialRange, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModelToLockController ); virtual ~RangeSelectionListener(); @@ -64,7 +64,7 @@ protected: private: RangeSelectionListenerParent & m_rParent; - ::rtl::OUString m_aRange; + OUString m_aRange; ControllerLockGuard m_aControllerLockGuard; }; diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 96dd48c774ee..c07df8998447 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -38,7 +38,7 @@ struct TitleDialogData { ::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList; ::com::sun::star::uno::Sequence< sal_Bool > aExistenceList; - ::com::sun::star::uno::Sequence< rtl::OUString > aTextList; + ::com::sun::star::uno::Sequence< OUString > aTextList; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ReferenceSizeProvider > apReferenceSizeProvider; SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index ac3679fa93a4..a7746b0e16e6 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -39,8 +39,8 @@ public: ChartTypeUnoDlg( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); private: @@ -53,7 +53,7 @@ private: // XTypeProvider virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPropertySet diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 5396b2310e50..2c7328787ff0 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -70,7 +70,7 @@ public: APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg) // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -84,12 +84,12 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); DECL_LINK( DialogEventHdl, VclWindowEvent* ); diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 4c4c75803f83..9d14cac4e674 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -48,7 +48,7 @@ public: ::com::sun::star::frame::XModel >& xChartModel, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChartView, - const ::rtl::OUString& rSelectedObjectCID ); + const OUString& rSelectedObjectCID ); void FillItemSet( SfxItemSet& rOutAttrs ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 8daa13a7a592..8a8080e96c67 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -32,12 +32,12 @@ namespace chart class ObjectPropertiesDialogParameter { public: - ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID ); + ObjectPropertiesDialogParameter( const OUString& rObjectCID ); virtual ~ObjectPropertiesDialogParameter(); void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); ObjectType getObjectType() const; - rtl::OUString getLocalizedName() const; + OUString getLocalizedName() const; bool HasGeometryProperties() const; bool HasStatisticProperties() const; @@ -55,7 +55,7 @@ public: bool IsSupportingAxisPositioning() const; bool ShowAxisOrigin() const; bool IsCrossingAxisIsCategoryAxis() const; - const ::com::sun::star::uno::Sequence< rtl::OUString >& GetCategories() const; + const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getDocument() const; @@ -63,11 +63,11 @@ public: bool IsComplexCategoriesAxis() const; private: - rtl::OUString m_aObjectCID; + OUString m_aObjectCID; ObjectType m_eObjectType; bool m_bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles) - rtl::OUString m_aLocalizedName; + OUString m_aLocalizedName; bool m_bHasGeometryProperties; bool m_bHasStatisticProperties; @@ -86,7 +86,7 @@ private: bool m_bSupportingAxisPositioning; bool m_bShowAxisOrigin; bool m_bIsCrossingAxisIsCategoryAxis; - ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories; + ::com::sun::star::uno::Sequence< OUString > m_aCategories; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 98addc7dfd83..f0ea1c9e4b93 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -69,7 +69,7 @@ public: void FillValueSets(); // ____ RangeSelectionListenerParent ____ - virtual void listeningFinished( const ::rtl::OUString & rNewRange ); + virtual void listeningFinished( const OUString & rNewRange ); virtual void disposingRangeSelection(); private: diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 72cdcf714e54..5a6e5b1ed28e 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -213,7 +213,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) catch( const uno::Exception &ex ) { (void)ex; - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 21bad8fcafe0..c3e98b01cab5 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -122,7 +122,7 @@ public: */ virtual bool requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0; + OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() = 0; }; @@ -219,7 +219,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> SAL_CALL queryDispatch( const ::com::sun::star::util::URL& rURL - , const rtl::OUString& rTargetFrameName + , const OUString& rTargetFrameName , sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); @@ -398,16 +398,16 @@ public: // ::com::sun::star::lang 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); @@ -453,7 +453,7 @@ public: virtual bool requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ); + OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); @@ -599,9 +599,9 @@ private: //executeDispatch methods void SAL_CALL executeDispatch_ObjectProperties(); - void SAL_CALL executeDispatch_FormatObject( const ::rtl::OUString& rDispatchCommand ); - void SAL_CALL executeDlg_ObjectProperties( const ::rtl::OUString& rObjectCID ); - bool executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl::OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ); + void SAL_CALL executeDispatch_FormatObject( const OUString& rDispatchCommand ); + void SAL_CALL executeDlg_ObjectProperties( const OUString& rObjectCID ); + bool executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ); void SAL_CALL executeDispatch_ChartType(); @@ -694,10 +694,10 @@ private: }; /// @return </sal_True>, if resize/move was successful bool impl_moveOrResizeObject( - const ::rtl::OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); - bool impl_DragDataPoint( const ::rtl::OUString & rCID, double fOffset ); + const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); + bool impl_DragDataPoint( const OUString & rCID, double fOffset ); - ::std::set< ::rtl::OUString > impl_getAvailableCommands(); + ::std::set< OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For parameters see @@ -713,7 +713,7 @@ private: void impl_PasteGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > & xGraphic, const ::Point & aPosition ); void impl_PasteShapes( SdrModel* pModel ); - void impl_PasteStringAsTextShape( const ::rtl::OUString& rString, const ::com::sun::star::awt::Point& rPosition ); + void impl_PasteStringAsTextShape( const OUString& rString, const ::com::sun::star::awt::Point& rPosition ); void impl_SetMousePointer( const MouseEvent & rEvent ); void impl_ClearSelection(); diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 8c7c733ff59b..8741ec9a21b7 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -72,7 +72,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 8091aa63046f..b0c56b81fe26 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -116,7 +116,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectang void SAL_CALL ChartController::executeDispatch_PositionAndSize() { - const ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + const OUString aCID( m_aSelection.getSelectedCID() ); if( aCID.isEmpty() ) return; diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 145e7e34ca8a..f06c271b5c89 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -69,7 +69,6 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 80056ac468b8..8fd50b0a64d7 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -135,7 +135,7 @@ bool ChartController::EndTextEdit() pOutliner->GetParagraph( 0 ), pOutliner->GetParagraphCount() ); - ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID(); + OUString aObjectCID = m_aSelection.getSelectedCID(); if ( !aObjectCID.isEmpty() ) { uno::Reference< beans::XPropertySet > xPropSet = diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 17581e3b06ab..889be4313877 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -601,7 +600,7 @@ bool ChartController::executeDispatch_Delete() bool bReturn = false; // remove the selected object - rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if( !aCID.isEmpty() ) { if( !isObjectDeleteable( uno::Any( aCID ) ) ) @@ -759,7 +758,7 @@ bool ChartController::executeDispatch_Delete() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, ::rtl::OUString( String( + ActionDescriptionProvider::DELETE, OUString( String( SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))), m_xUndoManager ); chart2::DataPointLabel aLabel; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index a104d13b9a60..0c748f13d7c5 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //............................................................................. namespace chart @@ -134,9 +133,9 @@ bool lcl_MoveObjectLogic( void lcl_insertMenuCommand( const uno::Reference< awt::XPopupMenu > & xMenu, const uno::Reference< awt::XMenuExtended > & xMenuEx, - sal_Int16 nId, const ::rtl::OUString & rCommand ) + sal_Int16 nId, const OUString & rCommand ) { - static ::rtl::OUString aEmptyString; + static OUString aEmptyString; xMenu->insertItem( nId, aEmptyString, 0, -1 ); xMenuEx->setCommand( nId, rCommand ); } @@ -729,7 +728,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) } else { - rtl::OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) ); + OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) ); if( aDragMethodServiceName.equals( ObjectIdentifier::getPieSegmentDragMethodServiceName() ) ) pDragMethod = new DragMethod_PieSegment( *pDrawViewWrapper, m_aSelection.getSelectedCID(), getModel() ); } @@ -936,7 +935,7 @@ void ChartController::execute_DoubleClick( const Point* pMousePixel ) bool bEditText = false; if ( m_aSelection.hasSelection() ) { - ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if ( !aCID.isEmpty() ) { ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID ); @@ -1404,7 +1403,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) nCode == KEY_DOWN ) { bDrag = true; - rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() )); + OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() )); sal_Int32 nOffsetPercentDummy( 0 ); awt::Point aMinimumPosition( 0, 0 ); awt::Point aMaximumPosition( 0, 0 ); @@ -1577,7 +1576,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) bool ChartController::requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, + OUString & rOutQuickHelpText, awt::Rectangle & rOutEqualRect ) { uno::Reference< frame::XModel > xChartModel; @@ -1587,7 +1586,7 @@ bool ChartController::requestQuickHelp( return false; // help text - ::rtl::OUString aCID; + OUString aCID; if( m_pDrawViewWrapper ) { aCID = SelectionHelper::getHitObjectCID( @@ -1622,9 +1621,9 @@ bool ChartController::requestQuickHelp( if ( rSelection.hasValue() ) { const uno::Type& rType = rSelection.getValueType(); - if ( rType == ::getCppuType( static_cast< const ::rtl::OUString* >( 0 ) ) ) + if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) ) ) { - ::rtl::OUString aNewCID; + OUString aNewCID; if ( ( rSelection >>= aNewCID ) && m_aSelection.setSelection( aNewCID ) ) { bSuccess = true; @@ -1672,7 +1671,7 @@ bool ChartController::requestQuickHelp( uno::Any aReturn; if ( m_aSelection.hasSelection() ) { - ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if ( !aCID.isEmpty() ) { aReturn = uno::makeAny( aCID ); @@ -1746,7 +1745,7 @@ void ChartController::impl_selectObjectAndNotiy() } bool ChartController::impl_moveOrResizeObject( - const ::rtl::OUString & rCID, + const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ) @@ -1829,7 +1828,7 @@ bool ChartController::impl_moveOrResizeObject( return bResult; } -bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double fAdditionalOffset ) +bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditionalOffset ) { bool bResult = false; if( fAdditionalOffset < -1.0 || fAdditionalOffset > 1.0 || fAdditionalOffset == 0.0 ) @@ -1985,7 +1984,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) return; } - ::rtl::OUString aHitObjectCID( + OUString aHitObjectCID( SelectionHelper::getHitObjectCID( aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ )); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 83d075a045c5..e09c298ddfa0 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 5b2c03b3aaf6..2e2713ba3b67 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -62,10 +62,10 @@ ChartFrameLoader::~ChartFrameLoader() APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME) - uno::Sequence< rtl::OUString > ChartFrameLoader + uno::Sequence< OUString > ChartFrameLoader ::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_FRAMELOADER_SERVICE_NAME; return aSNS; } @@ -146,7 +146,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL())); if( aIt != aMediaDescriptor.end()) { - ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >()); + OUString aURL( (*aIt).second.get< OUString >()); if( aURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" ))) { diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index efc9782c1874..a1742ea40502 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.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; namespace chart { diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index d4b78aa7256b..2e1bd460a2e1 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -203,7 +203,7 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt ) { // Point aLogicHitPos = PixelToLogic( rHEvt.GetMousePosPixel()); // old chart: GetPointerPosPixel() Point aLogicHitPos = PixelToLogic( GetPointerPosPixel()); - ::rtl::OUString aQuickHelpText; + OUString aQuickHelpText; awt::Rectangle aHelpRect; bool bIsBalloonHelp( Help::IsBalloonHelpEnabled() ); bHelpHandled = m_pWindowController->requestQuickHelp( aLogicHitPos, bIsBalloonHelp, aQuickHelpText, aHelpRect ); diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 0f609260aea5..2c547fba4c04 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index c0a82ecb61ca..b1d8b9f14000 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -73,10 +73,10 @@ protected: called with this parameter set to give an initial state. */ virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) = 0; - /** calls fireStatusEvent( ::rtl::OUString, xSingleListener ) + /** calls fireStatusEvent( OUString, xSingleListener ) */ void fireAllStatusEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); @@ -90,12 +90,12 @@ protected: called with this parameter set to give an initial state. */ void fireStatusEventForURL( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Any & rState, bool bEnabled, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >(), - const ::rtl::OUString & rFeatureDescriptor = ::rtl::OUString() ); + const OUString & rFeatureDescriptor = OUString() ); // ____ XDispatch ____ virtual void SAL_CALL dispatch( @@ -130,7 +130,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; private: - typedef ::std::map< ::rtl::OUString, ::cppu::OInterfaceContainerHelper* > + typedef ::std::map< OUString, ::cppu::OInterfaceContainerHelper* > tListenerMap; tListenerMap m_aListeners; diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index 2c02b0261291..483fedf4d9d3 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.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; namespace chart { diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 2e4a3b3131f6..0f568f7bf08c 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -84,7 +84,7 @@ public: void setChartDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xChartDispatch, - const ::std::set< ::rtl::OUString > & rChartCommands ); + const ::std::set< OUString > & rChartCommands ); /** Returns the dispatch that is able to do the command given in rURL, if implemented here. If the URL is not implemented here, it should be @@ -117,7 +117,7 @@ public: private: typedef - ::std::map< ::rtl::OUString, + ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > tDispatchMap; @@ -132,9 +132,9 @@ private: ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xChartDispatcher; - ::std::set< ::rtl::OUString > m_aChartCommands; + ::std::set< OUString > m_aChartCommands; - ::std::set< ::rtl::OUString > m_aContainerDocumentCommands; + ::std::set< OUString > m_aContainerDocumentCommands; ChartController* m_pChartController; DrawCommandDispatch* m_pDrawCommandDispatch; diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 812dbe58a050..31a088120f35 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -57,11 +57,11 @@ public: FieldUnit getFieldUnit(); virtual void Commit(); - virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const uno::Sequence<OUString>& aPropertyNames); }; CalcConfigItem::CalcConfigItem() - : ConfigItem( ::rtl::OUString( "Office.Calc/Layout" )) + : ConfigItem( OUString( "Office.Calc/Layout" )) { } @@ -70,7 +70,7 @@ CalcConfigItem::~CalcConfigItem() } void CalcConfigItem::Commit() {} -void CalcConfigItem::Notify( const uno::Sequence<rtl::OUString>& ) {} +void CalcConfigItem::Notify( const uno::Sequence<OUString>& ) {} FieldUnit CalcConfigItem::getFieldUnit() { diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index bcde205f12e4..f4c1669c3753 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -701,7 +700,7 @@ bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand ) return false; } -bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand ) +bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const OUString& rCommand ) { ShapeController* pShapeController = ( m_pDispatchContainer ? m_pDispatchContainer->getShapeController() : NULL ); if ( pShapeController ) diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index bf0895edfabb..a165bc259b46 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -82,7 +82,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); // ____ XModifyListener ____ @@ -97,13 +97,13 @@ protected: private: void fireStatusEventForURLImpl( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); - bool commandAvailable( const ::rtl::OUString & rCommand ); + bool commandAvailable( const OUString & rCommand ); void updateCommandAvailability(); - bool isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand ); + bool isShapeControllerCommandAvailable( const OUString& rCommand ); ChartController* m_pChartController; ::com::sun::star::uno::Reference< @@ -116,8 +116,8 @@ private: ::std::auto_ptr< impl::ModelState > m_apModelState; ::std::auto_ptr< impl::ControllerState > m_apControllerState; - mutable ::std::map< ::rtl::OUString, bool > m_aCommandAvailability; - mutable ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > m_aCommandArguments; + mutable ::std::map< OUString, bool > m_aCommandAvailability; + mutable ::std::map< OUString, ::com::sun::star::uno::Any > m_aCommandArguments; CommandDispatchContainer* m_pDispatchContainer; }; diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 0c107d0a3538..2724551354a3 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -41,7 +41,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::WeakReference; DragMethod_Base::DragMethod_Base( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel , ActionDescriptionProvider::ActionType eActionType ) : SdrDragMethod( rDrawViewWrapper ) @@ -61,7 +61,7 @@ Reference< frame::XModel > DragMethod_Base::getChartModel() const return Reference< frame::XModel >( m_xChartModel ); } -rtl::OUString DragMethod_Base::getUndoDescription() const +OUString DragMethod_Base::getUndoDescription() const { return ActionDescriptionProvider::createDescription( m_eActionType, diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index 148378040243..28ffa918d6da 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -33,12 +33,12 @@ namespace chart class DragMethod_Base : public SdrDragMethod { public: - DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID + DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE ); virtual ~DragMethod_Base(); - virtual rtl::OUString getUndoDescription() const; + virtual OUString getUndoDescription() const; virtual void TakeSdrDragComment(String& rStr) const; virtual Pointer GetSdrDragPointer() const; @@ -48,7 +48,7 @@ protected: protected: DrawViewWrapper& m_rDrawViewWrapper; - rtl::OUString m_aObjectCID; + OUString m_aObjectCID; ActionDescriptionProvider::ActionType m_eActionType; private: diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 27267eaab5a6..abf58cbc149e 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference; using ::basegfx::B2DVector; DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel ) : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel ) , m_aStartVector(100.0,100.0) @@ -48,7 +48,7 @@ DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper , m_aDragDirection(1000.0,1000.0) , m_fDragRange( 1.0 ) { - rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) ); + OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) ); sal_Int32 nOffsetPercent(0); awt::Point aMinimumPosition(0,0); @@ -75,7 +75,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment() void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const { rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED); - rStr.SearchAndReplaceAscii( "%PERCENTVALUE", rtl::OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); + rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); } bool DragMethod_PieSegment::BeginSdrDrag() { diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index 022a188dda9a..a92a855e21ce 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -28,7 +28,7 @@ namespace chart class DragMethod_PieSegment : public DragMethod_Base { public: - DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID + DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); virtual ~DragMethod_PieSegment(); diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index ce8a0e120aaa..00cada78f8a1 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel , RotationDirection eRotationDirection ) : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel, ActionDescriptionProvider::ROTATE ) diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index 04d6f6e46cff..e48ff981231a 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -39,7 +39,7 @@ public: }; DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , RotationDirection eRotationDirection ); diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 57b629e0fd05..ffe3ccb95cb8 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -59,13 +59,13 @@ namespace //............................................................................. // comparing two PropertyValue instances - struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, ::rtl::OUString, bool > + struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool > { - bool operator() ( const beans::PropertyValue& rPropValue, const ::rtl::OUString& rName ) const + bool operator() ( const beans::PropertyValue& rPropValue, const OUString& rName ) const { return rPropValue.Name.equals( rName ); } - bool operator() ( const ::rtl::OUString& rName, const beans::PropertyValue& rPropValue ) const + bool operator() ( const OUString& rName, const beans::PropertyValue& rPropValue ) const { return rName.equals( rPropValue.Name ); } @@ -97,11 +97,11 @@ void DrawCommandDispatch::initialize() FeatureCommandDispatchBase::initialize(); } -bool DrawCommandDispatch::isFeatureSupported( const ::rtl::OUString& rCommandURL ) +bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL ) { sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType ); } @@ -137,7 +137,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj ) sal_Bool bAttributesAppliedFromGallery = sal_False; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - ::std::vector< ::rtl::OUString > aObjList; + ::std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { for ( sal_uInt16 i = 0; i < aObjList.size(); ++i ) @@ -244,15 +244,15 @@ void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ ) { } -FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand ) +FeatureState DrawCommandDispatch::getState( const OUString& rCommand ) { FeatureState aReturn; aReturn.bEnabled = false; aReturn.aState <<= false; sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) ) { switch ( nFeatureId ) @@ -288,7 +288,7 @@ FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand ) return aReturn; } -void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) +void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) { (void)rArgs; @@ -297,8 +297,8 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen bool bCreate = false; sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) ) { m_nFeatureId = nFeatureId; @@ -382,7 +382,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen pDrawViewWrapper->SetCreateMode(); } - const ::rtl::OUString sKeyModifier( "KeyModifier" ); + const OUString sKeyModifier( "KeyModifier" ); const beans::PropertyValue* pIter = rArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + rArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if( @@ -577,7 +577,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID ) } bool DrawCommandDispatch::parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId, - OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType ) + OUString* pBaseCommand, OUString* pCustomShapeType ) { bool bFound = true; sal_uInt16 nFeatureId = 0; diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 1510346f395b..afa6799ab11c 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -45,7 +45,7 @@ public: // late initialisation, especially for adding as listener virtual void initialize(); - virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL ); + virtual bool isFeatureSupported( const OUString& rCommandURL ); void setAttributes( SdrObject* pObj ); void setLineEnds( SfxItemSet& rAttr ); @@ -59,10 +59,10 @@ protected: throw (::com::sun::star::uno::RuntimeException); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ); + virtual FeatureState getState( const OUString& rCommand ); // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); // all the features which should be handled by this class virtual void describeSupportedFeatures(); @@ -71,10 +71,10 @@ private: void setInsertObj( sal_uInt16 eObj ); SdrObject* createDefaultObject( const sal_uInt16 nID ); - bool parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId, ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType ); + bool parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId, OUString* pBaseCommand, OUString* pCustomShapeType ); ChartController* m_pChartController; - ::rtl::OUString m_aCustomShapeType; + OUString m_aCustomShapeType; }; //............................................................................. diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index b59945579bbb..2711702d8e7f 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -71,7 +71,7 @@ void lcl_addObjectsToList( const ObjectHierarchy& rHierarchy, const ObjectHierar while( aIt != aChildren.end() ) { ObjectHierarchy::tOID aOID = *aIt; - ::rtl::OUString aCID = aOID.getObjectCID(); + OUString aCID = aOID.getObjectCID(); ListBoxEntryData aEntry; aEntry.OID = aOID; aEntry.UIName += ObjectNameProvider::getNameForCID( aCID, xChartDoc ); @@ -97,7 +97,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { Reference< view::XSelectionSupplier > xSelectionSupplier( xChartController, uno::UNO_QUERY); ObjectHierarchy::tOID aSelectedOID; - rtl::OUString aSelectedCID; + OUString aSelectedCID; if( xSelectionSupplier.is() ) { aSelectedOID = ObjectIdentifier( xSelectionSupplier->getSelection() ); @@ -123,7 +123,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { if ( aSelectedOID.isAutoGeneratedObject() ) { - rtl::OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) ); + OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) ); for( aIt = m_aEntries.begin(); aIt != m_aEntries.end(); ++aIt ) { if( aIt->OID.getObjectCID().match( aSeriesCID ) ) @@ -144,8 +144,8 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { ListBoxEntryData aEntry; SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() ); - rtl::OUString aName = pSelectedObj ? pSelectedObj->GetName() : rtl::OUString(); - aEntry.UIName = ( aName.isEmpty() ? ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); + OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString(); + aEntry.UIName = ( aName.isEmpty() ? OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); aEntry.OID = aSelectedOID; m_aEntries.push_back( aEntry ); } @@ -252,9 +252,9 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName ); //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() +Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aServices(1); + Sequence< OUString > aServices(1); aServices[ 0 ] = "com.sun.star.frame.ToolbarController"; return aServices; } diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index f32fa37c32f6..025500f9f2ef 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -37,7 +37,7 @@ namespace chart struct ListBoxEntryData { - rtl::OUString UIName; + OUString UIName; ObjectHierarchy::tOID OID; sal_Int32 nHierarchyDepth; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index 5362827d47f1..c3b3ce7f5f58 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -44,7 +44,7 @@ void FeatureCommandDispatchBase::initialize() fillSupportedFeatures(); } -bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCommandURL ) +bool FeatureCommandDispatchBase::isFeatureSupported( const OUString& rCommandURL ) { SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rCommandURL ); if ( aIter != m_aSupportedFeatures.end() ) @@ -54,7 +54,7 @@ bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCom return false; } -void FeatureCommandDispatchBase::fireStatusEvent( const ::rtl::OUString& rURL, +void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL, const Reference< frame::XStatusListener >& xSingleListener /* = 0 */ ) { if ( rURL.isEmpty() ) @@ -78,7 +78,7 @@ void FeatureCommandDispatchBase::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) throw (uno::RuntimeException) { - ::rtl::OUString aCommand( URL.Complete ); + OUString aCommand( URL.Complete ); if ( getState( aCommand ).bEnabled ) { execute( aCommand, Arguments ); @@ -89,7 +89,7 @@ void FeatureCommandDispatchBase::implDescribeSupportedFeature( const sal_Char* p sal_uInt16 nId, sal_Int16 nGroup ) { ControllerFeature aFeature; - aFeature.Command = ::rtl::OUString::createFromAscii( pAsciiCommandURL ); + aFeature.Command = OUString::createFromAscii( pAsciiCommandURL ); aFeature.nFeatureId = nId; aFeature.GroupId = nGroup; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 06a534251cd5..59d1b32451b9 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -33,9 +33,9 @@ struct ControllerFeature: public ::com::sun::star::frame::DispatchInformation sal_uInt16 nFeatureId; }; -typedef ::std::map< ::rtl::OUString, +typedef ::std::map< OUString, ControllerFeature, - ::std::less< ::rtl::OUString > > SupportedFeatures; + ::std::less< OUString > > SupportedFeatures; struct FeatureState { @@ -57,7 +57,7 @@ public: // late initialisation, especially for adding as listener virtual void initialize(); - virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL ); + virtual bool isFeatureSupported( const OUString& rCommandURL ); protected: // XDispatch @@ -65,14 +65,14 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); - virtual void fireStatusEvent( const ::rtl::OUString& rURL, + virtual void fireStatusEvent( const OUString& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener ); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ) = 0; + virtual FeatureState getState( const OUString& rCommand ) = 0; // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0; + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0; // all the features which should be handled by this class virtual void describeSupportedFeatures() = 0; diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 6ed11f9f64fd..ebcb60569747 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -375,12 +374,12 @@ void ImplObjectHierarchy::createWallAndFloor( if( bHasWall && bIsThreeD ) { rContainer.push_back( - ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) ) ); + ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) ) ); Reference< beans::XPropertySet > xFloor( xDiagram->getFloor()); if( xFloor.is()) rContainer.push_back( - ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) ) ); + ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) ) ); } } @@ -443,7 +442,7 @@ void ImplObjectHierarchy::createDataSeriesTree( // data lablels if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) ) { - rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); aChildParticle+=("="); aSeriesSubContainer.push_back( ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) ); diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 047d55dd5709..fa57560005f7 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -128,7 +128,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType return true; } -bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID +bool PositionAndSizeHelper::moveObject( const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel , const awt::Rectangle& rNewPositionAndSize , const awt::Rectangle& rPageRectangle diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 16c795875aa6..950c05df949b 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -43,11 +43,11 @@ using namespace ::com::sun::star; namespace { -rtl::OUString lcl_getObjectName( SdrObject* pObj ) +OUString lcl_getObjectName( SdrObject* pObj ) { if(pObj) return pObj->GetName(); - return rtl::OUString(); + return OUString(); } void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper ) @@ -71,7 +71,7 @@ bool Selection::hasSelection() return m_aSelectedOID.isValid(); } -rtl::OUString Selection::getSelectedCID() +OUString Selection::getSelectedCID() { return m_aSelectedOID.getObjectCID(); } @@ -86,7 +86,7 @@ ObjectIdentifier Selection::getSelectedOID() const return m_aSelectedOID; } -bool Selection::setSelection( const ::rtl::OUString& rCID ) +bool Selection::setSelection( const OUString& rCID ) { if ( !rCID.equals( m_aSelectedOID.getObjectCID() ) ) { @@ -256,7 +256,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* if ( !m_aSelectedOID.isAdditionalShape() ) { - rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model + OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model if ( !m_aSelectedOID.isAutoGeneratedObject() ) { @@ -264,8 +264,8 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* } //check whether the diagram was hit but not selected (e.g. because it has no filling): - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject(); if( bBackGroundHit ) { @@ -283,7 +283,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* //check whether the legend was hit but not selected (e.g. because it has no filling): if( bBackGroundHit || m_aSelectedOID.getObjectCID().equals( aDiagramCID ) ) { - rtl::OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model + OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID ); if( pLegend ) { @@ -338,13 +338,13 @@ bool Selection::isAdditionalShapeSelected() const //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject - , rtl::OUString& rOutName + , OUString& rOutName , bool bGivenObjectMayBeResult ) { SolarMutexGuard aSolarGuard; //find the deepest named group SdrObject* pObj = pInOutObject; - rtl::OUString aName; + OUString aName; if( bGivenObjectMayBeResult ) aName = lcl_getObjectName( pObj ); @@ -374,7 +374,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject , ObjectIdentifier& rOutObject , bool bGivenObjectMayBeResult ) { - rtl::OUString aName; + OUString aName; if ( findNamedParent( pInOutObject, aName, bGivenObjectMayBeResult ) ) { rOutObject = ObjectIdentifier( aName ); @@ -384,7 +384,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject } bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos - , const rtl::OUString& rNameOfSelectedObject + , const OUString& rNameOfSelectedObject , const DrawViewWrapper& rDrawViewWrapper ) { if(rNameOfSelectedObject.isEmpty()) @@ -398,14 +398,14 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos return true; } -::rtl::OUString SelectionHelper::getHitObjectCID( +OUString SelectionHelper::getHitObjectCID( const Point& rMPos, DrawViewWrapper& rDrawViewWrapper, bool bGetDiagramInsteadOf_Wall ) { // //- solar mutex SolarMutexGuard aSolarGuard; - rtl::OUString aRet; + OUString aRet; SdrObject* pNewObj = rDrawViewWrapper.getHitObject(rMPos); aRet = lcl_getObjectName( pNewObj );//name of pNewObj @@ -421,10 +421,10 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos //accept only named objects while searching for the object to select if( !findNamedParent( pNewObj, aRet, true ) ) { - aRet = ::rtl::OUString(); + aRet = OUString(); } - rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model + OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model //get page when nothing was hit if( aRet.isEmpty() && !pNewObj ) { @@ -436,7 +436,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos { if( aRet.equals( aPageCID ) ) { - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); //todo: if more than one diagram is available in future do chack the list of all diagrams here SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID ); if( pDiagram ) @@ -449,11 +449,11 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos } else if( bGetDiagramInsteadOf_Wall ) { - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model if( aRet.equals( aWallCID ) ) { - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); aRet = aDiagramCID; } } @@ -463,7 +463,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos // \\- solar mutex } -bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID +bool SelectionHelper::isRotateableObject( const OUString& rCID , const uno::Reference< frame::XModel >& xChartModel ) { if( !ObjectIdentifier::isRotateableObject( rCID ) ) @@ -497,7 +497,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj ) { if(!pObj) return 0; - rtl::OUString aName( lcl_getObjectName( pObj ) ); + OUString aName( lcl_getObjectName( pObj ) ); if( aName.match("MarkHandles") || aName.match("HandlesOnly") ) return pObj; if( !aName.isEmpty() )//dont't get the markhandles of a different object @@ -643,7 +643,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) if( !pSubList )//no group object !pObj->IsGroupObject() return false; - rtl::OUString aName( lcl_getObjectName( pObj ) ); + OUString aName( lcl_getObjectName( pObj ) ); ObjectType eObjectType( ObjectIdentifier::getObjectType( aName ) ); if( OBJECTTYPE_DATA_POINT == eObjectType || OBJECTTYPE_DATA_LABEL == eObjectType @@ -660,7 +660,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) SdrObject* pSubObj = aIterator.Next(); if( OBJECTTYPE_DATA_SERIES == eObjectType ) { - rtl::OUString aSubName( lcl_getObjectName( pSubObj ) ); + OUString aSubName( lcl_getObjectName( pSubObj ) ); ObjectType eSubObjectType( ObjectIdentifier::getObjectType( aSubName ) ); if( eSubObjectType!=OBJECTTYPE_DATA_POINT ) return false; diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index 992043f68867..5a4273a7fb2a 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -41,7 +41,7 @@ class Selection public: //methods bool hasSelection(); - rtl::OUString getSelectedCID(); + OUString getSelectedCID(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getSelectedAdditionalShape(); ObjectIdentifier getSelectedOID() const; @@ -54,7 +54,7 @@ public: //methods bool isAdditionalShapeSelected() const; //returns true if selection has changed - bool setSelection( const ::rtl::OUString& rCID ); + bool setSelection( const OUString& rCID ); bool setSelection( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); @@ -87,7 +87,7 @@ class SelectionHelper : public MarkHandleProvider { public: static bool findNamedParent( SdrObject*& pInOutObject - , rtl::OUString& rOutName + , OUString& rOutName , bool bGivenObjectMayBeResult ); static bool findNamedParent( SdrObject*& pInOutObject , ObjectIdentifier& rOutObject @@ -95,15 +95,15 @@ public: static SdrObject* getMarkHandlesObject( SdrObject* pObj ); static E3dScene* getSceneToRotate( SdrObject* pObj ); static bool isDragableObjectHitTwice( const Point& rMPos - , const rtl::OUString& rNameOfSelectedObject + , const OUString& rNameOfSelectedObject , const DrawViewWrapper& rDrawViewWrapper ); - static ::rtl::OUString getHitObjectCID( + static OUString getHitObjectCID( const Point& rMPos, DrawViewWrapper& rDrawViewWrapper, bool bGetDiagramInsteadOf_Wall=false ); - static bool isRotateableObject( const ::rtl::OUString& rCID + static bool isRotateableObject( const OUString& rCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 49c94d5b129d..1e7adfd522d4 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -83,7 +83,7 @@ void ShapeController::disposing( const lang::EventObject& /* Source */ ) { } -FeatureState ShapeController::getState( const ::rtl::OUString& rCommand ) +FeatureState ShapeController::getState( const OUString& rCommand ) { FeatureState aReturn; aReturn.bEnabled = false; @@ -150,7 +150,7 @@ FeatureState ShapeController::getState( const ::rtl::OUString& rCommand ) return aReturn; } -void ShapeController::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) +void ShapeController::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) { (void)rArgs; @@ -470,7 +470,7 @@ void ShapeController::executeDispatch_RenameObject() SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject(); if ( pSelectedObj ) { - rtl::OUString aName = pSelectedObj->GetName(); + OUString aName = pSelectedObj->GetName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 268f94e3e1a1..ff3b5a0afc6b 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -55,10 +55,10 @@ protected: throw (::com::sun::star::uno::RuntimeException); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ); + virtual FeatureState getState( const OUString& rCommand ); // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); // all the features which should be handled by this class virtual void describeSupportedFeatures(); diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index f3107688f053..4c5d70df90c8 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -56,7 +56,7 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() t return aSupported; } -::sal_Bool ShapeToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) +::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ::comphelper::existsValue( ServiceName, getSupportedServiceNames_Static() ); } @@ -198,7 +198,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even { continue; } - ::rtl::OUString aCmd = rTb.GetItemCommand( nId ); + OUString aCmd = rTb.GetItemCommand( nId ); if ( aCmd == Event.FeatureURL.Complete ) { rTb.EnableItem( nId, Event.IsEnabled ); @@ -208,7 +208,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even } else { - ::rtl::OUString aItemText; + OUString aItemText; if ( Event.State >>= aItemText ) { rTb.SetItemText( nId, aItemText ); @@ -246,7 +246,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno m_nSlotId == SID_DRAWTBX_CS_STAR ); } -::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) +OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); @@ -255,10 +255,10 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno { return xSub->getSubToolbarName(); } - return ::rtl::OUString(); + return OUString(); } -void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException) +void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 97390e9954db..c8c7d83e1fd8 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -61,15 +61,15 @@ public: virtual void SAL_CALL release() throw (); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // needed by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -82,8 +82,8 @@ public: // ::com::sun::star::frame::XSubToolbarController virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 55da8a8bf1e1..db7cfc9be370 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index bfabd3d785de..39fef92a8ced 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -79,7 +79,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); // ____ XSelectionChangeListener ____ diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index 7aca7704be7e..e27276cf18d0 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; namespace chart { @@ -87,7 +86,7 @@ void SAL_CALL UndoElement::disposing() } // --------------------------------------------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) { return m_sActionString; } @@ -133,10 +132,10 @@ ShapeUndoElement::~ShapeUndoElement() } // --------------------------------------------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_pAction->GetComment(); } @@ -144,7 +143,7 @@ ShapeUndoElement::~ShapeUndoElement() void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); m_pAction->Undo(); } @@ -152,7 +151,7 @@ void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeExce void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); m_pAction->Redo(); } diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index cda2b656b1e5..7f3687abdfa0 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -63,13 +63,13 @@ public: is the cloned model from before the changes, which the Undo action represents, have been applied. Upon <member>invoking</member>, the clone model is applied to the document model. */ - UndoElement( const ::rtl::OUString & i_actionString, + UndoElement( const OUString & i_actionString, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_documentModel, const ::boost::shared_ptr< ChartModelClone >& i_modelClone ); // XUndoAction - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ private: void impl_toggleModelState(); private: - ::rtl::OUString m_sActionString; + OUString m_sActionString; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocumentModel; ::boost::shared_ptr< ChartModelClone > m_pModelClone; }; @@ -98,7 +98,7 @@ public: ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 27d23d137a44..5d059915da4d 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.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; namespace chart { diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index f0b9ae769978..88a727521ed1 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -59,7 +59,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); private: diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index ac3be8abca98..01727c88b4a7 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx index 85d6923b7eaa..755f38ff85bd 100644 --- a/chart2/source/controller/main/UndoGuard.hxx +++ b/chart2/source/controller/main/UndoGuard.hxx @@ -38,7 +38,7 @@ class UndoGuard { public: explicit UndoGuard( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager, const ModelFacet i_facet = E_MODEL ); @@ -58,7 +58,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; ::boost::shared_ptr< ChartModelClone > m_pDocumentSnapshot; - rtl::OUString m_aUndoString; + OUString m_aUndoString; bool m_bActionPosted; }; @@ -69,7 +69,7 @@ class UndoLiveUpdateGuard : public UndoGuard { public: explicit UndoLiveUpdateGuard( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); ~UndoLiveUpdateGuard(); @@ -83,7 +83,7 @@ class UndoLiveUpdateGuardWithData : { public: explicit UndoLiveUpdateGuardWithData( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); ~UndoLiveUpdateGuardWithData(); @@ -93,7 +93,7 @@ class UndoGuardWithSelection : public UndoGuard { public: explicit UndoGuardWithSelection( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); virtual ~UndoGuardWithSelection(); |