diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-27 11:14:38 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-03-14 13:43:38 +0200 |
commit | 8353667d35bc511378c9b14261b6bb11b7bd56aa (patch) | |
tree | a065c941301f2b693445958046360b27a651d439 /chart2/source/controller | |
parent | 6c47de46613b531bd975d073cf31c3fda6f8b8da (diff) |
com::sun::star->css in chart2
Change-Id: I04320d32d6d5c54e461cfabef58645f8b772bc69
Diffstat (limited to 'chart2/source/controller')
144 files changed, 1788 insertions, 2064 deletions
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/chart2/source/controller/accessibility/AccStatisticsObject.cxx index 930546901642..fbdc16012c40 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx @@ -36,13 +36,13 @@ AccStatisticsObject::~AccStatisticsObject() } OUString SAL_CALL AccStatisticsObject::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { return getToolTipText(); } OUString SAL_CALL AccStatisticsObject::getImplementationName() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { return OUString( "StatisticsObject" ); } diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx index 9c8fcc7fc85f..4688ae44bbc3 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx @@ -34,10 +34,10 @@ public: virtual ~AccStatisticsObject(); // ________ XAccessibleContext ________ - virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException); // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); }; } // accessibility diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 350a5937b601..68886667a624 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -118,8 +118,8 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId { // event is addressed to this object - ::com::sun::star::uno::Any aEmpty; - ::com::sun::star::uno::Any aSelected; + css::uno::Any aEmpty; + css::uno::Any aSelected; aSelected <<= AccessibleStateType::SELECTED; switch( eEventType ) { diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 767cfba4c932..375f63c38d55 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -154,7 +154,7 @@ OUString SAL_CALL AccessibleChartElement::getImplementationName() // ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return ObjectNameProvider::getNameForCID( GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ); @@ -162,7 +162,7 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName() // ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return getToolTipText(); } @@ -197,7 +197,7 @@ OUString SAL_CALL AccessibleChartElement::getTitledBorderText() } OUString SAL_CALL AccessibleChartElement::getToolTipText() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { CheckDisposeState(); diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index 7e4e75418afe..b6aef8b30112 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -60,7 +60,7 @@ namespace impl { typedef ::cppu::ImplInheritanceHelper< AccessibleBase, - ::com::sun::star::accessibility::XAccessibleExtendedComponent + css::accessibility::XAccessibleExtendedComponent > AccessibleChartElement_Base; } @@ -75,51 +75,49 @@ public: // ________ AccessibleBase ________ virtual bool ImplUpdateChildren() override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > ImplGetAccessibleChildById( sal_Int32 i ) const - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) override; virtual sal_Int32 ImplGetAccessibleChildCount() const - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ________ XAccessibleExtendedComponent ________ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getToolTipText() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // the following interface is implemented in AccessibleBase, however it is // also a (non-virtual) base class of XAccessibleExtendedComponent Thus // these methods have to be overridden and forward to AccessibleBase // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override; // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: bool m_bHasText; - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > m_xTextHelper; void InitTextEdit(); diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 3dc509b46273..e7b4eed1b6cc 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -116,7 +116,7 @@ sal_Int16 AccessibleChartShape::getAccessibleRole() } OUString AccessibleChartShape::getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString aDescription; if ( m_pAccShape.is() ) @@ -127,7 +127,7 @@ OUString AccessibleChartShape::getAccessibleDescription() } OUString AccessibleChartShape::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString aName; if ( m_pAccShape.is() ) @@ -256,7 +256,7 @@ OUString AccessibleChartShape::getTitledBorderText() } OUString AccessibleChartShape::getToolTipText() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape.is() ) diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index 42ea91e8e324..97bbb8d29f1f 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -37,7 +37,7 @@ namespace impl { typedef ::cppu::ImplInheritanceHelper< AccessibleBase, - ::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleChartShape_Base; + css::accessibility::XAccessibleExtendedComponent > AccessibleChartShape_Base; } class AccessibleChartShape : @@ -50,40 +50,40 @@ public: // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ________ XAccessibleContext ________ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override; // ________ XAccessibleExtendedComponent ________ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getToolTipText() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: rtl::Reference<accessibility::AccessibleShape> m_pAccShape; diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 42f5d7f11b2f..958b6baaa775 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -54,7 +54,7 @@ struct StaticAreaWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 6ba98ac5e34a..1f983f4ac4ea 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -41,9 +41,9 @@ class Chart2ModelContact; class AreaWrapper : public ::cppu::ImplInheritanceHelper< WrappedPropertySet - , com::sun::star::drawing::XShape - , com::sun::star::lang::XComponent - , com::sun::star::lang::XServiceInfo + , css::drawing::XShape + , css::lang::XComponent + , css::lang::XServiceInfo > { public: @@ -62,35 +62,35 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XShape ____ - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) + throw (css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception) override; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< + css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< + css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index aa09857706b7..f574bba59465 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -177,21 +177,21 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "AxisType", PROP_AXIS_TYPE, - cppu::UnoType<sal_Int32>::get(), //type com::sun::star::chart::ChartAxisType + cppu::UnoType<sal_Int32>::get(), //type css::chart::ChartAxisType //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "TimeIncrement", PROP_AXIS_TIME_INCREMENT, - cppu::UnoType<com::sun::star::chart::TimeIncrement>::get(), + cppu::UnoType<css::chart::TimeIncrement>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( Property( "ExplicitTimeIncrement", PROP_AXIS_EXPLICIT_TIME_INCREMENT, - cppu::UnoType<com::sun::star::chart::TimeIncrement>::get(), + cppu::UnoType<css::chart::TimeIncrement>::get(), beans::PropertyAttribute::READONLY | beans::PropertyAttribute::MAYBEVOID )); @@ -220,7 +220,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "CrossoverPosition", PROP_AXIS_CROSSOVER_POSITION, - cppu::UnoType<com::sun::star::chart::ChartAxisPosition>::get(), + cppu::UnoType<css::chart::ChartAxisPosition>::get(), beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( @@ -261,7 +261,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "MarkPosition", PROP_AXIS_MARK_POSITION, - cppu::UnoType<com::sun::star::chart::ChartAxisMarkPosition>::get(), + cppu::UnoType<css::chart::ChartAxisMarkPosition>::get(), beans::PropertyAttribute::MAYBEDEFAULT )); //Properties for labels: @@ -289,7 +289,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "LabelPosition", PROP_AXIS_LABEL_POSITION, - cppu::UnoType<com::sun::star::chart::ChartAxisLabelPosition>::get(), + cppu::UnoType<css::chart::ChartAxisLabelPosition>::get(), beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( @@ -302,7 +302,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "ArrangeOrder", PROP_AXIS_ARRANGE_ORDER, - cppu::UnoType<com::sun::star::chart::ChartAxisArrangeOrderType>::get(), + cppu::UnoType<css::chart::ChartAxisArrangeOrderType>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -379,7 +379,7 @@ struct StaticAxisWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index e0dcf255d1eb..2ba3dc0b2457 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -43,11 +43,11 @@ class Chart2ModelContact; class AxisWrapper : public ::cppu::ImplInheritanceHelper< WrappedPropertySet - , com::sun::star::chart::XAxis - , com::sun::star::drawing::XShape - , com::sun::star::lang::XComponent - , com::sun::star::lang::XServiceInfo - , com::sun::star::util::XNumberFormatsSupplier + , css::chart::XAxis + , css::drawing::XShape + , css::lang::XComponent + , css::lang::XServiceInfo + , css::util::XNumberFormatsSupplier > , public ReferenceSizePropertyProvider { @@ -79,55 +79,55 @@ public: //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; - virtual ::com::sun::star::uno::Any getReferenceSize() override; - virtual ::com::sun::star::awt::Size getCurrentSizeForReference() override; + virtual css::uno::Any getReferenceSize() override; + virtual css::awt::Size getCurrentSizeForReference() override; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< + css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< + css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // ____ chart::XAxis ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (css::uno::RuntimeException, std::exception) override; // ____ XShape ____ - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) + throw (css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception) override; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XNumberFormatsSupplier ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::util::XNumberFormats > SAL_CALL getNumberFormats() + throw (css::uno::RuntimeException, std::exception) override; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; private: //methods - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxis(); + css::uno::Reference< css::chart2::XAxis > getAxis(); private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -135,9 +135,9 @@ private: //member tAxisType m_eType; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAxisTitle; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xMajorGrid; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xMinorGrid; + css::uno::Reference< css::beans::XPropertySet > m_xAxisTitle; + css::uno::Reference< css::beans::XPropertySet > m_xMajorGrid; + css::uno::Reference< css::beans::XPropertySet > m_xMinorGrid; }; } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 974119758335..1553de4e3897 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -56,8 +56,7 @@ Chart2ModelContact::~Chart2ModelContact() this->clear(); } -void Chart2ModelContact::setModel( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ) +void Chart2ModelContact::setModel( const css::uno::Reference< css::frame::XModel >& xChartModel ) { this->clear(); m_xChartModel = xChartModel; @@ -252,8 +251,7 @@ awt::Point Chart2ModelContact::GetLegendPosition() const return aPoint; } -awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference< - ::com::sun::star::chart2::XTitle > & xTitle ) const +awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference< css::chart2::XTitle > & xTitle ) const { awt::Size aSize; ExplicitValueProvider* pProvider( getExplicitValueProvider() ); @@ -265,8 +263,7 @@ awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference< return aSize; } -awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference< - ::com::sun::star::chart2::XTitle > & xTitle ) const +awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference< css::chart2::XTitle > & xTitle ) const { awt::Point aPoint; ExplicitValueProvider* pProvider( getExplicitValueProvider() ); @@ -278,8 +275,7 @@ awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference< return aPoint; } -awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference< - ::com::sun::star::chart2::XAxis > & xAxis ) const +awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference< css::chart2::XAxis > & xAxis ) const { awt::Size aSize; ExplicitValueProvider* pProvider( getExplicitValueProvider() ); @@ -291,8 +287,7 @@ awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference< return aSize; } -awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference< - ::com::sun::star::chart2::XAxis > & xAxis ) const +awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference< css::chart2::XAxis > & xAxis ) const { awt::Point aPoint; ExplicitValueProvider* pProvider( getExplicitValueProvider() ); diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index 1491c79806a4..8b64b5f0fb96 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -46,114 +46,99 @@ namespace wrapper class Chart2ModelContact { public: - explicit Chart2ModelContact( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + explicit Chart2ModelContact( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~Chart2ModelContact(); public: - void setModel( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + void setModel( const css::uno::Reference< css::frame::XModel >& xChartModel ); void clear(); - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > getChartModel() const; + css::uno::Reference< css::frame::XModel > getChartModel() const; ChartModel* getModel() const { return mpModel;} - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > getChart2Document() const; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > getChart2Diagram() const; + css::uno::Reference< css::chart2::XChartDocument > getChart2Document() const; + css::uno::Reference< css::chart2::XDiagram > getChart2Diagram() const; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getDrawPage(); + css::uno::Reference< css::drawing::XDrawPage > getDrawPage(); /** get the current values calculated for an axis in the current view in case properties are 'auto'. */ void getExplicitValuesForAxis( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > & xAxis, + const css::uno::Reference< css::chart2::XAxis > & xAxis, ExplicitScaleData & rOutExplicitScale, ExplicitIncrementData & rOutExplicitIncrement ); sal_Int32 getExplicitNumberFormatKeyForAxis( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); + const css::uno::Reference< css::chart2::XAxis >& xAxis ); sal_Int32 getExplicitNumberFormatKeyForSeries( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries ); + const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); /** Returns the size of the page in logic coordinates. This value is used for setting an appropriate "ReferencePageSize" for FontHeights. */ - ::com::sun::star::awt::Size GetPageSize() const; + css::awt::Size GetPageSize() const; /** calculates the current axes title sizes and subtract that space them from the given rectangle */ - ::com::sun::star::awt::Rectangle SubstractAxisTitleSizes( const ::com::sun::star::awt::Rectangle& rPositionRect ); + css::awt::Rectangle SubstractAxisTitleSizes( const css::awt::Rectangle& rPositionRect ); /** Returns the position and size of the diagram in logic coordinates (100th mm) including the space used for axes including axes titles. */ - ::com::sun::star::awt::Rectangle GetDiagramRectangleIncludingTitle() const; + css::awt::Rectangle GetDiagramRectangleIncludingTitle() const; /** Returns the position and size of the diagram in logic coordinates (100th mm) including the space used for axes excluding axes titles. */ - ::com::sun::star::awt::Rectangle GetDiagramRectangleIncludingAxes() const; + css::awt::Rectangle GetDiagramRectangleIncludingAxes() const; /** Returns the position and size of the diagram in logic coordinates (100th mm) excluding the space used for axes (inner plot area). */ - ::com::sun::star::awt::Rectangle GetDiagramRectangleExcludingAxes() const; + css::awt::Rectangle GetDiagramRectangleExcludingAxes() const; /** Returns the size of the object in logic coordinates. */ - ::com::sun::star::awt::Size GetLegendSize() const; + css::awt::Size GetLegendSize() const; /** Returns the position of the object in logic coordinates. */ - ::com::sun::star::awt::Point GetLegendPosition() const; + css::awt::Point GetLegendPosition() const; /** Returns the size of the object in logic coordinates. */ - ::com::sun::star::awt::Size GetTitleSize( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > & xTitle ) const; + css::awt::Size GetTitleSize( const css::uno::Reference< css::chart2::XTitle > & xTitle ) const; /** Returns the position of the object in logic coordinates. */ - ::com::sun::star::awt::Point GetTitlePosition( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > & xTitle ) const; + css::awt::Point GetTitlePosition( const css::uno::Reference< css::chart2::XTitle > & xTitle ) const; /** Returns the size of the object in logic coordinates. */ - ::com::sun::star::awt::Size GetAxisSize( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > & xAxis ) const; + css::awt::Size GetAxisSize( const css::uno::Reference< css::chart2::XAxis > & xAxis ) const; /** Returns the position of the object in logic coordinates. */ - ::com::sun::star::awt::Point GetAxisPosition( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > & xAxis ) const; + css::awt::Point GetAxisPosition( const css::uno::Reference< css::chart2::XAxis > & xAxis ) const; private: //methods ExplicitValueProvider* getExplicitValueProvider() const; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XUnoTunnel > getChartView() const; + css::uno::Reference< css::lang::XUnoTunnel > getChartView() const; public: //member - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > - m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; private: //member - ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XModel > m_xChartModel; + css::uno::WeakReference< css::frame::XModel > m_xChartModel; ChartModel* mpModel; - mutable ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XUnoTunnel > m_xChartView; + mutable css::uno::Reference< css::lang::XUnoTunnel > m_xChartView; - typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc. + typedef std::map< OUString, css::uno::Reference< css::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc. tTableMap m_aTableMap; }; diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index dfde917be350..00a83c64c53b 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -539,16 +539,14 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( - const uno::Reference< - ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) + const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( aListener ); } void SAL_CALL ChartDataWrapper::removeChartDataChangeEventListener( - const uno::Reference< - ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) + const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); @@ -596,8 +594,7 @@ void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ { } -void ChartDataWrapper::fireChartDataChangeEvent( - ::com::sun::star::chart::ChartDataChangeEvent& aEvent ) +void ChartDataWrapper::fireChartDataChangeEvent( css::chart::ChartDataChangeEvent& aEvent ) { if( ! m_aEventListenerContainer.getLength() ) return; @@ -645,7 +642,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) bool bStacked = false; bool bPercent = false; bool bDeep = false; - uno::Reference< ::com::sun::star::chart::XChartDocument > xOldDoc( xChartDoc, uno::UNO_QUERY ); + uno::Reference< css::chart::XChartDocument > xOldDoc( xChartDoc, uno::UNO_QUERY ); OSL_ASSERT( xOldDoc.is()); uno::Reference< beans::XPropertySet > xDiaProp( xOldDoc->getDiagram(), uno::UNO_QUERY ); if( xDiaProp.is()) @@ -701,9 +698,9 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) } // notify listeners - ::com::sun::star::chart::ChartDataChangeEvent aEvent( + css::chart::ChartDataChangeEvent aEvent( static_cast< ::cppu::OWeakObject* >( this ), - ::com::sun::star::chart::ChartDataChangeType_ALL, 0, 0, 0, 0 ); + css::chart::ChartDataChangeType_ALL, 0, 0, 0, 0 ); fireChartDataChangeEvent( aEvent ); // \-- locked controllers } diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 0f2f2f958faf..f83eee2fc1ad 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -41,16 +41,16 @@ struct lcl_Operator; class ChartDataWrapper : public MutexContainer, public ::cppu::WeakImplHelper< - com::sun::star::chart2::XAnyDescriptionAccess, - com::sun::star::chart::XDateCategories, - com::sun::star::lang::XServiceInfo, - com::sun::star::lang::XEventListener, - com::sun::star::lang::XComponent > + css::chart2::XAnyDescriptionAccess, + css::chart::XDateCategories, + css::lang::XServiceInfo, + css::lang::XEventListener, + css::lang::XComponent > { public: explicit ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData >& xNewData ); + , const css::uno::Reference< css::chart::XChartData >& xNewData ); virtual ~ChartDataWrapper(); /// XServiceInfo declarations @@ -66,86 +66,70 @@ public: protected: // ____ XDateCategories ____ - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override; // ____ XAnyDescriptionAccess ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL + getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setAnyRowDescriptions( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL + getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setAnyColumnDescriptions( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL + getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setComplexRowDescriptions( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL + getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setComplexColumnDescriptions( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - double > > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - double > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - OUString > SAL_CALL getRowDescriptions() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< - OUString >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - OUString > SAL_CALL getColumnDescriptions() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< - OUString >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartData (base of XChartDataArray) ____ - virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual double SAL_CALL getNotANumber() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; - void fireChartDataChangeEvent( ::com::sun::star::chart::ChartDataChangeEvent& aEvent ); + void fireChartDataChangeEvent( css::chart::ChartDataChangeEvent& aEvent ); private: //methods void switchToInternalDataProvider(); @@ -153,8 +137,7 @@ private: //methods void applyData( lcl_Operator& rDataOperator ); private: //member - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAnyDescriptionAccess > m_xDataAccess; + css::uno::Reference< css::chart2::XAnyDescriptionAccess > m_xDataAccess; std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer; diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 035f7e9372ff..00ccc33db846 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -223,7 +223,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "NullDate", PROP_DOCUMENT_NULL_DATE, - ::cppu::UnoType<com::sun::star::util::DateTime>::get(), + ::cppu::UnoType<css::util::DateTime>::get(), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( @@ -251,7 +251,7 @@ struct StaticChartDocumentWrapperPropertyArray_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::std::sort( aProperties.begin(), aProperties.end(), @@ -279,14 +279,14 @@ public: explicit WrappedDataSourceLabelsInFirstRowProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedDataSourceLabelsInFirstRowProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -377,14 +377,14 @@ public: explicit WrappedDataSourceLabelsInFirstColumnProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedDataSourceLabelsInFirstColumnProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -475,14 +475,14 @@ public: explicit WrappedHasLegendProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedHasLegendProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -559,14 +559,14 @@ public: explicit WrappedHasMainTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedHasMainTitleProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -632,14 +632,14 @@ public: explicit WrappedHasSubTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedHasSubTitleProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1006,7 +1006,7 @@ void ChartDocumentWrapper::impl_resetAddIn() if( xInit.is() ) { uno::Any aParam; - uno::Reference< com::sun::star::chart::XChartDocument > xDoc( nullptr ); + uno::Reference< css::chart::XChartDocument > xDoc( nullptr ); aParam <<= xDoc; uno::Sequence< uno::Any > aSeq( &aParam, 1 ); xInit->initialize( aSeq ); diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index f775bc96408b..d5745663a2ec 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -209,7 +209,7 @@ void lcl_AddPropertiesToVector_SeriesOnly( uno::Sequence< Property > lcl_GetPropertySequence( DataSeriesPointWrapper::eType _eType ) { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector_PointProperties( aProperties ); if( _eType == DataSeriesPointWrapper::DATA_SERIES ) @@ -264,14 +264,14 @@ public: explicit WrappedAttachedAxisProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedAttachedAxisProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; protected: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -292,7 +292,7 @@ Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPr throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; - aRet <<= ::com::sun::star::chart::ChartAxisAssign::PRIMARY_Y; + aRet <<= css::chart::ChartAxisAssign::PRIMARY_Y; return aRet; } @@ -304,9 +304,9 @@ Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XProp uno::Reference< chart2::XDataSeries > xDataSeries( xInnerPropertySet, uno::UNO_QUERY ); bool bAttachedToMainAxis = ::chart::DiagramHelper::isSeriesAttachedToMainAxis( xDataSeries ); if( bAttachedToMainAxis ) - aRet <<= ::com::sun::star::chart::ChartAxisAssign::PRIMARY_Y; + aRet <<= css::chart::ChartAxisAssign::PRIMARY_Y; else - aRet <<= ::com::sun::star::chart::ChartAxisAssign::SECONDARY_Y; + aRet <<= css::chart::ChartAxisAssign::SECONDARY_Y; return aRet; } @@ -315,11 +315,11 @@ void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, cons { uno::Reference< chart2::XDataSeries > xDataSeries( xInnerPropertySet, uno::UNO_QUERY ); - sal_Int32 nChartAxisAssign = ::com::sun::star::chart::ChartAxisAssign::PRIMARY_Y; + sal_Int32 nChartAxisAssign = css::chart::ChartAxisAssign::PRIMARY_Y; if( ! (rOuterValue >>= nChartAxisAssign) ) throw lang::IllegalArgumentException("Property Axis requires value of type sal_Int32", nullptr, 0 ); - bool bNewAttachedToMainAxis = nChartAxisAssign == ::com::sun::star::chart::ChartAxisAssign::PRIMARY_Y; + bool bNewAttachedToMainAxis = nChartAxisAssign == css::chart::ChartAxisAssign::PRIMARY_Y; bool bOldAttachedToMainAxis = ::chart::DiagramHelper::isSeriesAttachedToMainAxis( xDataSeries ); if( bNewAttachedToMainAxis != bOldAttachedToMainAxis) @@ -378,14 +378,14 @@ public: explicit WrappedLineColorProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ); virtual ~WrappedLineColorProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override; + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -416,7 +416,7 @@ void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const R } void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = m_aDefaultValue; @@ -439,11 +439,11 @@ public: explicit WrappedLineStyleProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ); virtual ~WrappedLineStyleProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override; + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -477,7 +477,7 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R } void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = m_aDefaultValue; @@ -655,10 +655,10 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU if (rPropertyName == "SymbolBitmapURL") { uno::Any aAny = WrappedPropertySet::getPropertyValue("SymbolType"); - sal_Int32 nVal = com::sun::star::chart::ChartSymbolType::NONE; + sal_Int32 nVal = css::chart::ChartSymbolType::NONE; if (aAny >>= nVal) { - if (nVal != com::sun::star::chart::ChartSymbolType::BITMAPURL) + if (nVal != css::chart::ChartSymbolType::BITMAPURL) return beans::PropertyState::PropertyState_DEFAULT_VALUE; } } @@ -836,22 +836,22 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert static const sal_Int32 nErrorCategoryHandle = getInfoHelper().getHandleByName("ErrorCategory"); if( nErrorCategoryHandle == nHandle ) { - ::com::sun::star::chart::ChartErrorCategory aNewValue = ::com::sun::star::chart::ChartErrorCategory_NONE; + css::chart::ChartErrorCategory aNewValue = css::chart::ChartErrorCategory_NONE; rValue >>= aNewValue; Any aLow, aHigh; bool bSetHighAndLowValues = false; switch(aNewValue) { - case ::com::sun::star::chart::ChartErrorCategory_CONSTANT_VALUE: + case css::chart::ChartErrorCategory_CONSTANT_VALUE: aHigh = this->getPropertyValue("ConstantErrorHigh"); aLow = this->getPropertyValue("ConstantErrorLow"); bSetHighAndLowValues = true; break; - case ::com::sun::star::chart::ChartErrorCategory_PERCENT: + case css::chart::ChartErrorCategory_PERCENT: aHigh = aLow = this->getPropertyValue("PercentageError"); bSetHighAndLowValues = true; break; - case ::com::sun::star::chart::ChartErrorCategory_ERROR_MARGIN: + case css::chart::ChartErrorCategory_ERROR_MARGIN: aHigh = aLow = this->getPropertyValue("ErrorMargin"); bSetHighAndLowValues = true; break; @@ -865,14 +865,14 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert { switch(aNewValue) { - case ::com::sun::star::chart::ChartErrorCategory_CONSTANT_VALUE: + case css::chart::ChartErrorCategory_CONSTANT_VALUE: this->setPropertyValue("ConstantErrorHigh",aHigh); this->setPropertyValue("ConstantErrorLow",aLow); break; - case ::com::sun::star::chart::ChartErrorCategory_PERCENT: + case css::chart::ChartErrorCategory_PERCENT: this->setPropertyValue("PercentageError",aHigh); break; - case ::com::sun::star::chart::ChartErrorCategory_ERROR_MARGIN: + case css::chart::ChartErrorCategory_ERROR_MARGIN: this->setPropertyValue("ErrorMargin",aHigh); break; default: diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index da6455a5925a..8ee2734c4f34 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -44,10 +44,10 @@ class Chart2ModelContact; class DataSeriesPointWrapper : public ::cppu::ImplInheritanceHelper< WrappedPropertySet - , com::sun::star::lang::XServiceInfo - , com::sun::star::lang::XInitialization - , com::sun::star::lang::XComponent - , com::sun::star::lang::XEventListener + , css::lang::XServiceInfo + , css::lang::XInitialization + , css::lang::XComponent + , css::lang::XEventListener > , public ReferenceSizePropertyProvider @@ -84,61 +84,57 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ___lang::XInitialization___ - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; - virtual ::com::sun::star::uno::Any getReferenceSize() override; - virtual ::com::sun::star::awt::Size getCurrentSizeForReference() override; + virtual css::uno::Any getReferenceSize() override; + virtual css::awt::Size getCurrentSizeForReference() override; protected: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - 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, std::exception) override; - 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, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //own methods - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeries(); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataPointProperties(); + css::uno::Reference< css::chart2::XDataSeries > getDataSeries(); + css::uno::Reference< css::beans::XPropertySet > getDataPointProperties(); private: - std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; + std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer; eType m_eType; sal_Int32 m_nSeriesIndexInNewAPI; sal_Int32 m_nPointIndex; - bool m_bLinesAllowed; + bool m_bLinesAllowed; //this should only be used, if the DataSeriesPointWrapper is initialized via the XInitialize interface //because a big change in the chartmodel may lead to an dataseriespointer that is not connected to the model anymore //with the indices instead we can always get the new dataseries - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xDataSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xDataSeries; }; } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 2ae296f4c5ce..60c7f6556342 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -213,7 +213,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "DataRowSource", PROP_DIAGRAM_DATAROW_SOURCE, - cppu::UnoType<com::sun::star::chart::ChartDataRowSource>::get(), + cppu::UnoType<css::chart::ChartDataRowSource>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -461,7 +461,7 @@ struct StaticDiagramWrapperPropertyArray_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); @@ -876,7 +876,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( cons awt::Rectangle aRect( m_spChart2ModelContact->SubstractAxisTitleSizes(rPositionRect) ); DiagramWrapper::setDiagramPositionIncludingAxes( aRect ); } -::com::sun::star::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle(); } @@ -1206,14 +1206,14 @@ public: explicit WrappedDataRowSourceProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedDataRowSourceProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1235,19 +1235,19 @@ WrappedDataRowSourceProperty::~WrappedDataRowSourceProperty() void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ::com::sun::star::chart::ChartDataRowSource eChartDataRowSource = ::com::sun::star::chart::ChartDataRowSource_ROWS; + css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; if( ! (rOuterValue >>= eChartDataRowSource) ) { - sal_Int32 nNew = ::com::sun::star::chart::ChartDataRowSource_ROWS; + sal_Int32 nNew = css::chart::ChartDataRowSource_ROWS; if( !(rOuterValue >>= nNew) ) - throw lang::IllegalArgumentException( "Property DataRowSource requires ::com::sun::star::chart::ChartDataRowSource value", nullptr, 0 ); + throw lang::IllegalArgumentException( "Property DataRowSource requires css::chart::ChartDataRowSource value", nullptr, 0 ); else - eChartDataRowSource = ::com::sun::star::chart::ChartDataRowSource(nNew); + eChartDataRowSource = css::chart::ChartDataRowSource(nNew); } m_aOuterValue = rOuterValue; - bool bNewUseColumns = eChartDataRowSource == ::com::sun::star::chart::ChartDataRowSource_COLUMNS; + bool bNewUseColumns = eChartDataRowSource == css::chart::ChartDataRowSource_COLUMNS; OUString aRangeString; bool bUseColumns = true; @@ -1281,9 +1281,9 @@ Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPro m_spChart2ModelContact->getChartModel(), aRangeString, aSequenceMapping, bUseColumns , bFirstCellAsLabel, bHasCategories ) ) { - ::com::sun::star::chart::ChartDataRowSource eChartDataRowSource = ::com::sun::star::chart::ChartDataRowSource_ROWS; + css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; if(bUseColumns) - eChartDataRowSource = ::com::sun::star::chart::ChartDataRowSource_COLUMNS; + eChartDataRowSource = css::chart::ChartDataRowSource_COLUMNS; m_aOuterValue <<= eChartDataRowSource; } @@ -1295,7 +1295,7 @@ Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XP throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; - aRet <<= ::com::sun::star::chart::ChartDataRowSource_COLUMNS; + aRet <<= css::chart::ChartDataRowSource_COLUMNS; return aRet; } @@ -1308,14 +1308,14 @@ public: WrappedStackingProperty( StackMode eStackMode, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedStackingProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; protected: //methods bool detectInnerValue( StackMode& eInnerStackMode ) const; @@ -1420,14 +1420,14 @@ public: explicit WrappedDim3DProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedDim3DProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1491,14 +1491,14 @@ public: explicit WrappedVerticalProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedVerticalProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1567,14 +1567,14 @@ public: explicit WrappedNumberOfLinesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedNumberOfLinesProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; protected: //methods bool detectInnerValue( uno::Any& rInnerValue ) const; @@ -1721,14 +1721,14 @@ public: explicit WrappedAttributedDataPointsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedAttributedDataPointsProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1835,14 +1835,14 @@ public: explicit WrappedSolidTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedSolidTypeProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1864,7 +1864,7 @@ WrappedSolidTypeProperty::~WrappedSolidTypeProperty() void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - sal_Int32 nNewSolidType = ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID; + sal_Int32 nNewSolidType = css::chart::ChartSolidType::RECTANGULAR_SOLID; if( ! (rOuterValue >>= nNewSolidType) ) throw lang::IllegalArgumentException( "Property SolidType requires integer value", nullptr, 0 ); @@ -1899,7 +1899,7 @@ Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropert Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - return uno::makeAny( ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID ); + return uno::makeAny( css::chart::ChartSolidType::RECTANGULAR_SOLID ); } class WrappedAutomaticSizeProperty : public WrappedProperty @@ -1908,14 +1908,14 @@ public: WrappedAutomaticSizeProperty(); virtual ~WrappedAutomaticSizeProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; }; WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() @@ -1980,8 +1980,8 @@ public: explicit WrappedIncludeHiddenCellsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedIncludeHiddenCellsProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 0ec3eb56a7af..fb8d1d495fd8 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -55,19 +55,19 @@ class Chart2ModelContact; class DiagramWrapper : public cppu::ImplInheritanceHelper< WrappedPropertySet - , ::com::sun::star::chart::XDiagram - , ::com::sun::star::chart::XAxisSupplier - , ::com::sun::star::chart::XAxisZSupplier - , ::com::sun::star::chart::XTwoAxisXSupplier // : XAxisXSupplier - , ::com::sun::star::chart::XTwoAxisYSupplier // : XAxisYSupplier - , ::com::sun::star::chart::XStatisticDisplay - , ::com::sun::star::chart::X3DDisplay - , ::com::sun::star::chart::X3DDefaultSetter - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XComponent - , ::com::sun::star::chart::XDiagramPositioning - , ::com::sun::star::chart2::XDiagramProvider - , ::com::sun::star::chart::XSecondAxisTitleSupplier + , css::chart::XDiagram + , css::chart::XAxisSupplier + , css::chart::XAxisZSupplier + , css::chart::XTwoAxisXSupplier // : XAxisXSupplier + , css::chart::XTwoAxisYSupplier // : XAxisYSupplier + , css::chart::XStatisticDisplay + , css::chart::X3DDisplay + , css::chart::X3DDefaultSetter + , css::lang::XServiceInfo + , css::lang::XComponent + , css::chart::XDiagramPositioning + , css::chart2::XDiagramProvider + , css::chart::XSecondAxisTitleSupplier > { public: @@ -87,184 +87,182 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< + css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< + css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XDiagram ____ virtual OUString SAL_CALL getDiagramType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // ____ XShape (base of XDiagram) ____ - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) + throw (css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception) override; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XAxisSupplier ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XAxisZSupplier ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > SAL_CALL getZAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getZMainGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getZHelpGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getZAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::drawing::XShape > SAL_CALL getZAxisTitle() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getZMainGrid() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getZHelpGrid() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getZAxis() + throw (css::uno::RuntimeException, std::exception) override; // ____ XTwoAxisXSupplier ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getSecondaryXAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() + throw (css::uno::RuntimeException, std::exception) override; // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > SAL_CALL getXAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getXAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getXMainGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getXHelpGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::drawing::XShape > SAL_CALL getXAxisTitle() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getXAxis() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getXMainGrid() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getXHelpGrid() + throw (css::uno::RuntimeException, std::exception) override; // ____ XTwoAxisYSupplier ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getSecondaryYAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() + throw (css::uno::RuntimeException, std::exception) override; // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > SAL_CALL getYAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getYAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getYHelpGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getYMainGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::drawing::XShape > SAL_CALL getYAxisTitle() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getYAxis() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getYHelpGrid() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getYMainGrid() + throw (css::uno::RuntimeException, std::exception) override; // ____ XSecondAxisTitleSupplier ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > SAL_CALL getSecondXAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > SAL_CALL getSecondYAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::drawing::XShape > SAL_CALL getSecondXAxisTitle() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::drawing::XShape > SAL_CALL getSecondYAxisTitle() + throw (css::uno::RuntimeException, std::exception) override; // ____ XStatisticDisplay ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getUpBar() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getDownBar() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getMinMaxLine() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getUpBar() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getDownBar() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getMinMaxLine() + throw (css::uno::RuntimeException, std::exception) override; // ____ X3DDisplay ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getWall() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getFloor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getWall() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getFloor() + throw (css::uno::RuntimeException, std::exception) override; // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override; // ____ XDiagramPositioning ____ - virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionIncludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) override; // ____ XDiagramProvider ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > SAL_CALL getDiagram() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XAxis > m_xXAxis; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XAxis > m_xYAxis; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XAxis > m_xZAxis; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XAxis > m_xSecondXAxis; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XAxis > m_xSecondYAxis; - - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xWall; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xFloor; - - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xMinMaxLineWrapper; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xUpBarWrapper; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xDownBarWrapper; + css::uno::Reference< + css::chart::XAxis > m_xXAxis; + css::uno::Reference< + css::chart::XAxis > m_xYAxis; + css::uno::Reference< + css::chart::XAxis > m_xZAxis; + css::uno::Reference< + css::chart::XAxis > m_xSecondXAxis; + css::uno::Reference< + css::chart::XAxis > m_xSecondYAxis; + + css::uno::Reference< + css::beans::XPropertySet > m_xWall; + css::uno::Reference< + css::beans::XPropertySet > m_xFloor; + + css::uno::Reference< + css::beans::XPropertySet > m_xMinMaxLineWrapper; + css::uno::Reference< + css::beans::XPropertySet > m_xUpBarWrapper; + css::uno::Reference< + css::beans::XPropertySet > m_xDownBarWrapper; }; } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 6ce104f45d76..a430ef02d631 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -57,7 +57,7 @@ struct StaticGridWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index a53e0b09e7b1..c8dcc1c7b9fa 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -40,8 +40,8 @@ class Chart2ModelContact; class GridWrapper : public ::cppu::ImplInheritanceHelper< WrappedPropertySet - , com::sun::star::lang::XComponent - , com::sun::star::lang::XServiceInfo + , css::lang::XComponent + , css::lang::XServiceInfo > { public: @@ -73,19 +73,17 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 8b77142744a2..ef0768a9eaa0 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -88,7 +88,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP xInnerPropertySet->getPropertyValue( "Show" ) >>= bShowLegend; if(!bShowLegend) { - aRet = uno::makeAny( ::com::sun::star::chart::ChartLegendPosition_NONE ); + aRet = uno::makeAny( css::chart::ChartLegendPosition_NONE ); } else { @@ -107,8 +107,8 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c bool bNewShowLegend = true; bool bOldShowLegend = true; { - ::com::sun::star::chart::ChartLegendPosition eOuterPos(::com::sun::star::chart::ChartLegendPosition_NONE); - if( (rOuterValue >>= eOuterPos) && eOuterPos == ::com::sun::star::chart::ChartLegendPosition_NONE ) + css::chart::ChartLegendPosition eOuterPos(css::chart::ChartLegendPosition_NONE); + if( (rOuterValue >>= eOuterPos) && eOuterPos == css::chart::ChartLegendPosition_NONE ) bNewShowLegend = false; xInnerPropertySet->getPropertyValue( "Show" ) >>= bOldShowLegend; } @@ -127,13 +127,13 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c chart2::LegendPosition eNewInnerPos(chart2::LegendPosition_LINE_END); if( aInnerValue >>= eNewInnerPos ) { - ::com::sun::star::chart::ChartLegendExpansion eNewExpansion = + css::chart::ChartLegendExpansion eNewExpansion = ( eNewInnerPos == chart2::LegendPosition_LINE_END || eNewInnerPos == chart2::LegendPosition_LINE_START ) - ? ::com::sun::star::chart::ChartLegendExpansion_HIGH - : ::com::sun::star::chart::ChartLegendExpansion_WIDE; + ? css::chart::ChartLegendExpansion_HIGH + : css::chart::ChartLegendExpansion_WIDE; - ::com::sun::star::chart::ChartLegendExpansion eOldExpansion( ::com::sun::star::chart::ChartLegendExpansion_HIGH ); + css::chart::ChartLegendExpansion eOldExpansion( css::chart::ChartLegendExpansion_HIGH ); bool bExpansionWasSet( xInnerPropertySet->getPropertyValue( "Expansion" ) >>= eOldExpansion ); @@ -152,7 +152,7 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c Any WrappedLegendAlignmentProperty::convertInnerToOuterValue( const Any& rInnerValue ) const { - ::com::sun::star::chart::ChartLegendPosition ePos = ::com::sun::star::chart::ChartLegendPosition_NONE; + css::chart::ChartLegendPosition ePos = css::chart::ChartLegendPosition_NONE; chart2::LegendPosition eNewPos; if( rInnerValue >>= eNewPos ) @@ -160,20 +160,20 @@ Any WrappedLegendAlignmentProperty::convertInnerToOuterValue( const Any& rInnerV switch( eNewPos ) { case chart2::LegendPosition_LINE_START: - ePos = ::com::sun::star::chart::ChartLegendPosition_LEFT; + ePos = css::chart::ChartLegendPosition_LEFT; break; case chart2::LegendPosition_LINE_END: - ePos = ::com::sun::star::chart::ChartLegendPosition_RIGHT; + ePos = css::chart::ChartLegendPosition_RIGHT; break; case chart2::LegendPosition_PAGE_START: - ePos = ::com::sun::star::chart::ChartLegendPosition_TOP; + ePos = css::chart::ChartLegendPosition_TOP; break; case chart2::LegendPosition_PAGE_END: - ePos = ::com::sun::star::chart::ChartLegendPosition_BOTTOM; + ePos = css::chart::ChartLegendPosition_BOTTOM; break; default: - ePos = ::com::sun::star::chart::ChartLegendPosition_NONE; + ePos = css::chart::ChartLegendPosition_NONE; break; } } @@ -183,21 +183,21 @@ Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterV { chart2::LegendPosition eNewPos = chart2::LegendPosition_LINE_END; - ::com::sun::star::chart::ChartLegendPosition ePos; + css::chart::ChartLegendPosition ePos; if( rOuterValue >>= ePos ) { switch( ePos ) { - case ::com::sun::star::chart::ChartLegendPosition_LEFT: + case css::chart::ChartLegendPosition_LEFT: eNewPos = chart2::LegendPosition_LINE_START; break; - case ::com::sun::star::chart::ChartLegendPosition_RIGHT: + case css::chart::ChartLegendPosition_RIGHT: eNewPos = chart2::LegendPosition_LINE_END; break; - case ::com::sun::star::chart::ChartLegendPosition_TOP: + case css::chart::ChartLegendPosition_TOP: eNewPos = chart2::LegendPosition_PAGE_START; break; - case ::com::sun::star::chart::ChartLegendPosition_BOTTOM: + case css::chart::ChartLegendPosition_BOTTOM: eNewPos = chart2::LegendPosition_PAGE_END; break; default: // NONE @@ -225,14 +225,14 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Alignment", PROP_LEGEND_ALIGNMENT, - cppu::UnoType<com::sun::star::chart::ChartLegendPosition>::get(), + cppu::UnoType<css::chart::ChartLegendPosition>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "Expansion", PROP_LEGEND_EXPANSION, - cppu::UnoType<com::sun::star::chart::ChartLegendExpansion>::get(), + cppu::UnoType<css::chart::ChartLegendExpansion>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); } @@ -248,7 +248,7 @@ struct StaticLegendWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 8b1f1c2ed119..a6e40188d2bf 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -43,9 +43,9 @@ class Chart2ModelContact; class LegendWrapper : public ::cppu::ImplInheritanceHelper< WrappedPropertySet - , com::sun::star::drawing::XShape - , com::sun::star::lang::XComponent - , com::sun::star::lang::XServiceInfo + , css::drawing::XShape + , css::lang::XComponent + , css::lang::XServiceInfo > , public ReferenceSizePropertyProvider { @@ -66,39 +66,39 @@ public: //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; - virtual ::com::sun::star::uno::Any getReferenceSize() override; - virtual ::com::sun::star::awt::Size getCurrentSizeForReference() override; + virtual css::uno::Any getReferenceSize() override; + virtual css::awt::Size getCurrentSizeForReference() override; // ____ XShape ____ - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) + throw (css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception) override; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< + css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< + css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 23d048f207ef..1b7db85eec37 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -75,7 +75,7 @@ struct StaticMinMaxLineWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 08748bfe12d5..26760be4ce9c 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -46,12 +46,12 @@ class Chart2ModelContact; class MinMaxLineWrapper : public MutexContainer , public ::cppu::WeakImplHelper - < ::com::sun::star::lang::XComponent - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::beans::XPropertySet - , ::com::sun::star::beans::XMultiPropertySet - , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::beans::XMultiPropertyStates + < css::lang::XComponent + , css::lang::XServiceInfo + , css::beans::XPropertySet + , css::beans::XMultiPropertySet + , css::beans::XPropertyState + , css::beans::XMultiPropertyStates > { public: @@ -71,44 +71,42 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; private: //methods static ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx index 586b97fe4cc3..432f3123c5b8 100644 --- a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx +++ b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx @@ -29,8 +29,8 @@ class ReferenceSizePropertyProvider { public: virtual void updateReferenceSize() = 0; - virtual ::com::sun::star::uno::Any getReferenceSize() = 0; - virtual ::com::sun::star::awt::Size getCurrentSizeForReference() = 0; + virtual css::uno::Any getReferenceSize() = 0; + virtual css::awt::Size getCurrentSizeForReference() = 0; protected: ~ReferenceSizePropertyProvider() {} diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 648281f2310c..6ca38c41a3d3 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -41,9 +41,9 @@ namespace wrapper class TitleWrapper : public ::cppu::ImplInheritanceHelper< WrappedPropertySet - , com::sun::star::drawing::XShape - , com::sun::star::lang::XComponent - , com::sun::star::lang::XServiceInfo + , css::drawing::XShape + , css::lang::XComponent + , css::lang::XServiceInfo > , public ReferenceSizePropertyProvider { @@ -65,61 +65,59 @@ public: //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; - virtual ::com::sun::star::uno::Any getReferenceSize() override; - virtual ::com::sun::star::awt::Size getCurrentSizeForReference() override; + virtual css::uno::Any getReferenceSize() override; + virtual css::awt::Size getCurrentSizeForReference() override; protected: // ____ XShape ____ - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) + throw (css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception) override; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // character properties have to be handled differently (via the XFormattedString elements) - void getFastCharacterPropertyValue( sal_Int32 nHandle, ::com::sun::star::uno::Any& rValue ); - void setFastCharacterPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + void getFastCharacterPropertyValue( sal_Int32 nHandle, css::uno::Any& rValue ); + void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw (css::uno::Exception); // ____ WrappedPropertySet ____ - 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, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getFirstCharacterPropertySet(); + css::uno::Reference< css::beans::XPropertySet > getFirstCharacterPropertySet(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > getTitleObject(); + css::uno::Reference< css::chart2::XTitle > getTitleObject(); private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 9921af669504..547697bb5204 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -56,7 +56,7 @@ struct StaticUpDownBarWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 938fe0881932..01e5dda969ef 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -45,12 +45,12 @@ class Chart2ModelContact; class UpDownBarWrapper : public MutexContainer , public ::cppu::WeakImplHelper - < ::com::sun::star::lang::XComponent - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::beans::XPropertySet - , ::com::sun::star::beans::XMultiPropertySet - , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::beans::XMultiPropertyStates + < css::lang::XComponent + , css::lang::XServiceInfo + , css::beans::XPropertySet + , css::beans::XMultiPropertySet + , css::beans::XPropertyState + , css::beans::XMultiPropertyStates > { public: @@ -70,44 +70,44 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< + css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< + css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; private: //methods static ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 5ae15ce5fdd0..f836ab864772 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -58,7 +58,7 @@ struct StaticWallFloorWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::chart::FillProperties::AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index 3773f1fbb2c2..e3c96ccf5d3a 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -39,8 +39,8 @@ class Chart2ModelContact; class WallFloorWrapper : public ::cppu::ImplInheritanceHelper< WrappedPropertySet - , com::sun::star::lang::XComponent - , com::sun::star::lang::XServiceInfo + , css::lang::XComponent + , css::lang::XServiceInfo > { public: @@ -60,19 +60,17 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index 80d8536bddc6..786a8a7647e1 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -33,11 +33,11 @@ public: explicit WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedAddInProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -49,11 +49,11 @@ public: explicit WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedBaseDiagramProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -65,11 +65,11 @@ public: explicit WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedAdditionalShapesProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -81,11 +81,11 @@ public: explicit WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedRefreshAddInAllowedProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index 8ca724ab9a3a..972ea658124e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -31,7 +31,7 @@ namespace wrapper class WrappedAutomaticPositionProperties { public: - static void addProperties( ::std::vector< ::com::sun::star::beans::Property >& rOutProperties ); + static void addProperties( ::std::vector< css::beans::Property >& rOutProperties ); static void addWrappedProperties( std::vector< WrappedProperty* >& rList ); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index f4fd05c614cd..58035b8addb7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -40,14 +40,14 @@ public: , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedAxisAndGridExistenceProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -207,14 +207,14 @@ public: , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedAxisTitleExistenceProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -321,14 +321,14 @@ public: , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedAxisLabelExistenceProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index cb2b2c3ef72b..38be4b4cf158 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -36,21 +36,21 @@ public: 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 - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override; + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; protected: - virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const override; - virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const override; + virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; + virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const override; protected: ReferenceSizePropertyProvider* m_pRefSizePropProvider; diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index 9736c91c1d2e..01d818464696 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -41,8 +41,8 @@ namespace wrapper class WrappedDataCaptionProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 > { public: - virtual sal_Int32 getValueFromSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet ) const override; - virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const override; + virtual sal_Int32 getValueFromSeries( const css::uno::Reference< css::beans::XPropertySet >& xSeriesPropertySet ) const override; + virtual void setValueToSeries( const css::uno::Reference< css::beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const override; explicit WrappedDataCaptionProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -62,13 +62,13 @@ sal_Int32 lcl_LabelToCaption( const chart2::DataPointLabel& rLabel ) sal_Int32 nCaption=0; if( rLabel.ShowNumber ) - nCaption |= ::com::sun::star::chart::ChartDataCaption::VALUE; + nCaption |= css::chart::ChartDataCaption::VALUE; if( rLabel.ShowNumberInPercent ) - nCaption |= ::com::sun::star::chart::ChartDataCaption::PERCENT; + nCaption |= css::chart::ChartDataCaption::PERCENT; if( rLabel.ShowCategoryName ) - nCaption |= ::com::sun::star::chart::ChartDataCaption::TEXT; + nCaption |= css::chart::ChartDataCaption::TEXT; if( rLabel.ShowLegendSymbol ) - nCaption |= ::com::sun::star::chart::ChartDataCaption::SYMBOL; + nCaption |= css::chart::ChartDataCaption::SYMBOL; return nCaption; } @@ -77,13 +77,13 @@ chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption ) { chart2::DataPointLabel aLabel(false,false,false,false); - if( nCaption & ::com::sun::star::chart::ChartDataCaption::VALUE ) + if( nCaption & css::chart::ChartDataCaption::VALUE ) aLabel.ShowNumber = true; - if( nCaption & ::com::sun::star::chart::ChartDataCaption::PERCENT ) + if( nCaption & css::chart::ChartDataCaption::PERCENT ) aLabel.ShowNumberInPercent = true; - if( nCaption & ::com::sun::star::chart::ChartDataCaption::TEXT ) + if( nCaption & css::chart::ChartDataCaption::TEXT ) aLabel.ShowCategoryName = true; - if( nCaption & ::com::sun::star::chart::ChartDataCaption::SYMBOL ) + if( nCaption & css::chart::ChartDataCaption::SYMBOL ) aLabel.ShowLegendSymbol = true; return aLabel; diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx index a4e988cfc1ba..ad5222f202f2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedDataCaptionProperties { public: - static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 5326a56993ba..378bb63f3391 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -39,11 +39,11 @@ public: , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedBarPositionProperty_Base(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; void setDimensionAndAxisIndex( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); @@ -52,10 +52,10 @@ protected: sal_Int32 m_nAxisIndex; std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - sal_Int32 m_nDefaultValue; - OUString m_InnerSequencePropertyName; + sal_Int32 m_nDefaultValue; + OUString m_InnerSequencePropertyName; - mutable ::com::sun::star::uno::Any m_aOuterValue; + mutable css::uno::Any m_aOuterValue; }; class WrappedGapwidthProperty : public WrappedBarPositionProperty_Base diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index 2e75025dbe17..c578b21a4296 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -37,14 +37,14 @@ public: explicit WrappedNumberFormatProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedNumberFormatProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; friend class WrappedLinkNumberFormatProperty; private: @@ -57,14 +57,14 @@ public: explicit WrappedLinkNumberFormatProperty(); virtual ~WrappedLinkNumberFormatProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 3cc7aef98073..f941f169d393 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -270,19 +270,19 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons sal_Int32 nType = 0; if( (rOuterValue >>= nType) ) { - if( ::com::sun::star::chart::ChartAxisType::AUTOMATIC == nType ) + if( css::chart::ChartAxisType::AUTOMATIC == nType ) { aScaleData.AutoDateAxis = true; if( aScaleData.AxisType == AxisType::DATE ) aScaleData.AxisType = AxisType::CATEGORY; } - else if( ::com::sun::star::chart::ChartAxisType::CATEGORY == nType ) + else if( css::chart::ChartAxisType::CATEGORY == nType ) { aScaleData.AutoDateAxis = false; if( aScaleData.AxisType == AxisType::DATE ) aScaleData.AxisType = AxisType::CATEGORY; } - else if( ::com::sun::star::chart::ChartAxisType::DATE == nType ) + else if( css::chart::ChartAxisType::DATE == nType ) { if( aScaleData.AxisType == AxisType::CATEGORY ) aScaleData.AxisType = AxisType::DATE; @@ -525,15 +525,15 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const } case SCALE_PROP_AXIS_TYPE: { - sal_Int32 nType = ::com::sun::star::chart::ChartAxisType::AUTOMATIC; + sal_Int32 nType = css::chart::ChartAxisType::AUTOMATIC; if( aScaleData.AxisType == AxisType::DATE ) { - nType = ::com::sun::star::chart::ChartAxisType::DATE; + nType = css::chart::ChartAxisType::DATE; } else if( aScaleData.AxisType == AxisType::CATEGORY ) { if( !aScaleData.AutoDateAxis ) - nType = ::com::sun::star::chart::ChartAxisType::CATEGORY; + nType = css::chart::ChartAxisType::CATEGORY; } aRet = uno::makeAny( nType ); break; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index 7b66dadfde37..a6c0d890276c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -59,23 +59,23 @@ public: static void addWrappedProperties( std::vector< WrappedProperty* >& rList, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; protected: //methods - void setPropertyValue( tScaleProperty eScaleProperty, const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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); - ::com::sun::star::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; tScaleProperty m_eScaleProperty; - mutable ::com::sun::star::uno::Any m_aOuterValue; + mutable css::uno::Any m_aOuterValue; }; } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx index 987963faab55..a74c0f675724 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx @@ -34,7 +34,7 @@ namespace wrapper class WrappedScaleTextProperties { public: - static void addProperties( ::std::vector< ::com::sun::star::beans::Property >& rOutProperties ); + static void addProperties( ::std::vector< css::beans::Property >& rOutProperties ); static void addWrappedProperties( std::vector< WrappedProperty* >& rList , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index ad4cef1d5ef2..d1a78ffad3cf 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -44,14 +44,14 @@ public: std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedD3DTransformMatrixProperty(); - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 5905cbd0c52d..733899470536 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -45,10 +45,10 @@ template< typename PROPERTYTYPE > class WrappedSeriesOrDiagramProperty : public WrappedProperty { 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, const PROPERTYTYPE & aNewValue ) const =0; + virtual PROPERTYTYPE getValueFromSeries( const css::uno::Reference< css::beans::XPropertySet >& xSeriesPropertySet ) const =0; + virtual void setValueToSeries( const css::uno::Reference< css::beans::XPropertySet >& xSeriesPropertySet, const PROPERTYTYPE & aNewValue ) const =0; - explicit WrappedSeriesOrDiagramProperty( const OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue + explicit WrappedSeriesOrDiagramProperty( const OUString& rName, const css::uno::Any& rDefaulValue , std::shared_ptr< Chart2ModelContact > spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) : WrappedProperty(rName,OUString()) @@ -67,13 +67,13 @@ public: if( m_ePropertyType == DIAGRAM && m_spChart2ModelContact.get() ) { - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > aSeriesVector( + ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector( ::chart::DiagramHelper::getDataSeriesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >::const_iterator aIter = + ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter = aSeriesVector.begin(); for( ; aIter != aSeriesVector.end(); ++aIter ) { - PROPERTYTYPE aCurValue = getValueFromSeries( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >::query( *aIter ) ); + PROPERTYTYPE aCurValue = getValueFromSeries( css::uno::Reference< css::beans::XPropertySet >::query( *aIter ) ); if( !bHasDetectableInnerValue ) rValue = aCurValue; else @@ -96,13 +96,13 @@ public: if( m_ePropertyType == DIAGRAM && m_spChart2ModelContact.get() ) { - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > aSeriesVector( + ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector( ::chart::DiagramHelper::getDataSeriesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >::const_iterator aIter = + ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter = aSeriesVector.begin(); for( ; aIter != aSeriesVector.end(); ++aIter ) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xSeriesPropertySet( *aIter, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > xSeriesPropertySet( *aIter, css::uno::UNO_QUERY ); if( xSeriesPropertySet.is() ) { setValueToSeries( xSeriesPropertySet, aNewValue ); @@ -110,12 +110,12 @@ public: } } } - virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override { PROPERTYTYPE aNewValue = PROPERTYTYPE(); if( ! (rOuterValue >>= aNewValue) ) - throw ::com::sun::star::lang::IllegalArgumentException( "statistic property requires different type", nullptr, 0 ); + throw css::lang::IllegalArgumentException( "statistic property requires different type", nullptr, 0 ); if( m_ePropertyType == DIAGRAM ) { @@ -135,8 +135,8 @@ public: } } - virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override { if( m_ePropertyType == DIAGRAM ) { @@ -153,22 +153,22 @@ public: } else { - ::com::sun::star::uno::Any aRet( m_aDefaultValue ); + css::uno::Any aRet( m_aDefaultValue ); aRet <<= getValueFromSeries( xInnerPropertySet ); return aRet; } } - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override { return m_aDefaultValue; } protected: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - mutable ::com::sun::star::uno::Any m_aOuterValue; - ::com::sun::star::uno::Any m_aDefaultValue; + mutable css::uno::Any m_aOuterValue; + css::uno::Any m_aDefaultValue; tSeriesOrDiagramPropertyType m_ePropertyType; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 139c46b4ec75..30e47aaa623a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -44,7 +44,7 @@ class WrappedSplineProperty : public WrappedProperty { public: explicit WrappedSplineProperty( const OUString& rOuterName, const OUString& rInnerName - , const ::com::sun::star::uno::Any& rDefaulValue + , const css::uno::Any& rDefaulValue , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedProperty(rOuterName,OUString()) , m_spChart2ModelContact(spChart2ModelContact) @@ -59,7 +59,7 @@ public: { bool bHasDetectableInnerValue = false; rHasAmbiguousValue = false; - Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > aChartTypes( + Sequence< css::uno::Reference< css::chart2::XChartType > > aChartTypes( ::chart::DiagramHelper::getChartTypesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); for( sal_Int32 nN = aChartTypes.getLength(); nN--; ) { @@ -95,12 +95,12 @@ public: } return bHasDetectableInnerValue; } - void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - 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) override + void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override { PROPERTYTYPE aNewValue; if( ! (rOuterValue >>= aNewValue) ) - throw ::com::sun::star::lang::IllegalArgumentException( "spline property requires different type", nullptr, 0 ); + throw css::lang::IllegalArgumentException( "spline property requires different type", nullptr, 0 ); m_aOuterValue = rOuterValue; @@ -110,13 +110,13 @@ public: { if( bHasAmbiguousValue || aNewValue != aOldValue ) { - Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > aChartTypes( + Sequence< css::uno::Reference< css::chart2::XChartType > > aChartTypes( ::chart::DiagramHelper::getChartTypesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); for( sal_Int32 nN = aChartTypes.getLength(); nN--; ) { try { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xChartTypePropertySet( aChartTypes[nN], ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > xChartTypePropertySet( aChartTypes[nN], css::uno::UNO_QUERY ); if( xChartTypePropertySet.is() ) { xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,this->convertOuterToInnerValue(uno::makeAny(aNewValue))); @@ -133,8 +133,8 @@ public: } } - ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override { bool bHasAmbiguousValue = false; PROPERTYTYPE aValue; @@ -145,16 +145,16 @@ public: return m_aOuterValue; } - ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override + css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override { return m_aDefaultValue; } protected: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - mutable ::com::sun::star::uno::Any m_aOuterValue; - ::com::sun::star::uno::Any m_aDefaultValue; + mutable css::uno::Any m_aOuterValue; + css::uno::Any m_aDefaultValue; // this inner name is not set as inner name at the base class const OUString m_aOwnInnerName; }; @@ -165,8 +165,8 @@ public: explicit WrappedSplineTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedSplineTypeProperty(); - virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const override; - virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const override; + virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; + virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const override; }; namespace diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx index 64a9f2ea8970..0633ff572bf3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedSplineProperties { public: - static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); static void addWrappedProperties( std::vector< WrappedProperty* >& rList , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 21f08fe6147a..085ed9fdb6dc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -52,57 +52,57 @@ namespace Any lcl_getRegressionDefault() { Any aRet; - aRet <<= ::com::sun::star::chart::ChartRegressionCurveType_NONE; + aRet <<= css::chart::ChartRegressionCurveType_NONE; return aRet; } -::com::sun::star::chart::ChartRegressionCurveType lcl_getRegressionCurveType(SvxChartRegress eRegressionType) +css::chart::ChartRegressionCurveType lcl_getRegressionCurveType(SvxChartRegress eRegressionType) { - ::com::sun::star::chart::ChartRegressionCurveType eRet = ::com::sun::star::chart::ChartRegressionCurveType_NONE; + css::chart::ChartRegressionCurveType eRet = css::chart::ChartRegressionCurveType_NONE; switch(eRegressionType) { case CHREGRESS_LINEAR: - eRet = ::com::sun::star::chart::ChartRegressionCurveType_LINEAR; + eRet = css::chart::ChartRegressionCurveType_LINEAR; break; case CHREGRESS_LOG: - eRet = ::com::sun::star::chart::ChartRegressionCurveType_LOGARITHM; + eRet = css::chart::ChartRegressionCurveType_LOGARITHM; break; case CHREGRESS_EXP: - eRet = ::com::sun::star::chart::ChartRegressionCurveType_EXPONENTIAL; + eRet = css::chart::ChartRegressionCurveType_EXPONENTIAL; break; case CHREGRESS_POWER: - eRet = ::com::sun::star::chart::ChartRegressionCurveType_POWER; + eRet = css::chart::ChartRegressionCurveType_POWER; break; case CHREGRESS_POLYNOMIAL: - eRet = ::com::sun::star::chart::ChartRegressionCurveType_POLYNOMIAL; + eRet = css::chart::ChartRegressionCurveType_POLYNOMIAL; break; /*case CHREGRESS_MOVING_AVERAGE: - eRet = ::com::sun::star::chart::ChartRegressionCurveType_MOVING_AVERAGE; + eRet = css::chart::ChartRegressionCurveType_MOVING_AVERAGE; break;*/ default: - eRet = ::com::sun::star::chart::ChartRegressionCurveType_NONE; + eRet = css::chart::ChartRegressionCurveType_NONE; break; } return eRet; } -SvxChartRegress lcl_getRegressionType( ::com::sun::star::chart::ChartRegressionCurveType eRegressionCurveType ) +SvxChartRegress lcl_getRegressionType( css::chart::ChartRegressionCurveType eRegressionCurveType ) { SvxChartRegress eRet; switch (eRegressionCurveType) { - case ::com::sun::star::chart::ChartRegressionCurveType_LINEAR: + case css::chart::ChartRegressionCurveType_LINEAR: eRet = CHREGRESS_LINEAR; break; - case ::com::sun::star::chart::ChartRegressionCurveType_LOGARITHM: + case css::chart::ChartRegressionCurveType_LOGARITHM: eRet = CHREGRESS_LOG; break; - case ::com::sun::star::chart::ChartRegressionCurveType_EXPONENTIAL: + case css::chart::ChartRegressionCurveType_EXPONENTIAL: eRet = CHREGRESS_EXP; break; - case ::com::sun::star::chart::ChartRegressionCurveType_POLYNOMIAL: - //case ::com::sun::star::chart::ChartRegressionCurveType_MOVING_AVERAGE: - case ::com::sun::star::chart::ChartRegressionCurveType_POWER: + case css::chart::ChartRegressionCurveType_POLYNOMIAL: + //case css::chart::ChartRegressionCurveType_MOVING_AVERAGE: + case css::chart::ChartRegressionCurveType_POWER: eRet = CHREGRESS_POWER; break; default: @@ -114,7 +114,7 @@ SvxChartRegress lcl_getRegressionType( ::com::sun::star::chart::ChartRegressionC sal_Int32 lcl_getErrorBarStyle( const uno::Reference< beans::XPropertySet >& xErrorBarProperties ) { - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; if(xErrorBarProperties.is()) xErrorBarProperties->getPropertyValue( "ErrorBarStyle" ) >>= nStyle; return nStyle; @@ -193,7 +193,7 @@ protected: //default in new and old api are different xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(false) ); xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(false) ); - xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny(::com::sun::star::chart::ErrorBarStyle::NONE) ); + xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny(css::chart::ErrorBarStyle::NONE) ); xSeriesPropertySet->setPropertyValue( CHART_UNONAME_ERRORBAR_Y , uno::makeAny( xErrorBarProperties ) ); } return xErrorBarProperties; @@ -234,7 +234,7 @@ double WrappedConstantErrorLowProperty::getValueFromSeries( const Reference< bea uno::Reference< beans::XPropertySet > xErrorBarProperties; if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { - if( ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) ) + if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) ) xErrorBarProperties->getPropertyValue( "NegativeError" ) >>= aRet; else m_aOuterValue >>= aRet; @@ -248,7 +248,7 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans:: if( xErrorBarProperties.is() ) { m_aOuterValue = uno::makeAny( aNewValue ); - if( ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) ) + if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) ) { xErrorBarProperties->setPropertyValue( "NegativeError", m_aOuterValue ); } @@ -288,7 +288,7 @@ double WrappedConstantErrorHighProperty::getValueFromSeries( const Reference< be uno::Reference< beans::XPropertySet > xErrorBarProperties; if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { - if( ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) ) + if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) ) xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet; else m_aOuterValue >>= aRet; @@ -302,7 +302,7 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans: if( xErrorBarProperties.is() ) { m_aOuterValue = uno::makeAny( aNewValue ); - if( ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) ) + if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) ) { xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue ); } @@ -354,11 +354,11 @@ void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XProper //PROP_CHART_STATISTIC_ERROR_CATEGORY // deprecated, replaced by ErrorBarStyle -class WrappedErrorCategoryProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorCategory > +class WrappedErrorCategoryProperty : public WrappedStatisticProperty< css::chart::ChartErrorCategory > { public: - virtual ::com::sun::star::chart::ChartErrorCategory getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorCategory& aNewValue ) const override; + virtual css::chart::ChartErrorCategory getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartErrorCategory& aNewValue ) const override; explicit WrappedErrorCategoryProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -368,46 +368,46 @@ public: WrappedErrorCategoryProperty::WrappedErrorCategoryProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorCategory >( "ErrorCategory" - , uno::makeAny( ::com::sun::star::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType ) + : WrappedStatisticProperty< css::chart::ChartErrorCategory >( "ErrorCategory" + , uno::makeAny( css::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType ) { } WrappedErrorCategoryProperty::~WrappedErrorCategoryProperty() { } -::com::sun::star::chart::ChartErrorCategory WrappedErrorCategoryProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const +css::chart::ChartErrorCategory WrappedErrorCategoryProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const { - ::com::sun::star::chart::ChartErrorCategory aRet = ::com::sun::star::chart::ChartErrorCategory_NONE; + css::chart::ChartErrorCategory aRet = css::chart::ChartErrorCategory_NONE; m_aDefaultValue >>= aRet; uno::Reference< beans::XPropertySet > xErrorBarProperties; if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; xErrorBarProperties->getPropertyValue( "ErrorBarStyle" ) >>= nStyle; switch(nStyle) { - case ::com::sun::star::chart::ErrorBarStyle::NONE: - aRet = ::com::sun::star::chart::ChartErrorCategory_NONE; + case css::chart::ErrorBarStyle::NONE: + aRet = css::chart::ChartErrorCategory_NONE; break; - case ::com::sun::star::chart::ErrorBarStyle::VARIANCE: - aRet = ::com::sun::star::chart::ChartErrorCategory_VARIANCE; + case css::chart::ErrorBarStyle::VARIANCE: + aRet = css::chart::ChartErrorCategory_VARIANCE; break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION: - aRet = ::com::sun::star::chart::ChartErrorCategory_STANDARD_DEVIATION; + case css::chart::ErrorBarStyle::STANDARD_DEVIATION: + aRet = css::chart::ChartErrorCategory_STANDARD_DEVIATION; break; - case ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE: - aRet = ::com::sun::star::chart::ChartErrorCategory_CONSTANT_VALUE; + case css::chart::ErrorBarStyle::ABSOLUTE: + aRet = css::chart::ChartErrorCategory_CONSTANT_VALUE; break; - case ::com::sun::star::chart::ErrorBarStyle::RELATIVE: - aRet = ::com::sun::star::chart::ChartErrorCategory_PERCENT; + case css::chart::ErrorBarStyle::RELATIVE: + aRet = css::chart::ChartErrorCategory_PERCENT; break; - case ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: - aRet = ::com::sun::star::chart::ChartErrorCategory_ERROR_MARGIN; + case css::chart::ErrorBarStyle::ERROR_MARGIN: + aRet = css::chart::ChartErrorCategory_ERROR_MARGIN; break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR: + case css::chart::ErrorBarStyle::STANDARD_ERROR: break; - case ::com::sun::star::chart::ErrorBarStyle::FROM_DATA: + case css::chart::ErrorBarStyle::FROM_DATA: break; default: break; @@ -415,7 +415,7 @@ WrappedErrorCategoryProperty::~WrappedErrorCategoryProperty() } return aRet; } -void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorCategory& aNewValue ) const +void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartErrorCategory& aNewValue ) const { if( !xSeriesPropertySet.is() ) return; @@ -423,26 +423,26 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) ); if( xErrorBarProperties.is() ) { - sal_Int32 nNewStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nNewStyle = css::chart::ErrorBarStyle::NONE; switch(aNewValue) { - case ::com::sun::star::chart::ChartErrorCategory_NONE: - nNewStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + case css::chart::ChartErrorCategory_NONE: + nNewStyle = css::chart::ErrorBarStyle::NONE; break; - case ::com::sun::star::chart::ChartErrorCategory_VARIANCE: - nNewStyle = ::com::sun::star::chart::ErrorBarStyle::VARIANCE; + case css::chart::ChartErrorCategory_VARIANCE: + nNewStyle = css::chart::ErrorBarStyle::VARIANCE; break; - case ::com::sun::star::chart::ChartErrorCategory_STANDARD_DEVIATION: - nNewStyle = ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION; + case css::chart::ChartErrorCategory_STANDARD_DEVIATION: + nNewStyle = css::chart::ErrorBarStyle::STANDARD_DEVIATION; break; - case ::com::sun::star::chart::ChartErrorCategory_CONSTANT_VALUE: - nNewStyle = ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE; + case css::chart::ChartErrorCategory_CONSTANT_VALUE: + nNewStyle = css::chart::ErrorBarStyle::ABSOLUTE; break; - case ::com::sun::star::chart::ChartErrorCategory_PERCENT: - nNewStyle = ::com::sun::star::chart::ErrorBarStyle::RELATIVE; + case css::chart::ChartErrorCategory_PERCENT: + nNewStyle = css::chart::ErrorBarStyle::RELATIVE; break; - case ::com::sun::star::chart::ChartErrorCategory_ERROR_MARGIN: - nNewStyle = ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN; + case css::chart::ChartErrorCategory_ERROR_MARGIN: + nNewStyle = css::chart::ErrorBarStyle::ERROR_MARGIN; break; default: break; @@ -484,7 +484,7 @@ double WrappedPercentageErrorProperty::getValueFromSeries( const Reference< bean uno::Reference< beans::XPropertySet > xErrorBarProperties; if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { - if( ::com::sun::star::chart::ErrorBarStyle::RELATIVE == lcl_getErrorBarStyle( xErrorBarProperties ) ) + if( css::chart::ErrorBarStyle::RELATIVE == lcl_getErrorBarStyle( xErrorBarProperties ) ) xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet; else m_aOuterValue >>= aRet; @@ -497,7 +497,7 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X if( xErrorBarProperties.is() ) { m_aOuterValue = uno::makeAny( aNewValue ); - if( ::com::sun::star::chart::ErrorBarStyle::RELATIVE == lcl_getErrorBarStyle( xErrorBarProperties ) ) + if( css::chart::ErrorBarStyle::RELATIVE == lcl_getErrorBarStyle( xErrorBarProperties ) ) { xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue ); xErrorBarProperties->setPropertyValue( "NegativeError" , m_aOuterValue ); @@ -538,7 +538,7 @@ double WrappedErrorMarginProperty::getValueFromSeries( const Reference< beans::X uno::Reference< beans::XPropertySet > xErrorBarProperties; if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { - if( ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN == lcl_getErrorBarStyle( xErrorBarProperties ) ) + if( css::chart::ErrorBarStyle::ERROR_MARGIN == lcl_getErrorBarStyle( xErrorBarProperties ) ) xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet; else m_aOuterValue >>= aRet; @@ -551,7 +551,7 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp if( xErrorBarProperties.is() ) { m_aOuterValue = uno::makeAny( aNewValue ); - if( ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN == lcl_getErrorBarStyle( xErrorBarProperties ) ) + if( css::chart::ErrorBarStyle::ERROR_MARGIN == lcl_getErrorBarStyle( xErrorBarProperties ) ) { xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue ); xErrorBarProperties->setPropertyValue( "NegativeError" , m_aOuterValue ); @@ -560,11 +560,11 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp } //PROP_CHART_STATISTIC_ERROR_INDICATOR -class WrappedErrorIndicatorProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorIndicatorType > +class WrappedErrorIndicatorProperty : public WrappedStatisticProperty< css::chart::ChartErrorIndicatorType > { public: - virtual ::com::sun::star::chart::ChartErrorIndicatorType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorIndicatorType& aNewValue ) const override; + virtual css::chart::ChartErrorIndicatorType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartErrorIndicatorType& aNewValue ) const override; explicit WrappedErrorIndicatorProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -574,17 +574,17 @@ public: WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorIndicatorType >( "ErrorIndicator" - , uno::makeAny( ::com::sun::star::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType ) + : WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >( "ErrorIndicator" + , uno::makeAny( css::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType ) { } WrappedErrorIndicatorProperty::~WrappedErrorIndicatorProperty() { } -::com::sun::star::chart::ChartErrorIndicatorType WrappedErrorIndicatorProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const +css::chart::ChartErrorIndicatorType WrappedErrorIndicatorProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const { - ::com::sun::star::chart::ChartErrorIndicatorType aRet = ::com::sun::star::chart::ChartErrorIndicatorType_NONE; + css::chart::ChartErrorIndicatorType aRet = css::chart::ChartErrorIndicatorType_NONE; m_aDefaultValue >>= aRet; uno::Reference< beans::XPropertySet > xErrorBarProperties; if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) @@ -595,15 +595,15 @@ WrappedErrorIndicatorProperty::~WrappedErrorIndicatorProperty() xErrorBarProperties->getPropertyValue( "ShowNegativeError" ) >>= bNegative; if( bPositive && bNegative ) - aRet = ::com::sun::star::chart::ChartErrorIndicatorType_TOP_AND_BOTTOM; + aRet = css::chart::ChartErrorIndicatorType_TOP_AND_BOTTOM; else if( bPositive && !bNegative ) - aRet = ::com::sun::star::chart::ChartErrorIndicatorType_UPPER; + aRet = css::chart::ChartErrorIndicatorType_UPPER; else if( !bPositive && bNegative ) - aRet = ::com::sun::star::chart::ChartErrorIndicatorType_LOWER; + aRet = css::chart::ChartErrorIndicatorType_LOWER; } return aRet; } -void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorIndicatorType& aNewValue ) const +void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartErrorIndicatorType& aNewValue ) const { uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) ); if( xErrorBarProperties.is() ) @@ -612,14 +612,14 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP bool bNegative = false; switch( aNewValue ) { - case ::com::sun::star::chart::ChartErrorIndicatorType_TOP_AND_BOTTOM: + case css::chart::ChartErrorIndicatorType_TOP_AND_BOTTOM: bPositive = true; bNegative = true; break; - case ::com::sun::star::chart::ChartErrorIndicatorType_UPPER: + case css::chart::ChartErrorIndicatorType_UPPER: bPositive = true; break; - case ::com::sun::star::chart::ChartErrorIndicatorType_LOWER: + case css::chart::ChartErrorIndicatorType_LOWER: bNegative = true; break; default: @@ -648,7 +648,7 @@ WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< sal_Int32 >( "ErrorBarStyle" - , uno::makeAny( ::com::sun::star::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType ) + , uno::makeAny( css::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType ) { } WrappedErrorBarStyleProperty::~WrappedErrorBarStyleProperty() @@ -657,7 +657,7 @@ WrappedErrorBarStyleProperty::~WrappedErrorBarStyleProperty() sal_Int32 WrappedErrorBarStyleProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const { - sal_Int32 nRet = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nRet = css::chart::ErrorBarStyle::NONE; m_aDefaultValue >>= nRet; uno::Reference< beans::XPropertySet > xErrorBarProperties; if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) @@ -813,11 +813,11 @@ void WrappedErrorBarRangeNegativeProperty::setValueToSeries( const Reference< be } //PROP_CHART_STATISTIC_REGRESSION_CURVES -class WrappedRegressionCurvesProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartRegressionCurveType > +class WrappedRegressionCurvesProperty : public WrappedStatisticProperty< css::chart::ChartRegressionCurveType > { public: - virtual ::com::sun::star::chart::ChartRegressionCurveType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartRegressionCurveType & aNewValue ) const override; + virtual css::chart::ChartRegressionCurveType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartRegressionCurveType & aNewValue ) const override; explicit WrappedRegressionCurvesProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -827,7 +827,7 @@ public: WrappedRegressionCurvesProperty::WrappedRegressionCurvesProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< ::com::sun::star::chart::ChartRegressionCurveType >( "RegressionCurves" + : WrappedStatisticProperty< css::chart::ChartRegressionCurveType >( "RegressionCurves" , lcl_getRegressionDefault(), spChart2ModelContact, ePropertyType ) { } @@ -836,9 +836,9 @@ WrappedRegressionCurvesProperty::~WrappedRegressionCurvesProperty() { } -::com::sun::star::chart::ChartRegressionCurveType WrappedRegressionCurvesProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const +css::chart::ChartRegressionCurveType WrappedRegressionCurvesProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const { - ::com::sun::star::chart::ChartRegressionCurveType aRet; + css::chart::ChartRegressionCurveType aRet; m_aDefaultValue >>= aRet; uno::Reference< chart2::XRegressionCurveContainer > xRegCnt( xSeriesPropertySet, uno::UNO_QUERY ); if( xRegCnt.is() ) @@ -848,7 +848,7 @@ WrappedRegressionCurvesProperty::~WrappedRegressionCurvesProperty() } return aRet; } -void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartRegressionCurveType& aNewValue ) const +void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartRegressionCurveType& aNewValue ) const { uno::Reference< chart2::XRegressionCurveContainer > xRegressionCurveContainer( xSeriesPropertySet, uno::UNO_QUERY ); uno::Reference< chart2::XRegressionCurve > xRegressionCurve( xSeriesPropertySet, uno::UNO_QUERY ); @@ -1012,7 +1012,7 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut rOutProperties.push_back( Property( "ErrorCategory", PROP_CHART_STATISTIC_ERROR_CATEGORY, - cppu::UnoType<com::sun::star::chart::ChartErrorCategory>::get(), + cppu::UnoType<css::chart::ChartErrorCategory>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( @@ -1036,7 +1036,7 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut rOutProperties.push_back( Property( "ErrorIndicator", PROP_CHART_STATISTIC_ERROR_INDICATOR, - cppu::UnoType<com::sun::star::chart::ChartErrorIndicatorType>::get(), + cppu::UnoType<css::chart::ChartErrorIndicatorType>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( @@ -1054,7 +1054,7 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut rOutProperties.push_back( Property( "RegressionCurves", PROP_CHART_STATISTIC_REGRESSION_CURVES, - cppu::UnoType<com::sun::star::chart::ChartRegressionCurveType>::get(), + cppu::UnoType<css::chart::ChartRegressionCurveType>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx index be99b2ce5ba6..390677936cdd 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedStatisticProperties { public: - static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 33c9138331ce..966ef5b537e1 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -41,26 +41,26 @@ class WrappedStockProperty : public WrappedProperty { public: explicit WrappedStockProperty( const OUString& rOuterName - , const ::com::sun::star::uno::Any& rDefaulValue + , const css::uno::Any& rDefaulValue , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedStockProperty(); - void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - 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) override; + void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0; protected: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - mutable ::com::sun::star::uno::Any m_aOuterValue; - ::com::sun::star::uno::Any m_aDefaultValue; + mutable css::uno::Any m_aOuterValue; + css::uno::Any m_aDefaultValue; }; WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName - , const ::com::sun::star::uno::Any& rDefaulValue + , const css::uno::Any& rDefaulValue , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedProperty(rOuterName,OUString()) , m_spChart2ModelContact(spChart2ModelContact) @@ -72,8 +72,8 @@ WrappedStockProperty::~WrappedStockProperty() { } -void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - 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) +void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -109,8 +109,8 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r } } -::com::sun::star::uno::Any WrappedStockProperty::getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { return m_aDefaultValue; } @@ -121,8 +121,8 @@ public: explicit WrappedVolumeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedVolumeProperty(); - ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; @@ -135,8 +135,8 @@ WrappedVolumeProperty::~WrappedVolumeProperty() { } -::com::sun::star::uno::Any WrappedVolumeProperty::getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -192,8 +192,8 @@ public: explicit WrappedUpDownProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedUpDownProperty(); - ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; @@ -204,8 +204,8 @@ WrappedUpDownProperty::WrappedUpDownProperty( std::shared_ptr< Chart2ModelContac WrappedUpDownProperty::~WrappedUpDownProperty() { } -::com::sun::star::uno::Any WrappedUpDownProperty::getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx index 775f6189976e..9a92d0fc9609 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedStockProperties { public: - static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); static void addWrappedProperties( std::vector< WrappedProperty* >& rList , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index e22ce7685466..a7bf6af8b262 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -113,27 +113,27 @@ enum PROP_CHART_SYMBOL_AND_LINES }; -sal_Int32 lcl_getSymbolType( const ::com::sun::star::chart2::Symbol& rSymbol ) +sal_Int32 lcl_getSymbolType( const css::chart2::Symbol& rSymbol ) { - sal_Int32 nSymbol = ::com::sun::star::chart::ChartSymbolType::NONE; + sal_Int32 nSymbol = css::chart::ChartSymbolType::NONE; switch( rSymbol.Style ) { case chart2::SymbolStyle_NONE: break; case chart2::SymbolStyle_AUTO: - nSymbol = ::com::sun::star::chart::ChartSymbolType::AUTO; + nSymbol = css::chart::ChartSymbolType::AUTO; break; case chart2::SymbolStyle_STANDARD: nSymbol = rSymbol.StandardSymbol%15; break; case chart2::SymbolStyle_POLYGON://new feature - nSymbol = ::com::sun::star::chart::ChartSymbolType::AUTO; + nSymbol = css::chart::ChartSymbolType::AUTO; break; case chart2::SymbolStyle_GRAPHIC: - nSymbol = ::com::sun::star::chart::ChartSymbolType::BITMAPURL; + nSymbol = css::chart::ChartSymbolType::BITMAPURL; break; default: - nSymbol = ::com::sun::star::chart::ChartSymbolType::AUTO; + nSymbol = css::chart::ChartSymbolType::AUTO; break; } return nSymbol; @@ -142,13 +142,13 @@ void lcl_setSymbolTypeToSymbol( sal_Int32 nSymbolType, chart2::Symbol& rSymbol ) { switch( nSymbolType ) { - case ::com::sun::star::chart::ChartSymbolType::NONE: + case css::chart::ChartSymbolType::NONE: rSymbol.Style = chart2::SymbolStyle_NONE; break; - case ::com::sun::star::chart::ChartSymbolType::AUTO: + case css::chart::ChartSymbolType::AUTO: rSymbol.Style = chart2::SymbolStyle_AUTO; break; - case ::com::sun::star::chart::ChartSymbolType::BITMAPURL: + case css::chart::ChartSymbolType::BITMAPURL: rSymbol.Style = chart2::SymbolStyle_GRAPHIC; break; default: @@ -217,7 +217,7 @@ WrappedSymbolTypeProperty::WrappedSymbolTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedSeriesOrDiagramProperty< sal_Int32 >( "SymbolType" - , uno::makeAny( ::com::sun::star::chart::ChartSymbolType::NONE ) + , uno::makeAny( css::chart::ChartSymbolType::NONE ) , spChart2ModelContact , ePropertyType ) { @@ -260,21 +260,21 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper { if(bHasAmbiguousValue) { - m_aOuterValue = uno::makeAny( ::com::sun::star::chart::ChartSymbolType::AUTO ); + m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::AUTO ); } else { - if( ::com::sun::star::chart::ChartSymbolType::NONE == aValue ) - m_aOuterValue = uno::makeAny( ::com::sun::star::chart::ChartSymbolType::NONE ); + if( css::chart::ChartSymbolType::NONE == aValue ) + m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::NONE ); else - m_aOuterValue = uno::makeAny( ::com::sun::star::chart::ChartSymbolType::AUTO ); + m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::AUTO ); } } return m_aOuterValue; } else { - ::com::sun::star::uno::Any aRet( m_aDefaultValue ); + css::uno::Any aRet( m_aDefaultValue ); aRet <<= getValueFromSeries( xInnerPropertySet ); return aRet; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx index 181c67d2d59f..f065e3167282 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedSymbolProperties { public: - static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList , std::shared_ptr< Chart2ModelContact > spChart2ModelContact ); static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index 6f1ce7fb6dcc..1f4749636503 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -30,12 +30,12 @@ public: explicit WrappedTextRotationProperty( bool bDirectState=false ); virtual ~WrappedTextRotationProperty(); - virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override; + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; protected: - virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const override; - virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const override; + virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; + virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const override; bool m_bDirectState; }; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 6999d504779f..6697b170d53f 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -55,7 +55,7 @@ public: ChartTypeParameter( sal_Int32 nSubTypeIndex, bool bXAxisWithValues=false , bool b3DLook=false, GlobalStackMode eStackMode=GlobalStackMode_NONE , bool _bSymbols = true, bool _bLines = true - , ::com::sun::star::chart2::CurveStyle eCurveStyle = ::com::sun::star::chart2::CurveStyle_LINES ); + , css::chart2::CurveStyle eCurveStyle = css::chart2::CurveStyle_LINES ); ChartTypeParameter(); virtual ~ChartTypeParameter(); @@ -70,7 +70,7 @@ public: bool bLines; GlobalStackMode eStackMode; - ::com::sun::star::chart2::CurveStyle eCurveStyle; + css::chart2::CurveStyle eCurveStyle; sal_Int32 nCurveResolution; sal_Int32 nSplineOrder; @@ -107,22 +107,22 @@ public: virtual void showExtraControls(VclBuilderContainer* pParent); virtual void hideExtraControls() const; virtual void fillExtraControls( const ChartTypeParameter& rParameter - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel - , 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); + , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel + , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps=css::uno::Reference< css::beans::XPropertySet >() ) const; + virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException); bool isSubType( const OUString& rServiceName ); - ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xTemplateProps ); + ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const css::uno::Reference< + css::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 ); OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; void commitToModel( const ChartTypeParameter& rParameter - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel ); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate( const ChartTypeParameter& rParameter - , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xTemplateManager ) const; + , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel ); + css::uno::Reference< + css::chart2::XChartTypeTemplate > getCurrentTemplate( const ChartTypeParameter& rParameter + , const css::uno::Reference< css::lang::XMultiServiceFactory >& xTemplateManager ) const; protected: bool bSupportsXAxisWithValues; @@ -272,10 +272,10 @@ public: virtual void showExtraControls(VclBuilderContainer* pParent) override; virtual void hideExtraControls() const override; virtual void fillExtraControls( const ChartTypeParameter& rParameter - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const override; + , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel + , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps=css::uno::Reference< css::beans::XPropertySet >() ) const override; - virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException) override; + virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override; private: DECL_LINK_TYPED( ChangeLineCountHdl, Edit&, void ); diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx index 4c5523337e46..a0a3c670f4df 100644 --- a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx +++ b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx @@ -31,8 +31,7 @@ namespace chart class ChartTypeTemplateProvider { public: - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const =0; + virtual css::uno::Reference< css::chart2::XChartTypeTemplate > getCurrentTemplate() const =0; virtual ~ChartTypeTemplateProvider() {} }; diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index be6d2a84ade8..aa404c910125 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -96,10 +96,8 @@ public: /// reset the dirty status, if changes have been saved void SetClean(); - void SetDataFromModel( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + void SetDataFromModel( const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc, + const css::uno::Reference< css::uno::XComponentContext > & xContext ); // predicates to determine what actions are possible at the current cursor // position. This depends on the implementation of the according mutators @@ -145,8 +143,7 @@ public: void RenewSeriesHeaders(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartDoc; + css::uno::Reference< css::chart2::XChartDocument > m_xChartDoc; std::unique_ptr< DataBrowserModel > m_apDataBrowserModel; typedef ::std::vector< std::shared_ptr< impl::SeriesHeader > > tSeriesHeaderContainer; diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index 0ae832123d91..2f8137696ff4 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -39,9 +39,8 @@ class DataBrowserModel { public: explicit DataBrowserModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc, + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~DataBrowserModel(); /** Inserts a new data series after the data series to which the data column @@ -78,14 +77,14 @@ public: /// If getCellType( nAtColumn, nAtRow ) returns TEXT, the result will be Nan double getCellNumber( 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 ); + css::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 OUString & rText ); - bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue ); + bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const css::uno::Any & aValue ); sal_Int32 getColumnCount() const; sal_Int32 getMaxRowCount() const; @@ -96,10 +95,8 @@ public: struct tDataHeader { - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xDataSeries; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > m_xChartType; + css::uno::Reference< css::chart2::XDataSeries > m_xDataSeries; + css::uno::Reference< css::chart2::XChartType > m_xChartType; bool m_bSwapXAndYAxis; sal_Int32 m_nStartColumn; sal_Int32 m_nEndColumn; @@ -112,10 +109,8 @@ public: {} // "full" CTOR tDataHeader( - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > xDataSeries, - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > xChartType, + css::uno::Reference< css::chart2::XDataSeries > xDataSeries, + css::uno::Reference< css::chart2::XChartType > xChartType, bool bSwapXAndYAxis, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) : @@ -132,11 +127,9 @@ public: const tDataHeaderVector& getDataHeaders() const { return m_aHeaders;} tDataHeader getHeaderForSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > &xSeries ) const; + const css::uno::Reference< css::chart2::XDataSeries > &xSeries ) const; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > + css::uno::Reference< css::chart2::XDataSeries > getDataSeriesByColumn( sal_Int32 nColumn ) const; private: @@ -145,16 +138,14 @@ private: void removeComplexCategoryLevel( sal_Int32 nAtColumnIndex ); void addErrorBarRanges( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xDataSeries, + const css::uno::Reference<css::chart2::XDataSeries > & xDataSeries, sal_Int32 nNumberFormatKey, sal_Int32 & rInOutSequenceIndex, sal_Int32 & rInOutHeaderEnd, bool bYError ); sal_Int32 getCategoryColumnCount(); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartDocument; + css::uno::Reference< css::chart2::XChartDocument > m_xChartDocument; std::unique_ptr< DialogModel > m_apDialogModel; struct tDataColumn; diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index 7f2013510953..45980a14936f 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -60,51 +60,41 @@ class DialogModel { public: explicit DialogModel( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDocument, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument, + const css::uno::Reference< css::uno::XComponentContext > & xContext ); ~DialogModel(); typedef ::std::pair< OUString, - ::std::pair< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >, - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > > + ::std::pair< css::uno::Reference< css::chart2::XDataSeries >, + css::uno::Reference< css::chart2::XChartType > > > tSeriesWithChartTypeByName; typedef ::std::map< OUString, OUString > tRolesWithRanges; void setTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartTypeTemplate > & xTemplate ); + const css::uno::Reference< css::chart2::XChartTypeTemplate > & xTemplate ); std::shared_ptr< RangeSelectionHelper > getRangeSelectionHelper() const; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > getChartModel() const; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataProvider > + css::uno::Reference< css::chart2::data::XDataProvider > getDataProvider() const; - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeriesContainer > > + ::std::vector< css::uno::Reference< css::chart2::XDataSeriesContainer > > getAllDataSeriesContainers() const; ::std::vector< tSeriesWithChartTypeByName > getAllDataSeriesWithLabel() const; static tRolesWithRanges getRolesWithRanges( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xSeries, + const css::uno::Reference< css::chart2::XDataSeries > & xSeries, const OUString & aRoleOfSequenceForLabel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > & xChartType ); + const css::uno::Reference< css::chart2::XChartType > & xChartType ); enum eMoveDirection { @@ -112,31 +102,24 @@ public: MOVE_UP }; - void moveSeries( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xSeries, + void moveSeries( const css::uno::Reference< css::chart2::XDataSeries > & xSeries, eMoveDirection eDirection ); /// @return the newly inserted series - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > insertSeriesAfter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > & xChartType, + css::uno::Reference< + css::chart2::XDataSeries > insertSeriesAfter( + const css::uno::Reference< css::chart2::XDataSeries > & xSeries, + const css::uno::Reference< css::chart2::XChartType > & xChartType, bool bCreateDataCachedSequences = false ); void deleteSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > & xChartType ); + const css::uno::Reference< css::chart2::XDataSeries > & xSeries, + const css::uno::Reference< css::chart2::XChartType > & xChartType ); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > getCategories() const; - void setCategories( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories ); + void setCategories( const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xCategories ); OUString getCategoriesRange() const; @@ -148,8 +131,7 @@ public: bool allArgumentsForRectRangeDetected() const; - void setData( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > & rArguments ); + void setData( const css::uno::Sequence< css::beans::PropertyValue > & rArguments ); void setTimeBasedRange( bool bTimeBased, sal_Int32 nStart, sal_Int32 nEnd) const; @@ -165,16 +147,13 @@ public: static sal_Int32 GetRoleIndexForSorting( const OUString & rInternalRoleString ); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > + css::uno::Reference< css::chart2::XChartDocument > m_xChartDocument; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartTypeTemplate > + css::uno::Reference< css::chart2::XChartTypeTemplate > m_xTemplate; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; mutable std::shared_ptr< RangeSelectionHelper > @@ -184,9 +163,8 @@ private: private: void applyInterpretedData( - const ::com::sun::star::chart2::InterpretedData & rNewData, - const ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > & rSeriesToReUse, + const css::chart2::InterpretedData & rNewData, + const ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > & rSeriesToReUse, bool bSetStyles ); sal_Int32 countSeries() const; diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index be4efd35ff34..ec300482f784 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -695,7 +695,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe return aRet; } -OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ) +OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument ) { OUString aRet; ObjectType eObjectType( ObjectIdentifier::getObjectType(rObjectCID) ); diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 5447040b08a6..7ff918745909 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -133,6 +133,7 @@ DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, vcl::Window for( sal_Int32 nEnum=0; nEnum<m_pLB_LabelPlacement->GetEntryCount(); ++nEnum ) aPlacementToStringMap[nEnum] = m_pLB_LabelPlacement->GetEntry(static_cast<sal_uInt16>(nEnum)); + std::vector< sal_Int32 > aAvailabelPlacementList; const SfxPoolItem *pPoolItem = nullptr; if( rInAttrs.GetItemState(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, true, &pPoolItem) == SfxItemState::SET ) diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 8a9353a4eb5b..b4ed6789103e 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -121,7 +121,7 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo } } -void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Reference< frame::XModel >& xChartModel ) const +void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XModel >& xChartModel ) const { try { @@ -135,7 +135,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen //position chart2::LegendPosition eNewPos; - ::com::sun::star::chart::ChartLegendExpansion eExp = ::com::sun::star::chart::ChartLegendExpansion_HIGH; + css::chart::ChartLegendExpansion eExp = css::chart::ChartLegendExpansion_HIGH; if( m_pRbtLeft->IsChecked() ) eNewPos = chart2::LegendPosition_LINE_START; @@ -146,12 +146,12 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen else if( m_pRbtTop->IsChecked() ) { eNewPos = chart2::LegendPosition_PAGE_START; - eExp = ::com::sun::star::chart::ChartLegendExpansion_WIDE; + eExp = css::chart::ChartLegendExpansion_WIDE; } else if( m_pRbtBottom->IsChecked() ) { eNewPos = chart2::LegendPosition_PAGE_END; - eExp = ::com::sun::star::chart::ChartLegendExpansion_WIDE; + eExp = css::chart::ChartLegendExpansion_WIDE; } xProp->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos )); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index cddfbe6161ff..911e81940a93 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -36,7 +36,7 @@ class ThreeD_SceneAppearance_TabPage : public TabPage public: ThreeD_SceneAppearance_TabPage( vcl::Window* pWindow, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, + const css::uno::Reference< css::frame::XModel > & xChartModel, ControllerLockHelper & rControllerLockHelper ); virtual ~ThreeD_SceneAppearance_TabPage(); virtual void dispose() override; @@ -54,7 +54,7 @@ private: void updateScheme(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > m_xChartModel; VclPtr<ListBox> m_pLB_Scheme; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index b9e6eaadb0d6..b4f6d4340e90 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -36,8 +36,7 @@ class ThreeD_SceneGeometry_TabPage : public TabPage { public: ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xSceneProperties, + const css::uno::Reference< css::beans::XPropertySet > & xSceneProperties, ControllerLockHelper & rControllerLockHelper ); virtual ~ThreeD_SceneGeometry_TabPage(); virtual void dispose() override; @@ -61,8 +60,7 @@ private: void applyAnglesToModel(); void applyPerspectiveToModel(); - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xSceneProperties; + css::uno::Reference< css::beans::XPropertySet > m_xSceneProperties; VclPtr<CheckBox> m_pCbxRightAngledAxes; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 4ced5b8afb39..07509aedc228 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -64,7 +64,7 @@ void LightButton::switchLightOn(bool bOn) struct LightSource { long nDiffuseColor; - ::com::sun::star::drawing::Direction3D aDirection; + css::drawing::Direction3D aDirection; bool bIsEnabled; LightSource() : diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 1adad136d873..900a1f6306d6 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -52,9 +52,8 @@ class ThreeD_SceneIllumination_TabPage : public TabPage public: ThreeD_SceneIllumination_TabPage( vcl::Window* pWindow, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xSceneProperties, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, + const css::uno::Reference< css::beans::XPropertySet > & xSceneProperties, + const css::uno::Reference< css::frame::XModel >& xChartModel, const XColorListRef &pColorTable ); virtual ~ThreeD_SceneIllumination_TabPage(); virtual void dispose() override; @@ -93,14 +92,13 @@ private: LightSourceInfo* m_pLightSourceInfoList; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSceneProperties; + css::uno::Reference< css::beans::XPropertySet > m_xSceneProperties; TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; bool m_bInCommitToModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xChartModel; + css::uno::Reference< css::frame::XModel > m_xChartModel; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 6b29e4bc42ad..b8de8916b537 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -303,7 +303,7 @@ void AxisPositionsTabPage::SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCa m_bCrossingAxisIsCategoryAxis = bCrossingAxisIsCategoryAxis; } -void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories ) +void AxisPositionsTabPage::SetCategories( const css::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 19b6caeb032d..dae55be9b20d 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -45,7 +45,7 @@ public: void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCategoryAxis ); - void SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories ); + void SetCategories( const css::uno::Sequence< OUString >& rCategories ); void SupportAxisPositioning( bool bSupportAxisPositioning ); @@ -82,7 +82,7 @@ private: //member: SvNumberFormatter* m_pNumFormatter; bool m_bCrossingAxisIsCategoryAxis; - ::com::sun::star::uno::Sequence< OUString > m_aCategories; + css::uno::Sequence< OUString > m_aCategories; bool m_bSupportAxisPositioning; }; diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 62a64220e5e6..980316555237 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -49,8 +49,7 @@ class ChartTypeTabPage : public ResourceChangeListener, public svt::OWizardPage, { public: ChartTypeTabPage( vcl::Window* pParent - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartModel + , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel , bool bDoLiveUpdate, bool bShowDescription = true ); virtual ~ChartTypeTabPage(); virtual void dispose() override; @@ -58,8 +57,7 @@ public: virtual void initializePage() override; virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const override; + virtual css::uno::Reference< css::chart2::XChartTypeTemplate > getCurrentTemplate() const override; protected: ChartTypeDialogController* getSelectedMainType(); @@ -87,8 +85,7 @@ protected: SortByXValuesResourceGroup* m_pSortByXValuesResourceGroup; GL3DResourceGroup* m_pGL3DResourceGroup; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartModel; + css::uno::Reference< css::chart2::XChartDocument > m_xChartModel; ::std::vector< ChartTypeDialogController* > m_aChartTypeDialogControllerList; ChartTypeDialogController* m_pCurrentMainType; diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx index 48f4c87280c7..e84a6e117cca 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx @@ -36,10 +36,10 @@ public: virtual ~SeriesEntry(); /// the corresponding data series - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xDataSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xDataSeries; /// the chart type that contains the series (via XDataSeriesContainer) - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > m_xChartType; + css::uno::Reference< css::chart2::XChartType > m_xChartType; }; class SeriesListBox : public ::SvTreeListBox diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index bd03013e221b..3fd18f9bfe1a 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -34,8 +34,7 @@ public: void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType ); void SetChartDocumentForRangeChoosing( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDocument ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument ); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 3979ec58a4a6..a3ee89393fef 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -34,8 +34,6 @@ namespace chart { -/** -*/ class ChartTypeTemplateProvider; class DialogModel; @@ -102,8 +100,7 @@ protected: //member bool m_bIsDirty; OUString m_aLastValidRangeString; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartTypeTemplate > m_xCurrentChartTypeTemplate; + css::uno::Reference< css::chart2::XChartTypeTemplate > m_xCurrentChartTypeTemplate; ChartTypeTemplateProvider* m_pTemplateProvider; DialogModel & m_rDialogModel; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 613cbd6172ab..8e1539382ed5 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -123,11 +123,11 @@ bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs) rOutAttrs->Put(SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, ! m_pCBAxisSideBySide->IsChecked())); if(m_pRB_DontPaint->IsChecked()) - rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,css::chart::MissingValueTreatment::LEAVE_GAP)); else if(m_pRB_AssumeZero->IsChecked()) - rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::USE_ZERO)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,css::chart::MissingValueTreatment::USE_ZERO)); else if(m_pRB_ContinueLine->IsChecked()) - rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::CONTINUE)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,css::chart::MissingValueTreatment::CONTINUE)); if (m_pCBIncludeHiddenCells->IsVisible()) rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCBIncludeHiddenCells->IsChecked())); @@ -202,20 +202,20 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs) for( size_t nN =0; nN<aMissingValueTreatments.size(); nN++ ) { sal_Int32 nVal = aMissingValueTreatments[nN]; - if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP) + if(nVal==css::chart::MissingValueTreatment::LEAVE_GAP) m_pRB_DontPaint->Enable(); - else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO) + else if(nVal==css::chart::MissingValueTreatment::USE_ZERO) m_pRB_AssumeZero->Enable(); - else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE) + else if(nVal==css::chart::MissingValueTreatment::CONTINUE) m_pRB_ContinueLine->Enable(); } long nVal=static_cast<const SfxInt32Item*>(pPoolItem)->GetValue(); - if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP) + if(nVal==css::chart::MissingValueTreatment::LEAVE_GAP) m_pRB_DontPaint->Check(); - else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO) + else if(nVal==css::chart::MissingValueTreatment::USE_ZERO) m_pRB_AssumeZero->Check(); - else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE) + else if(nVal==css::chart::MissingValueTreatment::CONTINUE) m_pRB_ContinueLine->Check(); } else diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 639ca60784c3..8d806a1fe83b 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -40,10 +40,8 @@ class TitlesAndObjectsTabPage : public svt::OWizardPage { public: TitlesAndObjectsTabPage( svt::OWizardMachine* pParent - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel + , const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~TitlesAndObjectsTabPage(); virtual void dispose() override; @@ -65,10 +63,8 @@ protected: VclPtr<CheckBox> m_pCB_Grid_Y; VclPtr<CheckBox> m_pCB_Grid_Z; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; + css::uno::Reference< css::chart2::XChartDocument > m_xChartModel; + css::uno::Reference< css::uno::XComponentContext> m_xCC; bool m_bCommitToModel; TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index e8f4f8be15ca..2fbee3d54989 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -61,14 +61,10 @@ struct AccessibleElementInfo { AccessibleUniqueId m_aOID; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::chart2::XChartDocument > m_xChartDocument; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::view::XSelectionSupplier > m_xSelectionSupplier; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::uno::XInterface > m_xView; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::awt::XWindow > m_xWindow; + css::uno::WeakReference< css::chart2::XChartDocument > m_xChartDocument; + css::uno::WeakReference< css::view::XSelectionSupplier > m_xSelectionSupplier; + css::uno::WeakReference< css::uno::XInterface > m_xView; + css::uno::WeakReference< css::awt::XWindow > m_xWindow; std::shared_ptr< ObjectHierarchy > m_spObjectHierarchy; @@ -80,12 +76,12 @@ struct AccessibleElementInfo namespace impl { typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XEventListener + css::accessibility::XAccessible, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleEventBroadcaster, + css::lang::XServiceInfo, + css::lang::XEventListener > AccessibleBase_Base; } @@ -118,7 +114,7 @@ protected: @return true, if the component is already disposed and bThrowException is false, false otherwise */ - bool CheckDisposeState( bool bThrowException = true ) const throw (::com::sun::star::lang::DisposedException); + bool CheckDisposeState( bool bThrowException = true ) const throw (css::lang::DisposedException); /** Events coming from the core have to be processed in this methods. The default implementation returns false, which indicates that the object is @@ -137,12 +133,12 @@ protected: /** Adds a state to the set. */ - void AddState( sal_Int16 aState ) throw (::com::sun::star::uno::RuntimeException); + void AddState( sal_Int16 aState ) throw (css::uno::RuntimeException); /** Removes a state from the set if the set contains the state, otherwise nothing is done. */ - void RemoveState( sal_Int16 aState ) throw (::com::sun::star::uno::RuntimeException); + void RemoveState( sal_Int16 aState ) throw (css::uno::RuntimeException); /** has to be overridden by derived classes that support child elements. With this method a rescan is initiated that should result in a correct @@ -181,7 +177,7 @@ protected: @return the (x,y) pixel coordinates of the upper left corner */ - virtual ::com::sun::star::awt::Point GetUpperLeftOnScreen() const; + virtual css::awt::Point GetUpperLeftOnScreen() const; /** This method creates an AccessibleEventObject and sends it to all listeners that are currently listening to this object @@ -190,8 +186,8 @@ protected: vcl::unohelper::NotifyAccessibleStateEventGlobally() */ void BroadcastAccEvent( sal_Int16 nId, - const ::com::sun::star::uno::Any & rNew, - const ::com::sun::star::uno::Any & rOld, + const css::uno::Any & rNew, + const css::uno::Any & rOld, bool bSendGlobally = false ) const; /** Removes all children from the internal lists and broadcasts child remove @@ -205,17 +201,16 @@ protected: /** Is called from getAccessibleChild(). Before this method is called, an update of children is done if necessary. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > ImplGetAccessibleChildById( sal_Int32 i ) const - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); /** Is called from getAccessibleChildCount(). Before this method is called, an update of children is done if necessary. */ virtual sal_Int32 ImplGetAccessibleChildCount() const - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); const AccessibleElementInfo& GetInfo() const { return m_aAccInfo;} void SetInfo( const AccessibleElementInfo & rNewInfo ); @@ -225,84 +220,84 @@ protected: virtual void SAL_CALL disposing() override; // ________ XAccessible ________ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() + throw (css::uno::RuntimeException, std::exception) override; // ________ XAccessibleContext ________ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// @return AccessibleRole.SHAPE virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleName() -// throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL +// throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale() + throw (css::accessibility::IllegalAccessibleComponentStateException, + css::uno::RuntimeException, std::exception) override; // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleDescription() -// throw (::com::sun::star::uno::RuntimeException); +// throw (css::uno::RuntimeException); // ________ XAccessibleComponent ________ virtual sal_Bool SAL_CALL containsPoint( - const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; // has to be defined in derived classes - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) override; // ________ XEventListener ________ virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // ________ XAccessibleEventBroadcaster ________ virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; private: enum eColorType @@ -343,7 +338,7 @@ private: Note: Keeping this reference ensures, that the helper object is only destroyed after this object has been disposed(). */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > + css::uno::Reference< css::accessibility::XAccessibleStateSet > m_aStateSet; AccessibleElementInfo m_aAccInfo; diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 8037184b3524..28d4fa9a5d86 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -48,8 +48,8 @@ namespace impl { typedef ::cppu::ImplInheritanceHelper< ::chart::AccessibleBase, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::view::XSelectionChangeListener > + css::lang::XInitialization, + css::view::XSelectionChangeListener > AccessibleChartView_Base; } @@ -71,35 +71,35 @@ public: // 4: awt::XWindow representing the view's window (is a vcl Window) // all arguments are only valid until next initialization - don't keep them longer virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) override; // ____ view::XSelectionChangeListener ____ - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // ________ XEventListener ________ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ________ XAccessibleComponent ________ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; protected: // ________ AccessibleChartElement ________ - virtual ::com::sun::star::awt::Point GetUpperLeftOnScreen() const override; + virtual css::awt::Point GetUpperLeftOnScreen() const override; private: // methods /** @return the result that m_xWindow->getPosSize() _should_ return. It @@ -108,23 +108,18 @@ private: // methods a decoration. Thus you have an offset of (currently) (2,2) which isn't taken into account. */ - ::com::sun::star::awt::Rectangle GetWindowPosSize() const; + css::awt::Rectangle GetWindowPosSize() const; ExplicitValueProvider* getExplicitValueProvider(); private: // members - ::com::sun::star::uno::WeakReference< - ::com::sun::star::view::XSelectionSupplier > m_xSelectionSupplier; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XModel > m_xChartModel; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::uno::XInterface > m_xChartView; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::awt::XWindow > m_xWindow; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::accessibility::XAccessible > m_xParent; - - std::shared_ptr< ObjectHierarchy > m_spObjectHierarchy; + css::uno::WeakReference< css::view::XSelectionSupplier > m_xSelectionSupplier; + css::uno::WeakReference< css::frame::XModel > m_xChartModel; + css::uno::WeakReference< css::uno::XInterface > m_xChartView; + css::uno::WeakReference< css::awt::XWindow > m_xWindow; + css::uno::WeakReference< css::accessibility::XAccessible > m_xParent; + + std::shared_ptr< ObjectHierarchy > m_spObjectHierarchy; AccessibleUniqueId m_aCurrentSelectionOID; SdrView* m_pSdrView; ::accessibility::IAccessibleViewForwarder* m_pViewForwarder; diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index d41d243dfc0b..a5fd2381c117 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -38,8 +38,8 @@ class DrawViewWrapper; namespace impl { typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::lang::XInitialization, - ::com::sun::star::accessibility::XAccessibleContext > + css::lang::XInitialization, + css::accessibility::XAccessibleContext > AccessibleTextHelper_Base; } @@ -65,34 +65,34 @@ public: text currently. */ virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) override; // ____ XAccessibleContext ____ virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( ::sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() + throw (css::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale() + throw (css::accessibility::IllegalAccessibleComponentStateException, + css::uno::RuntimeException, std::exception) override; private: ::accessibility::AccessibleTextHelper * m_pTextHelper; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 502257347193..2906ade9cedb 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -87,18 +87,18 @@ enum ChartDrawMode { CHARTDRAW_INSERT, CHARTDRAW_SELECT }; class ChartController : public ::cppu::WeakImplHelper < - ::com::sun::star::frame::XController //comprehends XComponent (required interface) - ,::com::sun::star::frame::XDispatchProvider //(required interface) - ,::com::sun::star::view::XSelectionSupplier //(optional interface) - ,::com::sun::star::ui::XContextMenuInterception //(optional interface) - ,::com::sun::star::util::XCloseListener //(needed for communication with XModel) - ,::com::sun::star::lang::XServiceInfo - ,::com::sun::star::frame::XDispatch - ,::com::sun::star::awt::XWindow //this is the Window Controller part of this Controller, that will be given to a Frame via setComponent - ,::com::sun::star::lang::XMultiServiceFactory - ,::com::sun::star::util::XModifyListener - ,::com::sun::star::util::XModeChangeListener - ,::com::sun::star::frame::XLayoutManagerListener + css::frame::XController //comprehends XComponent (required interface) + ,css::frame::XDispatchProvider //(required interface) + ,css::view::XSelectionSupplier //(optional interface) + ,css::ui::XContextMenuInterception //(optional interface) + ,css::util::XCloseListener //(needed for communication with XModel) + ,css::lang::XServiceInfo + ,css::frame::XDispatch + ,css::awt::XWindow //this is the Window Controller part of this Controller, that will be given to a Frame via setComponent + ,css::lang::XMultiServiceFactory + ,css::util::XModifyListener + ,css::util::XModeChangeListener + ,css::frame::XLayoutManagerListener > { friend class DrawCommandDispatch; @@ -106,13 +106,12 @@ class ChartController : public ::cppu::WeakImplHelper < public: //no default constructor - explicit ChartController(::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext); + explicit ChartController(css::uno::Reference< css::uno::XComponentContext > const & xContext); virtual ~ChartController(); OUString GetContextName(); - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) @@ -123,245 +122,218 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ::com::sun::star::frame::XController (required interface) + // css::frame::XController (required interface) virtual void SAL_CALL - attachFrame( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XFrame > & xFrame ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - attachModel( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xModel ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL - getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL + getFrame() throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL - getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL + getModel() throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL - getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + getViewData() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - restoreViewData( const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + restoreViewData( const css::uno::Any& rValue ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XComponent (base of XController) + // css::lang::XComponent (base of XController) virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + dispose() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::frame::XDispatchProvider (required interface) - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch> SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& rURL + removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) override; + + // css::frame::XDispatchProvider (required interface) + virtual css::uno::Reference< css::frame::XDispatch> SAL_CALL + queryDispatch( const css::util::URL& rURL , const OUString& rTargetFrameName , sal_Int32 nSearchFlags) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch > > SAL_CALL - queryDispatches( const ::com::sun::star::uno::Sequence< - ::com::sun::star::frame::DispatchDescriptor > & xDescripts) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL + queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::view::XSelectionSupplier (optional interface) + // css::view::XSelectionSupplier (optional interface) virtual sal_Bool SAL_CALL - select( const ::com::sun::star::uno::Any& rSelection ) + select( const css::uno::Any& rSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL - getSelection() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + getSelection() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addSelectionChangeListener( const ::com::sun::star::uno::Reference< - com::sun::star::view::XSelectionChangeListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeSelectionChangeListener( const ::com::sun::star::uno::Reference< - com::sun::star::view::XSelectionChangeListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::ui::XContextMenuInterception (optional interface) + // css::ui::XContextMenuInterception (optional interface) virtual void SAL_CALL - registerContextMenuInterceptor( const ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - releaseContextMenuInterceptor( const ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) + throw (css::uno::RuntimeException, std::exception) override; //additional interfaces - // ::com::sun::star::util::XCloseListener + // css::util::XCloseListener virtual void SAL_CALL - queryClosing( const ::com::sun::star::lang::EventObject& Source + queryClosing( const css::lang::EventObject& Source , sal_Bool GetsOwnership ) - throw (::com::sun::star::util::CloseVetoException - , ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::util::CloseVetoException + , css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - notifyClosing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + notifyClosing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) + // css::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL - disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XDispatch + // css::frame::XDispatch virtual void SAL_CALL - dispatch( const ::com::sun::star::util::URL& aURL - , const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aArgs ) - throw (::com::sun::star::uno::RuntimeException, + dispatch( const css::util::URL& aURL + , const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addStatusListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XStatusListener >& xControl - , const ::com::sun::star::util::URL& aURL ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl + , const css::util::URL& aURL ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeStatusListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XStatusListener >& xControl - , const ::com::sun::star::util::URL& aURL ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl + , const css::util::URL& aURL ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XWindow + // css::awt::XWindow virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL + virtual css::awt::Rectangle SAL_CALL getPosSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setVisible( sal_Bool Visible ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setEnable( sal_Bool Enable ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + setFocus() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addWindowListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XWindowListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeWindowListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XWindowListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addFocusListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeFocusListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addKeyListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XKeyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeKeyListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XKeyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addMouseListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XMouseListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeMouseListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XMouseListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addMouseMotionListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XMouseMotionListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeMouseMotionListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XMouseMotionListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - addPaintListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XPaintListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removePaintListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XPaintListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + // css::lang XMultiServiceFactory + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + const css::uno::Sequence< + css::uno::Any >& Arguments ) + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XModifyListener + // css::util::XModifyListener virtual void SAL_CALL modified( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XModeChangeListener + // css::util::XModeChangeListener virtual void SAL_CALL modeChanged( - const ::com::sun::star::util::ModeChangeEvent& _rSource ) - throw (::com::sun::star::uno::RuntimeException, + const css::util::ModeChangeEvent& _rSource ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XLayoutManagerListener + // css::frame::XLayoutManagerListener virtual void SAL_CALL layoutEvent( - const ::com::sun::star::lang::EventObject& aSource, + const css::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, - const ::com::sun::star::uno::Any& aInfo ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aInfo ) + throw (css::uno::RuntimeException, std::exception) override; // WindowController stuff void PrePaint(vcl::RenderContext& rRenderContext); @@ -391,11 +363,11 @@ public: */ bool requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ); + OUString & rOutQuickHelpText, css::awt::Rectangle & rOutEqualRect ); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); - static bool isObjectDeleteable( const ::com::sun::star::uno::Any& rSelection ); + static bool isObjectDeleteable( const css::uno::Any& rSelection ); void setDrawMode( ChartDrawMode eMode ) { m_eDrawMode = eMode; } @@ -418,8 +390,8 @@ private: class TheModel : public salhelper::SimpleReferenceObject { public: - explicit TheModel( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xModel ); + explicit TheModel( const css::uno::Reference< + css::frame::XModel > & xModel ); virtual ~TheModel(); @@ -427,12 +399,12 @@ private: void addListener( ChartController* pController ); void removeListener( ChartController* pController ); void tryTermination(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > getModel() const { return m_xModel;} private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > m_xCloseable; + css::uno::Reference< css::frame::XModel > m_xModel; + css::uno::Reference< css::util::XCloseable > m_xCloseable; //the ownership between model and controller is not clear at first //each controller might consider himself as owner of the model first @@ -459,10 +431,10 @@ private: bool m_bSuspended; bool m_bCanClose; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + css::uno::Reference< css::uno::XComponentContext> m_xCC; //model - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + css::uno::Reference< css::frame::XFrame > m_xFrame; mutable ::osl::Mutex m_aModelMutex; TheModelRef m_aModel; @@ -483,7 +455,7 @@ private: bool m_bConnectingToView; bool m_bDisposed; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; + css::uno::Reference< css::document::XUndoManager > m_xUndoManager; std::unique_ptr< UndoGuard > m_pTextActionUndoGuard; std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute; @@ -491,8 +463,8 @@ private: CommandDispatchContainer m_aDispatchContainer; std::unique_ptr< DropTargetHelper > m_apDropTargetHelper; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XLayoutManagerEventBroadcaster > m_xLayoutManagerEventBroadcaster; + css::uno::Reference< + css::frame::XLayoutManagerEventBroadcaster > m_xLayoutManagerEventBroadcaster; ChartDrawMode m_eDrawMode; @@ -580,8 +552,8 @@ private: void executeDispatch_ToggleGridHorizontal(); void executeDispatch_ToggleGridVertical(); - void impl_ShapeControllerDispatch( const ::com::sun::star::util::URL& rURL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void impl_ShapeControllerDispatch( const css::util::URL& rURL, + const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); DECL_LINK_TYPED( DoubleClickWaitingHdl, Timer*, void ); void execute_DoubleClick( const Point* pMousePixel = nullptr ); @@ -592,12 +564,11 @@ private: void impl_notifySelectionChangeListeners(); void impl_invalidateAccessible(); void impl_initializeAccessible(); - void impl_initializeAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XInitialization >& xInit ); + void impl_initializeAccessible( const css::uno::Reference< css::lang::XInitialization >& xInit ); //sets the model member to null if it equals the parameter //returns true if successful - bool impl_releaseThisModel( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > & xModel ); + bool impl_releaseThisModel( const css::uno::Reference< css::uno::XInterface > & xModel ); enum eMoveOrResizeType { @@ -611,21 +582,20 @@ private: static std::set< OUString > impl_getAvailableCommands(); - /** Creates a helper accesibility class that must be initialized via XInitialization. For + /** Creates a helper accessibility class that must be initialized via XInitialization. For parameters see The returned object should not be used directly. Instead a proxy object should use this helper to retrieve its children and add them to its own children. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > impl_createAccessibleTextContext(); - void impl_PasteGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > & xGraphic, + void impl_PasteGraphic( css::uno::Reference< css::graphic::XGraphic > & xGraphic, const ::Point & aPosition ); void impl_PasteShapes( SdrModel* pModel ); - void impl_PasteStringAsTextShape( const OUString& rString, const ::com::sun::star::awt::Point& rPosition ); + void impl_PasteStringAsTextShape( const OUString& rString, const css::awt::Point& rPosition ); void impl_SetMousePointer( const MouseEvent & rEvent ); void impl_ClearSelection(); diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index f622b4505e6e..8b5c8e111f25 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -45,11 +45,11 @@ class Chart2ModelContact; class ChartDocumentWrapper_Base : public ::cppu::ImplInheritanceHelper < WrappedPropertySet - , ::com::sun::star::chart::XChartDocument - , ::com::sun::star::drawing::XDrawPageSupplier - , ::com::sun::star::lang::XMultiServiceFactory - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::uno::XAggregation + , css::chart::XChartDocument + , css::drawing::XDrawPageSupplier + , css::lang::XMultiServiceFactory + , css::lang::XServiceInfo + , css::uno::XAggregation > { }; @@ -58,9 +58,7 @@ class ChartDocumentWrapper : public ChartDocumentWrapper_Base , public ::utl::OEventListenerAdapter { public: - explicit ChartDocumentWrapper( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit ChartDocumentWrapper( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~ChartDocumentWrapper(); /// XServiceInfo declarations @@ -74,8 +72,8 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - void setAddIn( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable >& xAddIn ); - ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const { return m_xAddIn;} + void setAddIn( const css::uno::Reference< css::util::XRefreshable >& xAddIn ); + css::uno::Reference< css::util::XRefreshable > getAddIn() const { return m_xAddIn;} void setUpdateAddIn( bool bUpdateAddIn ); bool getUpdateAddIn() const { return m_bUpdateAddIn;} @@ -83,121 +81,105 @@ public: void setBaseDiagram( const OUString& rBaseDiagram ); OUString getBaseDiagram() const { return m_aBaseDiagram;} - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getAdditionalShapes() const; + css::uno::Reference< css::drawing::XShapes > getAdditionalShapes() const; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage > impl_getDrawPage() const - throw (::com::sun::star::uno::RuntimeException); + css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const + throw (css::uno::RuntimeException); protected: // ____ chart::XChartDocument ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > SAL_CALL getTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > SAL_CALL getSubTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > SAL_CALL getLegend() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getArea() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XDiagram > SAL_CALL getDiagram() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XChartData > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL attachData( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XChartData >& xData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDiagram( const css::uno::Reference< + css::chart::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attachData( const css::uno::Reference< + css::chart::XChartData >& xData ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XModel ____ - 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, std::exception) override; + virtual sal_Bool SAL_CALL attachResource( const OUString& URL, + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getURL() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< + css::beans::PropertyValue > SAL_CALL getArgs() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL connectController( const css::uno::Reference< + css::frame::XController >& Controller ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disconnectController( const css::uno::Reference< + css::frame::XController >& Controller ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL lockControllers() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL unlockControllers() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasControllersLocked() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController > SAL_CALL getCurrentController() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::frame::XController > SAL_CALL getCurrentController() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) + throw (css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::uno::XInterface > SAL_CALL getCurrentSelection() + throw (css::uno::RuntimeException, std::exception) override; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XInterface (for new interfaces) ____ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; // ____ ::utl::OEventListenerAdapter ____ - virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ) override; + virtual void _disposing( const css::lang::EventObject& rSource ) override; // ____ XDrawPageSupplier ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() + throw (css::uno::RuntimeException, std::exception) override; // ____ XMultiServiceFactory ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Arguments ) + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() + throw (css::uno::RuntimeException, std::exception) override; // ____ XAggregation ____ virtual void SAL_CALL setDelegator( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& rDelegator ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& rDelegator ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override; + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; private: //methods void impl_resetAddIn(); @@ -205,24 +187,24 @@ private: //methods private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator; + css::uno::Reference< css::uno::XInterface > m_xDelegator; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xTitle; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xSubTitle; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xLegend; - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData > m_xChartData; - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > m_xDiagram; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xArea; + css::uno::Reference< css::drawing::XShape > m_xTitle; + css::uno::Reference< css::drawing::XShape > m_xSubTitle; + css::uno::Reference< css::drawing::XShape > m_xLegend; + css::uno::Reference< css::chart::XChartData > m_xChartData; + css::uno::Reference< css::chart::XDiagram > m_xDiagram; + css::uno::Reference< css::beans::XPropertySet > m_xArea; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xAddIn; + css::uno::Reference< css::util::XRefreshable > m_xAddIn; OUString m_aBaseDiagram; bool m_bUpdateAddIn; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> - m_xShapeFactory; + css::uno::Reference< css::uno::XInterface > m_xChartView; + css::uno::Reference< css::lang::XMultiServiceFactory> + m_xShapeFactory; - bool m_bIsDisposed; + bool m_bIsDisposed; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx b/chart2/source/controller/inc/CommandDispatchContainer.hxx index adea7db9f2bb..08e3c55f6f4d 100644 --- a/chart2/source/controller/inc/CommandDispatchContainer.hxx +++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx @@ -70,20 +70,17 @@ public: // handled by other dispatchers. (Chart is currently the controller // itself) explicit CommandDispatchContainer( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + const css::uno::Reference< css::uno::XComponentContext > & xContext, ChartController* pController ); void setModel( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); /** Set a chart dispatcher that is used for all commands contained in rChartCommands */ void setChartDispatch( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch >& rChartDispatch, + const css::uno::Reference< css::frame::XDispatch >& rChartDispatch, const ::std::set< OUString > & rChartCommands ); /** Returns the dispatch that is able to do the command given in rURL, if @@ -93,22 +90,18 @@ public: <p>If all this fails, return an empty dispatch.</p> */ - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch > getDispatchForURL( - const ::com::sun::star::util::URL & rURL ); + css::uno::Reference< css::frame::XDispatch > getDispatchForURL( + const css::util::URL & rURL ); - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch > > getDispatchesForURLs( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::frame::DispatchDescriptor > & aDescriptors ); + css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > getDispatchesForURLs( + const css::uno::Sequence< css::frame::DispatchDescriptor > & aDescriptors ); void DisposeAndClear(); - static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > + static css::uno::Reference< css::frame::XDispatch > getContainerDispatchForURL( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > & xChartController, - const ::com::sun::star::util::URL & rURL ); + const css::uno::Reference< css::frame::XController > & xChartController, + const css::util::URL & rURL ); void setDrawCommandDispatch( DrawCommandDispatch* pDispatch ); DrawCommandDispatch* getDrawCommandDispatch() { return m_pDrawCommandDispatch; } @@ -118,23 +111,22 @@ public: private: typedef ::std::map< OUString, - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch > > + css::uno::Reference< css::frame::XDispatch > > tDispatchMap; typedef - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > tDisposeVector; + ::std::vector< css::uno::Reference< css::frame::XDispatch > > tDisposeVector; mutable tDispatchMap m_aCachedDispatches; mutable tDisposeVector m_aToBeDisposedDispatches; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::WeakReference< css::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xChartDispatcher; - ::std::set< OUString > m_aChartCommands; + css::uno::Reference< css::frame::XDispatch > m_xChartDispatcher; + ::std::set< OUString > m_aChartCommands; - ::std::set< OUString > m_aContainerDocumentCommands; + ::std::set< OUString > m_aContainerDocumentCommands; ChartController* m_pChartController; DrawCommandDispatch* m_pDrawCommandDispatch; diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 7e9853abe58e..53a4c0582dc8 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -53,7 +53,7 @@ public: /// tries to get an OutputDevice from the XParent of the model to use as reference device void attachParentReferenceDevice( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel ); + const css::uno::Reference< css::frame::XModel > & xChartModel ); //fill list of selection handles 'aHdl' virtual void SetMarkHandles() override; @@ -79,8 +79,7 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; - static SdrObject* getSdrObject( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + static SdrObject* getSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape ); private: mutable MarkHandleProvider* m_pMarkHandleProvider; diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index 10de4044cfdb..8104f77ba139 100644 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -41,14 +41,11 @@ class ErrorBarItemConverter : public ItemConverter { public: ErrorBarItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::frame::XModel > & xChartModel, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ); virtual ~ErrorBarItemConverter(); virtual void FillItemSet( SfxItemSet & rOutItemSet ) const override; @@ -59,14 +56,13 @@ protected: virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; private: std::shared_ptr< ItemConverter > m_spGraphicConverter; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< css::frame::XModel > m_xModel; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index 00d1eda9bf0b..a919d41da875 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -44,12 +44,10 @@ public: }; GraphicPropertyItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, eGraphicObjectType eObjectType = FILLED_DATA_POINT ); virtual ~GraphicPropertyItemConverter(); @@ -60,13 +58,12 @@ protected: virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw (css::uno::Exception, std::exception) override; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; private: eGraphicObjectType m_eGraphicObjectType; SdrModel & m_rDrawModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > m_xNamedPropertyTableFactory; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xNamedPropertyTableFactory; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 6218f3842feb..8ccc785549d5 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -73,8 +73,7 @@ public: reading/writing converted items */ ItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet , + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet , SfxItemPool& rItemPool ); virtual ~ItemConverter(); @@ -160,7 +159,7 @@ protected: @return true if the item changed a property, false otherwise. */ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( css::uno::Exception ); /// Returns the pool SfxItemPool & GetItemPool() const { return m_rItemPool;} @@ -168,11 +167,10 @@ protected: /** Returns the XPropertySet that was given in the CTOR and is used to apply items in ApplyItemSet(). */ - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > GetPropertySet() const { return m_xPropertySet;} + css::uno::Reference< css::beans::XPropertySet > GetPropertySet() const { return m_xPropertySet;} // ____ ::utl::OEventListenerAdapter ____ - virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ) override; + virtual void _disposing( const css::lang::EventObject& rSource ) override; protected: /** sets a new property set, that you get with GetPropertySet(). It should @@ -180,14 +178,11 @@ protected: the regression type of a regression curve which changes the object identity. */ - void resetPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xPropSet ); + void resetPropertySet( const css::uno::Reference< css::beans::XPropertySet > & xPropSet ); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xPropertySet; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > m_xPropertySetInfo; + css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; + css::uno::Reference< css::beans::XPropertySetInfo > m_xPropertySetInfo; SfxItemPool& m_rItemPool; bool m_bIsValid; diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index 4a6cdcbf9d57..e78541740639 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -36,12 +36,10 @@ class LegendItemConverter : public ItemConverter { public: LegendItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, const css::awt::Size* pRefSize = nullptr ); virtual ~LegendItemConverter(); @@ -54,9 +52,9 @@ protected: virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index 193f2e6a3859..8d653dd44521 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -50,8 +50,7 @@ public: used for keyboard navigation). */ explicit ObjectHierarchy( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDocument, + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument, ExplicitValueProvider * pExplicitValueProvider = nullptr, bool bFlattenDiagram = false, bool bOrderingForElementSelector = false ); @@ -81,11 +80,10 @@ class ObjectKeyNavigation { public: explicit ObjectKeyNavigation( const ObjectHierarchy::tOID & rCurrentOID, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDocument, + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument, ExplicitValueProvider * pExplicitValueProvider = nullptr ); - bool handleKeyEvent( const ::com::sun::star::awt::KeyEvent & rEvent ); + bool handleKeyEvent( const css::awt::KeyEvent & rEvent ); ObjectHierarchy::tOID getCurrentSelection() const { return m_aCurrentOID;} private: @@ -100,8 +98,7 @@ private: bool veryLast(); ObjectHierarchy::tOID m_aCurrentOID; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartDocument; + css::uno::Reference< css::chart2::XChartDocument > m_xChartDocument; ExplicitValueProvider * m_pExplicitValueProvider; bool m_bStepDownInDiagram; }; diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx index dbe7be844db6..dad409a1d037 100644 --- a/chart2/source/controller/inc/ObjectNameProvider.hxx +++ b/chart2/source/controller/inc/ObjectNameProvider.hxx @@ -36,38 +36,33 @@ class ObjectNameProvider public: 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 ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static OUString getGridName( const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static OUString getTitleName( const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static OUString getTitleNameByType( TitleHelper::eTitleType eType ); static OUString getNameForCID( const OUString& rObjectCID, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDocument ); + const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument ); static OUString getName_ObjectForSeries( ObjectType eObjectType, const OUString& rSeriesCID, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDocument ); + const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument ); 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 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 ); + static OUString getHelpText( const OUString& rObjectCID, const css::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false ); + static OUString getHelpText( const OUString& rObjectCID, const css::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); /** This is used for showing the currently selected object in the status bar (command "Context") */ - static OUString getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); + static OUString getSelectedObjectText( const OUString & rObjectCID, const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument ); }; } //namespace chart diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index fb46df3f5350..eb0ac9c6cdf0 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -33,14 +33,14 @@ class PositionAndSizeHelper { public: static bool moveObject( ObjectType eObjectType - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xObjectProp - , const ::com::sun::star::awt::Rectangle& rNewPositionAndSize - , const ::com::sun::star::awt::Rectangle& rPageRectangle ); + , const css::uno::Reference< css::beans::XPropertySet >& xObjectProp + , const css::awt::Rectangle& rNewPositionAndSize + , const css::awt::Rectangle& rPageRectangle ); 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 ); + , const css::uno::Reference< css::frame::XModel >& xChartModel + , const css::awt::Rectangle& rNewPositionAndSize + , const css::awt::Rectangle& rPageRectangle ); }; } //namespace chart diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx index cad411fcc717..049c19eac9d3 100644 --- a/chart2/source/controller/inc/RangeSelectionHelper.hxx +++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx @@ -39,13 +39,11 @@ class RangeSelectionHelper { public: explicit RangeSelectionHelper( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDocument ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument ); ~RangeSelectionHelper(); bool hasRangeSelection(); - ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XRangeSelection > getRangeSelection(); + css::uno::Reference< css::sheet::XRangeSelection > getRangeSelection(); void raiseRangeSelectionDocument(); bool chooseRange( const OUString & aCurrentRange, @@ -53,19 +51,16 @@ public: RangeSelectionListenerParent & rListenerParent ); void stopRangeListening( bool bRemoveListener = true ); bool verifyCellRange( const OUString & rRangeStr ); - bool verifyArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments ); + bool verifyArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XRangeSelection > + css::uno::Reference< css::sheet::XRangeSelection > m_xRangeSelection; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > + css::uno::Reference< css::chart2::XChartDocument > m_xChartDocument; - ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XRangeSelectionListener > + css::uno::Reference< css::sheet::XRangeSelectionListener > m_xRangeSelectionListener; }; diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 23ff7d82753b..1f99b442aa11 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -39,26 +39,25 @@ protected: class RangeSelectionListener : public ::cppu::WeakImplHelper< - ::com::sun::star::sheet::XRangeSelectionListener > + css::sheet::XRangeSelectionListener > { public: explicit RangeSelectionListener( RangeSelectionListenerParent & rParent, const OUString & rInitialRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModelToLockController ); + const css::uno::Reference< css::frame::XModel >& xModelToLockController ); virtual ~RangeSelectionListener(); protected: // ____ XRangeSelectionListener ____ - virtual void SAL_CALL done( const ::com::sun::star::sheet::RangeSelectionEvent& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL aborted( const ::com::sun::star::sheet::RangeSelectionEvent& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; private: RangeSelectionListenerParent & m_rParent; diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index 364f96fc9734..a7bc851935d8 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -38,14 +38,11 @@ class RegressionCurveItemConverter : public ItemConverter { public: RegressionCurveItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCurveCnt, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::chart2::XRegressionCurveContainer > & xRegCurveCnt, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ); virtual ~RegressionCurveItemConverter(); virtual void FillItemSet( SfxItemSet & rOutItemSet ) const override; @@ -56,14 +53,13 @@ protected: virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; private: std::shared_ptr< ItemConverter > m_spGraphicConverter; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurveContainer > m_xCurveContainer; + css::uno::Reference< css::chart2::XRegressionCurveContainer > m_xCurveContainer; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 030dc1874e96..3a4c55d3a367 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -36,12 +36,10 @@ class RegressionEquationItemConverter : public ItemConverter { public: RegressionEquationItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, const css::awt::Size* pRefSize = nullptr ); virtual ~RegressionEquationItemConverter(); @@ -54,9 +52,9 @@ protected: virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/SelectionHelper.hxx b/chart2/source/controller/inc/SelectionHelper.hxx index 9f973261260b..a770a495a01c 100644 --- a/chart2/source/controller/inc/SelectionHelper.hxx +++ b/chart2/source/controller/inc/SelectionHelper.hxx @@ -37,21 +37,18 @@ public: //methods bool hasSelection(); OUString getSelectedCID(); - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > getSelectedAdditionalShape(); + css::uno::Reference< css::drawing::XShape > getSelectedAdditionalShape(); ObjectIdentifier getSelectedOID() const { return m_aSelectedOID;} bool isResizeableObjectSelected(); - bool isRotateableObjectSelected( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + bool isRotateableObjectSelected( const css::uno::Reference< css::frame::XModel >& xChartModel ); bool isDragableObjectSelected(); bool isAdditionalShapeSelected() const; //returns true if selection has changed bool setSelection( const OUString& rCID ); - bool setSelection( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + bool setSelection( const css::uno::Reference< css::drawing::XShape >& xShape ); void clearSelection(); @@ -99,8 +96,7 @@ public: bool bGetDiagramInsteadOf_Wall=false ); static bool isRotateableObject( const OUString& rCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); explicit SelectionHelper( SdrObject* pSelectedObj ); virtual ~SelectionHelper(); diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 6eab46059ac8..926241d9db49 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -34,12 +34,9 @@ class SeriesOptionsItemConverter : public ItemConverter { public: SeriesOptionsItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::frame::XModel > & xChartModel, + const css::uno::Reference< css::uno::XComponentContext > & xContext, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool ); virtual ~SeriesOptionsItemConverter(); @@ -48,15 +45,13 @@ protected: virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xChartModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; + css::uno::Reference< css::frame::XModel > m_xChartModel; + css::uno::Reference< css::uno::XComponentContext> m_xCC; bool m_bAttachToMainAxis; bool m_bSupportingOverlapAndGapWidthProperties; @@ -75,10 +70,9 @@ private: sal_Int32 m_nStartingAngle; bool m_bClockwise; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > m_xCooSys; + css::uno::Reference< css::chart2::XCoordinateSystem > m_xCooSys; - ::com::sun::star::uno::Sequence< sal_Int32 > m_aSupportedMissingValueTreatments; + css::uno::Sequence< sal_Int32 > m_aSupportedMissingValueTreatments; sal_Int32 m_nMissingValueTreatment; bool m_bSupportingPlottingOfHiddenCells; diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index 884beb44f9fe..7d5cf7384759 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -36,10 +36,8 @@ class StatisticsItemConverter : public ItemConverter { public: StatisticsItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::frame::XModel > & xChartModel, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool ); virtual ~StatisticsItemConverter(); @@ -48,13 +46,12 @@ protected: virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ) override; + throw( css::uno::Exception ) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< css::frame::XModel > m_xModel; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 2eeebf0fa707..429365917b5b 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -31,15 +31,13 @@ namespace chart class TimerTriggeredControllerLock { public: - TimerTriggeredControllerLock( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ); + TimerTriggeredControllerLock( const css::uno::Reference< css::frame::XModel >& xModel ); virtual ~TimerTriggeredControllerLock(); void startTimer(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< css::frame::XModel > m_xModel; std::unique_ptr< ControllerLockGuardUNO > m_apControllerLockGuard; AutoTimer m_aTimer; diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 4d52f4dc74b1..9a8070f0b487 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -33,19 +33,19 @@ namespace chart struct TitleDialogData { - ::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList; - ::com::sun::star::uno::Sequence< sal_Bool > aExistenceList; - ::com::sun::star::uno::Sequence< OUString > aTextList; + css::uno::Sequence< sal_Bool > aPossibilityList; + css::uno::Sequence< sal_Bool > aExistenceList; + css::uno::Sequence< OUString > aTextList; std::unique_ptr< ReferenceSizeProvider > apReferenceSizeProvider; TitleDialogData(ReferenceSizeProvider* pReferenzeSizeProvider = nullptr); - void readFromModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); + void readFromModel( const css::uno::Reference< css::frame::XModel >& xChartModel ); /* return true if anything has changed; when pOldState is NULL then all data are written to the model */ - bool writeDifferenceToModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext + bool writeDifferenceToModel( const css::uno::Reference< css::frame::XModel >& xChartModel + , const css::uno::Reference< css::uno::XComponentContext >& xContext , TitleDialogData* pOldState=nullptr ); }; diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 965e42c2e323..889011d786eb 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -33,16 +33,14 @@ class ChartTypeDialog : public ModalDialog { public: ChartTypeDialog( vcl::Window* pWindow - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); virtual ~ChartTypeDialog(); virtual void dispose() override; private: VclPtr<ChartTypeTabPage> m_pChartTypeTabPage; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xChartModel; + css::uno::Reference< css::frame::XModel > m_xChartModel; }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index cd4ed1f1088a..aaca031c5323 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -34,26 +34,26 @@ class ChartTypeUnoDlg : public ChartTypeUnoDlg_BASE ,public ::comphelper::OPropertyArrayUsageHelper< ChartTypeUnoDlg > { public: - ChartTypeUnoDlg( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + ChartTypeUnoDlg( const css::uno::Reference< css::uno::XComponentContext >& xContext ); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); private: virtual ~ChartTypeUnoDlg(); // OGenericUnoDialog overridables - virtual void implInitialize(const com::sun::star::uno::Any& _rValue) override; + virtual void implInitialize(const css::uno::Any& _rValue) override; virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; // XTypeProvider - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper @@ -62,7 +62,7 @@ private: ChartTypeUnoDlg(const ChartTypeUnoDlg&) = delete; void operator =(const ChartTypeUnoDlg&) = delete; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; + css::uno::Reference< css::frame::XModel > m_xChartModel; }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 22b3c4df7c80..7e7255c4cadc 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -42,10 +42,8 @@ class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable { public: CreationWizard( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext + const css::uno::Reference< css::frame::XModel >& xChartModel + , const css::uno::Reference< css::uno::XComponentContext >& xContext , sal_Int32 nOnePageOnlyIndex=-1 );//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap bool isClosable() { /*@todo*/ return m_bIsClosable;} @@ -67,10 +65,8 @@ private: virtual VclPtr<TabPage> createPage(WizardState nState) override; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; + css::uno::Reference< css::chart2::XChartDocument > m_xChartModel; + css::uno::Reference< css::uno::XComponentContext> m_xCC; bool m_bIsClosable; sal_Int32 m_nOnePageOnlyIndex;//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap ChartTypeTemplateProvider* m_pTemplateProvider; diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index f99aa556fddc..d9493cfb0d83 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -40,26 +40,25 @@ namespace chart class CreationWizard; class CreationWizardUnoDlg : public MutexContainer , public ::cppu::OComponentHelper - , public ::com::sun::star::ui::dialogs::XExecutableDialog - , public ::com::sun::star::lang::XServiceInfo - , public ::com::sun::star::lang::XInitialization - , public ::com::sun::star::frame::XTerminateListener - , public ::com::sun::star::beans::XPropertySet + , public css::ui::dialogs::XExecutableDialog + , public css::lang::XServiceInfo + , public css::lang::XInitialization + , public css::frame::XTerminateListener + , public css::beans::XPropertySet { public: - CreationWizardUnoDlg( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + CreationWizardUnoDlg( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~CreationWizardUnoDlg(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -73,26 +72,26 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; DECL_LINK_TYPED( DialogEventHdl, VclWindowEvent&, void ); @@ -107,12 +106,9 @@ private: void createDialogOnDemand(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xChartModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; - com::sun::star::uno::Reference< - com::sun::star::awt::XWindow > m_xParentWindow; + css::uno::Reference< css::frame::XModel > m_xChartModel; + css::uno::Reference< css::uno::XComponentContext> m_xCC; + css::uno::Reference< css::awt::XWindow > m_xParentWindow; VclPtr<CreationWizard> m_pDialog; bool m_bUnlockControllersOnExecute; diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index f1d10852fc46..356192440dc1 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -42,10 +42,8 @@ class DataEditor : public ModalDialog { public: DataEditor( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc, + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~DataEditor(); virtual void dispose() override; @@ -67,9 +65,8 @@ private: bool m_bReadOnly; VclPtr<DataBrowser> m_xBrwData; VclPtr<ToolBox> m_pTbxData; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartDoc; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::chart2::XChartDocument > m_xChartDoc; + css::uno::Reference< css::uno::XComponentContext > m_xContext; /// handles actions of the toolbox diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 7789d03e38c4..b5965177aabf 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -45,10 +45,8 @@ class DataSourceDialog : public: explicit DataSourceDialog( vcl::Window * pParent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDocument, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument, + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~DataSourceDialog(); virtual void dispose() override; diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 7c8b2791ddef..3799116d49e8 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -29,8 +29,8 @@ namespace chart struct InsertAxisOrGridDialogData { - ::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList; - ::com::sun::star::uno::Sequence< sal_Bool > aExistenceList; + css::uno::Sequence< sal_Bool > aPossibilityList; + css::uno::Sequence< sal_Bool > aExistenceList; InsertAxisOrGridDialogData(); }; diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 78bdce4cdb01..2fc4a4c6260b 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -33,17 +33,14 @@ class InsertErrorBarsDialog : public ModalDialog { public: InsertErrorBarsDialog( vcl::Window* pParent, const SfxItemSet& rMyAttrs, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDocument, + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument, ErrorBarResources::tErrorBarType eType ); void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); static double getAxisMinorStepWidthForErrorBarDecimals( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xChartView, + const css::uno::Reference< css::frame::XModel >& xChartModel, + const css::uno::Reference< css::uno::XInterface >& xChartView, const OUString& rSelectedObjectCID ); void FillItemSet( SfxItemSet& rOutAttrs ); diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index ab5a024410de..38d58c398017 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -37,13 +37,10 @@ private: std::unique_ptr < LegendPositionResources > m_xLegendPositionResources; public: - SchLegendDlg( vcl::Window* pParent, const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext>& xCC ); + SchLegendDlg( vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext>& xCC ); - void init( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); - bool writeToModel( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ) const; + void init( const css::uno::Reference< css::frame::XModel >& xChartModel ); + bool writeToModel( const css::uno::Reference< css::frame::XModel >& xChartModel ) const; }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 258f83de4557..3ec0631d1b89 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -33,7 +33,7 @@ public: ObjectPropertiesDialogParameter( const OUString& rObjectCID ); virtual ~ObjectPropertiesDialogParameter(); - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); + void init( const css::uno::Reference< css::frame::XModel >& xModel ); ObjectType getObjectType() const { return m_eObjectType;} OUString getLocalizedName() const { return m_aLocalizedName;} @@ -53,9 +53,9 @@ public: bool IsSupportingAxisPositioning() const { return m_bSupportingAxisPositioning;} bool ShowAxisOrigin() const { return m_bShowAxisOrigin;} bool IsCrossingAxisIsCategoryAxis() const { return m_bIsCrossingAxisIsCategoryAxis;} - const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const { return m_aCategories;} + const css::uno::Sequence< OUString >& GetCategories() const { return m_aCategories;} - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > + css::uno::Reference< css::chart2::XChartDocument > getDocument() const { return m_xChartDocument;} bool IsComplexCategoriesAxis() const { return m_bComplexCategoriesAxis;} @@ -86,9 +86,9 @@ private: bool m_bSupportingAxisPositioning; bool m_bShowAxisOrigin; bool m_bIsCrossingAxisIsCategoryAxis; - ::com::sun::star::uno::Sequence< OUString > m_aCategories; + css::uno::Sequence< OUString > m_aCategories; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument; + css::uno::Reference< css::chart2::XChartDocument > m_xChartDocument; bool m_bComplexCategoriesAxis; @@ -129,8 +129,7 @@ public: SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const ObjectPropertiesDialogParameter* pDialogParameter, const ViewElementListProvider* pViewElementListProvider, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); + const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); virtual ~SchAttribTabDlg(); virtual void dispose() override; diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index c599e3181ba0..e7a4f8f62df0 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -38,7 +38,7 @@ class View3DDialog : public TabDialog { public: View3DDialog( vcl::Window* pWindow, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, + const css::uno::Reference< css::frame::XModel > & xChartModel, const XColorListRef &pColorTable ); virtual ~View3DDialog(); virtual void dispose() override; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 155b9f9410d6..d87b4bc655db 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -54,8 +54,7 @@ public: void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); void SetErrorBarType( tErrorBarType eNewType ); void SetChartDocumentForRangeChoosing( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDocument ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument ); void Reset(const SfxItemSet& rInAttrs); bool FillItemSet(SfxItemSet& rOutAttrs) const; diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx index e8d70e07c77d..c282718b34c8 100644 --- a/chart2/source/controller/inc/res_LegendPosition.hxx +++ b/chart2/source/controller/inc/res_LegendPosition.hxx @@ -36,14 +36,12 @@ public: //constructor without Display checkbox LegendPositionResources(VclBuilderContainer& rParent); //constructor inclusive Display checkbox - LegendPositionResources(VclBuilderContainer& rParent, const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext>& xCC ); + LegendPositionResources(VclBuilderContainer& rParent, const css::uno::Reference< + css::uno::XComponentContext>& xCC ); virtual ~LegendPositionResources(); - void writeToResources( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); - void writeToModel( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ) const; + void writeToResources( const css::uno::Reference< css::frame::XModel >& xChartModel ); + void writeToModel( const css::uno::Reference< css::frame::XModel >& xChartModel ) const; void initFromItemSet( const SfxItemSet& rInAttrs ); void writeToItemSet( SfxItemSet& rOutAttrs ) const; @@ -57,8 +55,7 @@ private: void impl_setRadioButtonToggleHdl(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; + css::uno::Reference< css::uno::XComponentContext> m_xCC; VclPtr<CheckBox> m_pCbxShow; diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index d42c166edf89..eb49b1020b88 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -341,7 +341,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_POSITION: { - ::com::sun::star::chart::ChartAxisPosition eAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); + css::chart::ChartAxisPosition eAxisPos( css::chart::ChartAxisPosition_ZERO ); GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eAxisPos; rOutItemSet.Put( SfxInt32Item( nWhichId, eAxisPos ) ); } @@ -374,7 +374,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_LABEL_POSITION: { - ::com::sun::star::chart::ChartAxisLabelPosition ePos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS ); + css::chart::ChartAxisLabelPosition ePos( css::chart::ChartAxisLabelPosition_NEAR_AXIS ); GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= ePos; rOutItemSet.Put( SfxInt32Item( nWhichId, ePos ) ); } @@ -382,7 +382,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_MARK_POSITION: { - ::com::sun::star::chart::ChartAxisMarkPosition ePos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); + css::chart::ChartAxisMarkPosition ePos( css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= ePos; rOutItemSet.Put( SfxInt32Item( nWhichId, ePos ) ); } @@ -448,7 +448,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI bool lcl_isDateAxis( const SfxItemSet & rItemSet ) { - sal_Int32 nAxisType = static_cast< const SfxInt32Item & >( rItemSet.Get( SCHATTR_AXISTYPE )).GetValue();//::com::sun::star::chart2::AxisType + sal_Int32 nAxisType = static_cast< const SfxInt32Item & >( rItemSet.Get( SCHATTR_AXISTYPE )).GetValue();//css::chart2::AxisType return (chart2::AxisType::DATE == nAxisType); } @@ -738,11 +738,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet double fValue = 0.0; if( aValue >>= fValue ) { - xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE )); + xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( css::chart::ChartAxisPosition_VALUE )); xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue )); } else - xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START )); + xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( css::chart::ChartAxisPosition_START )); } } } @@ -753,11 +753,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet case SCHATTR_AXIS_POSITION: { - ::com::sun::star::chart::ChartAxisPosition eAxisPos = - (::com::sun::star::chart::ChartAxisPosition) + css::chart::ChartAxisPosition eAxisPos = + (css::chart::ChartAxisPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); - ::com::sun::star::chart::ChartAxisPosition eOldAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); + css::chart::ChartAxisPosition eOldAxisPos( css::chart::ChartAxisPosition_ZERO ); bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eOldAxisPos ); if( !bPropExisted || ( eOldAxisPos != eAxisPos )) @@ -766,20 +766,20 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet bChangedOtherwise = true; //move the parallel axes to the other side if necessary - if( eAxisPos==::com::sun::star::chart::ChartAxisPosition_START || eAxisPos==::com::sun::star::chart::ChartAxisPosition_END ) + if( eAxisPos==css::chart::ChartAxisPosition_START || eAxisPos==css::chart::ChartAxisPosition_END ) { Reference< beans::XPropertySet > xParallelAxis( AxisHelper::getParallelAxis( m_xAxis, ChartModelHelper::findDiagram( m_xChartDoc ) ), uno::UNO_QUERY ); if( xParallelAxis.is() ) { - ::com::sun::star::chart::ChartAxisPosition eOtherPos; + css::chart::ChartAxisPosition eOtherPos; if( xParallelAxis->getPropertyValue( "CrossoverPosition" ) >>= eOtherPos ) { if( eOtherPos == eAxisPos ) { - ::com::sun::star::chart::ChartAxisPosition eOppositePos = - (eAxisPos==::com::sun::star::chart::ChartAxisPosition_START) - ? ::com::sun::star::chart::ChartAxisPosition_END - : ::com::sun::star::chart::ChartAxisPosition_START; + css::chart::ChartAxisPosition eOppositePos = + (eAxisPos==css::chart::ChartAxisPosition_START) + ? css::chart::ChartAxisPosition_END + : css::chart::ChartAxisPosition_START; xParallelAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( eOppositePos )); } } @@ -825,11 +825,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet case SCHATTR_AXIS_LABEL_POSITION: { - ::com::sun::star::chart::ChartAxisLabelPosition ePos = - (::com::sun::star::chart::ChartAxisLabelPosition) + css::chart::ChartAxisLabelPosition ePos = + (css::chart::ChartAxisLabelPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); - ::com::sun::star::chart::ChartAxisLabelPosition eOldPos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS ); + css::chart::ChartAxisLabelPosition eOldPos( css::chart::ChartAxisLabelPosition_NEAR_AXIS ); bool bPropExisted = ( GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= eOldPos ); if( !bPropExisted || ( eOldPos != ePos )) @@ -838,20 +838,20 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet bChangedOtherwise = true; //move the parallel axes to the other side if necessary - if( ePos==::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START || ePos==::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END ) + if( ePos==css::chart::ChartAxisLabelPosition_OUTSIDE_START || ePos==css::chart::ChartAxisLabelPosition_OUTSIDE_END ) { Reference< beans::XPropertySet > xParallelAxis( AxisHelper::getParallelAxis( m_xAxis, ChartModelHelper::findDiagram( m_xChartDoc ) ), uno::UNO_QUERY ); if( xParallelAxis.is() ) { - ::com::sun::star::chart::ChartAxisLabelPosition eOtherPos; + css::chart::ChartAxisLabelPosition eOtherPos; if( xParallelAxis->getPropertyValue( "LabelPosition" ) >>= eOtherPos ) { if( eOtherPos == ePos ) { - ::com::sun::star::chart::ChartAxisLabelPosition eOppositePos = - (ePos==::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) - ? ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END - : ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START; + css::chart::ChartAxisLabelPosition eOppositePos = + (ePos==css::chart::ChartAxisLabelPosition_OUTSIDE_START) + ? css::chart::ChartAxisLabelPosition_OUTSIDE_END + : css::chart::ChartAxisLabelPosition_OUTSIDE_START; xParallelAxis->setPropertyValue( "LabelPosition" , uno::makeAny( eOppositePos )); } } @@ -863,11 +863,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet case SCHATTR_AXIS_MARK_POSITION: { - ::com::sun::star::chart::ChartAxisMarkPosition ePos = - (::com::sun::star::chart::ChartAxisMarkPosition) + css::chart::ChartAxisMarkPosition ePos = + (css::chart::ChartAxisMarkPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); - ::com::sun::star::chart::ChartAxisMarkPosition eOldPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); + css::chart::ChartAxisMarkPosition eOldPos( css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); bool bPropExisted = ( GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= eOldPos ); if( !bPropExisted || ( eOldPos != ePos )) @@ -963,7 +963,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet case SCHATTR_AXISTYPE: { - sal_Int32 nNewAxisType = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();//::com::sun::star::chart2::AxisType + sal_Int32 nNewAxisType = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();//css::chart2::AxisType aScale.AxisType = nNewAxisType; bSetScale = true; } diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index 43d0c06d2187..e609ac9c9975 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -161,26 +161,26 @@ bool ErrorBarItemConverter::ApplySpecialItem( } else { - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; switch( eErrorKind ) { case CHERROR_NONE: - nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; break; + nStyle = css::chart::ErrorBarStyle::NONE; break; case CHERROR_VARIANT: - nStyle = ::com::sun::star::chart::ErrorBarStyle::VARIANCE; break; + nStyle = css::chart::ErrorBarStyle::VARIANCE; break; case CHERROR_SIGMA: - nStyle = ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION; break; + nStyle = css::chart::ErrorBarStyle::STANDARD_DEVIATION; break; case CHERROR_PERCENT: - nStyle = ::com::sun::star::chart::ErrorBarStyle::RELATIVE; break; + nStyle = css::chart::ErrorBarStyle::RELATIVE; break; case CHERROR_BIGERROR: - nStyle = ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN; break; + nStyle = css::chart::ErrorBarStyle::ERROR_MARGIN; break; case CHERROR_CONST: - nStyle = ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE; break; + nStyle = css::chart::ErrorBarStyle::ABSOLUTE; break; case CHERROR_STDERROR: - nStyle = ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR; break; + nStyle = css::chart::ErrorBarStyle::STANDARD_ERROR; break; case CHERROR_RANGE: - nStyle = ::com::sun::star::chart::ErrorBarStyle::FROM_DATA; break; + nStyle = css::chart::ErrorBarStyle::FROM_DATA; break; } xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle )); @@ -345,21 +345,21 @@ void ErrorBarItemConverter::FillSpecialItem( { switch( nStyle ) { - case ::com::sun::star::chart::ErrorBarStyle::NONE: + case css::chart::ErrorBarStyle::NONE: break; - case ::com::sun::star::chart::ErrorBarStyle::VARIANCE: + case css::chart::ErrorBarStyle::VARIANCE: eErrorKind = CHERROR_VARIANT; break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION: + case css::chart::ErrorBarStyle::STANDARD_DEVIATION: eErrorKind = CHERROR_SIGMA; break; - case ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE: + case css::chart::ErrorBarStyle::ABSOLUTE: eErrorKind = CHERROR_CONST; break; - case ::com::sun::star::chart::ErrorBarStyle::RELATIVE: + case css::chart::ErrorBarStyle::RELATIVE: eErrorKind = CHERROR_PERCENT; break; - case ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: + case css::chart::ErrorBarStyle::ERROR_MARGIN: eErrorKind = CHERROR_BIGERROR; break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR: + case css::chart::ErrorBarStyle::STANDARD_ERROR: eErrorKind = CHERROR_STDERROR; break; - case ::com::sun::star::chart::ErrorBarStyle::FROM_DATA: + case css::chart::ErrorBarStyle::FROM_DATA: eErrorKind = CHERROR_RANGE; break; } } diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 7dd83bdd9473..396d5425a6a6 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -42,8 +42,7 @@ namespace wrapper { LegendItemConverter::LegendItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, SdrModel& rDrawModel, const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, @@ -126,16 +125,16 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe { chart2::LegendPosition eNewPos = static_cast<chart2::LegendPosition>(static_cast<const SfxInt32Item*>(pPoolItem)->GetValue()); - ::com::sun::star::chart::ChartLegendExpansion eExpansion = ::com::sun::star::chart::ChartLegendExpansion_HIGH; + css::chart::ChartLegendExpansion eExpansion = css::chart::ChartLegendExpansion_HIGH; switch( eNewPos ) { case chart2::LegendPosition_LINE_START: case chart2::LegendPosition_LINE_END: - eExpansion = ::com::sun::star::chart::ChartLegendExpansion_HIGH; + eExpansion = css::chart::ChartLegendExpansion_HIGH; break; case chart2::LegendPosition_PAGE_START: case chart2::LegendPosition_PAGE_END: - eExpansion = ::com::sun::star::chart::ChartLegendExpansion_WIDE; + eExpansion = css::chart::ChartLegendExpansion_WIDE; break; default: break; diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index c5143e5d35de..1047923c80dd 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -49,8 +49,7 @@ ItemPropertyMapType & lcl_GetEquationPropertyMap() } // anonymous namespace RegressionEquationItemConverter::RegressionEquationItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropertySet, + const css::uno::Reference< css::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, SdrModel& rDrawModel, const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 999bbe888699..5f749ea4bf8a 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -301,26 +301,26 @@ bool StatisticsItemConverter::ApplySpecialItem( } else { - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; switch( eErrorKind ) { case CHERROR_NONE: - nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; break; + nStyle = css::chart::ErrorBarStyle::NONE; break; case CHERROR_VARIANT: - nStyle = ::com::sun::star::chart::ErrorBarStyle::VARIANCE; break; + nStyle = css::chart::ErrorBarStyle::VARIANCE; break; case CHERROR_SIGMA: - nStyle = ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION; break; + nStyle = css::chart::ErrorBarStyle::STANDARD_DEVIATION; break; case CHERROR_PERCENT: - nStyle = ::com::sun::star::chart::ErrorBarStyle::RELATIVE; break; + nStyle = css::chart::ErrorBarStyle::RELATIVE; break; case CHERROR_BIGERROR: - nStyle = ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN; break; + nStyle = css::chart::ErrorBarStyle::ERROR_MARGIN; break; case CHERROR_CONST: - nStyle = ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE; break; + nStyle = css::chart::ErrorBarStyle::ABSOLUTE; break; case CHERROR_STDERROR: - nStyle = ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR; break; + nStyle = css::chart::ErrorBarStyle::STANDARD_ERROR; break; case CHERROR_RANGE: - nStyle = ::com::sun::star::chart::ErrorBarStyle::FROM_DATA; break; + nStyle = css::chart::ErrorBarStyle::FROM_DATA; break; } if( !xErrorBarProp.is() ) @@ -630,21 +630,21 @@ void StatisticsItemConverter::FillSpecialItem( { switch( nStyle ) { - case ::com::sun::star::chart::ErrorBarStyle::NONE: + case css::chart::ErrorBarStyle::NONE: break; - case ::com::sun::star::chart::ErrorBarStyle::VARIANCE: + case css::chart::ErrorBarStyle::VARIANCE: eErrorKind = CHERROR_VARIANT; break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION: + case css::chart::ErrorBarStyle::STANDARD_DEVIATION: eErrorKind = CHERROR_SIGMA; break; - case ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE: + case css::chart::ErrorBarStyle::ABSOLUTE: eErrorKind = CHERROR_CONST; break; - case ::com::sun::star::chart::ErrorBarStyle::RELATIVE: + case css::chart::ErrorBarStyle::RELATIVE: eErrorKind = CHERROR_PERCENT; break; - case ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: + case css::chart::ErrorBarStyle::ERROR_MARGIN: eErrorKind = CHERROR_BIGERROR; break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR: + case css::chart::ErrorBarStyle::STANDARD_ERROR: eErrorKind = CHERROR_STDERROR; break; - case ::com::sun::star::chart::ErrorBarStyle::FROM_DATA: + case css::chart::ErrorBarStyle::FROM_DATA: eErrorKind = CHERROR_RANGE; break; } } diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 211fccd9f5c3..b1eee73c03a9 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -503,7 +503,7 @@ void SAL_CALL ChartController::attachFrame( { try { - uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + uno::Reference< css::frame::XLayoutManager > xLayoutManager; xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; if ( xLayoutManager.is() ) { @@ -1318,7 +1318,7 @@ void SAL_CALL ChartController::dispatch( uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY ); if( xPropSet.is() ) { - uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + uno::Reference< css::frame::XLayoutManager > xLayoutManager; xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; if ( xLayoutManager.is() ) { diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 6f6b9c1c5597..838243b6abd7 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -46,7 +46,7 @@ void ChartController::executeDispatch_EditData() Reference< chart2::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY ); if( xChartDoc.is()) { - Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider()); + Reference< css::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider()); { SolarMutexGuard aSolarGuard; diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index ca09dce26f77..4b0102831fa5 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -430,7 +430,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) // add error bars with standard deviation uno::Reference< beans::XPropertySet > xErrorBarProp( StatisticsHelper::addErrorBars( xSeries, m_xCC, - ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION, + css::chart::ErrorBarStyle::STANDARD_DEVIATION, bYError)); // get an appropriate item converter diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 1f25ece8ebe1..798efedaa3ce 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -135,7 +135,7 @@ bool ChartController::EndTextEdit() ControllerLockGuardUNO aCLGuard( getModel() ); TitleHelper::setCompleteString( aString, uno::Reference< - ::com::sun::star::chart2::XTitle >::query( xPropSet ), m_xCC ); + css::chart2::XTitle >::query( xPropSet ), m_xCC ); OSL_ENSURE( m_pTextActionUndoGuard.get(), "ChartController::EndTextEdit: no TextUndoGuard!" ); if ( m_pTextActionUndoGuard.get() ) @@ -209,10 +209,10 @@ void ChartController::executeDispatch_InsertSpecialCharacter() } } -uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > +uno::Reference< css::accessibility::XAccessibleContext > ChartController::impl_createAccessibleTextContext() { - uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > xResult( + uno::Reference< css::accessibility::XAccessibleContext > xResult( new AccessibleTextHelper( m_pDrawViewWrapper )); return xResult; diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 6cfece93b5dc..58af6a624c6a 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -750,7 +750,7 @@ bool ChartController::executeDispatch_Delete() ControllerLockGuardUNO aCtlLockGuard( xModel ); xErrorBarProp->setPropertyValue( "ErrorBarStyle", - uno::makeAny( ::com::sun::star::chart::ErrorBarStyle::NONE )); + uno::makeAny( css::chart::ErrorBarStyle::NONE )); } bReturn = true; aUndoGuard.commit(); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index c218d51ef65d..ebb52745adbe 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -34,8 +34,8 @@ class ChartDropTargetHelper : public DropTargetHelper { public: explicit ChartDropTargetHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >& rxDropTarget, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument ); + const css::uno::Reference< css::datatransfer::dnd::XDropTarget >& rxDropTarget, + const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument ); virtual ~ChartDropTargetHelper(); protected: @@ -49,8 +49,7 @@ private: bool satisfiesPrerequisites() const; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartDocument; + css::uno::Reference< css::chart2::XChartDocument > m_xChartDocument; }; } // namespace chart diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 97dd7e5f6505..ffd399131a63 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -29,16 +29,12 @@ namespace chart { class ChartFrameLoader : public ::cppu::WeakImplHelper< - ::com::sun::star::frame::XSynchronousFrameLoader - , ::com::sun::star::lang::XServiceInfo - //comprehends XComponent (required interface) - // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + css::frame::XSynchronousFrameLoader + , css::lang::XServiceInfo > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + css::uno::Reference< css::uno::XComponentContext> m_xCC; bool m_bCancelRequired; ::osl::Condition m_oCancelFinished; @@ -47,11 +43,10 @@ private: //no default constructor ChartFrameLoader(){} public: - explicit ChartFrameLoader(::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext); + explicit ChartFrameLoader(css::uno::Reference< css::uno::XComponentContext > const & xContext); virtual ~ChartFrameLoader(); - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) @@ -62,17 +57,15 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ::com::sun::star::frame::XFrameLoader + // css::frame::XFrameLoader virtual sal_Bool SAL_CALL - load( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rMediaDescriptor - ,const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XFrame >& xFrame ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor + ,const css::uno::Reference< css::frame::XFrame >& xFrame ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - cancel() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + cancel() throw (css::uno::RuntimeException, std::exception) override; }; } //namespace chart diff --git a/chart2/source/controller/main/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx index 5d9e811ab826..616921970902 100644 --- a/chart2/source/controller/main/ChartModelClone.hxx +++ b/chart2/source/controller/main/ChartModelClone.hxx @@ -39,7 +39,7 @@ namespace chart { public: ChartModelClone( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_model, + const css::uno::Reference< css::frame::XModel >& i_model, const ModelFacet i_facet ); @@ -47,12 +47,12 @@ namespace chart ModelFacet getFacet() const; - void applyToModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_model ) const; + void applyToModel( const css::uno::Reference< css::frame::XModel >& i_model ) const; static void applyModelContentToModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & i_model, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & i_modelToCopyFrom, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > & i_data ); + const css::uno::Reference< css::frame::XModel > & i_model, + const css::uno::Reference< css::frame::XModel > & i_modelToCopyFrom, + const css::uno::Reference< css::chart2::XInternalDataProvider > & i_data ); void dispose(); @@ -60,9 +60,9 @@ namespace chart bool impl_isDisposed() const { return !m_xModelClone.is(); } private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModelClone; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > m_xDataClone; - ::com::sun::star::uno::Any m_aSelection; + css::uno::Reference< css::frame::XModel > m_xModelClone; + css::uno::Reference< css::chart2::XInternalDataProvider > m_xDataClone; + css::uno::Any m_aSelection; }; } // namespace chart diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx index e08d99f7f6d9..8a5e2acd83b2 100644 --- a/chart2/source/controller/main/ChartTransferable.hxx +++ b/chart2/source/controller/main/ChartTransferable.hxx @@ -45,10 +45,10 @@ protected: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) override; + const css::datatransfer::DataFlavor& rFlavor ) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > m_xMetaFileGraphic; + css::uno::Reference< css::graphic::XGraphic > m_xMetaFileGraphic; SdrModel* m_pMarkedObjModel; bool m_bDrawing; }; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 80b076930623..1c6d6ae4b0db 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; namespace { -::Rectangle lcl_AWTRectToVCLRect( const ::com::sun::star::awt::Rectangle & rAWTRect ) +::Rectangle lcl_AWTRectToVCLRect( const css::awt::Rectangle & rAWTRect ) { ::Rectangle aResult; aResult.setX( rAWTRect.X ); diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 3921f350615e..1ad1507bed75 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -63,7 +63,7 @@ public: virtual void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) override; virtual void Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; private: ChartController* m_pWindowController; diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index ea7fd7a157f4..851caa41c6ca 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -115,7 +115,7 @@ void SAL_CALL CommandDispatch::disposing( const lang::EventObject& /* Source */ {} void CommandDispatch::fireAllStatusEvents( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) + const css::uno::Reference< css::frame::XStatusListener > & xSingleListener ) { fireStatusEvent( OUString(), xSingleListener ); } diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 928691554fd6..7dcc1a7dc08b 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -36,8 +36,8 @@ namespace chart namespace impl { typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::frame::XDispatch, - ::com::sun::star::util::XModifyListener > + css::frame::XDispatch, + css::util::XModifyListener > CommandDispatch_Base; } @@ -48,9 +48,7 @@ class CommandDispatch : public impl::CommandDispatch_Base { public: - explicit CommandDispatch( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit CommandDispatch( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~CommandDispatch(); // late initialisation, especially for adding as listener @@ -75,12 +73,12 @@ protected: */ virtual void fireStatusEvent( const OUString & rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) = 0; + const css::uno::Reference< css::frame::XStatusListener > & xSingleListener ) = 0; /** calls fireStatusEvent( OUString, xSingleListener ) */ void fireAllStatusEvents( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); + const css::uno::Reference< css::frame::XStatusListener > & xSingleListener ); /** sends a status event for a specific command to all registered listeners or only the one given when set. @@ -92,25 +90,25 @@ protected: */ void fireStatusEventForURL( const OUString & rURL, - const ::com::sun::star::uno::Any & rState, + const css::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 css::uno::Reference< css::frame::XStatusListener > & xSingleListener = + css::uno::Reference< css::frame::XStatusListener >(), const OUString & rFeatureDescriptor = OUString() ); // ____ XDispatch ____ virtual void SAL_CALL dispatch( - const ::com::sun::star::util::URL& URL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::util::URL& URL, + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addStatusListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& Control, - const ::com::sun::star::util::URL& URL ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::frame::XStatusListener >& Control, + const css::util::URL& URL ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeStatusListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& Control, - const ::com::sun::star::util::URL& URL ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::frame::XStatusListener >& Control, + const css::util::URL& URL ) + throw (css::uno::RuntimeException, std::exception) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -118,17 +116,17 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; private: typedef ::std::map< OUString, ::comphelper::OInterfaceContainerHelper2* > diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index b6ba92373b99..3f32b4db1558 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -62,7 +62,7 @@ bool lcl_isStatusBarVisible( const Reference< frame::XController > & xController Reference< beans::XPropertySet > xPropSet( xController->getFrame(), uno::UNO_QUERY ); if( xPropSet.is() ) { - uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + uno::Reference< css::frame::XLayoutManager > xLayoutManager; xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; if ( xLayoutManager.is() ) bIsStatusBarVisible = xLayoutManager->isElementVisible( "private:resource/statusbar/statusbar" ); diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 6df9de83009c..422ff7de1c53 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -42,7 +42,7 @@ struct ControllerState; // to update the ControllerState when the selection changes. typedef ::cppu::ImplInheritanceHelper< CommandDispatch, - ::com::sun::star::view::XSelectionChangeListener > + css::view::XSelectionChangeListener > ControllerCommandDispatch_Base; } @@ -57,8 +57,7 @@ class ControllerCommandDispatch : public impl::ControllerCommandDispatch_Base { public: explicit ControllerCommandDispatch( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + const css::uno::Reference< css::uno::XComponentContext > & xContext, ChartController* pController, CommandDispatchContainer* pContainer ); virtual ~ControllerCommandDispatch(); @@ -68,9 +67,9 @@ public: protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( - const ::com::sun::star::util::URL& URL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::util::URL& URL, + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) + throw (css::uno::RuntimeException, std::exception) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -78,27 +77,27 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; virtual void fireStatusEvent( const OUString & rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) override; + const css::uno::Reference< css::frame::XStatusListener > & xSingleListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; private: void fireStatusEventForURLImpl( const OUString & rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); + const css::uno::Reference< css::frame::XStatusListener > & xSingleListener ); bool commandAvailable( const OUString & rCommand ); void updateCommandAvailability(); @@ -106,18 +105,15 @@ private: bool isShapeControllerCommandAvailable( const OUString& rCommand ); ChartController* m_pChartController; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController > m_xController; - ::com::sun::star::uno::Reference< - ::com::sun::star::view::XSelectionSupplier > m_xSelectionSupplier; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch > m_xDispatch; + css::uno::Reference< css::frame::XController > m_xController; + css::uno::Reference< css::view::XSelectionSupplier > m_xSelectionSupplier; + css::uno::Reference< css::frame::XDispatch > m_xDispatch; ::std::unique_ptr< impl::ModelState > m_apModelState; ::std::unique_ptr< impl::ControllerState > m_apControllerState; mutable ::std::map< OUString, bool > m_aCommandAvailability; - mutable ::std::map< OUString, ::com::sun::star::uno::Any > m_aCommandArguments; + mutable ::std::map< OUString, css::uno::Any > m_aCommandArguments; CommandDispatchContainer* m_pDispatchContainer; }; diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index 56060d9db022..1f5bf8114b76 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -31,7 +31,7 @@ class DragMethod_Base : public SdrDragMethod { public: DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel + , const css::uno::Reference< css::frame::XModel >& xChartModel , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE ); virtual ~DragMethod_Base(); @@ -41,7 +41,7 @@ public: virtual Pointer GetSdrDragPointer() const override; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getChartModel() const; + css::uno::Reference< css::frame::XModel > getChartModel() const; protected: DrawViewWrapper& m_rDrawViewWrapper; @@ -49,7 +49,7 @@ protected: ActionDescriptionProvider::ActionType m_eActionType; private: - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xChartModel; + css::uno::WeakReference< css::frame::XModel > m_xChartModel; }; } // namespace chart diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index c124c212b697..08ba137a8043 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -29,7 +29,7 @@ class DragMethod_PieSegment : public DragMethod_Base { public: DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); virtual ~DragMethod_PieSegment(); virtual void TakeSdrDragComment(OUString& rStr) const override; diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index 7c27599a08db..acb2a732af4b 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 OUString& rObjectCID - , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel + , const css::uno::Reference< css::frame::XModel >& xChartModel , RotationDirection eRotationDirection ); virtual ~DragMethod_RotateDiagram(); diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 0c6cf619cdfa..a6ce34cc6fd7 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -34,8 +34,7 @@ class ChartController; class DrawCommandDispatch: public FeatureCommandDispatchBase { public: - DrawCommandDispatch( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, ChartController* pController ); + DrawCommandDispatch( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ChartController* pController ); virtual ~DrawCommandDispatch(); // late initialisation, especially for adding as listener @@ -51,14 +50,14 @@ protected: virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // state of a feature virtual FeatureState getState( const OUString& rCommand ) override; // execute a feature - virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) override; + virtual void execute( const OUString& rCommand, const css::uno::Sequence< css::beans::PropertyValue>& rArgs ) override; // all the features which should be handled by this class virtual void describeSupportedFeatures() override; diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 772922be0dd7..310950a93778 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -236,7 +236,7 @@ bool SelectorListBox::Notify( NotifyEvent& rNEvt ) return bHandled || ListBox::Notify( rNEvt ); } -Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::CreateAccessible() +Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible() { UpdateChartElementsListAndSelection(); return ListBox::CreateAccessible(); diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index f10963437df2..a5e51cd3586e 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -48,23 +48,22 @@ class SelectorListBox : public ListBox virtual void Select() override; virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; void ReleaseFocus_Impl(); - void SetChartController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xChartController ); + void SetChartController( const css::uno::Reference< css::frame::XController >& xChartController ); void UpdateChartElementsListAndSelection(); private: - ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XController > m_xChartController; + css::uno::WeakReference< css::frame::XController > m_xChartController; ::std::vector< ListBoxEntryData > m_aEntries; bool m_bReleaseFocus; }; -typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> ElementSelectorToolbarController_BASE; +typedef ::cppu::ImplHelper1 < css::lang::XServiceInfo> ElementSelectorToolbarController_BASE; class ElementSelectorToolbarController : public ::svt::ToolboxController , public ElementSelectorToolbarController_BASE @@ -85,16 +84,16 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; private: VclPtr< SelectorListBox > m_apSelectorListBox; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index f6611e5ec4e8..60686e8f58c5 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -28,7 +28,7 @@ namespace chart { -struct ControllerFeature: public ::com::sun::star::frame::DispatchInformation +struct ControllerFeature: public css::frame::DispatchInformation { sal_uInt16 nFeatureId; }; @@ -40,7 +40,7 @@ typedef ::std::map< OUString, struct FeatureState { bool bEnabled; - ::com::sun::star::uno::Any aState; + css::uno::Any aState; FeatureState() : bEnabled( false ) { } }; @@ -50,8 +50,7 @@ struct FeatureState class FeatureCommandDispatchBase: public CommandDispatch { public: - explicit FeatureCommandDispatchBase( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + explicit FeatureCommandDispatchBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~FeatureCommandDispatchBase(); // late initialisation, especially for adding as listener @@ -61,18 +60,18 @@ public: protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& URL, + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) + throw (css::uno::RuntimeException, std::exception) override; virtual void fireStatusEvent( const OUString& rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener ) override; + const css::uno::Reference< css::frame::XStatusListener >& xSingleListener ) override; // state of a feature virtual FeatureState getState( const OUString& rCommand ) = 0; // execute a feature - virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0; + virtual void execute( const OUString& rCommand, const css::uno::Sequence< css::beans::PropertyValue>& rArgs ) = 0; // all the features which should be handled by this class virtual void describeSupportedFeatures() = 0; @@ -88,10 +87,10 @@ protected: URL. @param nGroup the command group of the feature. This is important for configuring the controller UI - by the user, see also <type scope="com::sun::star::frame">CommandGroup</type>. + by the user, see also <type scope="css::frame">CommandGroup</type>. */ void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, - sal_Int16 nGroup = ::com::sun::star::frame::CommandGroup::INTERNAL ); + sal_Int16 nGroup = css::frame::CommandGroup::INTERNAL ); mutable SupportedFeatures m_aSupportedFeatures; diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index d9c82de52361..6b58b1235131 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -473,9 +473,9 @@ void ImplObjectHierarchy::createDataSeriesTree( (xSeriesProp->getPropertyValue( CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarProp) && xErrorBarProp.is()) { - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && - ( nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ) ) + ( nStyle != css::chart::ErrorBarStyle::NONE ) ) { aSeriesSubContainer.push_back( ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierWithParent( @@ -487,9 +487,9 @@ void ImplObjectHierarchy::createDataSeriesTree( (xSeriesProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp) && xErrorBarProp.is()) { - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && - ( nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ) ) + ( nStyle != css::chart::ErrorBarStyle::NONE ) ) { aSeriesSubContainer.push_back( ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierWithParent( diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index ea88fc22bbd4..e938ea517fa6 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -71,7 +71,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType else if(OBJECTTYPE_LEGEND==eObjectType) { xObjectProp->setPropertyValue( "AnchorPosition", uno::makeAny(LegendPosition(LegendPosition_CUSTOM))); - xObjectProp->setPropertyValue( "Expansion", uno::makeAny(::com::sun::star::chart::ChartLegendExpansion_CUSTOM)); + xObjectProp->setPropertyValue( "Expansion", uno::makeAny(css::chart::ChartLegendExpansion_CUSTOM)); chart2::RelativePosition aRelativePosition; chart2::RelativeSize aRelativeSize; Point aAnchor = aObjectRect.TopLeft(); diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 0eba34e7ad15..139f499159c3 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -37,8 +37,7 @@ class ShapeController: public FeatureCommandDispatchBase friend class ControllerCommandDispatch; public: - ShapeController( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, ChartController* pController ); + ShapeController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ChartController* pController ); virtual ~ShapeController(); // late initialisation, especially for adding as listener @@ -49,14 +48,14 @@ protected: virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // state of a feature virtual FeatureState getState( const OUString& rCommand ) override; // execute a feature - virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) override; + virtual void execute( const OUString& rCommand, const css::uno::Sequence< css::beans::PropertyValue>& rArgs ) override; // all the features which should be handled by this class virtual void describeSupportedFeatures() override; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index 847a9c3ff7f3..f64b131083b1 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -38,7 +38,7 @@ namespace impl { typedef ::cppu::ImplInheritanceHelper< CommandDispatch, - ::com::sun::star::view::XSelectionChangeListener > + css::view::XSelectionChangeListener > StatusBarCommandDispatch_Base; } @@ -46,12 +46,9 @@ class StatusBarCommandDispatch : public impl::StatusBarCommandDispatch_Base { public: explicit StatusBarCommandDispatch( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::view::XSelectionSupplier > & xSelSupp ); + const css::uno::Reference< css::uno::XComponentContext > & xContext, + const css::uno::Reference< css::frame::XModel > & xModel, + const css::uno::Reference< css::view::XSelectionSupplier > & xSelSupp ); virtual ~StatusBarCommandDispatch(); // late initialisation, especially for adding as listener @@ -60,9 +57,9 @@ public: protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( - const ::com::sun::star::util::URL& URL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::util::URL& URL, + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) + throw (css::uno::RuntimeException, std::exception) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -70,28 +67,26 @@ protected: // ____ XModifyListener (override from CommandDispatch) ____ virtual void SAL_CALL modified( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; virtual void fireStatusEvent( const OUString & rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) override; + const css::uno::Reference< css::frame::XStatusListener > & xSingleListener ) override; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifiable > m_xModifiable; - ::com::sun::star::uno::Reference< - ::com::sun::star::view::XSelectionSupplier > m_xSelectionSupplier; + css::uno::Reference< css::util::XModifiable > m_xModifiable; + css::uno::Reference< css::view::XSelectionSupplier > m_xSelectionSupplier; bool m_bIsModified; ObjectIdentifier m_aSelectedOID; }; diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index 1835955139b5..68c91a32308c 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -44,7 +44,7 @@ namespace impl { typedef ::cppu::BaseMutex UndoElement_MBase; -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::document::XUndoAction > UndoElement_TBase; +typedef ::cppu::WeakComponentImplHelper< css::document::XUndoAction > UndoElement_TBase; class UndoElement :public UndoElement_MBase ,public UndoElement_TBase @@ -62,14 +62,14 @@ public: Upon <member>invoking</member>, the clone model is applied to the document model. */ UndoElement( const OUString & i_actionString, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_documentModel, + const css::uno::Reference< css::frame::XModel >& i_documentModel, const std::shared_ptr< ChartModelClone >& i_modelClone ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL redo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -81,13 +81,13 @@ private: void impl_toggleModelState(); private: - OUString m_sActionString; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocumentModel; - std::shared_ptr< ChartModelClone > m_pModelClone; + OUString m_sActionString; + css::uno::Reference< css::frame::XModel > m_xDocumentModel; + std::shared_ptr< ChartModelClone > m_pModelClone; }; typedef ::cppu::BaseMutex ShapeUndoElement_MBase; -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::document::XUndoAction > ShapeUndoElement_TBase; +typedef ::cppu::WeakComponentImplHelper< css::document::XUndoAction > ShapeUndoElement_TBase; class ShapeUndoElement :public ShapeUndoElement_MBase ,public ShapeUndoElement_TBase { @@ -95,9 +95,9 @@ public: explicit ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL redo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index 4e37e72e9249..78e943635e27 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -33,10 +33,8 @@ class UndoCommandDispatch : public CommandDispatch { public: explicit UndoCommandDispatch( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::uno::XComponentContext > & xContext, + const css::uno::Reference< css::frame::XModel > & xModel ); virtual ~UndoCommandDispatch(); // late initialisation, especially for adding as listener @@ -45,9 +43,9 @@ public: protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( - const ::com::sun::star::util::URL& URL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::util::URL& URL, + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) + throw (css::uno::RuntimeException, std::exception) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -55,18 +53,16 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; virtual void fireStatusEvent( const OUString & rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) override; + const css::uno::Reference< css::frame::XStatusListener > & xSingleListener ) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XUndoManager > m_xUndoManager; + css::uno::Reference< css::frame::XModel > m_xModel; + css::uno::Reference< css::document::XUndoManager > m_xUndoManager; }; } // namespace chart diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx index 167b8c6c5428..6a2d37d8477e 100644 --- a/chart2/source/controller/main/UndoGuard.hxx +++ b/chart2/source/controller/main/UndoGuard.hxx @@ -39,7 +39,7 @@ class UndoGuard public: explicit UndoGuard( const OUString& i_undoMessage, - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager, + const css::uno::Reference< css::document::XUndoManager > & i_undoManager, const ModelFacet i_facet = E_MODEL ); ~UndoGuard(); @@ -54,8 +54,8 @@ private: void discardSnapshot(); private: - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; + const css::uno::Reference< css::frame::XModel > m_xChartModel; + const css::uno::Reference< css::document::XUndoManager > m_xUndoManager; std::shared_ptr< ChartModelClone > m_pDocumentSnapshot; OUString m_aUndoString; @@ -70,7 +70,7 @@ class UndoLiveUpdateGuard : public UndoGuard public: explicit UndoLiveUpdateGuard( const OUString& i_undoMessage, - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager + const css::uno::Reference< css::document::XUndoManager > & i_undoManager ); ~UndoLiveUpdateGuard(); }; @@ -84,7 +84,7 @@ class UndoLiveUpdateGuardWithData : public: explicit UndoLiveUpdateGuardWithData( const OUString& i_undoMessage, - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager + const css::uno::Reference< css::document::XUndoManager > & i_undoManager ); ~UndoLiveUpdateGuardWithData(); }; @@ -94,7 +94,7 @@ class UndoGuardWithSelection : public UndoGuard public: explicit UndoGuardWithSelection( const OUString& i_undoMessage, - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager + const css::uno::Reference< css::document::XUndoManager > & i_undoManager ); virtual ~UndoGuardWithSelection(); }; @@ -103,12 +103,12 @@ class HiddenUndoContext { public: explicit HiddenUndoContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager + const css::uno::Reference< css::document::XUndoManager > & i_undoManager ); ~HiddenUndoContext(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; + css::uno::Reference< css::document::XUndoManager > m_xUndoManager; }; } |