diff options
Diffstat (limited to 'chart2/source/controller/inc')
17 files changed, 60 insertions, 60 deletions
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: |