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 | |
| parent | 6c47de46613b531bd975d073cf31c3fda6f8b8da (diff) | |
com::sun::star->css in chart2
Change-Id: I04320d32d6d5c54e461cfabef58645f8b772bc69
Diffstat (limited to 'chart2')
385 files changed, 5640 insertions, 6607 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index fa099df6c847..215c0f04abd1 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -76,31 +76,31 @@ namespace impl // Note: needed for queryInterface (if it calls the base-class implementation) typedef cppu::WeakImplHelper< -// ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument - ::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster - ,::com::sun::star::frame::XStorable2 //(extension of XStorable) - ,::com::sun::star::util::XModifiable //comprehends XModifyBroadcaster (required interface) - ,::com::sun::star::lang::XServiceInfo - ,::com::sun::star::lang::XInitialization - ,::com::sun::star::chart2::XChartDocument // derived from XModel - ,::com::sun::star::chart2::data::XDataReceiver // public API - ,::com::sun::star::chart2::XTitled - ,::com::sun::star::frame::XLoadable - ,::com::sun::star::util::XCloneable - ,::com::sun::star::embed::XVisualObject - ,::com::sun::star::lang::XMultiServiceFactory - ,::com::sun::star::document::XStorageBasedDocument - ,::com::sun::star::lang::XUnoTunnel - ,::com::sun::star::util::XNumberFormatsSupplier - ,::com::sun::star::container::XChild - ,::com::sun::star::util::XModifyListener - ,::com::sun::star::datatransfer::XTransferable - ,::com::sun::star::document::XDocumentPropertiesSupplier - ,::com::sun::star::chart2::data::XDataSource - ,::com::sun::star::document::XUndoManagerSupplier - ,::com::sun::star::chart2::X3DChartWindowProvider - ,::com::sun::star::util::XUpdatable - ,::com::sun::star::qa::XDumper +// css::frame::XModel //comprehends XComponent (required interface), base of XChartDocument + css::util::XCloseable //comprehends XCloseBroadcaster + ,css::frame::XStorable2 //(extension of XStorable) + ,css::util::XModifiable //comprehends XModifyBroadcaster (required interface) + ,css::lang::XServiceInfo + ,css::lang::XInitialization + ,css::chart2::XChartDocument // derived from XModel + ,css::chart2::data::XDataReceiver // public API + ,css::chart2::XTitled + ,css::frame::XLoadable + ,css::util::XCloneable + ,css::embed::XVisualObject + ,css::lang::XMultiServiceFactory + ,css::document::XStorageBasedDocument + ,css::lang::XUnoTunnel + ,css::util::XNumberFormatsSupplier + ,css::container::XChild + ,css::util::XModifyListener + ,css::datatransfer::XTransferable + ,css::document::XDocumentPropertiesSupplier + ,css::chart2::data::XDataSource + ,css::document::XUndoManagerSupplier + ,css::chart2::X3DChartWindowProvider + ,css::util::XUpdatable + ,css::qa::XDumper > ChartModel_Base; } @@ -122,54 +122,54 @@ private: bool mbTimeBased; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xChartView; // for the ref count + css::uno::Reference< css::uno::XInterface > xChartView; // for the ref count ChartView* mpChartView; OUString m_aResource; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aMediaDescriptor; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocumentProperties; - ::rtl::Reference< UndoManager > m_pUndoManager; + css::uno::Sequence< css::beans::PropertyValue > m_aMediaDescriptor; + css::uno::Reference< css::document::XDocumentProperties > m_xDocumentProperties; + ::rtl::Reference< UndoManager > m_pUndoManager; - ::comphelper::OInterfaceContainerHelper2 m_aControllers; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController; - sal_uInt16 m_nControllerLockCount; + ::comphelper::OInterfaceContainerHelper2 m_aControllers; + css::uno::Reference< css::frame::XController > m_xCurrentController; + sal_uInt16 m_nControllerLockCount; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xOldModelAgg; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XAggregation > m_xOldModelAgg; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage; + css::uno::Reference< css::embed::XStorage > m_xStorage; //the content of this should be always synchronized with the current m_xViewWindow size. The variable is necessary to hold the information as long as no view window exists. - ::com::sun::star::awt::Size m_aVisualAreaSize; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xParent; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > m_xRangeHighlighter; - ::std::vector< GraphicObject > m_aGraphicObjectVector; + css::awt::Size m_aVisualAreaSize; + css::uno::Reference< css::frame::XModel > m_xParent; + css::uno::Reference< css::chart2::data::XRangeHighlighter > m_xRangeHighlighter; + ::std::vector< GraphicObject > m_aGraphicObjectVector; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > m_xDataProvider; + css::uno::Reference< css::chart2::data::XDataProvider > m_xDataProvider; /** is only valid if m_xDataProvider is set. If m_xDataProvider is set to an external data provider this reference must be set to 0 */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > m_xInternalDataProvider; + css::uno::Reference< css::chart2::data::XDataProvider > m_xInternalDataProvider; - ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > + css::uno::Reference< css::util::XNumberFormatsSupplier > m_xOwnNumberFormatsSupplier; - ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > + css::uno::Reference< css::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; std::unique_ptr< SvNumberFormatter > m_apSvNumberFormatter; // #i113784# avoid memory leak - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager > + css::uno::Reference< css::chart2::XChartTypeManager > m_xChartTypeManager; // Diagram Access - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > + css::uno::Reference< css::chart2::XDiagram > m_xDiagram; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > + css::uno::Reference< css::chart2::XTitle > m_xTitle; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xPageBackground; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xXMLNamespaceMap; + css::uno::Reference< css::container::XNameAccess> m_xXMLNamespaceMap; private: //private methods @@ -177,48 +177,48 @@ private: OUString impl_g_getLocation(); bool - impl_isControllerConnected( const com::sun::star::uno::Reference< com::sun::star::frame::XController >& xController ); + impl_isControllerConnected( const css::uno::Reference< com::sun::star::frame::XController >& xController ); - com::sun::star::uno::Reference< com::sun::star::frame::XController > + css::uno::Reference< css::frame::XController > impl_getCurrentController() - throw( com::sun::star::uno::RuntimeException); + throw( css::uno::RuntimeException); void SAL_CALL impl_notifyModifiedListeners() - throw( com::sun::star::uno::RuntimeException); + throw( css::uno::RuntimeException); void SAL_CALL impl_notifyCloseListeners() - throw( com::sun::star::uno::RuntimeException); + throw( css::uno::RuntimeException); void SAL_CALL impl_notifyStorageChangeListeners() - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); void impl_store( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & xStorage ); + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor, + const css::uno::Reference< css::embed::XStorage > & xStorage ); void impl_load( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor, + const css::uno::Reference< css::embed::XStorage >& xStorage ); void impl_loadGraphics( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - ::com::sun::star::uno::Reference< ::com::sun::star::document::XFilter > - impl_createFilter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & rMediaDescriptor ); + const css::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + css::uno::Reference< css::document::XFilter > + impl_createFilter( const css::uno::Sequence< css::beans::PropertyValue > & rMediaDescriptor ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > impl_createDefaultChartTypeTemplate(); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > impl_createDefaultData(); + css::uno::Reference< css::chart2::XChartTypeTemplate > impl_createDefaultChartTypeTemplate(); + css::uno::Reference< css::chart2::data::XDataSource > impl_createDefaultData(); void impl_adjustAdditionalShapesPositionAndSize( - const ::com::sun::star::awt::Size& aVisualAreaSize ); + const css::awt::Size& aVisualAreaSize ); void insertDefaultChart(); public: //no default constructor - ChartModel(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + ChartModel(css::uno::Reference< css::uno::XComponentContext > const & xContext); explicit ChartModel( const ChartModel & rOther ); virtual ~ChartModel(); - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; @@ -230,190 +230,190 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ::com::sun::star::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; + // css::lang::XInitialization + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XModel (required interface) + // css::frame::XModel (required interface) virtual sal_Bool SAL_CALL - attachResource( const OUString& rURL - , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + attachResource( const OUString& rURL, + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL - getURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getURL() throw (css::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 css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getArgs() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + connectController( const css::uno::Reference< css::frame::XController >& xController ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disconnectController( const css::uno::Reference< css::frame::XController >& xController ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + lockControllers() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + unlockControllers() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasControllersLocked() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) - throw (::com::sun::star::container::NoSuchElementException - , ::com::sun::star::uno::RuntimeException, std::exception) override; + setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) + throw (css::container::NoSuchElementException + , css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XComponent (base of XModel) + // css::lang::XComponent (base of XModel) 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; + removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XCloseable + // css::util::XCloseable virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) - throw(::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::util::CloseVetoException, + css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XCloseBroadcaster (base of XCloseable) + // css::util::XCloseBroadcaster (base of XCloseable) virtual void SAL_CALL - addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XStorable2 (extension of XStorable) + // css::frame::XStorable2 (extension of XStorable) virtual void SAL_CALL storeSelf( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XStorable (required interface) + // css::frame::XStorable (required interface) virtual sal_Bool SAL_CALL - hasLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + hasLocation() throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL - getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getLocation() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isReadonly() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + isReadonly() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - store() throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException, std::exception) override; + store() throw (css::io::IOException + , css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - storeAsURL( const OUString& rURL - , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException, std::exception) override; + storeAsURL( const OUString& rURL, + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::io::IOException + , css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - storeToURL( const OUString& rURL - , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException, std::exception) override; + storeToURL( const OUString& rURL, + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::io::IOException + , css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XModifiable (required interface) + // css::util::XModifiable (required interface) virtual sal_Bool SAL_CALL - isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + isModified() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (::com::sun::star::beans::PropertyVetoException - , ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::PropertyVetoException + , css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XModifyBroadcaster (base of XModifiable) + // css::util::XModifyBroadcaster (base of XModifiable) virtual void SAL_CALL - addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ datatransferable::XTransferable ____ - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( - const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::datatransfer::UnsupportedFlavorException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getTransferData( + const css::datatransfer::DataFlavor& aFlavor ) + throw (css::datatransfer::UnsupportedFlavorException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isDataFlavorSupported( - const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::datatransfer::DataFlavor& aFlavor ) + throw (css::uno::RuntimeException, std::exception) override; // lang::XTypeProvider (override method of WeakImplHelper) - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() 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; // ____ document::XDocumentPropertiesSupplier ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL - getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL + getDocumentProperties( ) throw (css::uno::RuntimeException, std::exception) override; // ____ document::XUndoManagerSupplier ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL - getUndoManager( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL + getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::chart2::XChartDocument - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL - getFirstDiagram() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::chart2::XChartDocument + virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL + getFirstDiagram() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFirstDiagram( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL createInternalDataProvider( sal_Bool bCloneExistingData ) - 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 sal_Bool SAL_CALL hasInternalDataProvider() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataProvider > SAL_CALL getDataProvider() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - setChartTypeManager( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager >& xNewManager ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager > SAL_CALL + setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartTypeManager > SAL_CALL getChartTypeManager() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getPageBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL createDefaultChart() throw (css::uno::RuntimeException, std::exception) override; @@ -421,156 +421,157 @@ public: // ____ XDataReceiver (public API) ____ virtual void SAL_CALL - attachDataProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >& xProvider ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setArguments( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL attachNumberFormatsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attachNumberFormatsSupplier( const css::uno::Reference< + css::util::XNumberFormatsSupplier >& xSupplier ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() + throw (css::uno::RuntimeException, std::exception) override; // ____ XTitled ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XInterface (for old API wrapper) ____ - 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; // ____ XLoadable ____ virtual void SAL_CALL initNew() - throw (::com::sun::star::frame::DoubleInitializationException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL load( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::frame::DoubleInitializationException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::frame::DoubleInitializationException, + css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::frame::DoubleInitializationException, + css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XVisualObject ____ virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, - const ::com::sun::star::awt::Size& aSize ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::embed::WrongStateException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( + const css::awt::Size& aSize ) + throw (css::lang::IllegalArgumentException, + css::embed::WrongStateException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::embed::WrongStateException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( + throw (css::lang::IllegalArgumentException, + css::embed::WrongStateException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::embed::WrongStateException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::embed::WrongStateException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) override; // ____ XMultiServiceFactory ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + 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 - 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; // ____ XStorageBasedDocument ____ virtual void SAL_CALL loadFromStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::frame::DoubleInitializationException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::embed::XStorage >& xStorage, + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::lang::IllegalArgumentException, + css::frame::DoubleInitializationException, + css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL storeToStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::embed::XStorage >& xStorage, + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL switchToStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentStorage() - throw (::com::sun::star::io::IOException, - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::embed::XStorage >& xStorage ) + throw (css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() + throw (css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addStorageChangeListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeStorageChangeListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; // for SvNumberFormatsSupplierObj // ____ XUnoTunnel ___ - virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) + 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; // ____ XChild ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) - throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& Parent ) + throw (css::lang::NoSupportException, + css::uno::RuntimeException, std::exception) override; // ____ XDataSource ____ allows access to the currently used data and data ranges - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() + throw (css::uno::RuntimeException, std::exception) override; // X3DChartWindowProvider virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XUpdatable virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XDumper virtual OUString SAL_CALL dump() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // normal methods - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > + css::uno::Reference< css::util::XNumberFormatsSupplier > getNumberFormatsSupplier(); - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getChartView() { return xChartView;} + css::uno::Reference< css::uno::XInterface > getChartView() { return xChartView;} bool isTimeBased() const { return mbTimeBased;} void setTimeBased(bool bTimeBased); diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 079c6ea95562..013335bffbf7 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -88,16 +88,16 @@ struct TimeBasedInfo * done by the ChartWindow). */ class ChartView : public ::cppu::WeakImplHelper< - ::com::sun::star::lang::XInitialization - ,::com::sun::star::lang::XServiceInfo - ,::com::sun::star::datatransfer::XTransferable - ,::com::sun::star::lang::XUnoTunnel - ,::com::sun::star::util::XModifyListener - ,::com::sun::star::util::XModeChangeBroadcaster - ,::com::sun::star::util::XUpdatable2 - ,::com::sun::star::beans::XPropertySet - ,::com::sun::star::lang::XMultiServiceFactory - ,::com::sun::star::qa::XDumper + css::lang::XInitialization + ,css::lang::XServiceInfo + ,css::datatransfer::XTransferable + ,css::lang::XUnoTunnel + ,css::util::XModifyListener + ,css::util::XModeChangeBroadcaster + ,css::util::XUpdatable2 + ,css::beans::XPropertySet + ,css::lang::XMultiServiceFactory + ,css::qa::XDumper > , public ExplicitValueProvider , private SfxListener @@ -107,8 +107,7 @@ private: void init(); public: - ChartView(::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + ChartView(css::uno::Reference< css::uno::XComponentContext > const & xContext, ChartModel& rModel); virtual ~ChartView(); @@ -125,85 +124,85 @@ 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; // ___ExplicitValueProvider___ virtual bool getExplicitValuesForAxis( - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > xAxis + css::uno::Reference< css::chart2::XAxis > xAxis , ExplicitScaleData& rExplicitScale , ExplicitIncrementData& rExplicitIncrement ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > getShapeForCID( const OUString& rObjectCID ) override; - virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false ) override; + virtual css::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false ) override; - virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes() override; + virtual css::awt::Rectangle getDiagramRectangleExcludingAxes() override; std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() override; // ___XTransferable___ - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::datatransfer::UnsupportedFlavorException - , ::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) + throw (css::datatransfer::UnsupportedFlavorException + , css::io::IOException + , css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) + throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) + throw (css::uno::RuntimeException, std::exception) override; + + // 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::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; //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - // ::com::sun::star::util::XModeChangeBroadcaster + // css::util::XModeChangeBroadcaster - virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XUpdatable + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; // util::XUpdatable2 virtual void SAL_CALL updateSoft() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL updateHard() throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::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; - - // ::com::sun::star::lang::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( - 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; + // css::beans::XPropertySet + 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; + + // css::lang::XMultiServiceFactory + 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 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; // for ExplicitValueProvider // ____ XUnoTunnel ___ - virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) + throw (css::uno::RuntimeException, std::exception) override; // XDumper virtual OUString SAL_CALL dump() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; void setViewDirty(); @@ -217,7 +216,7 @@ private: //methods bool createAxisTitleShapes2D( CreateShapeParam2D& rParam, const css::awt::Size& rPageSize ); void createShapes3D(); bool isReal3DChart(); - void getMetaFile( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStream + void getMetaFile( const css::uno::Reference< css::io::XOutputStream >& xOutStream , bool bUseHighContrast ); SdrPage* getSdrPage(); @@ -237,24 +236,24 @@ private: //methods private: //member ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> + css::uno::Reference< css::uno::XComponentContext> m_xCC; chart::ChartModel& mrChartModel; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> + css::uno::Reference< css::lang::XMultiServiceFactory> m_xShapeFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage> + css::uno::Reference< css::drawing::XDrawPage> m_xDrawPage; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > mxRootShape; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDashTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xGradientTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xHatchTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xBitmapTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xTransGradientTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xMarkerTable; + css::uno::Reference< css::uno::XInterface > m_xDashTable; + css::uno::Reference< css::uno::XInterface > m_xGradientTable; + css::uno::Reference< css::uno::XInterface > m_xHatchTable; + css::uno::Reference< css::uno::XInterface > m_xBitmapTable; + css::uno::Reference< css::uno::XInterface > m_xTransGradientTable; + css::uno::Reference< css::uno::XInterface > m_xMarkerTable; std::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper; @@ -269,7 +268,7 @@ private: //member bool m_bRefreshAddIn; //better performance for big data - ::com::sun::star::awt::Size m_aPageResolution; + css::awt::Size m_aPageResolution; bool m_bPointsWereSkipped; //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% @@ -280,7 +279,7 @@ private: //member bool m_bSdrViewIsInEditMode; - ::com::sun::star::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes; + css::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes; std::shared_ptr<GL3DPlotterBase> m_pGL3DPlotter; TimeBasedInfo maTimeBased; 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; }; } diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index dfecfbc6747c..357e0c12701a 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -41,204 +41,164 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS AxisHelper { public: - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > createLinearScaling(); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > createLogarithmicScaling( double fBase = 10.0 ); + static css::uno::Reference< css::chart2::XScaling > createLinearScaling(); + static css::uno::Reference< css::chart2::XScaling > createLogarithmicScaling( double fBase = 10.0 ); - static ::com::sun::star::chart2::ScaleData createDefaultScale(); + static css::chart2::ScaleData createDefaultScale(); - static void removeExplicitScaling( ::com::sun::star::chart2::ScaleData& rScaleData ); + static void removeExplicitScaling( css::chart2::ScaleData& rScaleData ); - static bool isLogarithmic( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XScaling >& xScaling ); + static bool isLogarithmic( const css::uno::Reference< css::chart2::XScaling >& xScaling ); - static void checkDateAxis( ::com::sun::star::chart2::ScaleData& rScale, ExplicitCategoriesProvider* pExplicitCategoriesProvider, bool bChartTypeAllowsDateAxis ); - static ::com::sun::star::chart2::ScaleData getDateCheckedScale( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis, ChartModel& rModel ); + static void checkDateAxis( css::chart2::ScaleData& rScale, ExplicitCategoriesProvider* pExplicitCategoriesProvider, bool bChartTypeAllowsDateAxis ); + static css::chart2::ScaleData getDateCheckedScale( const css::uno::Reference< css::chart2::XAxis >& xAxis, ChartModel& rModel ); static sal_Int32 getExplicitNumberFormatKeyForAxis( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCorrespondingCoordinateSystem - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument>& xChartDoc + const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCorrespondingCoordinateSystem + , const css::uno::Reference< css::chart2::XChartDocument>& xChartDoc , bool bSearchForParallelAxisIfNothingIsFound ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > + static css::uno::Reference< + css::chart2::XAxis > createAxis( sal_Int32 nDimensionIndex, bool bMainAxis - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram + , const css::uno::Reference< css::uno::XComponentContext >& xContext , ReferenceSizeProvider * pRefSizeProvider = nullptr ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > + static css::uno::Reference< css::chart2::XAxis > createAxis( sal_Int32 nDimensionIndex , sal_Int32 nAxisIndex // 0==main or 1==secondary axis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext + , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys + , const css::uno::Reference< css::uno::XComponentContext > & xContext , ReferenceSizeProvider * pRefSizeProvider = nullptr ); static void showAxis( sal_Int32 nDimensionIndex, bool bMainAxis - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram + , const css::uno::Reference< css::uno::XComponentContext >& xContext , ReferenceSizeProvider * pRefSizeProvider = nullptr ); static void showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram + , const css::uno::Reference< css::uno::XComponentContext >& xContext ); static void hideAxis( sal_Int32 nDimensionIndex, bool bMainAxis - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static void hideGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static bool isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static bool isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); - static void makeAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); - static void makeGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); + static void makeAxisVisible( const css::uno::Reference< css::chart2::XAxis >& xAxis ); + static void makeGridVisible( const css::uno::Reference< css::beans::XPropertySet >& xGridProperties ); - static void makeAxisInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); - static void makeGridInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); + static void makeAxisInvisible( const css::uno::Reference< css::chart2::XAxis >& xAxis ); + static void makeGridInvisible( const css::uno::Reference< css::beans::XPropertySet >& xGridProperties ); - static void hideAxisIfNoDataIsAttached( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram); + static void hideAxisIfNoDataIsAttached( const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram); - SAL_DLLPRIVATE static bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties ); - static bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); - static bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); + SAL_DLLPRIVATE static bool areAxisLabelsVisible( const css::uno::Reference< css::beans::XPropertySet >& xAxisProperties ); + static bool isAxisVisible( const css::uno::Reference< css::chart2::XAxis >& xAxis ); + static bool isGridVisible( const css::uno::Reference< css::beans::XPropertySet >& xGridProperties ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > + static css::uno::Reference< css::chart2::XCoordinateSystem > getCoordinateSystemByIndex( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram + const css::uno::Reference< css::chart2::XDiagram >& xDiagram , sal_Int32 nIndex ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > + static css::uno::Reference< css::chart2::XCoordinateSystem > getCoordinateSystemOfAxis( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); + const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > + static css::uno::Reference< css::chart2::XAxis > getAxis( sal_Int32 nDimensionIndex, bool bMainAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); + static css::uno::Reference< css::chart2::XAxis > getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys ); - - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > - getCrossingMainAxis( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys ); - - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > - getParallelAxis( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); - - static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > - getGridProperties( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys + , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); + + static css::uno::Reference< css::chart2::XAxis > + getCrossingMainAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); + + static css::uno::Reference< css::chart2::XAxis > + getParallelAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); + + static css::uno::Reference< css::beans::XPropertySet > + getGridProperties( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys , sal_Int32 nDimensionIndex , sal_Int32 nAxisIndex //0: Primary axis, 1: secondary axis , sal_Int32 nSubGridIndex = -1 //-1: Main Grid; 0: First SubGrid etc ); static sal_Int32 getDimensionIndexOfAxis( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); + const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static bool getIndicesForAxis( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys + const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys , sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex ); static bool getIndicesForAxis( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram + const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram , sal_Int32& rOutCooSysIndex, sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex ); /** @param bOnlyVisible if </TRUE>, only axes with property "Show" set to </sal_True> are returned */ - static ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > > - getAllAxesOfDiagram( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram + static css::uno::Sequence< css::uno::Reference< css::chart2::XAxis > > + getAllAxesOfDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram , bool bOnlyVisible = false ); /** @param bOnlyVisible if </TRUE>, only axes with property "Show" set to </sal_True> are returned */ - SAL_DLLPRIVATE static std::vector< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > > - getAllAxesOfCoordinateSystem( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys + SAL_DLLPRIVATE static std::vector< css::uno::Reference< css::chart2::XAxis > > + getAllAxesOfCoordinateSystem( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys , bool bOnlyVisible = false ); - static ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > > - getAllGrids( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); + static css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > + getAllGrids( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); - static void getAxisOrGridPossibilities( ::com::sun::star::uno::Sequence< sal_Bool >& rPossibilityList - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, bool bAxis=true ); + static void getAxisOrGridPossibilities( css::uno::Sequence< sal_Bool >& rPossibilityList + , const css::uno::Reference< css::chart2::XDiagram>& xDiagram, bool bAxis=true ); - static void getAxisOrGridExcistence( ::com::sun::star::uno::Sequence< sal_Bool >& rExcistenceList - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, bool bAxis=true ); + static void getAxisOrGridExcistence( css::uno::Sequence< sal_Bool >& rExcistenceList + , const css::uno::Reference< css::chart2::XDiagram>& xDiagram, bool bAxis=true ); - static bool changeVisibilityOfGrids( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram - , const ::com::sun::star::uno::Sequence< sal_Bool >& rOldExistenceList - , const ::com::sun::star::uno::Sequence< sal_Bool >& rNewExistenceList - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + static bool changeVisibilityOfGrids( const css::uno::Reference< css::chart2::XDiagram>& xDiagram + , const css::uno::Sequence< sal_Bool >& rOldExistenceList + , const css::uno::Sequence< sal_Bool >& rNewExistenceList + , const css::uno::Reference< css::uno::XComponentContext >& xContext ); - static bool changeVisibilityOfAxes( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram - , const ::com::sun::star::uno::Sequence< sal_Bool >& rOldExistenceList - , const ::com::sun::star::uno::Sequence< sal_Bool >& rNewExistenceList - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext + static bool changeVisibilityOfAxes( const css::uno::Reference< css::chart2::XDiagram>& xDiagram + , const css::uno::Sequence< sal_Bool >& rOldExistenceList + , const css::uno::Sequence< sal_Bool >& rNewExistenceList + , const css::uno::Reference< css::uno::XComponentContext >& xContext , ReferenceSizeProvider * pRefSizeProvider = nullptr ); - static bool shouldAxisBeDisplayed( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSys ); - static bool isSecondaryYAxisNeeded( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys ); + static bool shouldAxisBeDisplayed( const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); + static bool isSecondaryYAxisNeeded( const css::uno::Reference< + css::chart2::XCoordinateSystem >& xCooSys ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > - getChartTypeByIndex( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys, sal_Int32 nIndex ); + static css::uno::Reference< css::chart2::XChartType > + getChartTypeByIndex( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys, + sal_Int32 nIndex ); - static void setRTLAxisLayout( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys ); + static void setRTLAxisLayout( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > - getFirstChartTypeWithSeriesAttachedToAxisIndex( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, const sal_Int32 nAttachedAxisIndex ); + static css::uno::Reference< css::chart2::XChartType > + getFirstChartTypeWithSeriesAttachedToAxisIndex( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, const sal_Int32 nAttachedAxisIndex ); static bool isAxisPositioningEnabled(); }; diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx index 713cccb8ff60..2a35146f1660 100644 --- a/chart2/source/inc/BaseGFXHelper.hxx +++ b/chart2/source/inc/BaseGFXHelper.hxx @@ -41,37 +41,37 @@ namespace chart namespace BaseGFXHelper { -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DRange getBoundVolume( const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPoly ); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DRange getBoundVolume( const css::drawing::PolyPolygonShape3D& rPolyPoly ); OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B2IRectangle makeRectangle( - const com::sun::star::awt::Point& rPosition, - const com::sun::star::awt::Size& rSize ); + const css::awt::Point& rPosition, + const css::awt::Size& rSize ); OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B2IRectangle makeRectangle( const css::awt::Rectangle& rRect ); -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Point B2IRectangleToAWTPoint( +OOO_DLLPUBLIC_CHARTTOOLS css::awt::Point B2IRectangleToAWTPoint( const ::basegfx::B2IRectangle& rB2IRectangle ); -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Size B2IRectangleToAWTSize( +OOO_DLLPUBLIC_CHARTTOOLS css::awt::Size B2IRectangleToAWTSize( const ::basegfx::B2IRectangle& rB2IRectangle ); ::basegfx::B3DVector Direction3DToB3DVector( - const com::sun::star::drawing::Direction3D& rDirection ); + const css::drawing::Direction3D& rDirection ); -com::sun::star::drawing::Direction3D B3DVectorToDirection3D( +css::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rB3DVector ); ::basegfx::B3DVector Position3DToB3DVector( - const com::sun::star::drawing::Position3D& rPosition ); + const css::drawing::Position3D& rPosition ); -com::sun::star::drawing::Position3D B3DVectorToPosition3D( +css::drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rB3DVector ); OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( - const ::com::sun::star::drawing::HomogenMatrix & rHomogenMatrix ); + const css::drawing::HomogenMatrix & rHomogenMatrix ); OOO_DLLPUBLIC_CHARTTOOLS -::com::sun::star::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( +css::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix & rB3DMatrix ); OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DTuple GetRotationFromMatrix( diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 0ae04ab2d39a..b9cca8739b2f 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -45,13 +45,13 @@ namespace chart namespace impl { typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::chart2::data::XDataSequence, - ::com::sun::star::chart2::data::XNumericalDataSequence, - ::com::sun::star::chart2::data::XTextualDataSequence, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XServiceInfo > + css::chart2::data::XDataSequence, + css::chart2::data::XNumericalDataSequence, + css::chart2::data::XTextualDataSequence, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::lang::XInitialization, + css::lang::XServiceInfo > CachedDataSequence_Base; } @@ -69,9 +69,7 @@ public: */ CachedDataSequence(); - explicit CachedDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit CachedDataSequence( const css::uno::Reference< css::uno::XComponentContext > & xContext ); /** creates a sequence and initializes it with the given string. This is especially useful for labels, which only have one element. @@ -101,49 +99,49 @@ public: protected: // ____ XPropertySet ____ - /// @see ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + /// @see css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) override; /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; /// @see ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // ____ XDataSequence ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( - ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( + css::chart2::data::LabelOrigin nLabelOrigin ) + throw (css::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // ____ XNumericalDataSequence ____ - /// @see ::com::sun::star::chart::data::XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + /// @see css::chart::data::XNumericalDataSequence + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override; // ____ XTextualDataSequence ____ - /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + /// @see css::chart::data::XTextualDataSequence + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) override; + // css::lang::XInitialization: + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) + throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; // <properties> sal_Int32 m_nNumberFormatKey; @@ -165,23 +163,21 @@ protected: private: /** is used by interface method getNumericalData(). */ - ::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const; + css::uno::Sequence< double > Impl_getNumericalData() const; /** is used by interface method getTextualData(). */ - ::com::sun::star::uno::Sequence< OUString > Impl_getTextualData() const; + css::uno::Sequence< OUString > Impl_getTextualData() const; /** is used by interface method getData(). */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Impl_getMixedData() const; + css::uno::Sequence< css::uno::Any > Impl_getMixedData() const; private: - enum DataType m_eCurrentDataType; - - ::com::sun::star::uno::Sequence< double > m_aNumericalSequence; - ::com::sun::star::uno::Sequence< OUString > m_aTextualSequence; - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any > m_aMixedSequence; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > - m_xModifyEventForwarder; + enum DataType m_eCurrentDataType; + + css::uno::Sequence< double > m_aNumericalSequence; + css::uno::Sequence< OUString > m_aTextualSequence; + css::uno::Sequence< css::uno::Any > m_aMixedSequence; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index a5cf8e9d3203..5435afe6dca7 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -121,14 +121,14 @@ namespace CharacterProperties }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + ::std::vector< css::beans::Property > & rOutProperties ); OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); OOO_DLLPUBLIC_CHARTTOOLS bool IsCharacterPropertyHandle( sal_Int32 nHandle ); - OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::FontDescriptor createFontDescriptorFromPropertySet( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > & xMultiPropSet ); + OOO_DLLPUBLIC_CHARTTOOLS css::awt::FontDescriptor createFontDescriptorFromPropertySet( + const css::uno::Reference< css::beans::XMultiPropertySet > & xMultiPropSet ); } } // namespace chart diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 426bdafa8687..3ddf4720027c 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -44,60 +44,44 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS ChartModelHelper { public: - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > createRangeHighlighter( - const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier >& xSelectionSupplier ); + static css::uno::Reference< css::chart2::data::XRangeHighlighter > createRangeHighlighter( + const css::uno::Reference< css::view::XSelectionSupplier >& xSelectionSupplier ); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > createInternalDataProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, bool bConnectToModel ); + static css::uno::Reference< css::chart2::data::XDataProvider > createInternalDataProvider( + const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc, bool bConnectToModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > - findDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); + static css::uno::Reference< css::chart2::XDiagram > + findDiagram( const css::uno::Reference< css::frame::XModel >& xModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > - findDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + static css::uno::Reference< css::chart2::XDiagram > + findDiagram( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > + static css::uno::Reference< css::chart2::XCoordinateSystem > getFirstCoordinateSystem( ChartModel& rModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > - getFirstCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); - - SAL_DLLPRIVATE static ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > getDataSeries( - ChartModel& rModel ); - - SAL_DLLPRIVATE static ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > getDataSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); - static ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > getDataSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xModel ); - - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > + static css::uno::Reference< css::chart2::XCoordinateSystem > + getFirstCoordinateSystem( const css::uno::Reference< css::frame::XModel >& xModel ); + + SAL_DLLPRIVATE static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > + getDataSeries( ChartModel& rModel ); + + SAL_DLLPRIVATE static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > + getDataSeries( const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); + static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > + getDataSeries( const css::uno::Reference< css::frame::XModel > & xModel ); + + static css::uno::Reference< css::chart2::XChartType > getChartTypeOfSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries ); + const css::uno::Reference< css::frame::XModel >& xModel + , const css::uno::Reference< css::chart2::XDataSeries >& xGivenDataSeries ); - static ::com::sun::star::awt::Size getDefaultPageSize(); + static css::awt::Size getDefaultPageSize(); - static ::com::sun::star::awt::Size getPageSize( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ); + static css::awt::Size getPageSize( const css::uno::Reference< css::frame::XModel >& xModel ); - static void triggerRangeHighlighting( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ); + static void triggerRangeHighlighting( const css::uno::Reference< css::frame::XModel >& xModel ); - static bool isIncludeHiddenCells( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + static bool isIncludeHiddenCells( const css::uno::Reference< css::frame::XModel >& xChartModel ); static bool setIncludeHiddenCells( bool bIncludeHiddenCells, ChartModel& rModel); }; diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 1751a83cc850..9e66c59e6684 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -36,56 +36,56 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS ChartTypeHelper { public: - static bool isSupportingGeometryProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingMainAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); - static bool isSupportingSecondaryAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); - static bool isSupportingAreaProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingSymbolProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingOverlapAndGapWidthProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingBarConnectors( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingRightAngledAxes( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static bool isSupportingAxisSideBySide( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingStartingAngle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + static bool isSupportingGeometryProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingStatisticProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingRegressionProperties(const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingMainAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); + static bool isSupportingSecondaryAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); + static bool isSupportingAreaProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingSymbolProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingOverlapAndGapWidthProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingBarConnectors( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingRightAngledAxes( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + static bool isSupportingAxisSideBySide( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingStartingAngle( const css::uno::Reference< css::chart2::XChartType >& xChartType ); //starting value for bars or baseline for areas for example - static bool isSupportingBaseValue( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static bool shiftCategoryPosAtXAxisPerDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static bool isSupportingAxisPositioning( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); - static bool isSupportingDateAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); - - //returns sequence of ::com::sun::star::chart::DataLabelPlacement - static ::com::sun::star::uno::Sequence < sal_Int32 > getSupportedLabelPlacements( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, bool bSwapXAndY - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries ); - - //returns sequence of ::com::sun::star::chart::MissingValueTreatment - static ::com::sun::star::uno::Sequence < sal_Int32 > getSupportedMissingValueTreatments( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - - SAL_DLLPRIVATE static ::com::sun::star::drawing::Direction3D getDefaultSimpleLightDirection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - SAL_DLLPRIVATE static ::com::sun::star::drawing::Direction3D getDefaultRealisticLightDirection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - SAL_DLLPRIVATE static sal_Int32 getDefaultDirectLightColor( bool bSimple, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - SAL_DLLPRIVATE static sal_Int32 getDefaultAmbientLightColor( bool bSimple, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static sal_Int32 getNumberOfDisplayedSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nNumberOfSeries ); - SAL_DLLPRIVATE static bool noBordersForSimpleScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - - static bool isSeriesInFrontOfAxisLine( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - - static sal_Int32 //one of ::com::sun::star::chart2::AxisType - getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType + static bool isSupportingBaseValue( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + static bool shiftCategoryPosAtXAxisPerDefault( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + static bool isSupportingAxisPositioning( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); + static bool isSupportingDateAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); + + //returns sequence of css::chart::DataLabelPlacement + static css::uno::Sequence < sal_Int32 > getSupportedLabelPlacements( + const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, bool bSwapXAndY + , const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); + + //returns sequence of css::chart::MissingValueTreatment + static css::uno::Sequence < sal_Int32 > getSupportedMissingValueTreatments( + const css::uno::Reference< css::chart2::XChartType >& xChartType ); + + SAL_DLLPRIVATE static css::drawing::Direction3D getDefaultSimpleLightDirection( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + SAL_DLLPRIVATE static css::drawing::Direction3D getDefaultRealisticLightDirection( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + SAL_DLLPRIVATE static sal_Int32 getDefaultDirectLightColor( bool bSimple, const css::uno::Reference< css::chart2::XChartType >& xChartType ); + SAL_DLLPRIVATE static sal_Int32 getDefaultAmbientLightColor( bool bSimple, const css::uno::Reference< css::chart2::XChartType >& xChartType ); + static sal_Int32 getNumberOfDisplayedSeries( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nNumberOfSeries ); + SAL_DLLPRIVATE static bool noBordersForSimpleScheme( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + + static bool isSeriesInFrontOfAxisLine( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + + static sal_Int32 //one of css::chart2::AxisType + getAxisType( const css::uno::Reference< css::chart2::XChartType >& xChartType , sal_Int32 nDimensionIndex ); - static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartType ); + static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const css::uno::Reference< + css::chart2::XChartType >& xChartType ); - static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartType ); + static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const css::uno::Reference< + css::chart2::XChartType >& xChartType ); - static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartType ); + static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const css::uno::Reference< + css::chart2::XChartType >& xChartType ); - static bool isSupportingOnlyDeepStackingFor3D( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + static bool isSupportingOnlyDeepStackingFor3D( const css::uno::Reference< css::chart2::XChartType >& xChartType ); }; } //namespace chart diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index 7c6f0e8b7656..1925511a9c00 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -31,7 +31,7 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS ChartViewHelper { public: - static void setViewToDirtyState( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); + static void setViewToDirtyState( const css::uno::Reference< css::frame::XModel >& xChartModel ); }; } //namespace chart diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx index 6d1f44f130ed..7f01b041a467 100644 --- a/chart2/source/inc/CloneHelper.hxx +++ b/chart2/source/inc/CloneHelper.hxx @@ -38,10 +38,10 @@ template< class Interface > Interface operator() ( const Interface & xOther ) { Interface xResult; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > - xCloneable( xOther, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XCloneable > + xCloneable( xOther, css::uno::UNO_QUERY ); if( xCloneable.is()) - xResult.set( xCloneable->createClone(), ::com::sun::star::uno::UNO_QUERY ); + xResult.set( xCloneable->createClone(), css::uno::UNO_QUERY ); return xResult; } @@ -61,8 +61,8 @@ template< class Interface > /// clones a UNO-sequence of UNO-References template< class Interface > void CloneRefSequence( - const ::com::sun::star::uno::Sequence< Interface > & rSource, - ::com::sun::star::uno::Sequence< Interface > & rDestination ) + const css::uno::Sequence< Interface > & rSource, + css::uno::Sequence< Interface > & rDestination ) { rDestination.realloc( rSource.getLength()); ::std::transform( rSource.getConstArray(), rSource.getConstArray() + rSource.getLength(), diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index 31dc130d248a..12df360f1b53 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -33,18 +33,15 @@ class OOO_DLLPUBLIC_CHARTTOOLS ColorPerPointHelper { public: static bool hasPointOwnColor( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xDataSeriesProperties + const css::uno::Reference< css::beans::XPropertySet >& xDataSeriesProperties , sal_Int32 nPointIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xDataPointProperties //may be NULL this is just for performance + , const css::uno::Reference< css::beans::XPropertySet >& xDataPointProperties //may be NULL this is just for performance ); // returns true if AttributedDataPoints contains nPointIndex and the // property Color is DEFAULT SAL_DLLPRIVATE static bool hasPointOwnProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSeriesProperties + const css::uno::Reference< css::beans::XPropertySet >& xSeriesProperties , sal_Int32 nPointIndex ); }; diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index af72ba1c2844..c218bf761f49 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -50,12 +50,12 @@ and operations e.g drawing::Position3D + drawing::Direction3D /** ::basegfx::B3DHomMatrix -> HomogenMatrix */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix +OOO_DLLPUBLIC_CHARTTOOLS css::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix& rM ); /** HomogenMatrix -> ::basegfx::B3DHomMatrix */ -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const com::sun::star::drawing::HomogenMatrix& rHM ); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const css::drawing::HomogenMatrix& rHM ); /** ::basegfx::B3DHomMatrix -> B2DHomMatrix */ @@ -64,135 +64,131 @@ OOO_DLLPUBLIC_CHARTTOOLS /** B2DHomMatrix <-> HomogenMatrix3 */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix3 +OOO_DLLPUBLIC_CHARTTOOLS css::drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM ); /** Position3D -> B3DPoint */ -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Position3DToB3DPoint( const com::sun::star::drawing::Position3D& rPosition ); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Position3DToB3DPoint( const css::drawing::Position3D& rPosition ); /** B3DVector -> Direction3D */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector); +OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector); /** B3DPoint -> Position3D */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); +OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); /** Direction3D -> B3DVector */ -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const css::drawing::Direction3D& rDirection); /** PolyPolygonShape3D + drawing::Position3D -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS -void AddPointToPoly( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly - , const com::sun::star::drawing::Position3D& rPos +void AddPointToPoly( css::drawing::PolyPolygonShape3D& rPoly + , const css::drawing::Position3D& rPos , sal_Int32 nSequenceIndex=0 ); /** get a single Point from a Polygon */ -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::drawing::Position3D getPointFromPoly( - const ::com::sun::star::drawing::PolyPolygonShape3D& rPolygon +OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D getPointFromPoly( + const css::drawing::PolyPolygonShape3D& rPolygon , sal_Int32 nPointIndex, sal_Int32 nPolyIndex=0 ); OOO_DLLPUBLIC_CHARTTOOLS -void addPolygon( com::sun::star::drawing::PolyPolygonShape3D& rRet - , const com::sun::star::drawing::PolyPolygonShape3D& rAdd ); +void addPolygon( css::drawing::PolyPolygonShape3D& rRet + , const css::drawing::PolyPolygonShape3D& rAdd ); /** PolyPolygonShape3D + PolyPolygonShape3D -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS -void appendPoly( com::sun::star::drawing::PolyPolygonShape3D& rRet - , const com::sun::star::drawing::PolyPolygonShape3D& rAdd ); +void appendPoly( css::drawing::PolyPolygonShape3D& rRet + , const css::drawing::PolyPolygonShape3D& rAdd ); /** PolyPolygonBezierCoords -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS -com::sun::star::drawing::PolyPolygonShape3D BezierToPoly( - const com::sun::star::drawing::PolyPolygonBezierCoords& rBezier ); +css::drawing::PolyPolygonShape3D BezierToPoly( + const css::drawing::PolyPolygonBezierCoords& rBezier ); /** PolyPolygonShape3D -> drawing::PointSequenceSequence (2D) */ OOO_DLLPUBLIC_CHARTTOOLS -com::sun::star::drawing::PointSequenceSequence PolyToPointSequence( - const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon ); +css::drawing::PointSequenceSequence PolyToPointSequence( + const css::drawing::PolyPolygonShape3D& rPolyPolygon ); /** drawing::PointSequenceSequence + drawing::PointSequenceSequence */ OOO_DLLPUBLIC_CHARTTOOLS -void appendPointSequence( com::sun::star::drawing::PointSequenceSequence& rTarget - , com::sun::star::drawing::PointSequenceSequence& rAdd ); +void appendPointSequence( css::drawing::PointSequenceSequence& rTarget + , css::drawing::PointSequenceSequence& rAdd ); /** Position3D + Direction3D == Position3D */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D - operator+( const com::sun::star::drawing::Position3D& rPos - , const com::sun::star::drawing::Direction3D& rDirection); +OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D + operator+( const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rDirection); /** Position3D - Position3D == Direction3D */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D - operator-( const com::sun::star::drawing::Position3D& rPos1 - , const com::sun::star::drawing::Position3D& rPos2); - +OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Direction3D + operator-( const css::drawing::Position3D& rPos1 + , const css::drawing::Position3D& rPos2); /** awt::Rect --> awt::Point (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point ToPoint( const com::sun::star::awt::Rectangle& rRectangle ); +OOO_DLLPUBLIC_CHARTTOOLS css::awt::Point ToPoint( const css::awt::Rectangle& rRectangle ); /** awt::Rect --> awt::Size (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size ToSize( const com::sun::star::awt::Rectangle& rRectangle ); +OOO_DLLPUBLIC_CHARTTOOLS css::awt::Size ToSize( const css::awt::Rectangle& rRectangle ); /** Position3D --> awt::Point (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point Position3DToAWTPoint( const com::sun::star::drawing::Position3D& rPos ); +OOO_DLLPUBLIC_CHARTTOOLS css::awt::Point Position3DToAWTPoint( const css::drawing::Position3D& rPos ); /** Direction3D --> awt::Size (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size Direction3DToAWTSize( const com::sun::star::drawing::Direction3D& rDirection ); +OOO_DLLPUBLIC_CHARTTOOLS css::awt::Size Direction3DToAWTSize( const css::drawing::Direction3D& rDirection ); /** B3DPoint -> Sequence<double> */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint ); +OOO_DLLPUBLIC_CHARTTOOLS css::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint ); /** Sequence<double> -> drawing::Position3D */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D - SequenceToPosition3D( const com::sun::star::uno::Sequence< double >& rSeq ); +OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D + SequenceToPosition3D( const css::uno::Sequence< double >& rSeq ); /** drawing::Position3D -> Sequence<double> */ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > - Position3DToSequence( const com::sun::star::drawing::Position3D& rPosition ); +OOO_DLLPUBLIC_CHARTTOOLS css::uno::Sequence< double > + Position3DToSequence( const css::drawing::Position3D& rPosition ); /** chart2::XDataSequence -> uno::Sequence< double > */ OOO_DLLPUBLIC_CHARTTOOLS -::com::sun::star::uno::Sequence< double > DataSequenceToDoubleSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); +css::uno::Sequence< double > DataSequenceToDoubleSequence( + const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence ); OOO_DLLPUBLIC_CHARTTOOLS -::com::sun::star::uno::Sequence< OUString > DataSequenceToStringSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); +css::uno::Sequence< OUString > DataSequenceToStringSequence( + const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence ); /** uno::Sequence< uno::Sequence< T > > -> uno::Sequence< T > */ template< typename T > -::com::sun::star::uno::Sequence< T > - FlattenSequence( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< T > > & aSeqSeq ) +css::uno::Sequence< T > + FlattenSequence( const css::uno::Sequence< css::uno::Sequence< T > > & aSeqSeq ) { sal_Int32 nOuter, nInner, nCount = 0, nResultSize = 0; const sal_Int32 nOuterSize = aSeqSeq.getLength(); for( nOuter=0; nOuter<nOuterSize; ++nOuter ) nResultSize += aSeqSeq[nOuter].getLength(); - ::com::sun::star::uno::Sequence< T > aResult( nResultSize ); + css::uno::Sequence< T > aResult( nResultSize ); for( nOuter=0; nOuter<nOuterSize; ++nOuter ) { @@ -218,12 +214,12 @@ template< typename T > } OOO_DLLPUBLIC_CHARTTOOLS -bool hasDoubleValue( const ::com::sun::star::uno::Any& rAny ); +bool hasDoubleValue( const css::uno::Any& rAny ); OOO_DLLPUBLIC_CHARTTOOLS -bool hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny ); +bool hasLongOrShortValue( const css::uno::Any& rAny ); OOO_DLLPUBLIC_CHARTTOOLS -sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny ); +sal_Int16 getShortForLongAlso( const css::uno::Any& rAny ); OOO_DLLPUBLIC_CHARTTOOLS bool replaceParamterInString( OUString & rInOutResourceString, diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 4599d0c47bad..ce49d68f274d 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -32,34 +32,34 @@ namespace chart namespace CommonFunctors { -/** unary function to convert any type T into a ::com::sun::star::uno::Any. +/** unary function to convert any type T into a css::uno::Any. <p>uno::makeAny is an inline function. Thus is cannot be taken directly (via mem_fun_ptr)</p> */ template< typename T > - struct makeAny : public ::std::unary_function< T, ::com::sun::star::uno::Any > + struct makeAny : public ::std::unary_function< T, css::uno::Any > { - ::com::sun::star::uno::Any operator() ( const T & aVal ) + css::uno::Any operator() ( const T & aVal ) { - return ::com::sun::star::uno::makeAny( aVal ); + return css::uno::makeAny( aVal ); } }; -/** unary function to convert ::com::sun::star::uno::Any into a double number. +/** unary function to convert css::uno::Any into a double number. <p>In case no number can be generated from the Any, NaN (see rtl::math::SetNAN()) is returned.</p> */ -struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::com::sun::star::uno::Any, double > +struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< css::uno::Any, double > { - double operator() ( const ::com::sun::star::uno::Any & rAny ) + double operator() ( const css::uno::Any & rAny ) { double fResult; ::rtl::math::setNan( & fResult ); - ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() ); - if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE ) + css::uno::TypeClass eClass( rAny.getValueType().getTypeClass() ); + if( eClass == css::uno::TypeClass_DOUBLE ) { fResult = * static_cast< const double * >( rAny.getValue() ); } @@ -68,15 +68,15 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::co } }; -/** unary function to convert ::com::sun::star::uno::Any into an +/** unary function to convert css::uno::Any into an OUString. */ -struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< css::uno::Any, OUString > { - OUString operator() ( const ::com::sun::star::uno::Any & rAny ) + OUString operator() ( const css::uno::Any & rAny ) { - ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() ); - if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE ) + css::uno::TypeClass eClass( rAny.getValueType().getTypeClass() ); + if( eClass == css::uno::TypeClass_DOUBLE ) { const double* pDouble = static_cast< const double * >( rAny.getValue() ); if( ::rtl::math::isNan(*pDouble) ) @@ -89,7 +89,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co true // remove trailing zeros ); } - else if( eClass == ::com::sun::star::uno::TypeClass_STRING ) + else if( eClass == css::uno::TypeClass_STRING ) { return * static_cast< const OUString * >( rAny.getValue() ); } diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 9c3a853b4612..834e8d45a0b4 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -31,9 +31,8 @@ namespace chart { -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme > createConfigColorScheme( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); +OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::XColorScheme > createConfigColorScheme( + const css::uno::Reference< css::uno::XComponentContext > & xContext ); namespace impl { @@ -42,13 +41,11 @@ class ChartConfigItem; class ConfigColorScheme : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XColorScheme, - ::com::sun::star::lang::XServiceInfo > + css::chart2::XColorScheme, + css::lang::XServiceInfo > { public: - explicit ConfigColorScheme( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit ConfigColorScheme( const css::uno::Reference< css::uno::XComponentContext > & xContext ); SAL_DLLPRIVATE virtual ~ConfigColorScheme(); /// declare XServiceInfo methods @@ -68,16 +65,15 @@ public: protected: // ____ XColorScheme ____ SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: SAL_DLLPRIVATE void retrieveConfigColors(); // member variables - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > m_xContext; - ::std::unique_ptr< impl::ChartConfigItem > m_apChartConfigItem; - mutable ::com::sun::star::uno::Sequence< sal_Int64 > m_aColorSequence; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + ::std::unique_ptr< impl::ChartConfigItem > m_apChartConfigItem; + mutable css::uno::Sequence< sal_Int64 > m_aColorSequence; mutable sal_Int32 m_nNumberOfColors; bool m_bNeedsUpdate; }; diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index a50554d8a0b0..531e3bd00ae8 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -47,7 +47,7 @@ namespace ContainerHelper */ template< class Container > Container - SequenceToSTLSequenceContainer( const ::com::sun::star::uno::Sequence< typename Container::value_type > & rSeq ) + SequenceToSTLSequenceContainer( const css::uno::Sequence< typename Container::value_type > & rSeq ) { Container aResult( rSeq.getLength()); ::std::copy( rSeq.begin(), rSeq.end(), aResult.begin() ); @@ -65,7 +65,7 @@ template< class Container > */ template< typename T > ::std::vector< T > - SequenceToVector( const ::com::sun::star::uno::Sequence< T > & rSeq ) + SequenceToVector( const css::uno::Sequence< T > & rSeq ) { return SequenceToSTLSequenceContainer< ::std::vector< T > >( rSeq ); } diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index 22036d0605f0..e690f5ac475b 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -33,13 +33,11 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockGuardUNO { public: - explicit ControllerLockGuardUNO( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xModel ); + explicit ControllerLockGuardUNO( const css::uno::Reference< css::frame::XModel > & xModel ); ~ControllerLockGuardUNO(); private: - com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::frame::XModel > mxModel; }; class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockGuard @@ -62,16 +60,14 @@ class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockHelper { public: explicit ControllerLockHelper( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); ~ControllerLockHelper(); SAL_DLLPRIVATE void lockControllers(); SAL_DLLPRIVATE void unlockControllers(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< css::frame::XModel > m_xModel; }; /** This guard calls lockControllers at the given ControllerLockHelper in the diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 1c1e6c0c98b1..748721cd2214 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -51,9 +51,8 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString @param aRole The role that is to be filtered out. */ -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > - getDataSequenceByRole( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > & xSource, +OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XLabeledDataSequence > + getDataSequenceByRole( const css::uno::Reference< css::chart2::data::XDataSource > & xSource, const OUString& aRole, bool bMatchPrefix = false ); @@ -67,10 +66,8 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::cha The role that is to be filtered out. */ OOO_DLLPUBLIC_CHARTTOOLS ::std::vector< - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > - getAllDataSequencesByRole( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > > & aDataSequences, + css::uno::Reference< css::chart2::data::XLabeledDataSequence > > + getAllDataSequencesByRole( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & aDataSequences, const OUString& aRole, bool bMatchPrefix = false ); @@ -83,11 +80,8 @@ getAllDataSequences( into a data source. The order of sequences will match the order of the data series. */ -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > - getDataSource( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > & aSeries ); +OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XDataSource > + getDataSource( const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > & aSeries ); /** Get the label of a series (e.g. for the legend) @@ -96,109 +90,90 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< to take its label. */ OOO_DLLPUBLIC_CHARTTOOLS OUString getDataSeriesLabel( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xSeries, + const css::uno::Reference< css::chart2::XDataSeries > & xSeries, const OUString & rLabelSequenceRole ); /** Get the label of a labeled sequence including necessary automatic generation */ OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > & xLabeledSeq ); + const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xLabeledSeq ); OOO_DLLPUBLIC_CHARTTOOLS void setStackModeAtSeries( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > & aSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > & aSeries, + const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, StackMode eStackMode ); OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getAttachedAxisIndex( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries ); + const css::uno::Reference< css::chart2::XDataSeries > & xSeries ); /// @param nAxisIndex, if -1 it is determined by the given data series via getAttachedAxisIndex OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getNumberFormatKeyFromAxis( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, + const css::uno::Reference< css::chart2::XDataSeries > & xSeries, + const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex = -1 ); OOO_DLLPUBLIC_CHARTTOOLS -::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > +css::uno::Reference< css::chart2::XCoordinateSystem > getCoordinateSystemOfSeries( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDataSeries > & xSeries, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); OOO_DLLPUBLIC_CHARTTOOLS -::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > +css::uno::Reference< css::chart2::XChartType > getChartTypeOfSeries( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDataSeries > & xSeries, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); OOO_DLLPUBLIC_CHARTTOOLS 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 ); OOO_DLLPUBLIC_CHARTTOOLS void switchSymbolsOnOrOff( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xSeriesProperties, + const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties, bool bSymbolsOn, sal_Int32 nSeriesIndex ); OOO_DLLPUBLIC_CHARTTOOLS void switchLinesOnOrOff( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xSeriesProperties, + const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties, bool bLinesOn ); OOO_DLLPUBLIC_CHARTTOOLS -void makeLinesThickOrThin( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xSeriesProperties, bool bThick ); +void makeLinesThickOrThin( const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties, bool bThick ); OOO_DLLPUBLIC_CHARTTOOLS void setPropertyAlsoToAllAttributedDataPoints( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, const OUString& rPropertyName, - const ::com::sun::star::uno::Any& rPropertyValue ); + const css::uno::Any& rPropertyValue ); OOO_DLLPUBLIC_CHARTTOOLS bool hasAttributedDataPointDifferentValue( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, const OUString& rPropertyName, - const ::com::sun::star::uno::Any& rPropertyValue ); + const css::uno::Any& rPropertyValue ); OOO_DLLPUBLIC_CHARTTOOLS bool areAllSeriesAttachedToSameAxis( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, + const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 & rOutAxisIndex ); -OOO_DLLPUBLIC_CHARTTOOLS bool hasUnhiddenData( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries ); +OOO_DLLPUBLIC_CHARTTOOLS bool hasUnhiddenData( const css::uno::Reference< + css::chart2::XDataSeries >& xSeries ); OOO_DLLPUBLIC_CHARTTOOLS -sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nClippedIndex, const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence >& xDataSequence, bool bTranslate ); +sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nClippedIndex, const css::uno::Reference< + css::chart2::data::XDataSequence >& xDataSequence, bool bTranslate ); -OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelsAtSeries( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries ); +OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelsAtSeries( const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); -OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelsAtPoints( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries ); +OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelsAtPoints( const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); -OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelAtPoint( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32 nPointIndex ); +OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelAtPoint( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, sal_Int32 nPointIndex ); -OOO_DLLPUBLIC_CHARTTOOLS void insertDataLabelsToSeriesAndAllPoints( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries ); +OOO_DLLPUBLIC_CHARTTOOLS void insertDataLabelsToSeriesAndAllPoints( const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); -OOO_DLLPUBLIC_CHARTTOOLS void insertDataLabelToPoint( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xPointPropertySet ); +OOO_DLLPUBLIC_CHARTTOOLS void insertDataLabelToPoint( const css::uno::Reference< css::beans::XPropertySet >& xPointPropertySet ); -OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromSeriesAndAllPoints( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries ); +OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromSeriesAndAllPoints( const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); -OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromPoint( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xPointPropertySet ); +OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromPoint( const css::uno::Reference< css::beans::XPropertySet >& xPointPropertySet ); } // namespace DataSeriesHelper } // namespace chart diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index df0f8dedc4c5..ebf2058fe793 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -31,18 +31,14 @@ namespace chart class DataSource : public ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::chart2::data::XDataSource, - ::com::sun::star::chart2::data::XDataSink > + css::lang::XServiceInfo, + css::chart2::data::XDataSource, + css::chart2::data::XDataSink > { public: + explicit DataSource( const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit DataSource( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); - explicit DataSource( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > > & rSequences ); + const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & rSequences ); virtual ~DataSource(); @@ -59,18 +55,16 @@ public: protected: // ____ XDataSource ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XDataSink ____ - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) + throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > > + css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > m_aDataSeq; }; diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index 4ad1a289a4e3..9bfc3360aeb1 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -43,82 +43,71 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS DataSourceHelper { public: - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > - createDataSource( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > > & rSequences ); + static css::uno::Reference< css::chart2::data::XDataSource > + createDataSource( const css::uno::Sequence< + css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & rSequences ); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > + static css::uno::Reference< css::chart2::data::XDataSequence > createCachedDataSequence(); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > + static css::uno::Reference< css::chart2::data::XDataSequence > createCachedDataSequence( const OUString & rSingleText ); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + static css::uno::Reference< css::chart2::data::XLabeledDataSequence > createLabeledDataSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues , - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xLabels ); + const css::uno::Reference< css::chart2::data::XDataSequence >& xValues , + const css::uno::Reference< css::chart2::data::XDataSequence >& xLabels ); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + static css::uno::Reference< css::chart2::data::XLabeledDataSequence > createLabeledDataSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues ); + const css::uno::Reference< css::chart2::data::XDataSequence >& xValues ); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + static css::uno::Reference< css::chart2::data::XLabeledDataSequence > createLabeledDataSequence(); - static ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > createArguments( + static css::uno::Sequence< css::beans::PropertyValue > + createArguments( bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ); - static ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > createArguments( + static css::uno::Sequence< + css::beans::PropertyValue > createArguments( const OUString & rRangeRepresentation, - const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, + const css::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ); - SAL_DLLPRIVATE static void readArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments - , OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping + SAL_DLLPRIVATE static void readArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments + , OUString & rRangeRepresentation, css::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories ); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > - pressUsedDataIntoRectangularFormat( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + static css::uno::Reference< css::chart2::data::XDataSource > + pressUsedDataIntoRectangularFormat( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + SAL_DLLPRIVATE static css::uno::Sequence< OUString > getUsedDataRanges( + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); - static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel ); + static css::uno::Sequence< OUString > getUsedDataRanges( + const css::uno::Reference< css::frame::XModel > & xChartModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > getUsedData( + static css::uno::Reference< css::chart2::data::XDataSource > getUsedData( ChartModel& rModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > getUsedData( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + static css::uno::Reference< css::chart2::data::XDataSource > getUsedData( + const css::uno::Reference< css::frame::XModel >& xChartModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > getUsedData( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + static css::uno::Reference< css::chart2::data::XDataSource > getUsedData( + const css::uno::Reference<css::chart2::XChartDocument >& xChartDoc ); static bool detectRangeSegmentation( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel + const css::uno::Reference< css::frame::XModel >& xChartModel , OUString& rOutRangeString - , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping + , css::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& rOutUseColumns , bool& rOutFirstCellAsLabel , bool& rOutHasCategories ); static void setRangeSegmentation( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel - , const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping + const css::uno::Reference< css::frame::XModel >& xChartModel + , const css::uno::Sequence< sal_Int32 >& rSequenceMapping , bool bUseColumns , bool bFirstCellAsLabel , bool bUseCategories ); @@ -131,19 +120,16 @@ public: HasCategories and FirstCellAsLabel. */ static bool allArgumentsForRectRangeDetected( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); + const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromLabeledDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq ); + SAL_DLLPRIVATE static css::uno::Sequence< OUString > getRangesFromLabeledDataSequence( + const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xLSeq ); SAL_DLLPRIVATE static OUString getRangeFromValues( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq ); + const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xLSeq ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromDataSource( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > & xSource ); + SAL_DLLPRIVATE static css::uno::Sequence< OUString > getRangesFromDataSource( + const css::uno::Reference< css::chart2::data::XDataSource > & xSource ); }; } //namespace chart diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index cbd78081edc8..f4d3945a46f0 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -52,8 +52,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS DiagramHelper { public: typedef ::std::pair< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartTypeTemplate >, + css::uno::Reference< css::chart2::XChartTypeTemplate >, OUString > tTemplateWithServiceName; @@ -67,18 +66,15 @@ public: */ static tTemplateWithServiceName getTemplateForDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xChartTypeManager); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xChartTypeManager); /** Sets the "SwapXAndYAxis" property at all coordinate systems found in the given diagram. "vertical==true" for bar charts, "vertical==false" for column charts */ - static void setVertical( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + static void setVertical( const css::uno::Reference< css::chart2::XDiagram > & xDiagram, bool bVertical = true ); /** Gets the "SwapXAndYAxis" property at all coordinate systems found in the @@ -86,13 +82,11 @@ public: "vertical==true" for bar charts, "vertical==false" for column charts */ - static bool getVertical( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + static bool getVertical( const css::uno::Reference< css::chart2::XDiagram > & xDiagram, bool& rbOutFoundResult, bool& rbOutAmbiguousResult ); static StackMode getStackMode( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, bool& rbFound, bool& rbAmbiguous ); @@ -103,8 +97,7 @@ public: applies to the first chart type/the bars) */ static void setStackMode( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, StackMode eStackMode ); @@ -118,20 +111,17 @@ public: "ambiguous") */ static StackMode getStackModeFromChartType( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > & xChartType, + const css::uno::Reference< css::chart2::XChartType > & xChartType, bool& rbFound, bool& rbAmbiguous, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem = - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >() + const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem = + css::uno::Reference< css::chart2::XCoordinateSystem >() ); /** Returns the dimension found for all chart types in the tree. If the dimension is not unique, 0 is returned. */ static sal_Int32 getDimension( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); /** Sets the dimension of the diagram given. @@ -141,122 +131,92 @@ public: XCoordinateSystemContainer of the diagram. */ static void setDimension( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, sal_Int32 nNewDimensionCount ); /** Replaces all occurrences of xCooSysToReplace in the tree with xReplacement in the diagram's tree */ SAL_DLLPRIVATE static void replaceCoordinateSystem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > & xCooSysToReplace, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > & xReplacement ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XCoordinateSystem > & xCooSysToReplace, + const css::uno::Reference< css::chart2::XCoordinateSystem > & xReplacement ); static bool isSeriesAttachedToMainAxis( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xDataSeries ); + const css::uno::Reference< css::chart2::XDataSeries >& xDataSeries ); static bool attachSeriesToAxis( bool bMainAxis, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::uno::XComponentContext > & xContext, bool bAdaptAxes=true ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > getAttachedAxis( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); + static css::uno::Reference< css::chart2::XAxis > getAttachedAxis( + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > + static css::uno::Reference< css::chart2::XChartType > getChartTypeOfSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries ); - - static ::std::vector< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); + + static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > getDataSeriesFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); /** return all data series in this diagram grouped by chart-types */ - static ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > > + static css::uno::Sequence< + css::uno::Sequence< + css::uno::Reference< css::chart2::XDataSeries > > > getDataSeriesGroups( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); static bool isCategoryDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static void setCategoriesToDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence >& xCategories, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::data::XLabeledDataSequence >& xCategories, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, bool bSetAxisType = false, // when this flag is true ... bool bCategoryAxis = true);// set the AxisType to CATEGORY or back to REALNUMBER - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + static css::uno::Reference< css::chart2::data::XLabeledDataSequence > getCategoriesFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getExplicitSimpleCategories( ChartModel& rModel ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > + SAL_DLLPRIVATE static css::uno::Sequence< OUString > generateAutomaticCategoriesFromCooSys( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > & xCooSys ); + const css::uno::Reference< css::chart2::XCoordinateSystem > & xCooSys ); static void switchToDateCategories( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); static void switchToTextCategories( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); - static bool isSupportingDateAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); - static bool isDateNumberFormat( sal_Int32 nNumberFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& xNumberFormats ); - static sal_Int32 getDateNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); - static sal_Int32 getDateTimeInputNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier, double fNumber ); + static bool isSupportingDateAxis( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); + static bool isDateNumberFormat( sal_Int32 nNumberFormat, const css::uno::Reference< css::util::XNumberFormats >& xNumberFormats ); + static sal_Int32 getDateNumberFormat( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); + static sal_Int32 getDateTimeInputNumberFormat( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier, double fNumber ); - static sal_Int32 getPercentNumberFormat( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); + static sal_Int32 getPercentNumberFormat( const css::uno::Reference< + css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > - getChartTypeByIndex( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Int32 nIndex ); + static css::uno::Reference< css::chart2::XChartType > + getChartTypeByIndex( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Int32 nIndex ); - static ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > + static css::uno::Sequence< + css::uno::Reference< css::chart2::XChartType > > getChartTypesFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); - SAL_DLLPRIVATE static bool areChartTypesCompatible( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xFirstType, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xSecondType ); + SAL_DLLPRIVATE static bool areChartTypesCompatible( const css::uno::Reference< + css::chart2::XChartType >& xFirstType, + const css::uno::Reference< css::chart2::XChartType >& xSecondType ); /** * Test if a series can be moved. @@ -274,10 +234,8 @@ public: * */ static bool isSeriesMoveable( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDataSeries >& xGivenDataSeries, bool bForward ); /** @@ -296,42 +254,33 @@ public: * */ static bool moveSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDataSeries >& xGivenDataSeries, bool bForward ); - static bool isSupportingFloorAndWall( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + static bool isSupportingFloorAndWall( const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); - static bool isPieOrDonutChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); + static bool isPieOrDonutChart( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static sal_Int32 getGeometry3D( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, bool& rbFound, bool& rbAmbiguous ); static void setGeometry3D( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, sal_Int32 nNewGeometry ); - //returns integer from constant group ::com::sun::star::chart::MissingValueTreatment + //returns integer from constant group css::chart::MissingValueTreatment static sal_Int32 getCorrectedMissingValueTreatment( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartType ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XChartType >& xChartType ); - static DiagramPositioningMode getDiagramPositioningMode( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + static DiagramPositioningMode getDiagramPositioningMode( const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); - static bool setDiagramPositioning( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, - const ::com::sun::star::awt::Rectangle& rPosRect /*100th mm*/ ); + static bool setDiagramPositioning( const css::uno::Reference< css::frame::XModel >& xChartModel, + const css::awt::Rectangle& rPosRect /*100th mm*/ ); - static ::com::sun::star::awt::Rectangle getDiagramRectangleFromModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); + static css::awt::Rectangle getDiagramRectangleFromModel( const css::uno::Reference< css::frame::XModel >& xChartModel ); static bool switchDiagramPositioningToExcludingPositioning( ChartModel& rModel , bool bResetModifiedState //set model back to unchanged if it was unchanged before diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx index a2f1bba814af..72642a23121c 100644 --- a/chart2/source/inc/DisposeHelper.hxx +++ b/chart2/source/inc/DisposeHelper.hxx @@ -30,16 +30,15 @@ namespace DisposeHelper template< class T > void Dispose( const T & xIntf ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( - xIntf, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > xComp( xIntf, css::uno::UNO_QUERY ); if( xComp.is()) xComp->dispose(); } template< class Intf > - void DisposeAndClear( ::com::sun::star::uno::Reference< Intf > & rIntf ) + void DisposeAndClear( css::uno::Reference< Intf > & rIntf ) { - Dispose< ::com::sun::star::uno::Reference< Intf > >( rIntf ); + Dispose< css::uno::Reference< Intf > >( rIntf ); rIntf.set( 0 ); } diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 9f8a187f816d..97333e3c5e8a 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -41,21 +41,20 @@ namespace chart { -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createErrorBar( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); +OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::beans::XPropertySet > createErrorBar( + const css::uno::Reference< css::uno::XComponentContext > & xContext ); namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener, - ::com::sun::star::chart2::data::XDataSource, - ::com::sun::star::chart2::data::XDataSink, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyState > + css::lang::XServiceInfo, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener, + css::chart2::data::XDataSource, + css::chart2::data::XDataSink, + css::beans::XPropertySet, + css::beans::XPropertyState > ErrorBar_Base; } @@ -73,9 +72,7 @@ private: sal_Int32 meStyle; public: - explicit ErrorBar( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit ErrorBar( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~ErrorBar(); /// XServiceInfo declarations @@ -90,75 +87,74 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // 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; // XPropertyState - virtual com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( - const com::sun::star::uno::Sequence< OUString >& rPropNames ) - throw (com::sun::star::beans::UnknownPropertyException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) + throw (css::beans::UnknownPropertyException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( + const css::uno::Sequence< OUString >& rPropNames ) + throw (css::beans::UnknownPropertyException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, std::exception) override; + throw (css::beans::UnknownPropertyException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; protected: ErrorBar( const ErrorBar & rOther ); // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ XDataSink ____ - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XDataSource ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() + throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; - typedef ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > > tDataSequenceContainer; + typedef ::std::vector< css::uno::Reference< + css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer; tDataSequenceContainer m_aDataSequences; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index 7e190df645a0..07de4ca91c43 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -38,39 +38,37 @@ namespace impl template< class InterfaceRef > struct addListenerFunctor : public ::std::unary_function< InterfaceRef, void > { - explicit addListenerFunctor( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener ) : + explicit addListenerFunctor( const css::uno::Reference< css::lang::XEventListener > & xListener ) : m_xListener( xListener ) {} void operator() ( const InterfaceRef & xObject ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > - xBroadcaster( xObject, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > + xBroadcaster( xObject, css::uno::UNO_QUERY ); if( xBroadcaster.is() && m_xListener.is()) xBroadcaster->addEventListener( m_xListener ); } private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xListener; + css::uno::Reference< css::lang::XEventListener > m_xListener; }; template< class InterfaceRef > struct removeListenerFunctor : public ::std::unary_function< InterfaceRef, void > { - explicit removeListenerFunctor( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener ) : + explicit removeListenerFunctor( const css::uno::Reference< css::lang::XEventListener > & xListener ) : m_xListener( xListener ) {} void operator() ( const InterfaceRef & xObject ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > - xBroadcaster( xObject, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > + xBroadcaster( xObject, css::uno::UNO_QUERY ); if( xBroadcaster.is() && m_xListener.is()) xBroadcaster->removeEventListener( m_xListener ); } private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xListener; + css::uno::Reference< css::lang::XEventListener > m_xListener; }; } // namespace impl @@ -78,8 +76,7 @@ private: template< class InterfaceRef > void addListener( const InterfaceRef & xObject, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener ) + const css::uno::Reference< css::lang::XEventListener > & xListener ) { if( xListener.is()) { @@ -91,8 +88,7 @@ void addListener( template< class Container > void addListenerToAllElements( const Container & rContainer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener ) + const css::uno::Reference< css::lang::XEventListener > & xListener ) { if( xListener.is()) ::std::for_each( rContainer.begin(), rContainer.end(), @@ -102,8 +98,7 @@ void addListenerToAllElements( template< class InterfaceRef > void removeListener( const InterfaceRef & xObject, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener ) + const css::uno::Reference< css::lang::XEventListener > & xListener ) { if( xListener.is()) { @@ -115,8 +110,7 @@ void removeListener( template< class Container > void removeListenerFromAllElements( const Container & rContainer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener ) + const css::uno::Reference< css::lang::XEventListener > & xListener ) { if( xListener.is()) ::std::for_each( rContainer.begin(), rContainer.end(), diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 6297ad1da067..60de98f6a00a 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -44,61 +44,56 @@ public: virtual ~SplitCategoriesProvider(); virtual sal_Int32 getLevelCount() const = 0; - virtual ::com::sun::star::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0; + virtual css::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0; }; class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider { public: - ExplicitCategoriesProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel + ExplicitCategoriesProvider( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSysModel , ChartModel& rChartModel ); virtual ~ExplicitCategoriesProvider(); void init(); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > getOriginalCategories(); + css::uno::Reference< css::chart2::data::XDataSequence > getOriginalCategories(); - ::com::sun::star::uno::Sequence< OUString > getSimpleCategories(); + css::uno::Sequence< OUString > getSimpleCategories(); const std::vector<ComplexCategory>* getCategoriesByLevel( sal_Int32 nLevel ); static OUString getCategoryByIndex( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel + const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSysModel , ChartModel& rModel , sal_Int32 nIndex ); - static ::com::sun::star::uno::Sequence< OUString > getExplicitSimpleCategories( + static css::uno::Sequence< OUString > getExplicitSimpleCategories( const SplitCategoriesProvider& rSplitCategoriesProvider ); - static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< OUString >& rOutTexts - , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rInAnys + static void convertCategoryAnysToText( css::uno::Sequence< OUString >& rOutTexts + , const css::uno::Sequence< css::uno::Any >& rInAnys , ChartModel& rModel ); bool hasComplexCategories() const; sal_Int32 getCategoryLevelCount() const; - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList() { return m_aSplitCategoriesList;} + const css::uno::Sequence< css::uno::Reference< + css::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList() { return m_aSplitCategoriesList;} bool isDateAxis(); const std::vector< double >& getDateCategories(); private: //member bool volatile m_bDirty; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::chart2::XCoordinateSystem > m_xCooSysModel; + css::uno::WeakReference< css::chart2::XCoordinateSystem > m_xCooSysModel; ChartModel& mrModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence> m_xOriginalCategories; + css::uno::Reference< css::chart2::data::XLabeledDataSequence> m_xOriginalCategories; bool m_bIsExplicitCategoriesInited; - ::com::sun::star::uno::Sequence< OUString > m_aExplicitCategories; + css::uno::Sequence< OUString > m_aExplicitCategories; ::std::vector< ::std::vector< ComplexCategory > > m_aComplexCats; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList; + css::uno::Sequence< css::uno::Reference< + css::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList; bool m_bIsDateAxis; bool m_bIsAutoDate; diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index 43024262c399..f33d7207bb12 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -64,7 +64,7 @@ namespace FillProperties }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + ::std::vector< css::beans::Property > & rOutProperties ); OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); } diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index 1cbdeba7974d..8432c5728fb9 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -30,15 +30,12 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS FormattedStringHelper { public: - static ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XFormattedString2 > > + static css::uno::Sequence< + css::uno::Reference< css::chart2::XFormattedString2 > > createFormattedStringSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext + const css::uno::Reference< css::uno::XComponentContext > & xContext , const OUString & rString - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xTextProperties ) throw(); + , const css::uno::Reference< css::beans::XPropertySet > & xTextProperties ) throw(); }; } //namespace chart diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx index 488be162cdad..26ec9fc40e67 100644 --- a/chart2/source/inc/InternalData.hxx +++ b/chart2/source/inc/InternalData.hxx @@ -34,22 +34,20 @@ public: void createDefaultData(); - void setData( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< double > > & rDataInRows ); - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< double > > getData() const; + void setData( const css::uno::Sequence< css::uno::Sequence< double > > & rDataInRows ); + css::uno::Sequence< css::uno::Sequence< double > > getData() const; - ::com::sun::star::uno::Sequence< double > getColumnValues( sal_Int32 nColumnIndex ) const; - ::com::sun::star::uno::Sequence< double > getRowValues( sal_Int32 nRowIndex ) const; + css::uno::Sequence< double > getColumnValues( sal_Int32 nColumnIndex ) const; + css::uno::Sequence< double > getRowValues( sal_Int32 nRowIndex ) const; void setColumnValues( sal_Int32 nColumnIndex, const ::std::vector< double > & rNewData ); void setRowValues( sal_Int32 nRowIndex, const ::std::vector< double > & rNewData ); - void setComplexColumnLabel( sal_Int32 nColumnIndex, const ::std::vector< ::com::sun::star::uno::Any >& rComplexLabel ); - void setComplexRowLabel( sal_Int32 nRowIndex, const ::std::vector< ::com::sun::star::uno::Any >& rComplexLabel ); + void setComplexColumnLabel( sal_Int32 nColumnIndex, const ::std::vector< css::uno::Any >& rComplexLabel ); + void setComplexRowLabel( sal_Int32 nRowIndex, const ::std::vector< css::uno::Any >& rComplexLabel ); - ::std::vector< ::com::sun::star::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const; - ::std::vector< ::com::sun::star::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const; + ::std::vector< css::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const; + ::std::vector< css::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const; void swapRowWithNext( sal_Int32 nRowIndex ); void swapColumnWithNext( sal_Int32 nColumnIndex ); @@ -67,7 +65,7 @@ public: sal_Int32 getRowCount() const; sal_Int32 getColumnCount() const; - typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Any > > tVecVecAny; //inner index is hierarchical level + typedef ::std::vector< ::std::vector< css::uno::Any > > tVecVecAny; //inner index is hierarchical level void setComplexRowLabels( const tVecVecAny& rNewRowLabels ); tVecVecAny getComplexRowLabels() const; diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index daaa4ecad43f..8355d8269f18 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -44,13 +44,13 @@ namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XInternalDataProvider, - ::com::sun::star::chart2::data::XRangeXMLConversion, - ::com::sun::star::chart2::XAnyDescriptionAccess, - ::com::sun::star::chart::XDateCategories, - ::com::sun::star::util::XCloneable, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XServiceInfo > + css::chart2::XInternalDataProvider, + css::chart2::data::XRangeXMLConversion, + css::chart2::XAnyDescriptionAccess, + css::chart::XDateCategories, + css::util::XCloneable, + css::lang::XInitialization, + css::lang::XServiceInfo > InternalDataProvider_Base; } @@ -68,12 +68,12 @@ class InternalDataProvider : public impl::InternalDataProvider_Base { public: - explicit InternalDataProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _xContext); + explicit InternalDataProvider(const css::uno::Reference< css::uno::XComponentContext > & _xContext); // #i120559# allow handing over a default for data orientation // (DataInColumns) that will be used when no data is available explicit InternalDataProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc, + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc, bool bConnectToModel, bool bDefaultDataInColumns ); explicit InternalDataProvider( const InternalDataProvider & rOther ); @@ -94,151 +94,144 @@ public: // ____ XInternalDataProvider ____ virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getDataByRangeRepresentation( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDataByRangeRepresentation( const OUString& aRange, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aNewData ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL appendSequence() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL registerDataSequenceForChanges( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSeq ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XDataProvider (base of XInternalDataProvider) ____ virtual sal_Bool SAL_CALL createDataSourcePossible( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource( + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments( + const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() + throw (css::uno::RuntimeException, std::exception) override; // ____ XRangeXMLConversion ____ virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // ____ 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 css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() + throw (css::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; + 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 ::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; + 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 ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) + throw (css::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; + 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; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; + // css::lang::XInitialization: + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) + throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; private: void addDataSequenceToMap( const OUString & rRangeRepresentation, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xSequence ); + const css::uno::Reference< css::chart2::data::XDataSequence > & xSequence ); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > + css::uno::Reference< css::chart2::data::XDataSequence > createDataSequenceAndAddToMap( const OUString & rRangeRepresentation, const OUString & rRole ); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > + css::uno::Reference< css::chart2::data::XDataSequence > createDataSequenceAndAddToMap( const OUString & rRangeRepresentation ); css::uno::Reference<css::chart2::data::XDataSequence> @@ -254,7 +247,7 @@ private: void decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd ); typedef ::std::multimap< OUString, - ::com::sun::star::uno::WeakReference< ::com::sun::star::chart2::data::XDataSequence > > + css::uno::WeakReference< css::chart2::data::XDataSequence > > tSequenceMap; typedef ::std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange; typedef ::std::pair< tSequenceMap::const_iterator, tSequenceMap::const_iterator > tConstSequenceMapRange; diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 3a641f15bd6b..a68bb703aadd 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -35,8 +35,8 @@ namespace chart namespace impl { typedef cppu::WeakImplHelper< - ::com::sun::star::chart2::data::XLabeledDataSequence2, - ::com::sun::star::lang::XServiceInfo > + css::chart2::data::XLabeledDataSequence2, + css::lang::XServiceInfo > LabeledDataSequence_Base; } @@ -47,13 +47,10 @@ class LabeledDataSequence : public: explicit LabeledDataSequence(); explicit LabeledDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & rValues ); + const css::uno::Reference< css::chart2::data::XDataSequence > & rValues ); explicit LabeledDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & rValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & rLabels ); + const css::uno::Reference< css::chart2::data::XDataSequence > & rValues, + const css::uno::Reference< css::chart2::data::XDataSequence > & rLabels ); virtual ~LabeledDataSequence(); @@ -70,34 +67,34 @@ public: protected: // ____ XLabeledDataSequence ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setValues( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLabel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xData; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xLabel; + css::uno::Reference< css::chart2::data::XDataSequence > m_xData; + css::uno::Reference< css::chart2::data::XDataSequence > m_xLabel; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index 26008b882956..44095006a939 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -36,26 +36,22 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS LegendHelper { public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend > + static css::uno::Reference< css::chart2::XLegend > showLegend( ChartModel& rModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + , const css::uno::Reference< css::uno::XComponentContext >& xContext ); static void hideLegend( ChartModel& rModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend > + static css::uno::Reference< css::chart2::XLegend > getLegend( ChartModel& rModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext = nullptr + , const css::uno::Reference< css::uno::XComponentContext >& xContext = nullptr , bool bCreate = false ); /** returns <FALSE/>, if either there is no legend at the diagram, or there is a legend which has a "Show" property of value <FALSE/>. Otherwise, <TRUE/> is returned. */ - static bool hasLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); + static bool hasLegend( const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); }; } //namespace chart diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 6034027ed176..ef65f007d360 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -39,11 +39,11 @@ friend class LifeTimeGuard; protected: mutable ::osl::Mutex m_aAccessMutex; public: - LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, bool bLongLastingCallsCancelable = false ); + LifeTimeManager( css::lang::XComponent* pComponent, bool bLongLastingCallsCancelable = false ); virtual ~LifeTimeManager(); bool impl_isDisposed( bool bAssert=true ); - bool dispose() throw(::com::sun::star::uno::RuntimeException); + bool dispose() throw(css::uno::RuntimeException); public: ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; @@ -58,7 +58,7 @@ protected: SAL_DLLPRIVATE void impl_init(); protected: - ::com::sun::star::lang::XComponent* m_pComponent; + css::lang::XComponent* m_pComponent; ::osl::Condition m_aNoAccessCountCondition; sal_Int32 volatile m_nAccessCount; @@ -74,7 +74,7 @@ protected: class CloseableLifeTimeManager : public LifeTimeManager { protected: - ::com::sun::star::util::XCloseable* m_pCloseable; + css::util::XCloseable* m_pCloseable; ::osl::Condition m_aEndTryClosingCondition; bool volatile m_bClosed; @@ -85,21 +85,20 @@ protected: bool volatile m_bOwnership; public: -OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable - , ::com::sun::star::lang::XComponent* pComponent +OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( css::util::XCloseable* pCloseable + , css::lang::XComponent* pComponent , bool bLongLastingCallsCancelable = false ); OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership) - throw ( ::com::sun::star::uno::Exception ); -OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex ) - throw ( ::com::sun::star::util::CloseVetoException ); + throw ( css::uno::Exception ); +OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex ) + throw ( css::util::CloseVetoException ); OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto ); OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); -OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XCloseListener > & xListener ) - throw(::com::sun::star::uno::RuntimeException); +OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) + throw(css::uno::RuntimeException); protected: virtual bool impl_canStartApiCall() override; diff --git a/chart2/source/inc/LineProperties.hxx b/chart2/source/inc/LineProperties.hxx index 2b61fdd4e74a..6c9d413a656e 100644 --- a/chart2/source/inc/LineProperties.hxx +++ b/chart2/source/inc/LineProperties.hxx @@ -20,19 +20,19 @@ class LineProperties { private: OUString maDashName; - com::sun::star::drawing::LineDash maLineDash; + css::drawing::LineDash maLineDash; sal_Int32 mnLineWidth; - com::sun::star::drawing::LineStyle meLineStyle; - com::sun::star::util::Color maLineColor; + css::drawing::LineStyle meLineStyle; + css::util::Color maLineColor; sal_Int16 mnLineTransparence; - com::sun::star::drawing::LineJoint meLineJoint; + css::drawing::LineJoint meLineJoint; public: LineProperties(); LineProperties(const LineProperties&); - com::sun::star::uno::Any getPropertyValue(const OUString& rName); - void setPropertyValue(const OUString& rName, const com::sun::star::uno::Any& rAny); + css::uno::Any getPropertyValue(const OUString& rName); + void setPropertyValue(const OUString& rName, const css::uno::Any& rAny); }; #endif diff --git a/chart2/source/inc/LinePropertiesHelper.hxx b/chart2/source/inc/LinePropertiesHelper.hxx index a5fd2b93c482..45b086810346 100644 --- a/chart2/source/inc/LinePropertiesHelper.hxx +++ b/chart2/source/inc/LinePropertiesHelper.hxx @@ -46,18 +46,18 @@ namespace LinePropertiesHelper }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + ::std::vector< css::beans::Property > & rOutProperties ); OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); - bool IsLineVisible( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xLineProperties ); - void SetLineVisible( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xLineProperties ); - void SetLineInvisible( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xLineProperties ); - void SetLineColor( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xGridProperties, sal_Int32 nColor ); + bool IsLineVisible( const css::uno::Reference< + css::beans::XPropertySet >& xLineProperties ); + void SetLineVisible( const css::uno::Reference< + css::beans::XPropertySet >& xLineProperties ); + void SetLineInvisible( const css::uno::Reference< + css::beans::XPropertySet >& xLineProperties ); + void SetLineColor( const css::uno::Reference< + css::beans::XPropertySet >& xGridProperties, sal_Int32 nColor ); } } // namespace chart diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index dead054ca0a2..e1c573d58d12 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -48,30 +48,24 @@ class OOO_DLLPUBLIC_CHARTTOOLS MediaDescriptorHelper private: //MediaDescriptorHelper(){}; public: - MediaDescriptorHelper( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > & rMediaDescriptor ); + MediaDescriptorHelper( const css::uno::Sequence< css::beans::PropertyValue > & rMediaDescriptor ); - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > getReducedForModel() { return m_aModelProperties;} + css::uno::Sequence< css::beans::PropertyValue > getReducedForModel() { return m_aModelProperties;} public: //all properties given in the constructor are stored in the following three sequences - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > m_aRegularProperties; //these are the properties which are described in service com.sun.star.document.MediaDescriptor and not marked as deprecated - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > m_aDeprecatedProperties; //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > m_aAdditionalProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor //properties which should be given to a model are additionally stored in this sequence (not documented properties and deprecated properties are not included!) - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor //@todo define this for debug only, except URL @@ -84,12 +78,12 @@ public: OUString Comment; bool ISSET_Comment; - ::com::sun::star::uno::Any + css::uno::Any ComponentData; bool ISSET_ComponentData; OUString FileName; //deprecated, same as url bool ISSET_FileName; - ::com::sun::star::uno::Any + css::uno::Any FilterData; bool ISSET_FilterData; OUString FilterName; //internal filter name. @@ -107,14 +101,14 @@ public: OUString HierarchicalDocumentName; bool ISSET_HierarchicalDocumentName; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > OutputStream; //a stream to receive the document data for saving bool ISSET_OutputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > InputStream; //content of document. bool ISSET_InputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - InteractionHandler; //::com::sun::star::task::XInteractionHandler + css::uno::Reference< css::uno::XInterface > + InteractionHandler; //css::task::XInteractionHandler bool ISSET_InteractionHandler; OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. @@ -131,11 +125,11 @@ public: bool ISSET_Password; //not documented ... @todo remove? - ::com::sun::star::awt::Rectangle + css::awt::Rectangle PosSize; //position and size of document window. bool ISSET_PosSize; - ::com::sun::star::uno::Sequence< sal_Int8 > + css::uno::Sequence< sal_Int8 > PostData; //contains the data for HTTP post method as a sequence of bytes. bool ISSET_PostData; OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. @@ -147,8 +141,8 @@ public: OUString Referer; //name of document referrer. bool ISSET_Referer; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - StatusIndicator; //::com::sun::star::task::XStatusIndicator + css::uno::Reference< css::uno::XInterface > + StatusIndicator; //css::task::XStatusIndicator bool ISSET_StatusIndicator; //not documented ... @todo remove? bool Silent; //prevents dialogs to query for more information. @@ -164,22 +158,22 @@ public: sal_Int16 Version; //storage version. bool ISSET_Version; - ::com::sun::star::uno::Any + css::uno::Any ViewData; bool ISSET_ViewData; sal_Int16 ViewId; //id of the initial view. bool ISSET_ViewId; // new framework objects - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > Storage; bool ISSET_Storage; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > + css::uno::Reference< css::io::XStream > Stream; bool ISSET_Stream; // undocumented SFX Properties - ::com::sun::star::uno::Sequence< sal_Int32 > + css::uno::Sequence< sal_Int32 > WinExtent; bool ISSET_WinExtent; bool SetEmbedded; diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index ad1b2b3d2083..99c075a68289 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -47,8 +47,7 @@ private: //methods private: //member ModifyListenerCallBack_impl* pModifyListener_impl; - ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > m_xModifyListener; + css::uno::Reference< css::util::XModifyListener > m_xModifyListener; }; } // namespace chart diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 2216588184e5..8d1b20d81361 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -40,7 +40,7 @@ namespace chart namespace ModifyListenerHelper { -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > createModifyEventForwarder(); +OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::util::XModifyListener > createModifyEventForwarder(); /** This helper class serves as forwarder of modify events. It can be used whenever an object has to send modify events after it gets a modify event of @@ -53,53 +53,53 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::uti class ModifyEventForwarder : public MutexContainer, public ::cppu::WeakComponentImplHelper< - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::util::XModifyBroadcaster, + css::util::XModifyListener > { public: ModifyEventForwarder(); - void FireEvent( const ::com::sun::star::lang::EventObject & rEvent ); + void FireEvent( const css::lang::EventObject & rEvent ); void AddListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ); + const css::uno::Reference< css::util::XModifyListener >& aListener ); void RemoveListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ); + const css::uno::Reference< css::util::XModifyListener >& aListener ); protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ WeakComponentImplHelperBase ____ virtual void SAL_CALL disposing() override; private: /// call disposing() at all listeners and remove all listeners - void DisposeAndClear( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XWeak > & xSource ); + void DisposeAndClear( const css::uno::Reference< + css::uno::XWeak > & xSource ); // ::osl::Mutex & m_rMutex; ::cppu::OBroadcastHelper m_aModifyListeners; typedef ::std::list< ::std::pair< - ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener >, - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > > > + css::uno::WeakReference< css::util::XModifyListener >, + css::uno::Reference< css::util::XModifyListener > > > tListenerMap; tListenerMap m_aListenerMap; @@ -111,77 +111,73 @@ namespace impl template< class InterfaceRef > struct addListenerFunctor : public ::std::unary_function< InterfaceRef, void > { - explicit addListenerFunctor( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) : + explicit addListenerFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) : m_xListener( xListener ) {} void operator() ( const InterfaceRef & xObject ) { - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster > - xBroadcaster( xObject, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XModifyBroadcaster > + xBroadcaster( xObject, css::uno::UNO_QUERY ); if( xBroadcaster.is() && m_xListener.is()) xBroadcaster->addModifyListener( m_xListener ); } private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener; + css::uno::Reference< css::util::XModifyListener > m_xListener; }; template< class InterfaceRef > struct removeListenerFunctor : public ::std::unary_function< InterfaceRef, void > { - explicit removeListenerFunctor( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) : + explicit removeListenerFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) : m_xListener( xListener ) {} void operator() ( const InterfaceRef & xObject ) { - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster > - xBroadcaster( xObject, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XModifyBroadcaster > + xBroadcaster( xObject, css::uno::UNO_QUERY ); if( xBroadcaster.is() && m_xListener.is()) xBroadcaster->removeModifyListener( m_xListener ); } private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener; + css::uno::Reference< css::util::XModifyListener > m_xListener; }; template< class Pair > struct addListenerToMappedElementFunctor : public ::std::unary_function< Pair, void > { - explicit addListenerToMappedElementFunctor( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) : + explicit addListenerToMappedElementFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) : m_xListener( xListener ) {} void operator() ( const Pair & aPair ) { - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster > - xBroadcaster( aPair.second, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XModifyBroadcaster > + xBroadcaster( aPair.second, css::uno::UNO_QUERY ); if( xBroadcaster.is() && m_xListener.is()) xBroadcaster->addModifyListener( m_xListener ); } private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener; + css::uno::Reference< css::util::XModifyListener > m_xListener; }; template< class Pair > struct removeListenerFromMappedElementFunctor : public ::std::unary_function< Pair, void > { - explicit removeListenerFromMappedElementFunctor( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) : + explicit removeListenerFromMappedElementFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) : m_xListener( xListener ) {} void operator() ( const Pair & aPair ) { - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster > - xBroadcaster( aPair.second, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XModifyBroadcaster > + xBroadcaster( aPair.second, css::uno::UNO_QUERY ); if( xBroadcaster.is() && m_xListener.is()) xBroadcaster->removeModifyListener( m_xListener ); } private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener; + css::uno::Reference< css::util::XModifyListener > m_xListener; }; } // namespace impl @@ -189,8 +185,7 @@ private: template< class InterfaceRef > void addListener( const InterfaceRef & xObject, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) + const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) { @@ -202,8 +197,7 @@ void addListener( template< class Container > void addListenerToAllElements( const Container & rContainer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) + const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) ::std::for_each( rContainer.begin(), rContainer.end(), @@ -213,8 +207,7 @@ void addListenerToAllElements( template< class Container > void addListenerToAllMapElements( const Container & rContainer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) + const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) ::std::for_each( rContainer.begin(), rContainer.end(), @@ -223,9 +216,8 @@ void addListenerToAllMapElements( template< typename T > void addListenerToAllSequenceElements( - const ::com::sun::star::uno::Sequence< T > & rSequence, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) + const css::uno::Sequence< T > & rSequence, + const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(), @@ -235,8 +227,7 @@ void addListenerToAllSequenceElements( template< class InterfaceRef > void removeListener( const InterfaceRef & xObject, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) + const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) { @@ -248,8 +239,7 @@ void removeListener( template< class Container > void removeListenerFromAllElements( const Container & rContainer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) + const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) ::std::for_each( rContainer.begin(), rContainer.end(), @@ -259,8 +249,7 @@ void removeListenerFromAllElements( template< class Container > void removeListenerFromAllMapElements( const Container & rContainer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) + const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) ::std::for_each( rContainer.begin(), rContainer.end(), @@ -269,9 +258,8 @@ void removeListenerFromAllMapElements( template< typename T > void removeListenerFromAllSequenceElements( - const ::com::sun::star::uno::Sequence< T > & rSequence, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener ) + const css::uno::Sequence< T > & rSequence, + const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(), diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 72c5055051a7..b00c90a405e2 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -32,58 +32,58 @@ namespace chart { -OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer( - const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); +OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::container::XNameContainer > createNameContainer( + const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::container::XNameContainer, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::util::XCloneable > + css::container::XNameContainer, + css::lang::XServiceInfo, + css::util::XCloneable > NameContainer_Base; } class NameContainer : public impl::NameContainer_Base { public: - NameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); + NameContainer( const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); explicit NameContainer( const NameContainer & rOther ); virtual ~NameContainer(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName( const OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Type SAL_CALL getElementType( ) throw( com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw( css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override; private: //methods NameContainer();//no default constructor private: //member - const ::com::sun::star::uno::Type m_aType; + const css::uno::Type m_aType; const OUString m_aServicename; const OUString m_aImplementationName; - typedef ::std::map< OUString, com::sun::star::uno::Any > tContentMap; + typedef ::std::map< OUString, css::uno::Any > tContentMap; tContentMap m_aMap; }; diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index d199ef7b4005..ae9c40ca67ae 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -33,28 +33,28 @@ class FixedNumberFormatter; class OOO_DLLPUBLIC_CHARTTOOLS NumberFormatterWrapper { public: - NumberFormatterWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ); + NumberFormatterWrapper( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier ); virtual ~NumberFormatterWrapper(); SvNumberFormatter* getSvNumberFormatter() const { return m_pNumberFormatter;} - ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > + css::uno::Reference< css::util::XNumberFormatsSupplier > getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; }; OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; Date getNullDate() const; private: //private member - ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > + css::uno::Reference< css::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; SvNumberFormatter* m_pNumberFormatter; - ::com::sun::star::uno::Any m_aNullDate; + css::uno::Any m_aNullDate; }; class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter { public: - FixedNumberFormatter( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier + FixedNumberFormatter( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier , sal_Int32 nNumberFormatKey ); virtual ~FixedNumberFormatter(); diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 93aed4ba63ae..a5c7de8eb602 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -47,10 +47,10 @@ class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet : public ::cppu::OPropertySetHelper, // includes uno::XWeak (and XInterface, esp. ref-counting) - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::beans::XPropertyState, - public ::com::sun::star::beans::XMultiPropertyStates, - public ::com::sun::star::style::XStyleSupplier + public css::lang::XTypeProvider, + public css::beans::XPropertyState, + public css::beans::XMultiPropertyStates, + public css::style::XStyleSupplier { public: OPropertySet( ::osl::Mutex & rMutex ); @@ -65,7 +65,7 @@ protected: supporting defaults. If a property does not have a default value, you may throw an UnknownPropertyException. */ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) = 0; @@ -104,11 +104,11 @@ protected: @see ::cppu::OPropertySetHelper */ virtual sal_Bool SAL_CALL convertFastPropertyValue - ( ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + ( css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) override; /** The same as setFastProperyValue; nHandle is always valid. The changes must not be broadcasted in this method. @@ -116,11 +116,11 @@ protected: @attention Although you are permitted to throw any UNO exception, only the following are valid for usage: - -- ::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 + -- css::beans::UnknownPropertyException + -- css::beans::PropertyVetoException + -- css::lang::IllegalArgumentException + -- css::lang::WrappedTargetException + -- css::uno::RuntimeException @param nHandle handle @param rValue value @@ -129,8 +129,8 @@ protected: */ virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; /** The same as getFastProperyValue, but return the value through rValue and @@ -139,7 +139,7 @@ protected: @see ::cppu::OPropertySetHelper */ virtual void SAL_CALL getFastPropertyValue - ( ::com::sun::star::uno::Any& rValue, + ( css::uno::Any& rValue, sal_Int32 nHandle ) const override; /// make original interface function visible again @@ -153,68 +153,68 @@ protected: // Interfaces // ____ 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; // ____ XTypeProvider ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XPropertyState ____ - virtual ::com::sun::star::beans::PropertyState SAL_CALL + virtual css::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; + 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 (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::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; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // ____ XMultiPropertyStates ____ // Note: getPropertyStates() is already implemented in XPropertyState with the // same signature virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::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; + 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; // ____ XStyleSupplier ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > SAL_CALL getStyle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& PropertyNames, + const css::uno::Sequence< css::uno::Any >& Values ) + throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // ____ XFastPropertySet ____ - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - 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 void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // Note: it is assumed that the base class implements setPropertyValue by // using setFastPropertyValue diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 7b40bed8bb6b..a59c2e6b4c49 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -91,8 +91,8 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier public: ObjectIdentifier(); ObjectIdentifier( const OUString& rObjectCID ); - ObjectIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); - ObjectIdentifier( const ::com::sun::star::uno::Any& rAny ); + ObjectIdentifier( const css::uno::Reference< css::drawing::XShape >& rxShape ); + ObjectIdentifier( const css::uno::Any& rAny ); virtual ~ObjectIdentifier(); ObjectIdentifier( const ObjectIdentifier& rOID ); @@ -102,15 +102,12 @@ public: bool operator<( const ObjectIdentifier& rOID ) const; static OUString createClassifiedIdentifierForObject( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xObject + const css::uno::Reference< css::uno::XInterface >& xObject , ChartModel& rModel); static OUString createClassifiedIdentifierForObject( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xObject - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + const css::uno::Reference< css::uno::XInterface >& xObject + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static OUString createClassifiedIdentifierForParticle( const OUString& rParticle ); @@ -122,33 +119,25 @@ public: , const OUString& rDragParameterString = OUString() ); static OUString createClassifiedIdentifierForGrid( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel + const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::frame::XModel >& xChartModel , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc SAL_DLLPRIVATE static OUString createParticleForDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram + const css::uno::Reference< css::chart2::XDiagram >& xDiagram , ChartModel& rModel); SAL_DLLPRIVATE static OUString createParticleForDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + const css::uno::Reference< css::chart2::XDiagram >& xDiagram + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static OUString createParticleForCoordinateSystem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys + const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys , ChartModel& rModel ); static OUString createParticleForCoordinateSystem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static OUString createParticleForAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); @@ -160,15 +149,12 @@ public: , sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex ); static OUString createParticleForLegend( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend >& xLegend + const css::uno::Reference< css::chart2::XLegend >& xLegend , ChartModel& rModel ); static OUString createParticleForLegend( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend >& xLegend - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + const css::uno::Reference< css::chart2::XLegend >& xLegend + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static OUString addChildParticle( const OUString& rParticle, const OUString& rChildParticle ); static OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ); @@ -217,46 +203,41 @@ public: static OUString getSeriesParticleFromCID( const OUString& rCID ); //return the model object that is indicated by rObjectCID - static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + static css::uno::Reference< css::beans::XPropertySet > getObjectPropertySet( const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); - static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + , const css::uno::Reference< css::frame::XModel >& xChartModel ); + static css::uno::Reference< css::beans::XPropertySet > getObjectPropertySet( const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDocument ); + , const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument ); //return the axis object that belongs to rObjectCID if any - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > + static css::uno::Reference< css::chart2::XAxis > getAxisForCID( const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); //return the series object that belongs to rObjectCID if any - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > + static css::uno::Reference< css::chart2::XDataSeries > getDataSeriesForCID( const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > + static css::uno::Reference< css::chart2::XDiagram > getDiagramForCID( const OUString& rObjectCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static const OUString& getPieSegmentDragMethodServiceName(); static OUString createPieSegmentDragParameterString( sal_Int32 nOffsetPercent - , const ::com::sun::star::awt::Point& rMinimumPosition - , const ::com::sun::star::awt::Point& rMaximumPosition ); + , const css::awt::Point& rMinimumPosition + , const css::awt::Point& rMaximumPosition ); static bool parsePieSegmentDragParameterString( const OUString& rDragParameterString , sal_Int32& rOffsetPercent - , ::com::sun::star::awt::Point& rMinimumPosition - , ::com::sun::star::awt::Point& rMaximumPosition ); + , css::awt::Point& rMinimumPosition + , css::awt::Point& rMaximumPosition ); static TitleHelper::eTitleType getTitleTypeForCID( const OUString& rCID ); @@ -266,8 +247,8 @@ public: bool isAutoGeneratedObject() const; bool isAdditionalShape() const; OUString getObjectCID() const { return m_aObjectCID;} - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const { return m_xAdditionalShape;} - ::com::sun::star::uno::Any getAny() const; + css::uno::Reference< css::drawing::XShape > getAdditionalShape() const { return m_xAdditionalShape;} + css::uno::Any getAny() const; private: // #i12587# support for shapes in chart @@ -276,7 +257,7 @@ private: // Note, that if m_aObjectCID is set, m_xAdditionalShape must be empty // and vice versa. OUString m_aObjectCID; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape; + css::uno::Reference< css::drawing::XShape > m_xAdditionalShape; }; } //namespace chart diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index 5e82292d2762..565778777f1c 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -46,9 +46,8 @@ namespace PropertyHelper @return The name used for storing this element in the table */ OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable( - const ::com::sun::star::uno::Any & rValue, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xFact, + const css::uno::Any & rValue, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); /** adds a gradient with a unique name to the gradient obtained by the given @@ -57,9 +56,8 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable( @return The name used for storing this element in the table */ OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable( - const ::com::sun::star::uno::Any & rValue, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xFact, + const css::uno::Any & rValue, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); /** adds a transparency gradient with a unique name to the gradient obtained @@ -69,9 +67,8 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable( */ OOO_DLLPUBLIC_CHARTTOOLS OUString addTransparencyGradientUniqueNameToTable( - const ::com::sun::star::uno::Any & rValue, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xFact, + const css::uno::Any & rValue, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); /** adds a hatch with a unique name to the gradient obtained by the given @@ -80,9 +77,8 @@ OUString addTransparencyGradientUniqueNameToTable( @return The name used for storing this element in the table */ OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable( - const ::com::sun::star::uno::Any & rValue, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xFact, + const css::uno::Any & rValue, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); /** adds a bitmap with a unique name to the gradient obtained by the given @@ -91,9 +87,8 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable( @return The name used for storing this element in the table */ OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable( - const ::com::sun::star::uno::Any & rValue, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xFact, + const css::uno::Any & rValue, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); /** Set a property to a certain value in the given map. This works for @@ -103,7 +98,7 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable( */ OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, - const ::com::sun::star::uno::Any & rAny ); + const css::uno::Any & rAny ); /** Set a property to a certain value in the given map. This works for properties that are already set, and those which are not yet in the map. @@ -114,13 +109,13 @@ void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, template< typename Value > void setPropertyValue( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const Value & value ) { - setPropertyValueAny( rOutMap, key, ::com::sun::star::uno::makeAny( value )); + setPropertyValueAny( rOutMap, key, css::uno::makeAny( value )); } template<> - void setPropertyValue< ::com::sun::star::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ); + void setPropertyValue< css::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ); -OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ); +OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ); /** Calls setPropertyValue() but asserts that the given property hasn't been set before. @@ -128,14 +123,14 @@ OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rO template< typename Value > void setPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const Value & value ) { - setPropertyValueDefaultAny( rOutMap, key, ::com::sun::star::uno::makeAny( value )); + setPropertyValueDefaultAny( rOutMap, key, css::uno::makeAny( value )); } /** Calls setPropertyValue() but asserts that the given property hasn't been set before. */ template<> - void setPropertyValueDefault< ::com::sun::star::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ); + void setPropertyValueDefault< css::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ); /** Calls setPropertyValueDefault() with an empty Any as value */ @@ -145,8 +140,8 @@ OOO_DLLPUBLIC_CHARTTOOLS void setEmptyPropertyValueDefault( tPropertyValueMap & struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess { - inline bool operator() ( const ::com::sun::star::beans::Property & first, - const ::com::sun::star::beans::Property & second ) + inline bool operator() ( const css::beans::Property & first, + const css::beans::Property & second ) { return ( first.Name.compareTo( second.Name ) < 0 ); } diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 798484ff47d4..2fe6291ece72 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -38,8 +38,8 @@ namespace chart namespace impl { typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::chart2::data::XRangeHighlighter, - ::com::sun::star::view::XSelectionChangeListener + css::chart2::data::XRangeHighlighter, + css::view::XSelectionChangeListener > RangeHighlighter_Base; } @@ -50,30 +50,29 @@ class RangeHighlighter : { public: explicit RangeHighlighter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::view::XSelectionSupplier > & xSelectionSupplier ); + const css::uno::Reference< css::view::XSelectionSupplier > & xSelectionSupplier ); virtual ~RangeHighlighter(); protected: // ____ XRangeHighlighter ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() + 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; + 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; + const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) + 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; // ____ XEventListener (base of XSelectionChangeListener) ____ 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; // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component @@ -85,18 +84,18 @@ private: void stopListening(); void determineRanges(); - void fillRangesForDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); - void fillRangesForDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries ); - void fillRangesForCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > & xAxis ); - void fillRangesForDataPoint( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xDataSeries, sal_Int32 nIndex ); - void fillRangesForErrorBars( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xErrorBar, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xDataSeries ); + void fillRangesForDiagram( const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + void fillRangesForDataSeries( const css::uno::Reference< css::chart2::XDataSeries > & xSeries ); + void fillRangesForCategories( const css::uno::Reference< css::chart2::XAxis > & xAxis ); + void fillRangesForDataPoint( const css::uno::Reference< css::uno::XInterface > & xDataSeries, sal_Int32 nIndex ); + void fillRangesForErrorBars( const css::uno::Reference< css::beans::XPropertySet > & xErrorBar, + const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries ); - ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier > + css::uno::Reference< css::view::XSelectionSupplier > m_xSelectionSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > + css::uno::Reference< css::view::XSelectionChangeListener > m_xListener; - ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange > + css::uno::Sequence< css::chart2::data::HighlightedRange > m_aSelectedRanges; sal_Int32 m_nAddedListenerCount; bool m_bIncludeHiddenCells; diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 9c15afd3ad69..02dac03b273e 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -47,11 +47,10 @@ public: }; ReferenceSizeProvider( - ::com::sun::star::awt::Size aPageSize, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); + css::awt::Size aPageSize, + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); - ::com::sun::star::awt::Size getPageSize() const { return m_aPageSize;} + css::awt::Size getPageSize() const { return m_aPageSize;} /** Retrieves the state auto-resize from all objects that support this feature. If all objects return the same state, AUTO_RESIZE_YES or @@ -62,8 +61,7 @@ public: with state NO, AUTO_RESIZE_AMBIGUOUS is returned. */ static AutoResizeState getAutoResizeState( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); /** sets or resets the auto-resize at all objects that support this feature for text to the opposite of the current setting. If the current state @@ -77,8 +75,7 @@ public: is </sal_True>. */ SAL_DLLPRIVATE void setValuesAtPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xProp, + const css::uno::Reference< css::beans::XPropertySet > & xProp, bool bAdaptFontSizes = true ); /** Sets the ReferencePageSize according to the internal settings of this @@ -86,8 +83,7 @@ public: XFormattedStrings */ SAL_DLLPRIVATE void setValuesAtTitle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > & xTitle ); + const css::uno::Reference< css::chart2::XTitle > & xTitle ); /** Sets the internal value at all data series in the currently set model. This is useful, if you have changed a chart-type and thus probably added @@ -111,21 +107,17 @@ private: the current property set, or the other way round. */ SAL_DLLPRIVATE static void getAutoResizeFromPropSet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xProp, + const css::uno::Reference< css::beans::XPropertySet > & xProp, AutoResizeState & rInOutState ); SAL_DLLPRIVATE void impl_setValuesAtTitled( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitled > & xTitled ); + const css::uno::Reference< css::chart2::XTitled > & xTitled ); SAL_DLLPRIVATE static void impl_getAutoResizeFromTitled( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitled > & xTitled, + const css::uno::Reference< css::chart2::XTitled > & xTitled, AutoResizeState & rInOutState ); - ::com::sun::star::awt::Size m_aPageSize; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > m_xChartDoc; + css::awt::Size m_aPageSize; + css::uno::Reference< css::chart2::XChartDocument > m_xChartDoc; bool m_bUseAutoScale; }; diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx index 8c886877f6c5..87dd524d3f17 100644 --- a/chart2/source/inc/RegressionCalculationHelper.hxx +++ b/chart2/source/inc/RegressionCalculationHelper.hxx @@ -42,8 +42,8 @@ typedef ::std::pair< ::std::vector< double >, ::std::vector< double > > tDoubleV */ template< class Pred > tDoubleVectorPair - cleanup( const ::com::sun::star::uno::Sequence< double > & rXValues, - const ::com::sun::star::uno::Sequence< double > & rYValues, + cleanup( const css::uno::Sequence< double > & rXValues, + const css::uno::Sequence< double > & rYValues, Pred aPred ) { tDoubleVectorPair aResult; diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 7a58ffbb43e8..afd0164e15fc 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -28,25 +28,25 @@ namespace chart { class RegressionCurveCalculator : public - cppu::WeakImplHelper< com::sun::star::chart2::XRegressionCurveCalculator > + cppu::WeakImplHelper< css::chart2::XRegressionCurveCalculator > { public: RegressionCurveCalculator(); virtual ~RegressionCurveCalculator(); static bool isLinearScaling( - const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScaling ); + const css::uno::Reference< css::chart2::XScaling >& xScaling ); static bool isLogarithmicScaling( - const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScaling ); + const css::uno::Reference< css::chart2::XScaling >& xScaling ); protected: virtual OUString ImplGetRepresentation( - const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter, + const css::uno::Reference< css::util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey ) const = 0; static OUString getFormattedString( - const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter, + const css::uno::Reference< css::util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey, double fNumber ); @@ -63,37 +63,37 @@ protected: sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL recalculateRegression( - const com::sun::star::uno::Sequence< double >& aXValues, - const com::sun::star::uno::Sequence< double >& aYValues ) - throw (com::sun::star::uno::RuntimeException, std::exception) override = 0; + const css::uno::Sequence< double >& aXValues, + const css::uno::Sequence< double >& aYValues ) + throw (css::uno::RuntimeException, std::exception) override = 0; virtual double SAL_CALL getCurveValue( double x ) - throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) override = 0; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override = 0; - virtual com::sun::star::uno::Sequence< com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues( + virtual css::uno::Sequence< css::geometry::RealPoint2D > SAL_CALL getCurveValues( double min, double max, sal_Int32 nPointCount, - const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScalingX, - const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScalingY, + const css::uno::Reference< css::chart2::XScaling >& xScalingX, + const css::uno::Reference< css::chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual double SAL_CALL getCorrelationCoefficient() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRepresentation() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormattedRepresentation( - const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier, + const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumFmtSupplier, sal_Int32 nNumberFormatKey ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 45408c37b676..a00738ad30a9 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -73,7 +73,7 @@ namespace RegressionCurveHelper /** Returns the first regression curve found that is not of type mean-value line */ - OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<com::sun::star::chart2::XRegressionCurve> + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurve> getFirstCurveNotMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer ); diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 4416abc2c114..f97e5eb49d4b 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -41,33 +41,33 @@ public: ( e.g. if aAnchor equals BOTTOM_LEFT, aPoint describes the coordinates of the bottom left corner of an object with size aObjectSize ) */ - static ::com::sun::star::awt::Point + static css::awt::Point getUpperLeftCornerOfAnchoredObject( - ::com::sun::star::awt::Point aPoint, - ::com::sun::star::awt::Size aObjectSize, - ::com::sun::star::drawing::Alignment aAnchor ); + css::awt::Point aPoint, + css::awt::Size aObjectSize, + css::drawing::Alignment aAnchor ); /** returns the center of an object that has size aObjectSize and where the point indicated by aAnchor has coordinates indicated by aPoint ( e.g. if aAnchor equals BOTTOM_LEFT, aPoint describes the coordinates of the bottom left corner of an object with size aObjectSize ) */ - static ::com::sun::star::awt::Point + static css::awt::Point getCenterOfAnchoredObject( - ::com::sun::star::awt::Point aPoint, - ::com::sun::star::awt::Size aUnrotatedObjectSize, - ::com::sun::star::drawing::Alignment aAnchor, + css::awt::Point aPoint, + css::awt::Size aUnrotatedObjectSize, + css::drawing::Alignment aAnchor, double fAnglePi ); /** Returns a relative position that is the same point after the anchor has been changed to the given one. The passed object size is taken into account for shifting the position. */ - SAL_DLLPRIVATE static ::com::sun::star::chart2::RelativePosition + SAL_DLLPRIVATE static css::chart2::RelativePosition getReanchoredPosition( - const ::com::sun::star::chart2::RelativePosition & rPosition, - const ::com::sun::star::chart2::RelativeSize & rObjectSize, - ::com::sun::star::drawing::Alignment aNewAnchor ); + const css::chart2::RelativePosition & rPosition, + const css::chart2::RelativeSize & rObjectSize, + css::drawing::Alignment aNewAnchor ); /** grows a relative size about the given amount and shifts the given position such that the resize is relative to the former rectangle's @@ -82,8 +82,8 @@ public: not change at all.</p> */ static bool centerGrow( - ::com::sun::star::chart2::RelativePosition & rInOutPosition, - ::com::sun::star::chart2::RelativeSize & rInOutSize, + css::chart2::RelativePosition & rInOutPosition, + css::chart2::RelativeSize & rInOutSize, double fAmountX, double fAmountY ); /** shifts a relative position about the given amount @@ -96,8 +96,8 @@ public: @return </sal_True>, if changes were applied. */ static bool moveObject( - ::com::sun::star::chart2::RelativePosition & rInOutPosition, - const ::com::sun::star::chart2::RelativeSize & rObjectSize, + css::chart2::RelativePosition & rInOutPosition, + const css::chart2::RelativeSize & rObjectSize, double fAmountX, double fAmountY ); }; diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index dfc2df420c10..0bb50bcac168 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -31,14 +31,14 @@ class OOO_DLLPUBLIC_CHARTTOOLS RelativeSizeHelper public: static double calculate( double fValue, - const ::com::sun::star::awt::Size & rOldReferenceSize, - const ::com::sun::star::awt::Size & rNewReferenceSize ); + const css::awt::Size & rOldReferenceSize, + const css::awt::Size & rNewReferenceSize ); static void adaptFontSizes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xTargetProperties, - const ::com::sun::star::awt::Size & rOldReferenceSize, - const ::com::sun::star::awt::Size & rNewReferenceSize ); + const css::uno::Reference< + css::beans::XPropertySet > & xTargetProperties, + const css::awt::Size & rOldReferenceSize, + const css::awt::Size & rNewReferenceSize ); private: RelativeSizeHelper() = delete; diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 17ebec6c14f2..690ac3f6e103 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -33,9 +33,9 @@ namespace chart class LogarithmicScaling : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XScaling, - ::com::sun::star::lang::XServiceName, - ::com::sun::star::lang::XServiceInfo + css::chart2::XScaling, + css::lang::XServiceName, + css::lang::XServiceInfo > { public: @@ -57,15 +57,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::chart2::XScaling > SAL_CALL + getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: const double m_fBase; @@ -74,9 +74,9 @@ private: class ExponentialScaling : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XScaling, - ::com::sun::star::lang::XServiceName, - ::com::sun::star::lang::XServiceInfo + css::chart2::XScaling, + css::lang::XServiceName, + css::lang::XServiceInfo > { public: @@ -97,26 +97,25 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ - virtual double SAL_CALL + virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL + getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: const double m_fBase; }; class LinearScaling : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XScaling, - ::com::sun::star::lang::XServiceName, - ::com::sun::star::lang::XServiceInfo + css::chart2::XScaling, + css::lang::XServiceName, + css::lang::XServiceInfo > { public: @@ -139,15 +138,14 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL + getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: const double m_fSlope; @@ -155,9 +153,9 @@ private: }; class PowerScaling : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XScaling, - ::com::sun::star::lang::XServiceName, - ::com::sun::star::lang::XServiceInfo + css::chart2::XScaling, + css::lang::XServiceName, + css::lang::XServiceInfo > { public: @@ -180,15 +178,14 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL + getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: const double m_fExponent; diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index 982cc06ad521..e1176720364a 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -72,7 +72,7 @@ namespace SceneProperties }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + ::std::vector< css::beans::Property > & rOutProperties ); OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); } diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 7d9aeaf7f1f9..675f478f9b02 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -35,78 +35,63 @@ namespace StatisticsHelper @see http://mathworld.wolfram.com/Variance.html */ - OOO_DLLPUBLIC_CHARTTOOLS double getVariance( const ::com::sun::star::uno::Sequence< double > & rData ); + OOO_DLLPUBLIC_CHARTTOOLS double getVariance( const css::uno::Sequence< double > & rData ); // square root of the variance - OOO_DLLPUBLIC_CHARTTOOLS double getStandardDeviation( const ::com::sun::star::uno::Sequence< double > & rData ); + OOO_DLLPUBLIC_CHARTTOOLS double getStandardDeviation( const css::uno::Sequence< double > & rData ); // also called "Standard deviation of the mean (SDOM)" - OOO_DLLPUBLIC_CHARTTOOLS double getStandardError( const ::com::sun::star::uno::Sequence< double > & rData ); + OOO_DLLPUBLIC_CHARTTOOLS double getStandardError( const css::uno::Sequence< double > & rData ); - OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XLabeledDataSequence > getErrorLabeledDataSequenceFromDataSource( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > & xDataSource, + const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource, bool bPositiveValue, bool bYError = true ); - OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XDataSequence > getErrorDataSequenceFromDataSource( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > & xDataSource, + const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource, bool bPositiveValue, bool bYError = true ); OOO_DLLPUBLIC_CHARTTOOLS double getErrorFromDataSource( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > & xDataSource, + const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource, sal_Int32 nIndex, bool bPositiveValue, bool bYError = true ); OOO_DLLPUBLIC_CHARTTOOLS void setErrorDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > & xDataSource, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataProvider > & xDataProvider, + const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource, + const css::uno::Reference< css::chart2::data::XDataProvider > & xDataProvider, const OUString & rNewRange, bool bPositiveValue, bool bYError = true, OUString * pXMLRange = nullptr ); /// @return the newly created or existing error bar object - OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::beans::XPropertySet > addErrorBars( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xDataSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries, + const css::uno::Reference< css::uno::XComponentContext > & xContext, sal_Int32 nStyle, bool bYError = true ); - OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::beans::XPropertySet > getErrorBars( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xDataSeries, + const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries, bool bYError = true ); OOO_DLLPUBLIC_CHARTTOOLS bool hasErrorBars( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xDataSeries, + const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries, bool bYError = true ); OOO_DLLPUBLIC_CHARTTOOLS void removeErrorBars( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xDataSeries, + const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries, bool bYError = true ); OOO_DLLPUBLIC_CHARTTOOLS bool usesErrorBarRanges( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > & xDataSeries, + const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries, bool bYError = true ); } diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index 024466cc2083..90ac23a3acfc 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -58,28 +58,23 @@ public: @todo deprecate the hard set camera geometry and use the property default */ - static ::com::sun::star::drawing::CameraGeometry getDefaultCameraGeometry( bool bPie=false ); + static css::drawing::CameraGeometry getDefaultCameraGeometry( bool bPie=false ); static void getRotationAngleFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties + const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties , double& rfXAngleRad, double& rfYAngleRad, double& rfZAngleRad ); static void setRotationAngleToDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties + const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties , double fXAngleRad, double fYAngleRad, double fZAngleRad ); static void getRotationFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties + const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties , sal_Int32& rnHorizontalAngleDegree, sal_Int32& rnVerticalAngleDegree ); static void setRotationToDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties + const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties , sal_Int32 nHorizontalAngleDegree, sal_Int32 nVerticalYAngleDegree ); - static void switchRightAngledAxes( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties + static void switchRightAngledAxes( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties , bool bRightAngledAxes ); static void adaptRadAnglesForRightAngledAxes( double& rfXAngleRad, double& rfYAngleRad ); @@ -97,11 +92,9 @@ public: , double fXRad, double fYRad, double fZRad ); static double getCameraDistance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties ); + const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties ); static void setCameraDistance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties + const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties , double fCameraDistance ); SAL_DLLPRIVATE static void ensureCameraDistanceRange( double& rfCameraDistance ); SAL_DLLPRIVATE static void getCameraDistanceRange( double& rfMinimumDistance, double& rfMaximumDistance ); @@ -109,37 +102,29 @@ public: static double CameraDistanceToPerspective( double fCameraDistance ); static double PerspectiveToCameraDistance( double fPerspective ); - static void set3DSettingsToDefault( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties ); - static void setDefaultRotation( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties ); - static void setDefaultIllumination( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties ); - - static void setDefaultRotation( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties, bool bPieOrDonut ); - - static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardLeftWall( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties ); - static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBackWall(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties ); - static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBottom(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSceneProperties ); - - static ThreeDLookScheme detectScheme( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ); - static void setScheme( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram + static void set3DSettingsToDefault( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties ); + static void setDefaultRotation( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties ); + static void setDefaultIllumination( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties ); + + static void setDefaultRotation( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties, bool bPieOrDonut ); + + static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardLeftWall( const css::uno::Reference< + css::beans::XPropertySet >& xSceneProperties ); + static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBackWall(const css::uno::Reference< + css::beans::XPropertySet >& xSceneProperties ); + static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBottom(const css::uno::Reference< + css::beans::XPropertySet >& xSceneProperties ); + + static ThreeDLookScheme detectScheme( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); + static void setScheme( const css::uno::Reference< css::chart2::XDiagram >& xDiagram , ThreeDLookScheme aScheme ); //sal_Int32 nRoundedEdges: <0 or >100 -> mixed state //sal_Int32 nObjectLines: 0->no lines; 1->all lines on; other->mixed state - static void getRoundedEdgesAndObjectLines( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram + static void getRoundedEdgesAndObjectLines( const css::uno::Reference< css::chart2::XDiagram >& xDiagram , sal_Int32& rnRoundedEdges, sal_Int32& rnObjectLines ); - static void setRoundedEdgesAndObjectLines( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram + static void setRoundedEdgesAndObjectLines( const css::uno::Reference< css::chart2::XDiagram >& xDiagram , sal_Int32 nRoundedEdges, sal_Int32 nObjectLines ); }; diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index b2436733173f..523575244ba8 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -51,50 +51,38 @@ public: TITLE_AT_STANDARD_Y_AXIS_POSITION //equals the X_AXIS_TITLE for barchart }; - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > + static css::uno::Reference< css::chart2::XTitle > getTitle( eTitleType nTitleIndex , ChartModel& rModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > + static css::uno::Reference< css::chart2::XTitle > getTitle( eTitleType nTitleIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ); + , const css::uno::Reference< css::frame::XModel >& xModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > + static css::uno::Reference< + css::chart2::XTitle > createTitle( eTitleType nTitleIndex , const OUString& rTitleText - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext + , const css::uno::Reference< css::frame::XModel >& xModel + , const css::uno::Reference< css::uno::XComponentContext > & xContext , ReferenceSizeProvider * pRefSizeProvider = nullptr ); static void removeTitle( eTitleType nTitleIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ); + , const css::uno::Reference< css::frame::XModel >& xModel ); - static OUString getCompleteString( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle >& xTitle ); + static OUString getCompleteString( const css::uno::Reference< css::chart2::XTitle >& xTitle ); static void setCompleteString( const OUString& rNewText - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle >& xTitle - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext + , const css::uno::Reference< css::chart2::XTitle >& xTitle + , const css::uno::Reference< css::uno::XComponentContext > & xContext , float * pDefaultCharHeight = nullptr ); static bool getTitleType( eTitleType& rType - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle >& xTitle + , const css::uno::Reference< css::chart2::XTitle >& xTitle , ChartModel& rModel); static bool getTitleType( eTitleType& rType - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle >& xTitle - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ); + , const css::uno::Reference< css::chart2::XTitle >& xTitle + , const css::uno::Reference< css::frame::XModel >& xModel ); }; } //namespace chart diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index f7c649daf418..607a2696725d 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -49,14 +49,14 @@ namespace chart namespace impl { typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::chart2::data::XDataSequence, - ::com::sun::star::chart2::data::XNumericalDataSequence, - ::com::sun::star::chart2::data::XTextualDataSequence, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifiable, // contains util::XModifyBroadcaster - ::com::sun::star::container::XIndexReplace, - ::com::sun::star::container::XNamed, // for setting a new range representation - ::com::sun::star::lang::XServiceInfo > + css::chart2::data::XDataSequence, + css::chart2::data::XNumericalDataSequence, + css::chart2::data::XTextualDataSequence, + css::util::XCloneable, + css::util::XModifiable, // contains util::XModifyBroadcaster + css::container::XIndexReplace, + css::container::XNamed, // for setting a new range representation + css::lang::XServiceInfo > UncachedDataSequence_Base; } @@ -81,12 +81,10 @@ public: lifetime is at least as long as the one of this object. */ UncachedDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv, + const css::uno::Reference< css::chart2::XInternalDataProvider > & xIntDataProv, const OUString & rRangeRepresentation ); UncachedDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv, + const css::uno::Reference< css::chart2::XInternalDataProvider > & xIntDataProv, const OUString & rRangeRepresentation, const OUString & rRole ); UncachedDataSequence( const UncachedDataSequence & rSource ); @@ -110,79 +108,79 @@ public: protected: // ____ XPropertySet ____ - /// @see ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + /// @see css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) override; /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; /// @see ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // ____ XDataSequence ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( - ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( + css::chart2::data::LabelOrigin nLabelOrigin ) + throw (css::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // ____ XNumericalDataSequence ____ - /// @see ::com::sun::star::chart::data::XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + /// @see css::chart::data::XNumericalDataSequence + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override; // ____ XTextualDataSequence ____ - /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + /// @see css::chart::data::XTextualDataSequence + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override; // ____ XIndexReplace ____ - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, + css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // ____ XIndexAccess (base of XIndexReplace) ____ virtual ::sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) + throw (css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // ____ XElementAccess (base of XIndexAccess) ____ - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XNamed (for setting a new range representation) ____ virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifiable ____ virtual sal_Bool SAL_CALL isModified() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster (base of XModifiable) ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; void fireModifyEvent(); @@ -198,10 +196,9 @@ protected: void registerProperties(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XInternalDataProvider > m_xDataProvider; + css::uno::Reference< css::chart2::XInternalDataProvider > m_xDataProvider; OUString m_aSourceRepresentation; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index c8ef988b55f8..cb671de2be9c 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -47,7 +47,7 @@ namespace UserDefinedProperties }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + ::std::vector< css::beans::Property > & rOutProperties ); } } // namespace chart diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 4dd09ff8bfcd..4ff2e3e4922c 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -46,10 +46,10 @@ template< class Listener > ::cppu::WeakImplHelper< Listener > { public: - explicit WeakListenerAdapter( const ::com::sun::star::uno::Reference< Listener > & xListener ) : + explicit WeakListenerAdapter( const css::uno::Reference< Listener > & xListener ) : m_xListener( xListener ) {} - explicit WeakListenerAdapter( const ::com::sun::star::uno::WeakReference< Listener > & xListener ) : + explicit WeakListenerAdapter( const css::uno::WeakReference< Listener > & xListener ) : m_xListener( xListener ) {} virtual ~WeakListenerAdapter() @@ -58,54 +58,51 @@ public: protected: // ____ XEventListener (base of all listeners) ____ virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException) SAL_OVERRIDE { - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > xEventListener = - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >( - ::com::sun::star::uno::Reference< Listener >( m_xListener), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XEventListener > xEventListener( + css::uno::Reference< Listener >( m_xListener), css::uno::UNO_QUERY ); if( xEventListener.is()) xEventListener->disposing( Source ); } - ::com::sun::star::uno::Reference< Listener > getListener() const + css::uno::Reference< Listener > getListener() const { return m_xListener; } private: - ::com::sun::star::uno::WeakReference< Listener > m_xListener; + css::uno::WeakReference< Listener > m_xListener; }; class WeakModifyListenerAdapter : - public WeakListenerAdapter< ::com::sun::star::util::XModifyListener > + public WeakListenerAdapter< css::util::XModifyListener > { public: explicit WeakModifyListenerAdapter( - const ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > & xListener ); + const css::uno::WeakReference< css::util::XModifyListener > & xListener ); virtual ~WeakModifyListenerAdapter(); protected: // ____ XModifyListener ____ - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; }; class WeakSelectionChangeListenerAdapter : - public WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener > + public WeakListenerAdapter< css::view::XSelectionChangeListener > { public: explicit WeakSelectionChangeListenerAdapter( - const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener ); + const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ); virtual ~WeakSelectionChangeListenerAdapter(); protected: // ____ 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; }; } // namespace chart diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index 61d9ce192a79..b9c26cbd7f84 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -30,26 +30,26 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDefaultProperty : public WrappedProperty public: explicit WrappedDefaultProperty( const OUString& rOuterName, const OUString& rInnerName, - const ::com::sun::star::uno::Any& rNewOuterDefault ); + const css::uno::Any& rNewOuterDefault ); virtual ~WrappedDefaultProperty(); 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 ::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 ::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; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, + css::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 css::beans::PropertyState getPropertyState( + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException) override; private: - ::com::sun::star::uno::Any m_aOuterDefaultValue; + css::uno::Any m_aOuterDefaultValue; }; } // namespace chart diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index 6b970195350f..6402afd57b7b 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -33,10 +33,10 @@ public: const OUString& rOuterName, const OUString& rInnerName ); virtual ~WrappedDirectStateProperty(); - 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; }; } // namespace chart diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index c530b01557d2..ca6fe26ef6d5 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -30,27 +30,27 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty { public: - WrappedIgnoreProperty( const OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue ); + WrappedIgnoreProperty( const OUString& rOuterName, const css::uno::Any& rDefaultValue ); virtual ~WrappedIgnoreProperty(); - 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; -SAL_DLLPRIVATE 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; +SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; -SAL_DLLPRIVATE 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; +SAL_DLLPRIVATE 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; -SAL_DLLPRIVATE 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; +SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; protected: - ::com::sun::star::uno::Any m_aDefaultValue; - mutable ::com::sun::star::uno::Any m_aCurrentValue; + css::uno::Any m_aDefaultValue; + mutable css::uno::Any m_aCurrentValue; }; class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperties diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index d5f0bea15eef..062d79566e34 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -40,24 +40,24 @@ public: const OUString& getOuterName() const { return m_aOuterName;} virtual OUString getInnerName() const; - 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); + 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); - 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); + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - 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); + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - 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); + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - 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); + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); protected: - virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const; - virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const; + virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const; + virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const; protected: OUString m_aOuterName; diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index c57840b014e6..1815dcf8bb0c 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -39,13 +39,10 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet : public MutexContainer , public ::cppu::WeakImplHelper - < ::com::sun::star::beans::XPropertySet - , ::com::sun::star::beans::XMultiPropertySet - , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::beans::XMultiPropertyStates - // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper - // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + < css::beans::XPropertySet + , css::beans::XMultiPropertySet + , css::beans::XPropertyState + , css::beans::XMultiPropertyStates > { public: @@ -56,40 +53,40 @@ public: public: //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; protected: //methods /** give all the properties that should be visible to the outer side */ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence()=0; + virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence()=0; /** give a list of all properties that need a special treatment; properties that are not in this list will be wrapped identical. The base class 'WrappedPropertySet' will take ownership on the contained pointer. @@ -97,10 +94,8 @@ protected: //methods */ virtual const std::vector< WrappedProperty* > createWrappedProperties()=0; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > getInnerPropertySet() = 0; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyState > getInnerPropertyState(); + virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() = 0; + SAL_DLLPRIVATE css::uno::Reference< css::beans::XPropertyState > getInnerPropertyState(); ::cppu::IPropertyArrayHelper& getInfoHelper(); SAL_DLLPRIVATE tWrappedPropertyMap& getWrappedPropertyMap(); @@ -109,8 +104,7 @@ protected: //methods const WrappedProperty* getWrappedProperty( sal_Int32 nHandle ); protected: //member - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > m_xInfo;//outer PropertySetInfo + css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;//outer PropertySetInfo ::cppu::OPropertyArrayHelper* m_pPropertyArrayHelper;//holds all possible outer properties diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index 05b9d2a1ff49..33127431092e 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -34,12 +34,10 @@ namespace chart class OOO_DLLPUBLIC_CHARTVIEW DataPointSymbolSupplier { public: - static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > - create2DSymbolList( ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > xShapeFactory - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Direction3D& rSize ); + static css::uno::Reference< css::drawing::XShapes > + create2DSymbolList( css::uno::Reference< css::lang::XMultiServiceFactory > xShapeFactory + , const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Direction3D& rSize ); }; } //namespace chart diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 2f43bd5938ff..71dafdd54fc0 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -36,8 +36,8 @@ class OOO_DLLPUBLIC_CHARTVIEW DrawModelWrapper : private SdrModel private: SfxItemPool* m_pChartItemPool; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > m_xMainDrawPage; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > m_xHiddenDrawPage; + css::uno::Reference< css::drawing::XDrawPage > m_xMainDrawPage; + css::uno::Reference< css::drawing::XDrawPage > m_xHiddenDrawPage; VclPtr<OutputDevice> m_pRefDevice; @@ -46,21 +46,20 @@ private: public: SAL_DLLPRIVATE DrawModelWrapper( - const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext ); + const css::uno::Reference<css::uno::XComponentContext>& xContext ); SAL_DLLPRIVATE virtual ~DrawModelWrapper(); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getShapeFactory(); + css::uno::Reference< css::lang::XMultiServiceFactory > getShapeFactory(); // the main page will contain the normal view objects - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getMainDrawPage(); + css::uno::Reference< css::drawing::XDrawPage > getMainDrawPage(); SAL_DLLPRIVATE void clearMainDrawPage(); // the extra page is not visible, but contains some extras like the symbols for data points - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getHiddenDrawPage(); + css::uno::Reference< css::drawing::XDrawPage > getHiddenDrawPage(); - static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > - getChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ); + static css::uno::Reference< css::drawing::XShapes > + getChartRootShape( const css::uno::Reference< css::drawing::XDrawPage>& xPage ); SAL_DLLPRIVATE void lockControllers(); SAL_DLLPRIVATE void unlockControllers(); @@ -69,9 +68,9 @@ public: SfxItemPool& GetItemPool(); - SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + SAL_DLLPRIVATE virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel > getUnoModel(); SdrModel& getSdrModel(); @@ -85,8 +84,7 @@ public: SdrObject* getNamedSdrObject( const OUString& rName ); static SdrObject* getNamedSdrObject( const OUString& rName, SdrObjList* pObjList ); - static bool removeShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + static bool removeShape( const css::uno::Reference< css::drawing::XShape >& xShape ); }; } //namespace chart #endif diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx index 4eea76d68c5a..9cf0e28dfd3d 100644 --- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx +++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx @@ -31,7 +31,7 @@ namespace chart { /** This structure contains the explicit values for a scale like Minimum and Maximum. - See also ::com::sun::star::chart2::ScaleData. + See also css::chart2::ScaleData. */ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData { @@ -41,13 +41,13 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData double Maximum; double Origin; - ::com::sun::star::chart2::AxisOrientation Orientation; + css::chart2::AxisOrientation Orientation; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > Scaling; + css::uno::Reference< css::chart2::XScaling > Scaling; - sal_Int32 AxisType;//see ::com::sun::star::chart2::AxisType + sal_Int32 AxisType;//see css::chart2::AxisType bool ShiftedCategoryPosition; - sal_Int32 TimeResolution; //constant of type <type>::com::sun::star::chart::TimeUnit</type> + sal_Int32 TimeResolution; //constant of type <type>css::chart::TimeUnit</type> Date NullDate; }; @@ -77,8 +77,8 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData /** the following two members are only for date-time axis */ - ::com::sun::star::chart::TimeInterval MajorTimeInterval; - ::com::sun::star::chart::TimeInterval MinorTimeInterval; + css::chart::TimeInterval MajorTimeInterval; + css::chart::TimeInterval MinorTimeInterval; /** the other members are for *not* date-time axis */ diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index 897f639d53a9..db1f4671dbfc 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -49,54 +49,52 @@ public: If the given Axis could not be found or for another reason no correct output can be given false is returned. */ virtual bool getExplicitValuesForAxis( - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > xAxis + css::uno::Reference< css::chart2::XAxis > xAxis , ExplicitScaleData& rExplicitScale , ExplicitIncrementData& rExplicitIncrement )=0; /** for rotated objects the shape size and position differs from the visible rectangle if bSnapRect is set to true you get the resulting visible position (left-top) and size */ - virtual ::com::sun::star::awt::Rectangle + virtual css::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false )=0; - virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes()=0; + virtual css::awt::Rectangle getDiagramRectangleExcludingAxes()=0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > getShapeForCID( const OUString& rObjectCID )=0; virtual std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); - static ExplicitValueProvider* getExplicitValueProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChartView ); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static ExplicitValueProvider* getExplicitValueProvider( const css::uno::Reference< css::uno::XInterface >& xChartView ); - static ::com::sun::star::awt::Rectangle + static css::awt::Rectangle addAxisTitleSizes( ChartModel& rModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xChartView - , const ::com::sun::star::awt::Rectangle& rExcludingPositionAndSize ); + , const css::uno::Reference< css::uno::XInterface >& xChartView + , const css::awt::Rectangle& rExcludingPositionAndSize ); - static ::com::sun::star::awt::Rectangle + static css::awt::Rectangle substractAxisTitleSizes( ChartModel& rModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xChartView - , const ::com::sun::star::awt::Rectangle& rPositionAndSizeIncludingTitles ); + , const css::uno::Reference< css::uno::XInterface >& xChartView + , const css::awt::Rectangle& rPositionAndSizeIncludingTitles ); static sal_Int32 getExplicitNumberFormatKeyForAxis( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument>& xChartDoc); + const css::uno::Reference< css::chart2::XAxis >& xAxis + , const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem + , const css::uno::Reference< css::chart2::XChartDocument>& xChartDoc); static sal_Int32 getExplicitNumberFormatKeyForDataLabel( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesOrPointProp - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries + const css::uno::Reference< css::beans::XPropertySet >& xSeriesOrPointProp + , const css::uno::Reference< css::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex /*-1 for whole series*/ - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); + , const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static sal_Int32 getExplicitPercentageNumberFormatKeyForDataLabel( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesOrPointProp - , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); + const css::uno::Reference< css::beans::XPropertySet >& xSeriesOrPointProp + , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); protected: ~ExplicitValueProvider() {} diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index ed133f433afa..db3a0d970b0c 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -338,24 +338,14 @@ sal_Int32 XMLFilter::impl_Import( comphelper::PropertyMapEntry const aImportInfoMap[] = { // necessary properties for XML progress bar at load time - { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("PrivateData"), 0, - cppu::UnoType<XInterface>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BaseURI"), 0, - ::cppu::UnoType<OUString>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, - ::cppu::UnoType<OUString>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, - ::cppu::UnoType<OUString>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BuildId"), 0, - ::cppu::UnoType<OUString>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("ProgressRange"), 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("PrivateData"), 0, cppu::UnoType<XInterface>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("BaseURI"), 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamRelPath"), 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamName"), 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("BuildId"), 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; uno::Reference< beans::XPropertySet > xImportInfo( diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index 91b4f22f192b..f71c4e4b2c26 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -39,12 +39,12 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper - < ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::chart2::XCoordinateSystem, - ::com::sun::star::chart2::XChartTypeContainer, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + < css::lang::XServiceInfo, + css::chart2::XCoordinateSystem, + css::chart2::XChartTypeContainer, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > BaseCoordinateSystem_Base; } @@ -55,23 +55,22 @@ class BaseCoordinateSystem : { public: BaseCoordinateSystem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + const css::uno::Reference< css::uno::XComponentContext > & xContext, sal_Int32 nDimensionCount = 2, bool bSwapXAndYAxis = false ); explicit BaseCoordinateSystem( const BaseCoordinateSystem & rSource ); virtual ~BaseCoordinateSystem(); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -81,54 +80,54 @@ public: protected: // ____ XCoordinateSystem ____ virtual ::sal_Int32 SAL_CALL getDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setAxisByDimension( ::sal_Int32 nDimension, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis, + const css::uno::Reference< css::chart2::XAxis >& xAxis, ::sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > SAL_CALL getAxisByDimension( + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XAxis > SAL_CALL getAxisByDimension( ::sal_Int32 nDimension, ::sal_Int32 nIndex ) - 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_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // ____ XChartTypeContainer ____ virtual void SAL_CALL addChartType( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& aChartType ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XChartType >& aChartType ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeChartType( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& aChartType ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > SAL_CALL getChartTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XChartType >& aChartType ) + throw (css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setChartTypes( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aChartTypes ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -137,20 +136,16 @@ protected: void fireModifyEvent(); protected: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; private: sal_Int32 m_nDimensionCount; - typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis > > > tAxisVecVecType; + typedef ::std::vector< ::std::vector< css::uno::Reference< css::chart2::XAxis > > > tAxisVecVecType; tAxisVecVecType m_aAllAxis; //outer sequence is the dimension; inner sequence is the axis index that indicates main or secondary axis - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any > m_aOrigin; - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > m_aChartTypes; + css::uno::Sequence< css::uno::Any > m_aOrigin; + ::std::vector< css::uno::Reference< css::chart2::XChartType > > m_aChartTypes; }; } // namespace chart diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index d656e6071f20..9466a9a9e179 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -28,8 +28,7 @@ class CartesianCoordinateSystem : public BaseCoordinateSystem { public: explicit CartesianCoordinateSystem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + const css::uno::Reference< css::uno::XComponentContext > & xContext, sal_Int32 nDimensionCount = 2, bool bSwapXAndYAxis = false ); explicit CartesianCoordinateSystem( const CartesianCoordinateSystem & rSource ); @@ -37,14 +36,13 @@ public: // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getViewServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() @@ -62,8 +60,7 @@ class CartesianCoordinateSystem2d : public CartesianCoordinateSystem { public: explicit CartesianCoordinateSystem2d( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~CartesianCoordinateSystem2d(); // ____ XServiceInfo ____ @@ -82,8 +79,8 @@ class CartesianCoordinateSystem3d : public CartesianCoordinateSystem { public: explicit CartesianCoordinateSystem3d( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< + css::uno::XComponentContext > & xContext ); virtual ~CartesianCoordinateSystem3d(); // ____ XServiceInfo ____ diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index e90acf112333..807ce952d3c5 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -35,53 +35,48 @@ namespace chart class ChartTypeManager : public ::cppu::WeakImplHelper< css::lang::XServiceInfo, - ::com::sun::star::lang::XMultiServiceFactory, - ::com::sun::star::chart2::XChartTypeManager > + css::lang::XMultiServiceFactory, + css::chart2::XChartTypeManager > { public: explicit ChartTypeManager( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~ChartTypeManager(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: // ____ 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; // ____ XChartTypeManager ____ // currently empty private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 8a95998a8ab5..81859e6186ab 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -50,14 +50,14 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XDataSeries, - ::com::sun::star::chart2::data::XDataSink, - ::com::sun::star::chart2::data::XDataSource, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::chart2::XRegressionCurveContainer, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::chart2::XDataSeries, + css::chart2::data::XDataSink, + css::chart2::data::XDataSource, + css::lang::XServiceInfo, + css::chart2::XRegressionCurveContainer, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > DataSeries_Base; } @@ -67,9 +67,7 @@ class DataSeries : public ::property::OPropertySet { public: - explicit DataSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit DataSeries( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~DataSeries(); /// XServiceInfo declarations @@ -95,90 +93,84 @@ protected: void Init( const DataSeries & rOther ); // ____ XDataSeries ____ - /// @see ::com::sun::star::chart2::XDataSeries - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + /// @see css::chart2::XDataSeries + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) - 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 void SAL_CALL resetDataPoint( sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL resetAllDataPoints() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XDataSink ____ - /// @see ::com::sun::star::chart2::data::XDataSink - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + /// @see css::chart2::data::XDataSink + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XDataSource ____ - /// @see ::com::sun::star::chart2::data::XDataSource - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + /// @see css::chart2::data::XDataSource + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() + throw (css::uno::RuntimeException, std::exception) override; // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - /// @see ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + /// @see css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; // ____ XRegressionCurveContainer ____ - /// @see ::com::sun::star::chart2::XRegressionCurveContainer + /// @see css::chart2::XRegressionCurveContainer virtual void SAL_CALL addRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurve >& aRegressionCurve ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurve >& aRegressionCurve ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) + throw (css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setRegressionCurves( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurve > >& aRegressionCurves ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > >& aRegressionCurves ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -187,25 +179,20 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > - m_xContext; - typedef ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > > tDataSequenceContainer; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + typedef ::std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer; tDataSequenceContainer m_aDataSequences; typedef ::std::map< sal_Int32, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > > tDataPointAttributeContainer; + css::uno::Reference< css::beans::XPropertySet > > tDataPointAttributeContainer; tDataPointAttributeContainer m_aAttributedDataPoints; typedef - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurve > > + ::std::vector< css::uno::Reference< css::chart2::XRegressionCurve > > tRegressionCurveContainerType; tRegressionCurveContainerType m_aRegressionCurves; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 96d839d436e1..6e86d36464d5 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -44,14 +44,14 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XDiagram, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::chart2::XCoordinateSystemContainer, - ::com::sun::star::chart2::XTitled, - ::com::sun::star::chart::X3DDefaultSetter, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener, - ::com::sun::star::util::XCloneable > + css::chart2::XDiagram, + css::lang::XServiceInfo, + css::chart2::XCoordinateSystemContainer, + css::chart2::XTitled, + css::chart::X3DDefaultSetter, + css::util::XModifyBroadcaster, + css::util::XModifyListener, + css::util::XCloneable > Diagram_Base; } @@ -61,8 +61,7 @@ class Diagram : public ::property::OPropertySet { public: - Diagram( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + Diagram( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~Diagram(); /// XServiceInfo declarations @@ -85,106 +84,97 @@ protected: explicit Diagram( const Diagram & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XFastPropertySet ____ - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - 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 void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; + css::uno::Any& rValue, sal_Int32 nHandle ) const override; // ____ XDiagram ____ - 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 ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend > SAL_CALL getLegend() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLegend( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend >& xLegend ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() - 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; + virtual css::uno::Reference< css::chart2::XLegend > SAL_CALL getLegend() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLegend( const css::uno::Reference< + css::chart2::XLegend >& xLegend ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDefaultColorScheme( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme >& xColorScheme ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XColorScheme >& xColorScheme ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDiagramData( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& aCoordSys ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeCoordinateSystem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& aCoordSys ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) + throw (css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setCoordinateSystems( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > >& aCoordinateSystems ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > >& aCoordinateSystems ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // ____ XTitled ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::chart2::XTitle > SAL_CALL getTitleObject() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitleObject( const css::uno::Reference< + css::chart2::XTitle >& Title ) + 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; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -193,37 +183,30 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; typedef - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > + ::std::vector< css::uno::Reference< css::chart2::XCoordinateSystem > > tCoordinateSystemContainerType; tCoordinateSystemContainerType m_aCoordSystems; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xWall; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xFloor; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > + css::uno::Reference< css::chart2::XTitle > m_xTitle; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend > + css::uno::Reference< css::chart2::XLegend > m_xLegend; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XColorScheme > + css::uno::Reference< css::chart2::XColorScheme > m_xColorScheme; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index ddf131394ef9..abd8a6bff923 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -28,8 +28,7 @@ class PolarCoordinateSystem : public BaseCoordinateSystem { public: explicit PolarCoordinateSystem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + const css::uno::Reference< css::uno::XComponentContext > & xContext, sal_Int32 nDimensionCount = 2, bool bSwapXAndYAxis = false ); explicit PolarCoordinateSystem( const PolarCoordinateSystem & rSource ); @@ -37,14 +36,13 @@ public: // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getViewServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() @@ -62,8 +60,7 @@ class PolarCoordinateSystem2d : public PolarCoordinateSystem { public: explicit PolarCoordinateSystem2d( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~PolarCoordinateSystem2d(); // ____ XServiceInfo ____ @@ -82,8 +79,7 @@ class PolarCoordinateSystem3d : public PolarCoordinateSystem { public: explicit PolarCoordinateSystem3d( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~PolarCoordinateSystem3d(); // ____ XServiceInfo ____ diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index bd353e973e0b..a00419aa2eab 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -34,9 +34,9 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > StockBar_Base; } @@ -56,37 +56,37 @@ protected: explicit StockBar( const StockBar & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -96,7 +96,7 @@ protected: private: const bool m_bRisingCourse; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 5a1ff1fe91c0..ffe01fc40e7c 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -52,14 +52,13 @@ namespace chart class XMLFilter : public ::cppu::WeakImplHelper< - ::com::sun::star::document::XFilter, - ::com::sun::star::document::XExporter, - ::com::sun::star::document::XImporter, - ::com::sun::star::lang::XServiceInfo > + css::document::XFilter, + css::document::XExporter, + css::document::XImporter, + css::lang::XServiceInfo > { public: - explicit XMLFilter( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit XMLFilter( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~XMLFilter(); /// XServiceInfo declarations @@ -76,25 +75,22 @@ public: protected: // ____ XFilter ____ virtual sal_Bool SAL_CALL filter( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL cancel() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent >& Document ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XComponent >& Document ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent >& Document ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XComponent >& Document ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } @@ -105,57 +101,40 @@ protected: * \param _rMediaDescriptor * \param _rOutOASIS */ - virtual void isOasisFormat(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& _rMediaDescriptor, bool & _rOutOASIS ); + virtual void isOasisFormat(const css::uno::Sequence< css::beans::PropertyValue >& _rMediaDescriptor, bool & _rOutOASIS ); private: // methods /// @return a warning code, or 0 for successful operation - sal_Int32 impl_Import( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent > & xDocumentComp, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > & aMediaDescriptor ); + sal_Int32 impl_Import( const css::uno::Reference< css::lang::XComponent > & xDocumentComp, + const css::uno::Sequence< css::beans::PropertyValue > & aMediaDescriptor ); /// @return a warning code, or 0 for successful operation sal_Int32 impl_ImportStream( const OUString & rStreamName, const OUString & rServiceName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XStorage > & xStorage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XParser > & xParser, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiComponentFactory > & xFactory, - const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XGraphicObjectResolver > & xGraphicObjectResolver, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xPropSet ); + const css::uno::Reference< css::embed::XStorage > & xStorage, + const css::uno::Reference< css::xml::sax::XParser > & xParser, + const css::uno::Reference< css::lang::XMultiComponentFactory > & xFactory, + const css::uno::Reference< css::document::XGraphicObjectResolver > & xGraphicObjectResolver, + css::uno::Reference< css::beans::XPropertySet >& xPropSet ); /// @return a warning code, or 0 for successful operation - sal_Int32 impl_Export( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent > & xDocumentComp, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > & aMediaDescriptor ); + sal_Int32 impl_Export( const css::uno::Reference< css::lang::XComponent > & xDocumentComp, + const css::uno::Sequence< css::beans::PropertyValue > & aMediaDescriptor ); /// @return a warning code, or 0 for successful operation sal_Int32 impl_ExportStream( const OUString & rStreamName, const OUString & rServiceName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XStorage > & xStorage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XWriter >& xActiveDataSource, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xFactory, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any > & rFilterProperties ); + const css::uno::Reference< css::embed::XStorage > & xStorage, + const css::uno::Reference< css::xml::sax::XWriter >& xActiveDataSource, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xFactory, + const css::uno::Sequence< css::uno::Any > & rFilterProperties ); // members - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent > m_xTargetDoc; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent > m_xSourceDoc; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XComponent > m_xTargetDoc; + css::uno::Reference< css::lang::XComponent > m_xSourceDoc; css::uno::Sequence<css::beans::PropertyValue> m_aMediaDescriptor; @@ -167,11 +146,10 @@ private: class XMLReportFilterHelper : public XMLFilter { - virtual void isOasisFormat(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& _rMediaDescriptor, bool & _rOutOASIS ) override; + virtual void isOasisFormat(const css::uno::Sequence< css::beans::PropertyValue >& _rMediaDescriptor, + bool & _rOutOASIS ) override; public: - explicit XMLReportFilterHelper( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & _xContext ) + explicit XMLReportFilterHelper( css::uno::Reference< css::uno::XComponentContext > const & _xContext ) :XMLFilter(_xContext) {} static OUString getImplementationName_Static() @@ -181,16 +159,15 @@ public: protected: virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::uno::RuntimeException, std::exception ) override { return getImplementationName_Static(); } // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent >& Document ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::lang::XComponent >& Document ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override { setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" ); XMLFilter::setTargetDocument(Document); @@ -198,10 +175,9 @@ protected: // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent >& Document ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::lang::XComponent >& Document ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override { setDocumentHandler( "com.sun.star.comp.report.ExportDocumentHandler" ); XMLFilter::setSourceDocument(Document); diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 7fb1ce385dee..a78f79053b94 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -101,7 +101,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( @@ -134,7 +134,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( @@ -168,7 +168,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "ArrangeOrder", PROP_AXIS_TEXT_ARRANGE_ORDER, - cppu::UnoType<com::sun::star::chart::ChartAxisArrangeOrderType>::get(), + cppu::UnoType<css::chart::ChartAxisArrangeOrderType>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -194,7 +194,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 display units: @@ -239,15 +239,15 @@ private: ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_SHOW, true ); - ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_CROSSOVER_POSITION, ::com::sun::star::chart::ChartAxisPosition_ZERO ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_CROSSOVER_POSITION, css::chart::ChartAxisPosition_ZERO ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_DISPLAY_LABELS, true ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE, true ); - ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_LABEL_POSITION, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_LABEL_POSITION, css::chart::ChartAxisLabelPosition_NEAR_AXIS ); ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_AXIS_TEXT_ROTATION, 0.0 ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_BREAK, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_OVERLAP, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_STACKED, false ); - ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_ARRANGE_ORDER, ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TEXT_ARRANGE_ORDER, css::chart::ChartAxisArrangeOrderType_AUTO ); float fDefaultCharHeight = 10.0; ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight ); @@ -256,7 +256,7 @@ private: ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AXIS_MAJOR_TICKMARKS, 2 /* CHAXIS_MARK_OUTER */ ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AXIS_MINOR_TICKMARKS, 0 /* CHAXIS_MARK_NONE */ ); - ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_MARK_POSITION, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_MARK_POSITION, css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_DISPLAY_UNITS, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TRY_STAGGERING_FIRST, false ); } @@ -277,7 +277,7 @@ struct StaticAxisInfoHelper_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/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index b97854074daa..bc6bc659c02d 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -39,12 +39,12 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XAxis, - ::com::sun::star::chart2::XTitled, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::chart2::XAxis, + css::chart2::XTitled, + css::lang::XServiceInfo, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > Axis_Base; } @@ -54,8 +54,7 @@ class Axis : public ::property::OPropertySet { public: - explicit Axis( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit Axis( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~Axis(); /// XServiceInfo declarations @@ -81,7 +80,7 @@ protected: void Init( const Axis & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; @@ -89,58 +88,51 @@ protected: virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XAxis ____ - virtual void SAL_CALL setScaleData( const ::com::sun::star::chart2::ScaleData& rScaleData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::chart2::ScaleData SAL_CALL getScaleData() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getGridProperties() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > > SAL_CALL getSubGridProperties() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > > SAL_CALL getSubTickProperties() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setScaleData( const css::chart2::ScaleData& rScaleData ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::chart2::ScaleData SAL_CALL getScaleData() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getGridProperties() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubGridProperties() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubTickProperties() + throw (css::uno::RuntimeException, std::exception) override; // ____ XTitled ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTitleObject( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XTitle >& Title ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ // Note: the coordinate systems are not cloned! - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -153,20 +145,15 @@ private: //methods private: //member - ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; - ::com::sun::star::chart2::ScaleData m_aScaleData; + css::chart2::ScaleData m_aScaleData; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xGrid; + css::uno::Reference< css::beans::XPropertySet > m_xGrid; - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > > m_aSubGridProperties; + css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > m_aSubGridProperties; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > m_xTitle; + css::uno::Reference< css::chart2::XTitle > m_xTitle; }; } // namespace chart diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 63dfa286a6e8..07c42d7cfa01 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -88,7 +88,7 @@ struct StaticCooSysInfoHelper_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::UserDefinedProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 0b88e7546a0a..6e2c06ed288d 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -788,7 +788,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() aArgs[3] = beans::PropertyValue( "DataRowSource", -1, - uno::makeAny( ::com::sun::star::chart::ChartDataRowSource_COLUMNS ), + uno::makeAny( css::chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xDataSource = m_xInternalDataProvider->createDataSource( aArgs ); } diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index f959b625f24c..a5c1035d55d9 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -115,7 +115,7 @@ Reference< embed::XStorage > lcl_createStorage( try { Reference< io::XStream > xStream( - ::ucbhelper::Content( rURL, Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()).openStream(), + ::ucbhelper::Content( rURL, Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()).openStream(), uno::UNO_QUERY ); Reference< lang::XSingleServiceFactory > xStorageFact( embed::StorageFactory::create( xContext ) ); diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index d3156a2cd3a6..d9888231e6c4 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -53,7 +53,7 @@ struct StaticDataPointInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::chart::DataPointProperties::AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 554d12c63edf..2be2e69053dc 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -37,11 +37,11 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::container::XChild, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener, - ::com::sun::star::lang::XServiceInfo > + css::container::XChild, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener, + css::lang::XServiceInfo > DataPoint_Base; } @@ -51,8 +51,7 @@ class DataPoint : public ::property::OPropertySet { public: - explicit DataPoint( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rParentProperties ); + explicit DataPoint( const css::uno::Reference< css::beans::XPropertySet > & rParentProperties ); virtual ~DataPoint(); /// merge XInterface implementations @@ -72,49 +71,49 @@ protected: explicit DataPoint( const DataPoint & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ // Note: m_xParentProperties are not cloned! - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XChild ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) - throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& Parent ) + throw (css::lang::NoSupportException, + css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -123,10 +122,9 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::WeakReference< - ::com::sun::star::beans::XPropertySet > m_xParentProperties; + css::uno::WeakReference< css::beans::XPropertySet > m_xParentProperties; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; bool m_bNoParentPropAllowed; }; diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx index e87c1a9d16c3..39362498a52a 100644 --- a/chart2/source/model/main/DataPointProperties.hxx +++ b/chart2/source/model/main/DataPointProperties.hxx @@ -86,7 +86,7 @@ namespace DataPointProperties }; void AddPropertiesToVector( - ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + ::std::vector< css::beans::Property > & rOutProperties ); void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); } diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 11c617481f02..3b6da23e4288 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -63,7 +63,7 @@ struct StaticDataSeriesInfoHelper : public rtl::StaticWithInit< ::cppu::OPropert { uno::Sequence< Property > operator()() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::chart::DataSeriesProperties::AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); @@ -92,7 +92,7 @@ void lcl_SetParent( xChild->setParent( xParentInterface ); } -typedef ::std::map< sal_Int32, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > +typedef ::std::map< sal_Int32, css::uno::Reference< css::beans::XPropertySet > > lcl_tDataPointMap; void lcl_CloneAttributedDataPoints( diff --git a/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx index 0c3a70b6aef6..a189b662a6cf 100644 --- a/chart2/source/model/main/DataSeriesProperties.hxx +++ b/chart2/source/model/main/DataSeriesProperties.hxx @@ -39,7 +39,7 @@ namespace DataSeriesProperties }; void AddPropertiesToVector( - ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); + ::std::vector< css::beans::Property > & rOutProperties ); void AddDefaultsToMap( tPropertyValueMap & rOutMap ); } diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index b0e5c0b04d2f..8a2b352dc39a 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -242,7 +242,7 @@ struct StaticDiagramInfoHelper_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::SceneProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); @@ -287,10 +287,9 @@ lcl_tCooSysMapping lcl_CloneCoordinateSystems( aIt != rSource.end(); ++aIt ) { lcl_tCooSysRef xClone; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > - xCloneable( *aIt, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XCloneable > xCloneable( *aIt, css::uno::UNO_QUERY ); if( xCloneable.is()) - xClone.set( xCloneable->createClone(), ::com::sun::star::uno::UNO_QUERY ); + xClone.set( xCloneable->createClone(), css::uno::UNO_QUERY ); if( xClone.is()) { diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 13b54ada3de7..57731ba0278d 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -67,7 +67,7 @@ struct StaticFormattedStringInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::std::sort( aProperties.begin(), aProperties.end(), diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index dd25cf9ac157..ae73f6160aa8 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -38,10 +38,10 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::lang::XServiceInfo, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > GridProperties_Base; } @@ -51,8 +51,7 @@ class GridProperties : public ::property::OPropertySet { public: - explicit GridProperties( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit GridProperties( css::uno::Reference< css::uno::XComponentContext > const & xContext ); explicit GridProperties(); virtual ~GridProperties(); @@ -76,37 +75,37 @@ protected: explicit GridProperties( const GridProperties & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -115,7 +114,7 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 1528dfc45968..69250fcaea6e 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -73,7 +73,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Expansion", PROP_LEGEND_EXPANSION, - cppu::UnoType<com::sun::star::chart::ChartLegendExpansion>::get(), + cppu::UnoType<css::chart::ChartLegendExpansion>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -122,7 +122,7 @@ private: ::chart::CharacterProperties::AddDefaultsToMap( rOutMap ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_ANCHOR_POSITION, chart2::LegendPosition_LINE_END ); - ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_EXPANSION, ::com::sun::star::chart::ChartLegendExpansion_HIGH ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_EXPANSION, css::chart::ChartLegendExpansion_HIGH ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_SHOW, true ); float fDefaultCharHeight = 10.0; @@ -147,7 +147,7 @@ struct StaticLegendInfoHelper_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::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 2fa59910284d..d3a761541655 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -37,11 +37,11 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XLegend, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::chart2::XLegend, + css::lang::XServiceInfo, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > Legend_Base; } @@ -51,8 +51,7 @@ class Legend : public ::property::OPropertySet { public: - explicit Legend( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit Legend( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~Legend(); /// XServiceInfo declarations @@ -75,38 +74,38 @@ protected: explicit Legend( const Legend & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -115,7 +114,7 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 295dd0a72d9f..9be30b3920a6 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -78,7 +78,7 @@ struct StaticPageBackgroundInfoHelper_Initializer private: static uno::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/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 5818c360c0ae..b89cb9a3f918 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -35,10 +35,10 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener, - ::com::sun::star::lang::XServiceInfo > + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener, + css::lang::XServiceInfo > PageBackground_Base; } @@ -48,8 +48,7 @@ class PageBackground : public ::property::OPropertySet { public: - explicit PageBackground( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit PageBackground( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~PageBackground(); /// XServiceInfo declarations @@ -70,38 +69,38 @@ protected: explicit PageBackground( const PageBackground & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -110,11 +109,9 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > - m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 347b83f11b37..58a84dd230ff 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -52,7 +52,7 @@ struct StaticStockBarInfoHelper_Initializer private: static uno::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/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 20300b252d83..a0b7bdfa7f07 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -72,7 +72,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "ParaAdjust", PROP_TITLE_PARA_ADJUST, - cppu::UnoType<com::sun::star::style::ParagraphAdjust>::get(), + cppu::UnoType<css::style::ParagraphAdjust>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -162,7 +162,7 @@ private: // ParagraphProperties ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_TITLE_PARA_ADJUST, - ::com::sun::star::style::ParagraphAdjust_CENTER ); + css::style::ParagraphAdjust_CENTER ); // PROP_TITLE_PARA_LAST_LINE_ADJUST ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_TITLE_PARA_LEFT_MARGIN, 0 ); @@ -196,7 +196,7 @@ struct StaticTitleInfoHelper_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 ); diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 6c9d62617766..c741da577f13 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -35,11 +35,11 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XTitle, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::chart2::XTitle, + css::lang::XServiceInfo, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > Title_Base; } @@ -49,8 +49,7 @@ class Title : public ::property::OPropertySet { public: - explicit Title( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit Title( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~Title(); /// XServiceInfo declarations @@ -73,48 +72,44 @@ protected: explicit Title( const Title & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XTitle ____ - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XFormattedString > >& Strings ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& Strings ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -123,11 +118,9 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XFormattedString > > m_aStrings; + css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > m_aStrings; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx index 55d265daff82..8c07a8dcc9e9 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -34,8 +34,8 @@ namespace chart namespace impl { class UndoManager_Impl; - typedef ::cppu::ImplHelper2 < ::com::sun::star::document::XUndoManager - , ::com::sun::star::util::XModifyBroadcaster + typedef ::cppu::ImplHelper2 < css::document::XUndoManager + , css::util::XModifyBroadcaster > UndoManager_Base; } @@ -53,36 +53,36 @@ namespace chart void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enterHiddenUndoContext( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL leaveUndoContext( ) throw (css::util::InvalidStateException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL undo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL redo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isUndoPossible( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isRedoPossible( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearRedo( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; // XLockable (base of XUndoManager) - virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lock( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlock( ) throw (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLocked( ) throw (css::uno::RuntimeException, std::exception) override; // XChild (base of XUndoManager) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; private: std::unique_ptr< impl::UndoManager_Impl > m_pImpl; diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 80093ed21c72..af0fc1617e62 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -80,7 +80,7 @@ struct StaticWallInfoHelper_Initializer private: static uno::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/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index 310218ebf9a2..00d09d8a926b 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -36,9 +36,9 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > Wall_Base; } @@ -58,38 +58,38 @@ protected: explicit Wall( const Wall & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; @@ -99,7 +99,7 @@ protected: private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index 2c6cad9e8c0d..d3afb47a6bff 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -27,22 +27,20 @@ namespace chart class AreaChartType : public ChartType { public: - explicit AreaChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit AreaChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~AreaChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -50,11 +48,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index da3770de9d87..72ecec17cd5e 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -86,7 +86,7 @@ struct StaticAreaChartTypeTemplateInfoHelper_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(), diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index 3e8185d59d2c..9a65af2d3912 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -36,8 +36,7 @@ class AreaChartTypeTemplate : { public: explicit AreaChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName, StackMode eStackMode, sal_Int32 nDim = 2 ); @@ -50,33 +49,32 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL resetStyles( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; // ____ ChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; virtual sal_Int32 getDimension() const override; virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const override; diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 9c08f3278933..eb6344d36733 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -27,22 +27,20 @@ namespace chart class BarChartType : public ChartType { public: - explicit BarChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit BarChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~BarChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -50,14 +48,14 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index d18f8996a41e..b1ad51e53c11 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -94,7 +94,7 @@ struct StaticBarChartTypeTemplateInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index f2e9008c1ca9..5c1dc3724cd1 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -42,8 +42,7 @@ public: }; explicit BarChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName, StackMode eStackMode, BarDirection eDirection, @@ -57,46 +56,43 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL resetStyles( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; // ____ ChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; virtual sal_Int32 getDimension() const override; virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const override; virtual bool isSwapXAndY() const override; virtual void createCoordinateSystems( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystemContainer > & xCooSysCnt ) override; + const css::uno::Reference< css::chart2::XCoordinateSystemContainer > & xCooSysCnt ) override; private: StackMode m_eStackMode; diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index b732c64d6ffa..09ce013c4df6 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -65,7 +65,7 @@ struct StaticBubbleChartTypeInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); @@ -170,7 +170,7 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles() - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropertyRoles(2); aPropertyRoles[0] = "FillColor"; diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index a472b67e0e0e..3e2f69e4e5c4 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -29,21 +29,20 @@ class BubbleChartType : public ChartType { public: explicit BubbleChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~BubbleChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -51,35 +50,35 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 9e4fcac4373d..47a7b51fbf9c 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -67,7 +67,7 @@ struct StaticBubbleChartTypeTemplateInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< ::com::sun::star::beans::Property > aProperties; + ::std::vector< css::beans::Property > aProperties; ::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index 17ead3f90206..b6ede1c10b66 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -34,8 +34,7 @@ class BubbleChartTypeTemplate : { public: explicit BubbleChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName ); virtual ~BubbleChartTypeTemplate(); @@ -46,34 +45,32 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ ChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; virtual sal_Int32 getDimension() const override; virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const override; diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx b/chart2/source/model/template/BubbleDataInterpreter.hxx index e51f74293628..ed5cebfcc0e8 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.hxx +++ b/chart2/source/model/template/BubbleDataInterpreter.hxx @@ -28,23 +28,22 @@ class BubbleDataInterpreter : public DataInterpreter { public: explicit BubbleDataInterpreter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~BubbleDataInterpreter(); protected: // ____ XDataInterpreter ____ - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL interpretDataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( + const css::uno::Reference< css::chart2::data::XDataSource >& xSource, + const css::uno::Sequence< css::beans::PropertyValue >& aArguments, + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isDataCompatible( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index e4125fbe36b0..85099844a1df 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -117,7 +117,7 @@ struct StaticCandleStickChartTypeInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index aad1844c8555..6521ca2b9cb1 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -28,21 +28,20 @@ class CandleStickChartType : public ChartType { public: explicit CandleStickChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~CandleStickChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -50,19 +49,19 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -70,17 +69,17 @@ protected: // ____ OPropertySet ____ virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index ad11a7285200..0b94cd3ac1e4 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -39,11 +39,11 @@ namespace impl { typedef ::cppu::WeakImplHelper< css::lang::XServiceInfo, - ::com::sun::star::chart2::XChartType, - ::com::sun::star::chart2::XDataSeriesContainer, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::chart2::XChartType, + css::chart2::XDataSeriesContainer, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > ChartType_Base; } @@ -53,9 +53,7 @@ class ChartType : public ::property::OPropertySet { public: - explicit ChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit ChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~ChartType(); /// merge XInterface implementations @@ -64,98 +62,95 @@ public: protected: explicit ChartType( const ChartType & rOther ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > GetComponentContext() const { return m_xContext;} // ____ XChartType ____ // still abstract ! implement ! virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XDataSeriesContainer ____ virtual void SAL_CALL addDataSeries( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& aDataSeries ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeDataSeries( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& aDataSeries ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > SAL_CALL getDataSeries() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) + throw (css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > SAL_CALL getDataSeries() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDataSeries( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aDataSeries ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aDataSeries ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; void fireModifyEvent(); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() protected: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > + css::uno::Reference< css::util::XModifyListener > const m_xModifyEventForwarder; private: void impl_addDataSeriesWithoutNotification( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& aDataSeries ); + const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const m_xContext; typedef - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > - tDataSeriesContainerType; + ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > tDataSeriesContainerType; // --- mutable members: the following members need mutex guard --- diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 8b038240b047..1606b360e736 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -70,59 +70,57 @@ namespace chart * create an XLegend via the global service factory, set it at the diagram. */ class ChartTypeTemplate : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XChartTypeTemplate, - ::com::sun::star::lang::XServiceName > + css::chart2::XChartTypeTemplate, + css::lang::XServiceName > { public: - explicit ChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + explicit ChartTypeTemplate( css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName ); virtual ~ChartTypeTemplate(); protected: // ____ XChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagramByDataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL createDiagramByDataSource( + const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::uno::RuntimeException, std::exception) override; /// denotes if the chart needs categories at the first scale virtual sal_Bool SAL_CALL supportsCategories() throw (css::uno::RuntimeException, ::std::exception) override; virtual void SAL_CALL changeDiagram( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL changeDiagramData( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL matchesTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< + css::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // still abstract: getChartTypeForNewSeries() - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL resetStyles( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; void SAL_CALL applyStyles( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Methods to override for automatic creation @@ -139,7 +137,7 @@ protected: */ virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) = 0; virtual bool isSwapXAndY() const; @@ -152,8 +150,7 @@ protected: changeDiagram */ virtual void adaptDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); /** Creates a 2d or 3d cartesian coordinate system with mathematically oriented, linear scales with auto-min/max. If the given @@ -163,8 +160,7 @@ protected: <p>The dimension depends on the value returned by getDimension().</p> */ virtual void createCoordinateSystems( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystemContainer > & xOutCooSysCnt ); + const css::uno::Reference< css::chart2::XCoordinateSystemContainer > & xOutCooSysCnt ); /** Sets categories at the scales of dimension 0 and the percent stacking at the scales of dimension 1 of all given coordinate systems. @@ -172,11 +168,8 @@ protected: <p>Called by FillDiagram.</p> */ virtual void adaptScales( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & aCooSysSeq, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories ); + const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > & aCooSysSeq, + const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xCategories ); /** create a data series tree, that fits the requirements of the chart type. @@ -204,16 +197,16 @@ protected: empty.</p> */ virtual void createChartTypes( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > > & aSeriesSeq, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > & aOldChartTypesSeq + const css::uno::Sequence< + css::uno::Sequence< + css::uno::Reference< + css::chart2::XDataSeries > > > & aSeriesSeq, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XCoordinateSystem > > & rCoordSys, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XChartType > > & aOldChartTypesSeq ); /** create axes and add them to the given container. If there are already @@ -225,9 +218,7 @@ protected: requesting a secondary axes a secondary y axes is added</p> */ void createAxes( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys ); + const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > & rCoordSys ); /** Give the number of requested axis per dimension here. Default is one axis for each dimension @@ -237,25 +228,18 @@ protected: /** adapt properties of exsisting axes and remove superfluous axes */ virtual void adaptAxes( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys ); + const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > & rCoordSys ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > GetComponentContext() const { return m_xContext;} static void copyPropertiesFromOldToNewCoordinateSystem( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > & rOldChartTypesSeq, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > & xNewChartType ); + const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > & rOldChartTypesSeq, + const css::uno::Reference< css::chart2::XChartType > & xNewChartType ); protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xContext; - mutable ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataInterpreter > m_xDataInterpreter; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + mutable css::uno::Reference< css::chart2::XDataInterpreter > m_xDataInterpreter; private: const OUString m_aServiceName; @@ -263,17 +247,17 @@ private: private: /** modifies the given diagram */ - void FillDiagram( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > > & aSeriesSeq, - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > xCategories, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > & aOldChartTypesSeq, + void FillDiagram( const css::uno::Reference< + css::chart2::XDiagram > & xDiagram, + const css::uno::Sequence< + css::uno::Sequence< + css::uno::Reference< + css::chart2::XDataSeries > > > & aSeriesSeq, + css::uno::Reference< + css::chart2::data::XLabeledDataSequence > xCategories, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XChartType > > & aOldChartTypesSeq, bool bCreate ); }; diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index c60b08bcba83..dc0429bb6bc9 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -92,7 +92,7 @@ struct StaticColumnChartTypeInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 3c1effc3b112..6da6f794194c 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -27,22 +27,20 @@ namespace chart class ColumnChartType : public ChartType { public: - explicit ColumnChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit ColumnChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~ColumnChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -50,24 +48,24 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 25f0cc1d51a9..2d6abcf69517 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -91,7 +91,7 @@ struct StaticColumnLineChartTypeTemplateInfoHelper_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(), diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index bfb9b6c293b0..7cb7d76e41d5 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -36,8 +36,7 @@ class ColumnLineChartTypeTemplate : { public: explicit ColumnLineChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName, StackMode eStackMode, sal_Int32 nNumberOfLines ); @@ -50,50 +49,48 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() + throw (css::uno::RuntimeException, std::exception) override; // ____ ChartTypeTemplate ____ virtual void createChartTypes( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > > & aSeriesSeq, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > & aOldChartTypesSeq + const css::uno::Sequence< + css::uno::Sequence< + css::uno::Reference< + css::chart2::XDataSeries > > > & aSeriesSeq, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XCoordinateSystem > > & rCoordSys, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XChartType > > & aOldChartTypesSeq ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const override; diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index 1da6049e4aa3..8c0505236fa2 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -29,17 +29,16 @@ class ColumnLineDataInterpreter : public DataInterpreter public: explicit ColumnLineDataInterpreter( sal_Int32 nNumberOfLines, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~ColumnLineDataInterpreter(); protected: // ____ XDataInterpreter ____ - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL interpretDataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( + const css::uno::Reference< css::chart2::data::XDataSource >& xSource, + const css::uno::Sequence< css::beans::PropertyValue >& aArguments, + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) + throw (css::uno::RuntimeException, std::exception) override; private: sal_Int32 m_nNumberOfLines; diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index 00a369990947..1d903e96fc13 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -28,15 +28,14 @@ namespace chart { class DataInterpreter : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XDataInterpreter, - ::com::sun::star::lang::XServiceInfo > + css::chart2::XDataInterpreter, + css::lang::XServiceInfo > { public: - explicit DataInterpreter( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit DataInterpreter( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~DataInterpreter(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > GetComponentContext() const { return m_xContext;} /// XServiceInfo declarations @@ -51,49 +50,41 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // convenience methods - static OUString GetRole( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xSeq ); + static OUString GetRole( const css::uno::Reference< css::chart2::data::XDataSequence > & xSeq ); static void SetRole( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xSeq, + const css::uno::Reference< css::chart2::data::XDataSequence > & xSeq, const OUString & rRole ); - static ::com::sun::star::uno::Any GetProperty( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > & aArguments, + static css::uno::Any GetProperty( + const css::uno::Sequence<css::beans::PropertyValue > & aArguments, const OUString & rName ); static bool HasCategories( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > & rArguments, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > > & rData ); + const css::uno::Sequence< css::beans::PropertyValue > & rArguments, + const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & rData ); static bool UseCategoriesAsX( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > & rArguments ); + const css::uno::Sequence< css::beans::PropertyValue > & rArguments ); protected: // ____ XDataInterpreter ____ - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL interpretDataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( + const css::uno::Reference< css::chart2::data::XDataSource >& xSource, + const css::uno::Sequence< css::beans::PropertyValue >& aArguments, + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isDataCompatible( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL mergeInterpretedData( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL mergeInterpretedData( + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 5d5077e07dc1..f16f51877405 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -27,21 +27,20 @@ namespace chart class FilledNetChartType : public NetChartType_Base { public: - explicit FilledNetChartType( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit FilledNetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~FilledNetChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -49,11 +48,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index 09d62f2280b2..e936caa983ce 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -134,22 +134,22 @@ uno::Sequence<OUString> GL3DBarChartType::getSupportedServiceNames_Static() } OUString SAL_CALL GL3DBarChartType::getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR); } uno::Sequence<OUString> GL3DBarChartType::getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles { "FillColor" }; return aPropRoles; } -com::sun::star::uno::Reference<com::sun::star::util::XCloneable> +css::uno::Reference<css::util::XCloneable> GL3DBarChartType::createClone() - throw (com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return uno::Reference<util::XCloneable>(new GL3DBarChartType(*this)); } diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 6f8535a260f3..7540e41290b3 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -24,20 +24,20 @@ public: explicit GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext ); virtual ~GL3DBarChartType(); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index 3c9e8ac85a1c..598ed8b0b62b 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -105,7 +105,7 @@ struct StaticLineChartTypeInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 34ede6dd7de6..8602ef32b63d 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -28,22 +28,20 @@ namespace chart class LineChartType : public ChartType { public: - explicit LineChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit LineChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~LineChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -51,21 +49,21 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 8c6175119699..e9706c09bd00 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -110,7 +110,7 @@ struct StaticLineChartTypeTemplateInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index 6871df34a7b3..c8d1ad21c9b8 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -36,8 +36,7 @@ class LineChartTypeTemplate : { public: explicit LineChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName, StackMode eStackMode, bool bSymbols, @@ -52,35 +51,32 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ ChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; virtual sal_Int32 getDimension() const override; virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const override; diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 644dcad5f3d6..5ea718208b64 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -27,49 +27,47 @@ namespace chart class NetChartType_Base : public ChartType { public: - explicit NetChartType_Base( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit NetChartType_Base( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~NetChartType_Base(); protected: explicit NetChartType_Base( const NetChartType_Base & rOther ); // ____ XChartType ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL + virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; class NetChartType : public NetChartType_Base { public: - explicit NetChartType( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + explicit NetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); virtual ~NetChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -77,11 +75,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index e6d4dde31add..cefc496a10b2 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -29,8 +29,7 @@ class NetChartTypeTemplate : public ChartTypeTemplate { public: explicit NetChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName, StackMode eStackMode, bool bSymbols, @@ -42,24 +41,21 @@ public: protected: // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ ChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const override; diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index b95d083594fc..568966f035c7 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -93,7 +93,7 @@ struct StaticPieChartTypeInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index c5d3ca3d160d..c0685469875a 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -28,22 +28,21 @@ class PieChartType : public ChartType { public: PieChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, bool bUseRings = false ); virtual ~PieChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -51,30 +50,30 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 6fc096aef638..3e5b679dff77 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -119,7 +119,7 @@ struct StaticPieChartTypeTemplateInfoHelper_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(), diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index f0b35e4f8226..e9f191fe3af7 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -36,10 +36,9 @@ class PieChartTypeTemplate : { public: PieChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName, - ::com::sun::star::chart2::PieChartOffsetMode eMode, + css::chart2::PieChartOffsetMode eMode, bool bRings = false, sal_Int32 nDim = 2 ); virtual ~PieChartTypeTemplate(); @@ -51,71 +50,63 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL resetStyles( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const override; virtual void adaptDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ) override; + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ) override; virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ) override; virtual void adaptAxes( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys ) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > & rCoordSys ) override; virtual void adaptScales( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & aCooSysSeq, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories ) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > & aCooSysSeq, + const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xCategories ) override; virtual void createChartTypes( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > >& aSeriesSeq, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > & aOldChartTypesSeq + const css::uno::Sequence< + css::uno::Sequence< + css::uno::Reference< + css::chart2::XDataSeries > > >& aSeriesSeq, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XCoordinateSystem > > & rCoordSys, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XChartType > > & aOldChartTypesSeq ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; }; diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 83e23e3e482e..0849a408e989 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -109,7 +109,7 @@ struct StaticScatterChartTypeInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 198787188dd0..b3ef17dd89de 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -29,25 +29,23 @@ class ScatterChartType : public ChartType { public: ScatterChartType( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, - ::com::sun::star::chart2::CurveStyle eCurveStyle = - ::com::sun::star::chart2::CurveStyle_LINES, + css::uno::Reference< css::uno::XComponentContext > const & xContext, + css::chart2::CurveStyle eCurveStyle = css::chart2::CurveStyle_LINES, sal_Int32 nResolution = 20, sal_Int32 nOrder = 3 ); virtual ~ScatterChartType(); 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 + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: @@ -55,30 +53,30 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 1c675c903bde..ef266daf22bf 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -112,7 +112,7 @@ struct StaticScatterChartTypeTemplateInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index a8e4f1268646..6a03fe38dff3 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -35,8 +35,7 @@ class ScatterChartTypeTemplate : { public: explicit ScatterChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName, bool bSymbols, bool bHasLines = true, @@ -50,39 +49,37 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL matchesTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ ChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; virtual sal_Int32 getDimension() const override; virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const override; diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 88a51fc115c4..074c262255cc 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -121,7 +121,7 @@ struct StaticStockChartTypeTemplateInfoHelper_Initializer private: static 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(), diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 2b660056d99d..89e4295ec31b 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -50,8 +50,7 @@ public: straight vertical line, and the close-value on the right hand side. */ explicit StockChartTypeTemplate( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & rServiceName, StockVariant eVariant, bool bJapaneseStyle ); @@ -64,56 +63,55 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram, + const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL + getChartTypeForNewSeries( const css::uno::Sequence< + css::uno::Reference< + css::chart2::XChartType > >& aFormerlyUsedChartTypes ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applyStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL resetStyles( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) override; // ChartTypeTemplate virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ) override; // ____ ChartTypeTemplate ____ virtual void createChartTypes( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > >& aSeriesSeq, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > > & aOldChartTypesSeq + const css::uno::Sequence< + css::uno::Sequence< + css::uno::Reference< + css::chart2::XDataSeries > > >& aSeriesSeq, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XCoordinateSystem > > & rCoordSys, + const css::uno::Sequence< + css::uno::Reference< + css::chart2::XChartType > > & aOldChartTypesSeq ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > + virtual css::uno::Reference< css::chart2::XChartType > getChartTypeForIndex( sal_Int32 nChartTypeIndex ) override; private: diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index af115fcc2c70..5b466f892c26 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -31,23 +31,22 @@ class StockDataInterpreter : public DataInterpreter public: explicit StockDataInterpreter( StockChartTypeTemplate::StockVariant eVariant, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~StockDataInterpreter(); protected: // ____ XDataInterpreter ____ - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL interpretDataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( + const css::uno::Reference< css::chart2::data::XDataSource >& xSource, + const css::uno::Sequence< css::beans::PropertyValue >& aArguments, + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isDataCompatible( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; private: StockChartTypeTemplate::StockVariant m_eStockVariant; diff --git a/chart2/source/model/template/XYDataInterpreter.hxx b/chart2/source/model/template/XYDataInterpreter.hxx index a864cb83c4dd..08ab0fb79d0c 100644 --- a/chart2/source/model/template/XYDataInterpreter.hxx +++ b/chart2/source/model/template/XYDataInterpreter.hxx @@ -27,24 +27,22 @@ namespace chart class XYDataInterpreter : public DataInterpreter { public: - explicit XYDataInterpreter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + explicit XYDataInterpreter( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~XYDataInterpreter(); protected: // ____ XDataInterpreter ____ - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL interpretDataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( + const css::uno::Reference< css::chart2::data::XDataSource >& xSource, + const css::uno::Sequence< css::beans::PropertyValue >& aArguments, + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isDataCompatible( - const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index ac9018ed5c55..03c1620faeba 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -359,7 +359,7 @@ Reference< XAxis > AxisHelper::createAxis( if( nAxisIndex>0 )//when inserting secondary axes copy some things from the main axis { - ::com::sun::star::chart::ChartAxisPosition eNewAxisPos( ::com::sun::star::chart::ChartAxisPosition_END ); + css::chart::ChartAxisPosition eNewAxisPos( css::chart::ChartAxisPosition_END ); Reference< XAxis > xMainAxis( xCooSys->getAxisByDimension( nDimensionIndex, 0 ) ); if( xMainAxis.is() ) @@ -378,10 +378,10 @@ Reference< XAxis > AxisHelper::createAxis( Reference< beans::XPropertySet > xMainProp( xMainAxis, uno::UNO_QUERY ); if( xMainProp.is() ) { - ::com::sun::star::chart::ChartAxisPosition eMainAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); + css::chart::ChartAxisPosition eMainAxisPos( css::chart::ChartAxisPosition_ZERO ); xMainProp->getPropertyValue("CrossoverPosition") >>= eMainAxisPos; - if( ::com::sun::star::chart::ChartAxisPosition_END == eMainAxisPos ) - eNewAxisPos = ::com::sun::star::chart::ChartAxisPosition_START; + if( css::chart::ChartAxisPosition_END == eMainAxisPos ) + eNewAxisPos = css::chart::ChartAxisPosition_START; } } @@ -561,7 +561,7 @@ void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGri } bool AxisHelper::isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid - , const Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) + , const Reference< css::chart2::XDiagram >& xDiagram ) { bool bRet = false; diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index b5a8799a9a92..2e1cf9367e4a 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -380,7 +380,7 @@ void CharacterProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "WritingMode", PROP_WRITING_MODE, - cppu::UnoType<sal_Int16>::get(), /*com::sun::star::text::WritingMode2*/ + cppu::UnoType<sal_Int16>::get(), /*css::text::WritingMode2*/ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -461,7 +461,7 @@ void CharacterProperties::AddDefaultsToMap( ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_CHAR_SET, sal_Int16(aFontCTL.GetCharSet()) ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_PITCH, sal_Int16(aFontCTL.GetPitch()) ); - ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_WRITING_MODE, sal_Int16( com::sun::star::text::WritingMode2::PAGE ) ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_WRITING_MODE, sal_Int16( css::text::WritingMode2::PAGE ) ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PARA_IS_CHARACTER_DISTANCE, sal_True ); } diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 5ef5adcfb0d1..d33f5f9fccf4 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -49,7 +49,7 @@ uno::Reference< chart2::data::XRangeHighlighter > ChartModelHelper::createRangeH } uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDataProvider( - const uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, bool bConnectToModel ) + const uno::Reference< css::chart2::XChartDocument >& xChartDoc, bool bConnectToModel ) { bool bDefaultDataInColumns(true); @@ -57,23 +57,23 @@ uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDa // chart data and use it as default for creating a new InternalDataProvider if(xChartDoc.is()) { - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > xDoc(xChartDoc, uno::UNO_QUERY); + css::uno::Reference< css::chart::XChartDocument > xDoc(xChartDoc, uno::UNO_QUERY); if(xDoc.is()) { - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > aDiagram = xDoc->getDiagram(); + css::uno::Reference< css::chart::XDiagram > aDiagram = xDoc->getDiagram(); if(aDiagram.is()) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xProp(aDiagram, uno::UNO_QUERY); + css::uno::Reference< css::beans::XPropertySet > xProp(aDiagram, uno::UNO_QUERY); if(xProp.is()) { - ::com::sun::star::chart::ChartDataRowSource aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS); + css::chart::ChartDataRowSource aDataRowSource(css::chart::ChartDataRowSource_COLUMNS); xProp->getPropertyValue( "DataRowSource" ) >>= aDataRowSource; - bDefaultDataInColumns = (::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource); + bDefaultDataInColumns = (css::chart::ChartDataRowSource_COLUMNS == aDataRowSource); } } } diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index a65bb0d3d8eb..a1cf6222c88b 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -257,16 +257,16 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const { aRet.realloc(4); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::INSIDE; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER; + *pSeq++ = css::chart::DataLabelPlacement::AVOID_OVERLAP; + *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE; + *pSeq++ = css::chart::DataLabelPlacement::INSIDE; + *pSeq++ = css::chart::DataLabelPlacement::CENTER; } else { aRet.realloc(1); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER; + *pSeq++ = css::chart::DataLabelPlacement::CENTER; } } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) @@ -276,11 +276,11 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const { aRet.realloc(5); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::LEFT; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::RIGHT; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER; + *pSeq++ = css::chart::DataLabelPlacement::TOP; + *pSeq++ = css::chart::DataLabelPlacement::BOTTOM; + *pSeq++ = css::chart::DataLabelPlacement::LEFT; + *pSeq++ = css::chart::DataLabelPlacement::RIGHT; + *pSeq++ = css::chart::DataLabelPlacement::CENTER; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ) @@ -300,49 +300,49 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const { if(bSwapXAndY) { - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::RIGHT; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::LEFT; + *pSeq++ = css::chart::DataLabelPlacement::RIGHT; + *pSeq++ = css::chart::DataLabelPlacement::LEFT; } else { - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM; + *pSeq++ = css::chart::DataLabelPlacement::TOP; + *pSeq++ = css::chart::DataLabelPlacement::BOTTOM; } } - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER; + *pSeq++ = css::chart::DataLabelPlacement::CENTER; if(!bStacked) - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::INSIDE; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::NEAR_ORIGIN; + *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE; + *pSeq++ = css::chart::DataLabelPlacement::INSIDE; + *pSeq++ = css::chart::DataLabelPlacement::NEAR_ORIGIN; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) ) { aRet.realloc(1); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP; + *pSeq++ = css::chart::DataLabelPlacement::TOP; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) { aRet.realloc(6); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::LEFT; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::RIGHT; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER; + *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE; + *pSeq++ = css::chart::DataLabelPlacement::TOP; + *pSeq++ = css::chart::DataLabelPlacement::BOTTOM; + *pSeq++ = css::chart::DataLabelPlacement::LEFT; + *pSeq++ = css::chart::DataLabelPlacement::RIGHT; + *pSeq++ = css::chart::DataLabelPlacement::CENTER; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) ) { aRet.realloc(1); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE; + *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) ) { aRet.realloc( 1 ); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE; + *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE; } else { @@ -516,7 +516,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultRealisticLightDirection( const u sal_Int32 ChartTypeHelper::getAxisType( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionIndex ) { - //retruned is a constant from constant group ::com::sun::star::chart2::AxisType + //retruned is a constant from constant group css::chart2::AxisType //@todo ask charttype itself --> need model change first if(!xChartType.is()) @@ -583,16 +583,16 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments( { aRet.realloc( 2 ); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP; - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::USE_ZERO; + *pSeq++ = css::chart::MissingValueTreatment::LEAVE_GAP; + *pSeq++ = css::chart::MissingValueTreatment::USE_ZERO; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) ) { aRet.realloc( bStacked ? 1 : 2 ); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::USE_ZERO; + *pSeq++ = css::chart::MissingValueTreatment::USE_ZERO; if( !bStacked ) - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::CONTINUE; + *pSeq++ = css::chart::MissingValueTreatment::CONTINUE; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) || @@ -600,18 +600,18 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments( { aRet.realloc( bStacked ? 2 : 3 ); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP; - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::USE_ZERO; + *pSeq++ = css::chart::MissingValueTreatment::LEAVE_GAP; + *pSeq++ = css::chart::MissingValueTreatment::USE_ZERO; if( !bStacked ) - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::CONTINUE; + *pSeq++ = css::chart::MissingValueTreatment::CONTINUE; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) ) { aRet.realloc( 3 ); sal_Int32* pSeq = aRet.getArray(); - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::CONTINUE; - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP; - *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::USE_ZERO; + *pSeq++ = css::chart::MissingValueTreatment::CONTINUE; + *pSeq++ = css::chart::MissingValueTreatment::LEAVE_GAP; + *pSeq++ = css::chart::MissingValueTreatment::USE_ZERO; } else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) ) diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index 65e72233c11f..985f46035cbe 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -30,11 +30,9 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; bool ColorPerPointHelper::hasPointOwnColor( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xDataSeriesProperties + const css::uno::Reference< css::beans::XPropertySet >& xDataSeriesProperties , sal_Int32 nPointIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xDataPointProperties //may be NULL this is just for performance + , const css::uno::Reference< css::beans::XPropertySet >& xDataPointProperties //may be NULL this is just for performance ) { if( !xDataSeriesProperties.is() ) @@ -59,8 +57,7 @@ bool ColorPerPointHelper::hasPointOwnColor( } bool ColorPerPointHelper::hasPointOwnProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSeriesProperties + const css::uno::Reference< css::beans::XPropertySet >& xSeriesProperties , sal_Int32 nPointIndex ) { if( xSeriesProperties.is() ) diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 3d90fa97d338..6528d78e382c 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -87,9 +87,9 @@ void lcl_addErrorBarRanges( if( ( xSeriesProp->getPropertyValue( CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarProp ) && xErrorBarProp.is()) { - sal_Int32 eStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 eStyle = css::chart::ErrorBarStyle::NONE; if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= eStyle ) && - eStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ) + eStyle == css::chart::ErrorBarStyle::FROM_DATA ) { uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY ); if( xErrorBarDataSource.is() ) @@ -99,9 +99,9 @@ void lcl_addErrorBarRanges( if( ( xSeriesProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp ) && xErrorBarProp.is()) { - sal_Int32 eStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 eStyle = css::chart::ErrorBarStyle::NONE; if( ( xErrorBarProp->getPropertyValue("ErrorBarStyle") >>= eStyle ) && - eStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ) + eStyle == css::chart::ErrorBarStyle::FROM_DATA ) { uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY ); if( xErrorBarDataSource.is() ) @@ -154,9 +154,9 @@ Reference< chart2::data::XLabeledDataSequence > DataSourceHelper::createLabeledD uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ) { - ::com::sun::star::chart::ChartDataRowSource eRowSource = ::com::sun::star::chart::ChartDataRowSource_ROWS; + css::chart::ChartDataRowSource eRowSource = css::chart::ChartDataRowSource_ROWS; if( bUseColumns ) - eRowSource = ::com::sun::star::chart::ChartDataRowSource_COLUMNS; + eRowSource = css::chart::ChartDataRowSource_COLUMNS; uno::Sequence< beans::PropertyValue > aArguments(3); aArguments[0] = beans::PropertyValue( "DataRowSource" @@ -204,9 +204,9 @@ void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue const beans::PropertyValue& aProperty = *pArguments; if ( aProperty.Name == "DataRowSource" ) { - ::com::sun::star::chart::ChartDataRowSource eRowSource; + css::chart::ChartDataRowSource eRowSource; if( aProperty.Value >>= eRowSource ) - bUseColumns = (eRowSource==::com::sun::star::chart::ChartDataRowSource_COLUMNS); + bUseColumns = (eRowSource==css::chart::ChartDataRowSource_COLUMNS); } else if ( aProperty.Name == "FirstCellAsLabel" ) { @@ -353,7 +353,7 @@ bool DataSourceHelper::detectRangeSegmentation( const uno::Reference< frame::XModel >& xChartModel , OUString& rOutRangeString - , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping + , css::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& rOutUseColumns , bool& rOutFirstCellAsLabel , bool& rOutHasCategories ) @@ -408,7 +408,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected( { bHasDataRowSource = (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo( - cppu::UnoType<com::sun::star::chart::ChartDataRowSource>::get())); + cppu::UnoType<css::chart::ChartDataRowSource>::get())); } else if ( aProperty.Name == "FirstCellAsLabel" ) { @@ -433,7 +433,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected( void DataSourceHelper::setRangeSegmentation( const uno::Reference< frame::XModel >& xChartModel - , const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping + , const css::uno::Sequence< sal_Int32 >& rSequenceMapping , bool bUseColumns , bool bFirstCellAsLabel, bool bUseCategories ) { uno::Reference< XChartDocument > xChartDocument( xChartModel, uno::UNO_QUERY ); diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 820209b25170..706ee385a4b2 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -1486,8 +1486,7 @@ bool DiagramHelper::isSupportingFloorAndWall( const Reference< return true; } -bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram >& xDiagram ) +bool DiagramHelper::isPieOrDonutChart( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) { uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); @@ -1566,7 +1565,7 @@ sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment( const Reference< chart2::XDiagram > & xDiagram, const Reference< chart2::XChartType >& xChartType ) { - sal_Int32 nResult = ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP; + sal_Int32 nResult = css::chart::MissingValueTreatment::LEAVE_GAP; uno::Sequence < sal_Int32 > aAvailableMissingValueTreatments( ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ) ); @@ -1702,7 +1701,7 @@ bool DiagramHelper::switchDiagramPositioningToExcludingPositioning( const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); if( nCurrentODFVersion > SvtSaveOptions::ODFVER_012 ) { - uno::Reference< ::com::sun::star::chart::XDiagramPositioning > xDiagramPositioning( rModel.getFirstDiagram(), uno::UNO_QUERY ); + uno::Reference< css::chart::XDiagramPositioning > xDiagramPositioning( rModel.getFirstDiagram(), uno::UNO_QUERY ); if( xDiagramPositioning.is() && ( bConvertAlsoFromAutoPositioning || !xDiagramPositioning->isAutomaticDiagramPositioning() ) && !xDiagramPositioning->isExcludingDiagramPositioning() ) { diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 29b866f8eeef..d35c6fa53bce 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -65,12 +65,12 @@ const SfxItemPropertySet* GetErrorBarPropertySet() {OUString("ErrorBarRangePositive"),6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export {OUString("ErrorBarRangeNegative"),7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export {OUString("Weight"),8,cppu::UnoType<double>::get(),0,0}, - {OUString("LineStyle"),9,cppu::UnoType<com::sun::star::drawing::LineStyle>::get(),0,0}, + {OUString("LineStyle"),9,cppu::UnoType<css::drawing::LineStyle>::get(),0,0}, {OUString("LineDash"),10,cppu::UnoType<drawing::LineDash>::get(),0,0}, {OUString("LineWidth"),11,cppu::UnoType<sal_Int32>::get(),0,0}, - {OUString("LineColor"),12,cppu::UnoType<com::sun::star::util::Color>::get(),0,0}, + {OUString("LineColor"),12,cppu::UnoType<css::util::Color>::get(),0,0}, {OUString("LineTransparence"),13,cppu::UnoType<sal_Int16>::get(),0,0}, - {OUString("LineJoint"),14,cppu::UnoType<com::sun::star::drawing::LineJoint>::get(),0,0}, + {OUString("LineJoint"),14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl ); @@ -95,7 +95,7 @@ ErrorBar::ErrorBar( mfPositiveError(0), mfNegativeError(0), mfWeight(1), - meStyle(com::sun::star::chart::ErrorBarStyle::NONE), + meStyle(css::chart::ErrorBarStyle::NONE), m_xContext( xContext ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) {} @@ -237,7 +237,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) else if(rPropName == "ErrorBarRangePositive") { OUString aRange; - if(meStyle == com::sun::star::chart::ErrorBarStyle::FROM_DATA) + if(meStyle == css::chart::ErrorBarStyle::FROM_DATA) { uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aSequences = getDataSequences(); @@ -250,7 +250,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) else if(rPropName == "ErrorBarRangeNegative") { OUString aRange; - if(meStyle == com::sun::star::chart::ErrorBarStyle::FROM_DATA) + if(meStyle == css::chart::ErrorBarStyle::FROM_DATA) { uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aSequences = getDataSequences(); @@ -268,11 +268,11 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) } beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, std::exception) + throw (css::beans::UnknownPropertyException, std::exception) { if(rPropName == "ErrorBarStyle") { - if(meStyle == com::sun::star::chart::ErrorBarStyle::NONE) + if(meStyle == css::chart::ErrorBarStyle::NONE) return beans::PropertyState_DEFAULT_VALUE; return beans::PropertyState_DIRECT_VALUE; } @@ -282,8 +282,8 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) { switch(meStyle) { - case com::sun::star::chart::ErrorBarStyle::ABSOLUTE: - case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: + case css::chart::ErrorBarStyle::ABSOLUTE: + case css::chart::ErrorBarStyle::ERROR_MARGIN: return beans::PropertyState_DIRECT_VALUE; default: break; @@ -297,8 +297,8 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) { switch(meStyle) { - case com::sun::star::chart::ErrorBarStyle::ABSOLUTE: - case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: + case css::chart::ErrorBarStyle::ABSOLUTE: + case css::chart::ErrorBarStyle::ERROR_MARGIN: return beans::PropertyState_DIRECT_VALUE; default: break; @@ -308,7 +308,7 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) } else if(rPropName == "PercentageError") { - if(meStyle != com::sun::star::chart::ErrorBarStyle::RELATIVE) + if(meStyle != css::chart::ErrorBarStyle::RELATIVE) return beans::PropertyState_DEFAULT_VALUE; return beans::PropertyState_DIRECT_VALUE; } @@ -324,13 +324,13 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) } else if(rPropName == "ErrorBarRangePositive") { - if(meStyle == com::sun::star::chart::ErrorBarStyle::FROM_DATA && mbShowPositiveError) + if(meStyle == css::chart::ErrorBarStyle::FROM_DATA && mbShowPositiveError) return beans::PropertyState_DIRECT_VALUE; return beans::PropertyState_DEFAULT_VALUE; } else if(rPropName == "ErrorBarRangeNegative") { - if(meStyle == com::sun::star::chart::ErrorBarStyle::FROM_DATA && mbShowNegativeError) + if(meStyle == css::chart::ErrorBarStyle::FROM_DATA && mbShowNegativeError) return beans::PropertyState_DIRECT_VALUE; return beans::PropertyState_DEFAULT_VALUE; } @@ -339,7 +339,7 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) } uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames ) - throw (com::sun::star::beans::UnknownPropertyException, std::exception) + throw (css::beans::UnknownPropertyException, std::exception) { uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() ); for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i) @@ -362,23 +362,23 @@ uno::Any ErrorBar::getPropertyDefault( const OUString& ) return uno::Any(); } -void ErrorBar::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void ErrorBar::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } -void ErrorBar::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void ErrorBar::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } -void ErrorBar::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void ErrorBar::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } -void ErrorBar::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void ErrorBar::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 2d1802cec97d..ca9475ba444b 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -221,9 +221,8 @@ class SplitCategoriesProvider_ForLabeledDataSequences : public SplitCategoriesPr public: explicit SplitCategoriesProvider_ForLabeledDataSequences( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence> >& rSplitCategoriesList + const css::uno::Sequence< + css::uno::Reference< css::chart2::data::XLabeledDataSequence> >& rSplitCategoriesList , ChartModel& rModel ) : m_rSplitCategoriesList( rSplitCategoriesList ) , mrModel( rModel ) @@ -235,8 +234,8 @@ public: virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const override; private: - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence> >& m_rSplitCategoriesList; + const css::uno::Sequence< css::uno::Reference< + css::chart2::data::XLabeledDataSequence> >& m_rSplitCategoriesList; ChartModel& mrModel; }; diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index 5316984b10fc..064136093a9a 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -34,7 +34,7 @@ namespace chart namespace { -void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ) +void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties ) { rOutProperties.push_back( Property( "FillStyle", @@ -99,7 +99,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s | beans::PropertyAttribute::MAYBEDEFAULT )); } -void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ) +void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties ) { rOutProperties.push_back( Property( "FillBitmapName", diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx index 2c3c80e68663..2bc7e6fe6895 100644 --- a/chart2/source/tools/ImplOPropertySet.hxx +++ b/chart2/source/tools/ImplOPropertySet.hxx @@ -39,10 +39,10 @@ public: /** supports states DIRECT_VALUE and DEFAULT_VALUE */ - ::com::sun::star::beans::PropertyState + css::beans::PropertyState GetPropertyStateByHandle( sal_Int32 nHandle ) const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > + css::uno::Sequence< css::beans::PropertyState > GetPropertyStatesByHandle( const ::std::vector< sal_Int32 > & aHandles ) const; void SetPropertyToDefault( sal_Int32 nHandle ); @@ -58,25 +58,25 @@ public: @return false if the property is default, true otherwise. */ bool GetPropertyValueByHandle( - ::com::sun::star::uno::Any & rValue, + css::uno::Any & rValue, sal_Int32 nHandle ) const; void SetPropertyValueByHandle( sal_Int32 nHandle, - const ::com::sun::star::uno::Any & rValue ); + const css::uno::Any & rValue ); - bool SetStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & xStyle ); - ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > + bool SetStyle( const css::uno::Reference< css::style::XStyle > & xStyle ); + css::uno::Reference< css::style::XStyle > GetStyle() const { return m_xStyle;} typedef - ::std::map< sal_Int32, ::com::sun::star::uno::Any > + ::std::map< sal_Int32, css::uno::Any > tPropertyMap; private: void cloneInterfaceProperties(); tPropertyMap m_aProperties; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > + css::uno::Reference< css::style::XStyle > m_xStyle; }; diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 6511a2893e84..efafdbd2e653 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -788,8 +788,8 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( aArguments[1] = beans::PropertyValue( "DataRowSource", -1, uno::makeAny( m_bDataInColumns - ? ::com::sun::star::chart::ChartDataRowSource_COLUMNS - : ::com::sun::star::chart::ChartDataRowSource_ROWS ), + ? css::chart::ChartDataRowSource_COLUMNS + : css::chart::ChartDataRowSource_ROWS ), beans::PropertyState_DIRECT_VALUE ); // internal data always contains labels and categories aArguments[2] = beans::PropertyValue( @@ -1506,13 +1506,13 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL InternalDataProvider::addChartDataChangeEventListener( - const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& ) + const Reference< css::chart::XChartDataChangeEventListener >& ) throw (uno::RuntimeException, std::exception) { } void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener( - const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& ) + const Reference< css::chart::XChartDataChangeEventListener >& ) throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index 6ca8e3f43de1..c174e398ac40 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -48,11 +48,11 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel if( !(xProp->getPropertyValue( "AnchorPosition") >>= ePos ) ) xProp->setPropertyValue( "AnchorPosition", uno::makeAny( ePos )); - ::com::sun::star::chart::ChartLegendExpansion eExpansion = + css::chart::ChartLegendExpansion eExpansion = ( ePos == chart2::LegendPosition_LINE_END || ePos == chart2::LegendPosition_LINE_START ) - ? ::com::sun::star::chart::ChartLegendExpansion_HIGH - : ::com::sun::star::chart::ChartLegendExpansion_WIDE; + ? css::chart::ChartLegendExpansion_HIGH + : css::chart::ChartLegendExpansion_WIDE; if( !(xProp->getPropertyValue( "Expansion") >>= eExpansion ) ) xProp->setPropertyValue( "Expansion", uno::makeAny( eExpansion )); diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 840692b0d533..2378ad06c24d 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -161,8 +161,8 @@ bool LifeTimeManager::dispose() //--release all resources and references after calling this method successful } -CloseableLifeTimeManager::CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable - , ::com::sun::star::lang::XComponent* pComponent +CloseableLifeTimeManager::CloseableLifeTimeManager( css::util::XCloseable* pCloseable + , css::lang::XComponent* pComponent , bool bLongLastingCallsCancelable ) : LifeTimeManager( pComponent, bLongLastingCallsCancelable ) , m_pCloseable(pCloseable) diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx index 41aa01d6bf68..e5e29145a43a 100644 --- a/chart2/source/tools/LinePropertiesHelper.cxx +++ b/chart2/source/tools/LinePropertiesHelper.cxx @@ -97,8 +97,8 @@ void LinePropertiesHelper::AddDefaultsToMap( ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINE_JOINT, drawing::LineJoint_ROUND ); } -bool LinePropertiesHelper::IsLineVisible( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xLineProperties ) +bool LinePropertiesHelper::IsLineVisible( const css::uno::Reference< + css::beans::XPropertySet >& xLineProperties ) { bool bRet = false; try @@ -125,8 +125,8 @@ bool LinePropertiesHelper::IsLineVisible( const ::com::sun::star::uno::Reference return bRet; } -void LinePropertiesHelper::SetLineVisible( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xLineProperties ) +void LinePropertiesHelper::SetLineVisible( const css::uno::Reference< + css::beans::XPropertySet >& xLineProperties ) { try { @@ -149,8 +149,8 @@ void LinePropertiesHelper::SetLineVisible( const ::com::sun::star::uno::Referenc } } -void LinePropertiesHelper::SetLineInvisible( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xLineProperties ) +void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference< + css::beans::XPropertySet >& xLineProperties ) { try { @@ -168,8 +168,8 @@ void LinePropertiesHelper::SetLineInvisible( const ::com::sun::star::uno::Refere } } -void LinePropertiesHelper::SetLineColor( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xLineProperties, sal_Int32 nColor ) +void LinePropertiesHelper::SetLineColor( const css::uno::Reference< + css::beans::XPropertySet >& xLineProperties, sal_Int32 nColor ) { try { diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index 062c5f466164..9951b1336194 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -137,11 +137,11 @@ void MediaDescriptorHelper::impl_init() ISSET_CharacterSet = false; ISSET_Comment = false; -// ::com::sun::star::uno::Any ComponentData; +// css::uno::Any ComponentData; ISSET_ComponentData = false; ISSET_FileName = false; -// ::com::sun::star::uno::Any FilterData; +// css::uno::Any FilterData; ISSET_FilterData = false; ISSET_FilterName = false; ISSET_FilterFlags = false; @@ -163,10 +163,10 @@ void MediaDescriptorHelper::impl_init() ISSET_Overwrite = false; ISSET_Password = false; -// ::com::sun::star::awt::Rectangle PosSize; +// css::awt::Rectangle PosSize; ISSET_PosSize = false; -// ::com::sun::star::uno::Sequence< sal_Int8 > PostData; +// css::uno::Sequence< sal_Int8 > PostData; ISSET_PostData = false; ISSET_PostString = false; Preview = false; @@ -185,7 +185,7 @@ void MediaDescriptorHelper::impl_init() Version = 0; ISSET_Version = false; -// ::com::sun::star::uno::Any ViewData; +// css::uno::Any ViewData; ISSET_ViewData = false; ViewId = 0; ISSET_ViewId = false; diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index 622825462357..0ac16b840aca 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -26,8 +26,7 @@ using ::com::sun::star::uno::Reference; namespace chart { -typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::util::XModifyListener > +typedef ::cppu::WeakComponentImplHelper< css::util::XModifyListener > ModifyListenerCallBack_Base; class ModifyListenerCallBack_impl diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index b6d093e8d362..02b3e6a5a505 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -62,8 +62,8 @@ void lcl_fireModifyEvent( struct lcl_weakReferenceToSame : public ::std::unary_function< ::std::pair< - ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener >, - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > >, + css::uno::WeakReference< css::util::XModifyListener >, + css::uno::Reference< css::util::XModifyListener > >, bool > { explicit lcl_weakReferenceToSame( const Reference< util::XModifyListener > & xModListener ) : @@ -96,8 +96,8 @@ uno::Reference< util::XModifyListener > createModifyEventForwarder() ModifyEventForwarder::ModifyEventForwarder() : ::cppu::WeakComponentImplHelper< - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener >( m_aMutex ), + css::util::XModifyBroadcaster, + css::util::XModifyListener >( m_aMutex ), m_aModifyListeners( m_aMutex ) { } diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index 107b289c83d9..c3d14ce56073 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -30,12 +30,12 @@ namespace chart { uno::Reference< container::XNameContainer > createNameContainer( - const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ) + const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ) { return new NameContainer( rType, rServicename, rImplementationName ); } -NameContainer::NameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ) +NameContainer::NameContainer( const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ) : m_aType( rType ) , m_aServicename( rServicename ) , m_aImplementationName( rImplementationName ) @@ -59,19 +59,19 @@ NameContainer::~NameContainer() //XServiceInfo OUString SAL_CALL NameContainer::getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { return m_aImplementationName; } sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { Sequence<OUString> aSNS { m_aServicename }; return aSNS; diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index de4ea2803dee..121a25ac61dc 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -274,7 +274,7 @@ void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, } template<> - void setPropertyValue< ::com::sun::star::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ) + void setPropertyValue< css::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ) { setPropertyValueAny( rOutMap, key, rAny ); } @@ -286,7 +286,7 @@ void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapK } template<> - void setPropertyValueDefault< ::com::sun::star::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ) + void setPropertyValueDefault< css::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ) { setPropertyValueDefaultAny( rOutMap, key, rAny ); } diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 654f30a84c24..749bf64a1e9c 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -224,11 +224,11 @@ void RangeHighlighter::fillRangesForErrorBars( bool bUsesRangesAsErrorBars = false; try { - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; bUsesRangesAsErrorBars = ( xErrorBar.is() && (xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle) && - nStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ); + nStyle == css::chart::ErrorBarStyle::FROM_DATA ); } catch( const uno::Exception & ex ) { diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 62489feeec99..04e3160aed18 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -149,7 +149,7 @@ struct StaticRegressionCurveInfoHelper_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 ); diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index f09aecd4eddc..5b03c5eaad57 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -39,12 +39,12 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XServiceName, - ::com::sun::star::chart2::XRegressionCurve, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener > + css::lang::XServiceInfo, + css::lang::XServiceName, + css::chart2::XRegressionCurve, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > RegressionCurveModel_Base; } @@ -65,8 +65,7 @@ public: CURVE_TYPE_MOVING_AVERAGE }; - RegressionCurveModel( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, + RegressionCurveModel( css::uno::Reference< css::uno::XComponentContext > const & xContext, tCurveType eCurveType ); RegressionCurveModel( const RegressionCurveModel & rOther ); virtual ~RegressionCurveModel(); @@ -78,48 +77,47 @@ public: protected: // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XRegressionCurve ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getEquationProperties() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setEquationProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xEquationProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; using ::cppu::OPropertySetHelper::disposing; @@ -129,14 +127,13 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; const tCurveType m_eRegressionCurveType; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xEquationProperties; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::beans::XPropertySet > m_xEquationProperties; }; // implementations for factory instantiation @@ -145,15 +142,14 @@ class MeanValueRegressionCurve : public RegressionCurveModel { public: explicit MeanValueRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit MeanValueRegressionCurve( const MeanValueRegressionCurve & rOther ); virtual ~MeanValueRegressionCurve(); // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() @@ -171,15 +167,15 @@ class LinearRegressionCurve : public RegressionCurveModel { public: explicit LinearRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< + css::uno::XComponentContext > & xContext ); explicit LinearRegressionCurve( const LinearRegressionCurve & rOther ); virtual ~LinearRegressionCurve(); // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() @@ -197,15 +193,15 @@ class LogarithmicRegressionCurve : public RegressionCurveModel { public: explicit LogarithmicRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< + css::uno::XComponentContext > & xContext ); explicit LogarithmicRegressionCurve( const LogarithmicRegressionCurve & rOther ); virtual ~LogarithmicRegressionCurve(); // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() @@ -223,15 +219,14 @@ class ExponentialRegressionCurve : public RegressionCurveModel { public: explicit ExponentialRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit ExponentialRegressionCurve( const ExponentialRegressionCurve & rOther ); virtual ~ExponentialRegressionCurve(); // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() @@ -249,15 +244,15 @@ class PotentialRegressionCurve : public RegressionCurveModel { public: explicit PotentialRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< + css::uno::XComponentContext > & xContext ); explicit PotentialRegressionCurve( const PotentialRegressionCurve & rOther ); virtual ~PotentialRegressionCurve(); // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() @@ -275,15 +270,14 @@ class PolynomialRegressionCurve : public RegressionCurveModel { public: explicit PolynomialRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit PolynomialRegressionCurve( const PolynomialRegressionCurve & rOther ); virtual ~PolynomialRegressionCurve(); // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() @@ -301,15 +295,14 @@ class MovingAverageRegressionCurve : public RegressionCurveModel { public: explicit MovingAverageRegressionCurve( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ); explicit MovingAverageRegressionCurve( const MovingAverageRegressionCurve & rOther ); virtual ~MovingAverageRegressionCurve(); // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 4804c0c36390..a544fe2a504b 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -142,7 +142,7 @@ struct StaticRegressionEquationInfoHelper_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 ); diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index d996f24f4d7b..b05aa1f4ac94 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -40,10 +40,10 @@ namespace impl { typedef ::cppu::WeakImplHelper< css::lang::XServiceInfo, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::util::XModifyListener, - ::com::sun::star::chart2::XTitle > + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener, + css::chart2::XTitle > RegressionEquation_Base; } @@ -58,18 +58,18 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations @@ -79,48 +79,47 @@ protected: explicit RegressionEquation( const RegressionEquation & rOther ); // ____ OPropertySet ____ - virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) 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; // ____ 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; // ____ XTitle ____ - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XFormattedString > >& Strings ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< + css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setText( const css::uno::Sequence< + css::uno::Reference< + css::chart2::XFormattedString > >& Strings ) + throw (css::uno::RuntimeException, std::exception) override; using ::cppu::OPropertySetHelper::disposing; @@ -130,11 +129,9 @@ protected: void fireModifyEvent(); private: - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XFormattedString > > m_aStrings; + css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > m_aStrings; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index b25d16594dc0..5ea07e40e925 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -345,11 +345,11 @@ bool StatisticsHelper::hasErrorBars( bool bYError /* = true */ ) { Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; return ( xErrorBar.is() && ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && - nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ); + nStyle != css::chart::ErrorBarStyle::NONE ); } void StatisticsHelper::removeErrorBars( @@ -359,7 +359,7 @@ void StatisticsHelper::removeErrorBars( Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); if ( xErrorBar.is()) xErrorBar->setPropertyValue( "ErrorBarStyle", uno::makeAny( - ::com::sun::star::chart::ErrorBarStyle::NONE )); + css::chart::ErrorBarStyle::NONE )); } bool StatisticsHelper::usesErrorBarRanges( @@ -367,11 +367,11 @@ bool StatisticsHelper::usesErrorBarRanges( bool bYError /* = true */ ) { Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); - sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; return ( xErrorBar.is() && ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && - nStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ); + nStyle == css::chart::ErrorBarStyle::FROM_DATA ); } } // namespace chart diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 86efbac5db51..a76f27626ca6 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -364,8 +364,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText } void TitleHelper::removeTitle( TitleHelper::eTitleType nTitleIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ) + , const css::uno::Reference< css::frame::XModel >& xModel ) { uno::Reference< XTitled > xTitled( lcl_getTitleParent( nTitleIndex, xModel ) ); if( xTitled.is()) @@ -375,8 +374,7 @@ void TitleHelper::removeTitle( TitleHelper::eTitleType nTitleIndex } bool TitleHelper::getTitleType( eTitleType& rType - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle >& xTitle + , const css::uno::Reference< css::chart2::XTitle >& xTitle , ChartModel& rModel ) { if( !xTitle.is() ) @@ -397,10 +395,8 @@ bool TitleHelper::getTitleType( eTitleType& rType } bool TitleHelper::getTitleType( eTitleType& rType - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle >& xTitle - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ) + , const css::uno::Reference< css::chart2::XTitle >& xTitle + , const css::uno::Reference< css::frame::XModel >& xModel ) { if( !xTitle.is() || !xModel.is() ) return false; diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index 3a19c1807a99..c6a10ca84620 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -29,7 +29,7 @@ namespace chart WeakModifyListenerAdapter::WeakModifyListenerAdapter( const uno::WeakReference< util::XModifyListener > & xListener ) : - WeakListenerAdapter< ::com::sun::star::util::XModifyListener >( xListener ) + WeakListenerAdapter< css::util::XModifyListener >( xListener ) {} WeakModifyListenerAdapter::~WeakModifyListenerAdapter() @@ -45,7 +45,7 @@ void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEve WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter( const Reference< view::XSelectionChangeListener > & xListener ) : - WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener ) + WeakListenerAdapter< css::view::XSelectionChangeListener >( xListener ) {} WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter() diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 19f31c4be9c3..6ac89266bd20 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -58,7 +58,7 @@ Any WrappedIgnoreProperty::getPropertyValue( const Reference< beans::XPropertySe } void WrappedIgnoreProperty::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) { m_aCurrentValue = m_aDefaultValue; } diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index 1aa4f324f483..c664a6ae92ea 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -71,7 +71,7 @@ Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& x } void WrappedProperty::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( xInnerPropertyState.is() && !this->getInnerName().isEmpty() ) xInnerPropertyState->setPropertyToDefault(this->getInnerName()); diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx index 5e5267de5b9e..d8c872711c51 100644 --- a/chart2/source/view/axes/DateHelper.cxx +++ b/chart2/source/view/axes/DateHelper.cxx @@ -86,13 +86,13 @@ double DateHelper::RasterizeDateValue( double fValue, const Date& rNullDate, lon Date aDate(rNullDate); aDate += static_cast<long>(::rtl::math::approxFloor(fValue)); switch(TimeResolution) { - case ::com::sun::star::chart::TimeUnit::DAY: + case css::chart::TimeUnit::DAY: break; - case ::com::sun::star::chart::TimeUnit::YEAR: + case css::chart::TimeUnit::YEAR: aDate.SetMonth(1); aDate.SetDay(1); break; - case ::com::sun::star::chart::TimeUnit::MONTH: + case css::chart::TimeUnit::MONTH: default: aDate.SetDay(1); break; diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index e94f7e5e7fbb..65dbdcbae644 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -31,9 +31,9 @@ namespace chart class DateScaling : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XScaling, - ::com::sun::star::lang::XServiceName, - ::com::sun::star::lang::XServiceInfo + css::chart2::XScaling, + css::lang::XServiceName, + css::lang::XServiceInfo > { public: @@ -53,15 +53,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::chart2::XScaling > SAL_CALL + getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: const Date m_aNullDate; @@ -71,9 +71,9 @@ private: class InverseDateScaling : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XScaling, - ::com::sun::star::lang::XServiceName, - ::com::sun::star::lang::XServiceInfo + css::chart2::XScaling, + css::lang::XServiceName, + css::lang::XServiceInfo > { public: @@ -93,15 +93,14 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL + getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: const Date m_aNullDate; diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx index 8d8e7a872d8c..1b65e96fa9bf 100644 --- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx +++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx @@ -188,7 +188,7 @@ void MergedMinimumAndMaximumSupplier::clearMinimumAndMaximumSupplierList() long MergedMinimumAndMaximumSupplier::calculateTimeResolutionOnXAxis() { - long nRet = ::com::sun::star::chart::TimeUnit::YEAR; + long nRet = css::chart::TimeUnit::YEAR; for( MinimumAndMaximumSupplierSet::iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt ) { long nCurrent = (*aIt)->calculateTimeResolutionOnXAxis(); diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 61df0aff8689..adbde416e882 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -62,11 +62,11 @@ ExplicitScaleData::ExplicitScaleData() : Minimum(0.0) , Maximum(10.0) , Origin(0.0) - , Orientation(::com::sun::star::chart2::AxisOrientation_MATHEMATICAL) + , Orientation(css::chart2::AxisOrientation_MATHEMATICAL) , Scaling() - , AxisType(::com::sun::star::chart2::AxisType::REALNUMBER) + , AxisType(css::chart2::AxisType::REALNUMBER) , ShiftedCategoryPosition(false) - , TimeResolution(::com::sun::star::chart::TimeUnit::DAY) + , TimeResolution(css::chart::TimeUnit::DAY) , NullDate(30,12,1899) { } @@ -78,8 +78,8 @@ ExplicitSubIncrement::ExplicitSubIncrement() } ExplicitIncrementData::ExplicitIncrementData() - : MajorTimeInterval(1,::com::sun::star::chart::TimeUnit::DAY) - , MinorTimeInterval(1,::com::sun::star::chart::TimeUnit::DAY) + : MajorTimeInterval(1,css::chart::TimeUnit::DAY) + , MinorTimeInterval(1,css::chart::TimeUnit::DAY) , Distance(1.0) , PostEquidistant(true) , BaseValue(0.0) @@ -96,7 +96,7 @@ ScaleAutomatism::ScaleAutomatism( const ScaleData& rSourceScale, const Date& rNu , m_bExpandIfValuesCloseToBorder( false ) , m_bExpandWideValuesToZero( false ) , m_bExpandNarrowValuesTowardZero( false ) - , m_nTimeResolution(::com::sun::star::chart::TimeUnit::DAY) + , m_nTimeResolution(css::chart::TimeUnit::DAY) , m_aNullDate(rNullDate) { resetValueRange(); diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index f60dfce99019..c3d98df7456c 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -233,8 +233,8 @@ void TickFactory2D::addPointSequenceForTickLine( drawing::PointSequenceSequence& B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties& rAxisProperties, bool bIncludeFarAwayDistanceIfSo, bool bIncludeSpaceBetweenTickAndText ) const { bool bFarAwayLabels = false; - if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START == rAxisProperties.m_eLabelPos - || ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == rAxisProperties.m_eLabelPos ) + if( css::chart::ChartAxisLabelPosition_OUTSIDE_START == rAxisProperties.m_eLabelPos + || css::chart::ChartAxisLabelPosition_OUTSIDE_END == rAxisProperties.m_eLabelPos ) bFarAwayLabels = true; double fInnerDirectionSign = rAxisProperties.maLabelAlignment.mfInnerTickDirection; diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 7ab71d5e1414..1fc63e5e081f 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -104,8 +104,7 @@ private: //methods protected: //member ExplicitScaleData m_rScale; ExplicitIncrementData m_rIncrement; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > - m_xInverseScaling; + css::uno::Reference< css::chart2::XScaling > m_xInverseScaling; //minimum and maximum of the visible range after scaling double m_fScaledVisibleMin; @@ -125,8 +124,8 @@ public: static sal_Int32 getTickScreenDistance( TickIter& rIter ); - void createPointSequenceForAxisMainLine( ::com::sun::star::drawing::PointSequenceSequence& rPoints ) const; - void addPointSequenceForTickLine( ::com::sun::star::drawing::PointSequenceSequence& rPoints + void createPointSequenceForAxisMainLine( css::drawing::PointSequenceSequence& rPoints ) const; + void addPointSequenceForTickLine( css::drawing::PointSequenceSequence& rPoints , sal_Int32 nSequenceIndex , double fScaledLogicTickValue, double fInnerDirectionSign , const TickmarkProperties& rTickmarkProperties, bool bPlaceAtLabels ) const; diff --git a/chart2/source/view/axes/Tickmarks_Dates.hxx b/chart2/source/view/axes/Tickmarks_Dates.hxx index b9556494f243..ac121d02924b 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.hxx +++ b/chart2/source/view/axes/Tickmarks_Dates.hxx @@ -41,7 +41,7 @@ private: //methods private: //member ExplicitScaleData m_aScale; ExplicitIncrementData m_aIncrement; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > + css::uno::Reference< css::chart2::XScaling > m_xInverseScaling; //minimum and maximum of the visible range after scaling diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 0155af96fdad..4a12bec1a056 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -27,8 +27,7 @@ namespace chart class EquidistantTickIter : public TickIter { public: - EquidistantTickIter( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< double > >& rTicks + EquidistantTickIter( const css::uno::Sequence< css::uno::Sequence< double > >& rTicks , const ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); EquidistantTickIter( TickInfoArraysType& rTickInfos @@ -75,8 +74,7 @@ private: //methods } private: //member - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< double > >* m_pSimpleTicks; + const css::uno::Sequence< css::uno::Sequence< double > >* m_pSimpleTicks; TickInfoArraysType* m_pInfoTicks; const ExplicitIncrementData& m_rIncrement; sal_Int32 m_nMaxDepth; @@ -106,8 +104,7 @@ public: private: //methods void addSubTicks( sal_Int32 nDepth, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< double > >& rParentTicks ) const; + css::uno::Sequence< css::uno::Sequence< double > >& rParentTicks ) const; double* getMajorTick( sal_Int32 nTick ) const; double* getMinorTick( sal_Int32 nTick, sal_Int32 nDepth , double fStartParentTick, double fNextParentTick ) const; @@ -120,8 +117,7 @@ private: //methods private: //member ExplicitScaleData m_rScale; ExplicitIncrementData m_rIncrement; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > - m_xInverseScaling; + css::uno::Reference< css::chart2::XScaling > m_xInverseScaling; //minimum and maximum of the visible range after scaling double m_fScaledVisibleMin; diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index e2e83944dedb..e88785840de4 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -49,8 +49,8 @@ VAxisBase::~VAxisBase() { } -void VAxisBase::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) +void VAxisBase::initAxisLabelProperties( const css::awt::Size& rFontReferenceSize + , const css::awt::Rectangle& rMaximumSpaceForLabels ) { m_aAxisLabelProperties.m_aFontReferenceSize = rFontReferenceSize; m_aAxisLabelProperties.m_aMaximumSpaceForLabels = rMaximumSpaceForLabels; diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 5d85f3c95a3b..4330f3ee65f7 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -35,8 +35,7 @@ class VAxisBase : public VAxisOrGridBase public: VAxisBase( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount , const AxisProperties& rAxisProperties - , const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); + , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); virtual ~VAxisBase(); /** @@ -51,13 +50,13 @@ public: virtual bool isAnythingToDraw(); virtual void initAxisLabelProperties( - const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ); + const css::awt::Size& rFontReferenceSize + , const css::awt::Rectangle& rMaximumSpaceForLabels ); virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos ); @@ -70,22 +69,21 @@ protected: //methods void updateUnscaledValuesAtTicks( TickIter& rIter ); virtual bool prepareShapeCreation(); - void recordMaximumTextSize( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape + void recordMaximumTextSize( const css::uno::Reference< css::drawing::XShape >& xShape , double fRotationAngleDegree ); bool isDateAxis() const; bool isComplexCategoryAxis() const; protected: //member - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - AxisProperties m_aAxisProperties; - AxisLabelProperties m_aAxisLabelProperties; - ::com::sun::star::uno::Sequence< OUString > m_aTextLabels; - bool m_bUseTextLabels; - - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xGroupShape_Shapes; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xTextTarget; + css::uno::Reference< css::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; + AxisProperties m_aAxisProperties; + AxisLabelProperties m_aAxisLabelProperties; + css::uno::Sequence< OUString > m_aTextLabels; + bool m_bUseTextLabels; + + css::uno::Reference< css::drawing::XShapes > m_xGroupShape_Shapes; + css::uno::Reference< css::drawing::XShapes > m_xTextTarget; /** * This typically consists of 2 TickInfo vectors (i.e. the outer vector diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 25f820437812..d9f038f440fd 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -39,11 +39,11 @@ public: VAxisOrGridBase( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount ); virtual ~VAxisOrGridBase(); - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) override; + virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); void set3DWallPositions( CuboidPlanePosition eLeftWallPos, CuboidPlanePosition eBackWallPos, CuboidPlanePosition eBottomPos ); virtual TickFactory* createTickFactory(); diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index ac0c4a5d7529..4d857746dd9b 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -158,9 +158,9 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel , m_nDimensionIndex(0) , m_bIsMainAxis(true) , m_bSwapXAndY(false) - , m_eCrossoverType( ::com::sun::star::chart::ChartAxisPosition_ZERO ) - , m_eLabelPos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS ) - , m_eTickmarkPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ) + , m_eCrossoverType( css::chart::ChartAxisPosition_ZERO ) + , m_eLabelPos( css::chart::ChartAxisLabelPosition_NEAR_AXIS ) + , m_eTickmarkPos( css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ) , m_bCrossingAxisHasReverseDirection(false) , m_bCrossingAxisIsCategoryAxes(false) , m_bDisplayLabels( true ) @@ -241,7 +241,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty if( AxisHelper::isAxisPositioningEnabled() ) { xAxisProp->getPropertyValue("CrossoverPosition") >>= m_eCrossoverType; - if( ::com::sun::star::chart::ChartAxisPosition_VALUE == m_eCrossoverType ) + if( css::chart::ChartAxisPosition_VALUE == m_eCrossoverType ) { double fValue = 0.0; xAxisProp->getPropertyValue("CrossoverValue") >>= fValue; @@ -250,7 +250,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty fValue = ::rtl::math::round(fValue); m_pfMainLinePositionAtOtherAxis.reset(fValue); } - else if( ::com::sun::star::chart::ChartAxisPosition_ZERO == m_eCrossoverType ) + else if( css::chart::ChartAxisPosition_ZERO == m_eCrossoverType ) m_pfMainLinePositionAtOtherAxis.reset(0.0); xAxisProp->getPropertyValue("LabelPosition") >>= m_eLabelPos; @@ -258,11 +258,11 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty } else { - m_eCrossoverType = ::com::sun::star::chart::ChartAxisPosition_START; + m_eCrossoverType = css::chart::ChartAxisPosition_START; if( m_bIsMainAxis == m_bCrossingAxisHasReverseDirection ) - m_eCrossoverType = ::com::sun::star::chart::ChartAxisPosition_END; - m_eLabelPos = ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS; - m_eTickmarkPos = ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS; + m_eCrossoverType = css::chart::ChartAxisPosition_END; + m_eLabelPos = css::chart::ChartAxisLabelPosition_NEAR_AXIS; + m_eTickmarkPos = css::chart::ChartAxisMarkPosition_AT_LABELS; } } catch( const uno::Exception& e ) @@ -292,18 +292,18 @@ void AxisProperties::init( bool bCartesian ) && m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) m_bComplexCategories = true; - if( ::com::sun::star::chart::ChartAxisPosition_END == m_eCrossoverType ) + if( css::chart::ChartAxisPosition_END == m_eCrossoverType ) maLabelAlignment.mfInnerTickDirection = m_bCrossingAxisHasReverseDirection ? 1.0 : -1.0; else maLabelAlignment.mfInnerTickDirection = m_bCrossingAxisHasReverseDirection ? -1.0 : 1.0; - if( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS == m_eLabelPos ) + if( css::chart::ChartAxisLabelPosition_NEAR_AXIS == m_eLabelPos ) maLabelAlignment.mfLabelDirection = maLabelAlignment.mfInnerTickDirection; - else if( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE == m_eLabelPos ) + else if( css::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE == m_eLabelPos ) maLabelAlignment.mfLabelDirection = -maLabelAlignment.mfInnerTickDirection; - else if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START == m_eLabelPos ) + else if( css::chart::ChartAxisLabelPosition_OUTSIDE_START == m_eLabelPos ) maLabelAlignment.mfLabelDirection = m_bCrossingAxisHasReverseDirection ? -1 : 1; - else if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == m_eLabelPos ) + else if( css::chart::ChartAxisLabelPosition_OUTSIDE_END == m_eLabelPos ) maLabelAlignment.mfLabelDirection = m_bCrossingAxisHasReverseDirection ? 1 : -1; if( m_nDimensionIndex==2 ) @@ -389,17 +389,17 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel ) xProp->getPropertyValue( "StackCharacters" ) >>= this->bStackCharacters; xProp->getPropertyValue( "TextRotation" ) >>= this->fRotationAngleDegree; - ::com::sun::star::chart::ChartAxisArrangeOrderType eArrangeOrder; + css::chart::ChartAxisArrangeOrderType eArrangeOrder; xProp->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder; switch(eArrangeOrder) { - case ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE: + case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE: this->eStaggering = SIDE_BY_SIDE; break; - case ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN: + case css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN: this->eStaggering = STAGGER_EVEN; break; - case ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_ODD: + case css::chart::ChartAxisArrangeOrderType_STAGGER_ODD: this->eStaggering = STAGGER_ODD; break; default: diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 0950856667f2..c29e43f5f9aa 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -61,8 +61,8 @@ struct AxisLabelProperties final { AxisLabelProperties(); - ::com::sun::star::awt::Size m_aFontReferenceSize;//reference size to calculate the font height - ::com::sun::star::awt::Rectangle m_aMaximumSpaceForLabels;//Labels need to be clipped in order to fit into this rectangle + css::awt::Size m_aFontReferenceSize;//reference size to calculate the font height + css::awt::Rectangle m_aMaximumSpaceForLabels;//Labels need to be clipped in order to fit into this rectangle sal_Int32 nNumberFormatKey; @@ -78,8 +78,7 @@ struct AxisLabelProperties final bool bRhythmIsFix; //states whether the given rhythm is fix or may be changed //methods: - void init( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxisModel ); + void init( const css::uno::Reference< css::chart2::XAxis >& xAxisModel ); bool isStaggered() const; @@ -136,7 +135,7 @@ struct AxisProperties final VLineProperties m_aLineProperties; //for category axes -> - sal_Int32 m_nAxisType;//REALNUMBER, CATEGORY etc. type ::com::sun::star::chart2::AxisType + sal_Int32 m_nAxisType;//REALNUMBER, CATEGORY etc. type css::chart2::AxisType bool m_bComplexCategories; ExplicitCategoriesProvider* m_pExplicitCategoriesProvider;/*no ownership here*/ css::uno::Reference<css::chart2::data::XTextualDataSequence> m_xAxisTextProvider; //for categories or series names @@ -144,13 +143,13 @@ struct AxisProperties final //methods: - AxisProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxisModel + AxisProperties( const css::uno::Reference< css::chart2::XAxis >& xAxisModel , ExplicitCategoriesProvider* pExplicitCategoriesProvider ); AxisProperties( const AxisProperties& rAxisProperties ); void init(bool bCartesian=false);//init from model data (m_xAxisModel) - void initAxisPositioning( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProp ); + void initAxisPositioning( const css::uno::Reference< css::beans::XPropertySet >& xAxisProp ); static TickmarkProperties getBiggestTickmarkProperties(); TickmarkProperties makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 nTextLevel ) const; diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 7847e2fade23..6d2ed91eddb5 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1753,16 +1753,16 @@ void VCartesianAxis::createTickMarkLineShapes( TickInfoArrayType& rTickInfos, co if( !(*aTickIter).bPaintIt ) continue; - bool bTicksAtLabels = ( m_aAxisProperties.m_eTickmarkPos != ::com::sun::star::chart::ChartAxisMarkPosition_AT_AXIS ); + bool bTicksAtLabels = ( m_aAxisProperties.m_eTickmarkPos != css::chart::ChartAxisMarkPosition_AT_AXIS ); double fInnerDirectionSign = m_aAxisProperties.maLabelAlignment.mfInnerTickDirection; - if( bTicksAtLabels && m_aAxisProperties.m_eLabelPos == ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END ) + if( bTicksAtLabels && m_aAxisProperties.m_eLabelPos == css::chart::ChartAxisLabelPosition_OUTSIDE_END ) fInnerDirectionSign *= -1.0; bTicksAtLabels = bTicksAtLabels || bOnlyAtLabels; //add ticks at labels: rTickFactory2D.addPointSequenceForTickLine( aPoints, nN++, (*aTickIter).fScaledTickValue , fInnerDirectionSign , rTickmarkProperties, bTicksAtLabels ); //add ticks at axis (without labels): - if( !bOnlyAtLabels && m_aAxisProperties.m_eTickmarkPos == ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ) + if( !bOnlyAtLabels && m_aAxisProperties.m_eTickmarkPos == css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ) rTickFactory2D.addPointSequenceForTickLine( aPoints, nN++, (*aTickIter).fScaledTickValue , m_aAxisProperties.maLabelAlignment.mfInnerTickDirection, rTickmarkProperties, !bTicksAtLabels ); } diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 5a9e931ca7af..8ba89a455380 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -30,7 +30,7 @@ class VCartesianAxis : public VAxisBase // public methods public: VCartesianAxis( const AxisProperties& rAxisProperties - , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier + , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount , PlottingPositionHelper* pPosHelper = nullptr //takes ownership ); diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 3ddf2f998943..930fe3519818 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; class TextualDataProvider : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::data::XTextualDataSequence + css::chart2::data::XTextualDataSequence > { public: diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index 388ce088f301..85819babdd39 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -29,14 +29,13 @@ namespace chart class VCartesianCoordinateSystem : public VCoordinateSystem { public: - explicit VCartesianCoordinateSystem( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys ); + explicit VCartesianCoordinateSystem( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); virtual ~VCartesianCoordinateSystem(); virtual void createVAxisList( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument> &ChartDoc - , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) override; + const css::uno::Reference< css::chart2::XChartDocument> &ChartDoc + , const css::awt::Size& rFontReferenceSize + , const css::awt::Rectangle& rMaximumSpaceForLabels ) override; virtual void initVAxisInList() override; virtual void updateScalesAndIncrementsOnAxes() override; diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index baee07527a58..6239b01faff1 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -33,23 +33,20 @@ class VCartesianGrid : public VAxisOrGridBase // public methods public: VCartesianGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount - , const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > >& rGridPropertiesList //main grid, subgrid, subsubgrid etc + , const css::uno::Sequence< + css::uno::Reference< css::beans::XPropertySet > >& rGridPropertiesList //main grid, subgrid, subsubgrid etc ); virtual ~VCartesianGrid(); virtual void createShapes() override; static void fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList - , const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > >& rGridPropertiesList ); + , const css::uno::Sequence< + css::uno::Reference< css::beans::XPropertySet > >& rGridPropertiesList ); private: - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > > m_aGridPropertiesList; //main grid, subgrid, subsubgrid etc + css::uno::Sequence< + css::uno::Reference< css::beans::XPropertySet > > m_aGridPropertiesList; //main grid, subgrid, subsubgrid etc }; } //namespace chart diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index fc03e33e17f3..379d93a56648 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -362,7 +362,7 @@ void VCoordinateSystem::prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAuto if( rScaleAutomatism.getScale().AxisType==AxisType::DATE && nDimIndex==0 ) { // This is a date X dimension. Determine proper time resolution. - sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::MONTH; + sal_Int32 nTimeResolution = css::chart::TimeUnit::MONTH; if( !(rScaleAutomatism.getScale().TimeIncrement.TimeResolution >>= nTimeResolution) ) { nTimeResolution = m_aMergedMinMaxSupplier.calculateTimeResolutionOnXAxis(); diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx index ef835cec68ff..f78af84d4a67 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.hxx +++ b/chart2/source/view/axes/VPolarAngleAxis.hxx @@ -32,7 +32,7 @@ class VPolarAngleAxis : public VPolarAxis { public: VPolarAngleAxis( const AxisProperties& rAxisProperties - , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier + , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionCount ); virtual ~VPolarAngleAxis(); @@ -44,7 +44,7 @@ public: private: //methods bool createTextShapes_ForAngleAxis( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + const css::uno::Reference< css::drawing::XShapes >& xTarget , EquidistantTickIter& rTickIter , AxisLabelProperties& rAxisLabelProperties , double fLogicRadius, double fLogicZ ); diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index df8cdc24b810..283a67ae5752 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -33,7 +33,7 @@ class VPolarAxis : public VAxisBase { public: static VPolarAxis* createAxis( const AxisProperties& rAxisProperties - , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier + , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount ); void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ); @@ -44,7 +44,7 @@ public: protected: VPolarAxis( const AxisProperties& rAxisProperties - , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier + , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount ); protected: //member diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 395666ea6636..734622bc45d5 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -29,18 +29,17 @@ namespace chart class VPolarCoordinateSystem : public VCoordinateSystem { public: - explicit VPolarCoordinateSystem( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys ); + explicit VPolarCoordinateSystem( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); virtual ~VPolarCoordinateSystem(); //better performance for big data - virtual ::com::sun::star::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const ::com::sun::star::awt::Size& rPageSize - , const ::com::sun::star::awt::Size& rPageResolution ) override; + virtual css::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const css::awt::Size& rPageSize + , const css::awt::Size& rPageResolution ) override; virtual void createVAxisList( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument> & xChartDoc - , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) override; + const css::uno::Reference< css::chart2::XChartDocument> & xChartDoc + , const css::awt::Size& rFontReferenceSize + , const css::awt::Rectangle& rMaximumSpaceForLabels ) override; virtual void initVAxisInList() override; virtual void updateScalesAndIncrementsOnAxes() override; diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index d6f9ad551fac..40889f5145b8 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -36,9 +36,8 @@ class VPolarGrid : public VAxisOrGridBase // public methods public: VPolarGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount - , const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > > & rGridPropertiesList //main grid, subgrid, subsubgrid etc + , const css::uno::Sequence< + css::uno::Reference< css::beans::XPropertySet > > & rGridPropertiesList //main grid, subgrid, subsubgrid etc ); virtual ~VPolarGrid(); @@ -47,7 +46,7 @@ public: void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ); static void createLinePointSequence_ForAngleAxis( - ::com::sun::star::drawing::PointSequenceSequence& rPoints + css::drawing::PointSequenceSequence& rPoints , TickInfoArraysType& rAllTickInfos , const ExplicitIncrementData& rIncrement , const ExplicitScaleData& rScale @@ -55,9 +54,8 @@ public: , double fLogicRadius, double fLogicZ ); private: //member - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > > m_aGridPropertiesList;//main grid, subgrid, subsubgrid etc + css::uno::Sequence< + css::uno::Reference< css::beans::XPropertySet > > m_aGridPropertiesList;//main grid, subgrid, subsubgrid etc PolarPlottingPositionHelper* m_pPosHelper; ::std::vector< ExplicitIncrementData > m_aIncrements; diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 041c022eedac..a3b1b50c4123 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -83,8 +83,8 @@ void VPolarRadiusAxis::setScales( const std::vector< ExplicitScaleData >& rScale m_apAxisWithLabels->setScales( rScales, bSwapXAndYAxis ); } -void VPolarRadiusAxis::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) +void VPolarRadiusAxis::initAxisLabelProperties( const css::awt::Size& rFontReferenceSize + , const css::awt::Rectangle& rMaximumSpaceForLabels ) { VPolarAxis::initAxisLabelProperties( rFontReferenceSize, rMaximumSpaceForLabels ); m_apAxisWithLabels->initAxisLabelProperties( rFontReferenceSize, rMaximumSpaceForLabels ); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index 0e639e6895b6..65ed5e6ccd00 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -34,32 +34,29 @@ class VPolarRadiusAxis : public VPolarAxis { public: VPolarRadiusAxis( const AxisProperties& rAxisProperties - , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier + , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionCount ); virtual ~VPolarRadiusAxis(); virtual void initPlotter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xLogicTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xFinalTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& xFactory + const css::uno::Reference< css::drawing::XShapes >& xLogicTarget + , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget + , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const OUString& rCID - ) throw (::com::sun::star::uno::RuntimeException ) override; + ) throw (css::uno::RuntimeException ) override; - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) override; + virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override; virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; virtual void initAxisLabelProperties( - const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) override; + const css::awt::Size& rFontReferenceSize + , const css::awt::Rectangle& rMaximumSpaceForLabels ) override; virtual sal_Int32 estimateMaximumAutoMainIncrementCount() override; diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 8618f269d062..44a26bd1ba20 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -154,8 +154,8 @@ void AreaChart::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32 xSlo if( m_bArea && pSeries ) { sal_Int32 nMissingValueTreatment = pSeries->getMissingValueTreatment(); - if( nMissingValueTreatment == ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP ) - pSeries->setMissingValueTreatment( ::com::sun::star::chart::MissingValueTreatment::USE_ZERO ); + if( nMissingValueTreatment == css::chart::MissingValueTreatment::LEAVE_GAP ) + pSeries->setMissingValueTreatment( css::chart::MissingValueTreatment::USE_ZERO ); } if( m_nDimension == 3 && !m_bCategoryXAxis ) { @@ -784,7 +784,7 @@ void AreaChart::createShapes() || ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY) || ::rtl::math::isNan(fLogicZ) || ::rtl::math::isInf(fLogicZ) ) { - if( (*aSeriesIter)->getMissingValueTreatment() == ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP ) + if( (*aSeriesIter)->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP ) { drawing::PolyPolygonShape3D& rPolygon = (*aSeriesIter)->m_aPolyPolygonShape3D; sal_Int32& rIndex = (*aSeriesIter)->m_nPolygonIndex; @@ -945,23 +945,23 @@ void AreaChart::createShapes() switch(nLabelPlacement) { - case ::com::sun::star::chart::DataLabelPlacement::TOP: + case css::chart::DataLabelPlacement::TOP: aScenePosition3D.PositionY -= (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_TOP; break; - case ::com::sun::star::chart::DataLabelPlacement::BOTTOM: + case css::chart::DataLabelPlacement::BOTTOM: aScenePosition3D.PositionY += (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_BOTTOM; break; - case ::com::sun::star::chart::DataLabelPlacement::LEFT: + case css::chart::DataLabelPlacement::LEFT: aScenePosition3D.PositionX -= (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_LEFT; break; - case ::com::sun::star::chart::DataLabelPlacement::RIGHT: + case css::chart::DataLabelPlacement::RIGHT: aScenePosition3D.PositionX += (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_RIGHT; break; - case ::com::sun::star::chart::DataLabelPlacement::CENTER: + case css::chart::DataLabelPlacement::CENTER: eAlignment = LABEL_ALIGN_CENTER; //todo implement this different for area charts break; diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 76f9d541fcb5..80f56ec7121c 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -30,8 +30,7 @@ class AreaChart : public VSeriesPlotter { // public methods public: - AreaChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + AreaChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount , bool bCategoryXAxis, bool bNoArea=false ); @@ -40,7 +39,7 @@ public: virtual void createShapes() override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier virtual double getMaximumX() override; @@ -48,7 +47,7 @@ public: virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; virtual LegendSymbolStyle getLegendSymbolStyle() override; - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; + virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; private: //methods //no default constructor @@ -56,16 +55,16 @@ private: //methods void impl_createSeriesShapes(); bool impl_createArea( VDataSeries* pSeries - , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly - , ::com::sun::star::drawing::PolyPolygonShape3D* pPreviousSeriesPoly + , css::drawing::PolyPolygonShape3D* pSeriesPoly + , css::drawing::PolyPolygonShape3D* pPreviousSeriesPoly , PlottingPositionHelper* pPosHelper ); bool impl_createLine( VDataSeries* pSeries - , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly + , css::drawing::PolyPolygonShape3D* pSeriesPoly , PlottingPositionHelper* pPosHelper ); - static bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly - , ::com::sun::star::chart2::CurveStyle eCurveStyle + static bool create_stepped_line( css::drawing::PolyPolygonShape3D aStartPoly + , css::chart2::CurveStyle eCurveStyle , PlottingPositionHelper* pPosHelper - , ::com::sun::star::drawing::PolyPolygonShape3D &aPoly ); + , css::drawing::PolyPolygonShape3D &aPoly ); private: //member PlottingPositionHelper* m_pMainPosHelper; @@ -75,18 +74,14 @@ private: //member bool m_bSymbol; //Properties for splines: - ::com::sun::star::chart2::CurveStyle m_eCurveStyle; - sal_Int32 m_nCurveResolution; - sal_Int32 m_nSplineOrder; + css::chart2::CurveStyle m_eCurveStyle; + sal_Int32 m_nCurveResolution; + sal_Int32 m_nSplineOrder; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xSeriesTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xErrorBarTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xTextTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xRegressionCurveEquationTarget; + css::uno::Reference< css::drawing::XShapes > m_xSeriesTarget; + css::uno::Reference< css::drawing::XShapes > m_xErrorBarTarget; + css::uno::Reference< css::drawing::XShapes > m_xTextTarget; + css::uno::Reference< css::drawing::XShapes > m_xRegressionCurveEquationTarget; }; } //namespace chart #endif diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 10759c3dad4d..e04971368138 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -146,7 +146,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( switch(nLabelPlacement) { - case ::com::sun::star::chart::DataLabelPlacement::TOP: + case css::chart::DataLabelPlacement::TOP: { if( !pPosHelper->isSwapXAndY() ) { @@ -163,7 +163,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( } } break; - case ::com::sun::star::chart::DataLabelPlacement::BOTTOM: + case css::chart::DataLabelPlacement::BOTTOM: { if(!pPosHelper->isSwapXAndY()) { @@ -180,7 +180,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( } } break; - case ::com::sun::star::chart::DataLabelPlacement::LEFT: + case css::chart::DataLabelPlacement::LEFT: { if( pPosHelper->isSwapXAndY() ) { @@ -197,7 +197,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( } } break; - case ::com::sun::star::chart::DataLabelPlacement::RIGHT: + case css::chart::DataLabelPlacement::RIGHT: { if( pPosHelper->isSwapXAndY() ) { @@ -214,7 +214,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( } } break; - case ::com::sun::star::chart::DataLabelPlacement::OUTSIDE: + case css::chart::DataLabelPlacement::OUTSIDE: { fY = (fBaseValue < fScaledUpperYValue) ? fScaledUpperYValue : fScaledLowerYValue; if( pPosHelper->isSwapXAndY() ) @@ -225,7 +225,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( fDepth = (fBaseValue < fScaledUpperYValue) ? fabs(fScaledUpperBarDepth) : fabs(fScaledLowerBarDepth); } break; - case ::com::sun::star::chart::DataLabelPlacement::INSIDE: + case css::chart::DataLabelPlacement::INSIDE: { fY = (fBaseValue < fScaledUpperYValue) ? fScaledUpperYValue : fScaledLowerYValue; if( pPosHelper->isSwapXAndY() ) @@ -236,7 +236,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( fDepth = (fBaseValue < fScaledUpperYValue) ? fabs(fScaledUpperBarDepth) : fabs(fScaledLowerBarDepth); } break; - case ::com::sun::star::chart::DataLabelPlacement::NEAR_ORIGIN: + case css::chart::DataLabelPlacement::NEAR_ORIGIN: { fY = (fBaseValue < fScaledUpperYValue) ? fScaledLowerYValue : fScaledUpperYValue; if( pPosHelper->isSwapXAndY() ) @@ -247,7 +247,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( fDepth = (fBaseValue < fScaledUpperYValue) ? fabs(fScaledLowerBarDepth) : fabs(fScaledUpperBarDepth); } break; - case ::com::sun::star::chart::DataLabelPlacement::CENTER: + case css::chart::DataLabelPlacement::CENTER: fY -= (fScaledUpperYValue-fScaledLowerYValue)/2.0; rAlignment = LABEL_ALIGN_CENTER; if(3==m_nDimension) diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index 7b8344f4033b..4153cdf3f09c 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -30,32 +30,29 @@ class BarChart : public VSeriesPlotter { // public methods public: - BarChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + BarChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~BarChart(); virtual void createShapes() override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; private: //methods //no default constructor BarChart(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > createDataPoint3D_Bar( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xObjectProperties + , const css::uno::Reference< css::beans::XPropertySet >& xObjectProperties , sal_Int32 nGeometry3D ); - ::com::sun::star::awt::Point getLabelScreenPositionAndAlignment( + css::awt::Point getLabelScreenPositionAndAlignment( LabelAlignment& rAlignment, sal_Int32 nLabelPlacement , double fScaledX, double fScaledLowerYValue, double fScaledUpperYValue, double fScaledZ , double fScaledLowerBarDepth, double fScaledUpperBarDepth, double fBaseValue @@ -67,8 +64,8 @@ private: //methods private: //member BarPositionHelper* m_pMainPosHelper; - ::com::sun::star::uno::Sequence< sal_Int32 > m_aOverlapSequence; - ::com::sun::star::uno::Sequence< sal_Int32 > m_aGapwidthSequence; + css::uno::Sequence< sal_Int32 > m_aOverlapSequence; + css::uno::Sequence< sal_Int32 > m_aGapwidthSequence; }; } //namespace chart #endif diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 2f8356044454..3470dcebfeae 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -354,23 +354,23 @@ void BubbleChart::createShapes() switch(nLabelPlacement) { - case ::com::sun::star::chart::DataLabelPlacement::TOP: + case css::chart::DataLabelPlacement::TOP: aScenePosition3D.PositionY -= (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_TOP; break; - case ::com::sun::star::chart::DataLabelPlacement::BOTTOM: + case css::chart::DataLabelPlacement::BOTTOM: aScenePosition3D.PositionY += (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_BOTTOM; break; - case ::com::sun::star::chart::DataLabelPlacement::LEFT: + case css::chart::DataLabelPlacement::LEFT: aScenePosition3D.PositionX -= (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_LEFT; break; - case ::com::sun::star::chart::DataLabelPlacement::RIGHT: + case css::chart::DataLabelPlacement::RIGHT: aScenePosition3D.PositionX += (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_RIGHT; break; - case ::com::sun::star::chart::DataLabelPlacement::CENTER: + case css::chart::DataLabelPlacement::CENTER: eAlignment = LABEL_ALIGN_CENTER; break; default: diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 6f92cb460004..f66a6144774b 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -29,8 +29,7 @@ class BubbleChart : public VSeriesPlotter { // public methods public: - BubbleChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + BubbleChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~BubbleChart(); @@ -38,7 +37,7 @@ public: virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) override; @@ -53,7 +52,7 @@ private: //methods void calculateMaximumLogicBubbleSize(); void calculateBubbleSizeScalingFactor(); - com::sun::star::drawing::Direction3D transformToScreenBubbleSize( double fLogicSize ); + css::drawing::Direction3D transformToScreenBubbleSize( double fLogicSize ); private: //member diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index fff4d88b9f2c..f85db625daa3 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -30,15 +30,14 @@ class CandleStickChart : public VSeriesPlotter { // public methods public: - CandleStickChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + CandleStickChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~CandleStickChart(); virtual void createShapes() override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index a922b54a7b6c..72777ddd6931 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -136,7 +136,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries // do NOT connect last and first point, if one is NAN, and NAN handling is NAN_AS_GAP double fFirstY = pSeries->getYValue( 0 ); double fLastY = pSeries->getYValue( VSeriesPlotter::getPointCount() - 1 ); - if( (pSeries->getMissingValueTreatment() != ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP) + if( (pSeries->getMissingValueTreatment() != css::chart::MissingValueTreatment::LEAVE_GAP) || (::rtl::math::isFinite( fFirstY ) && ::rtl::math::isFinite( fLastY )) ) { // connect last point in last polygon with first point in first polygon @@ -467,7 +467,7 @@ void NetChart::createShapes() if( m_bArea && ( ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY) ) ) { - if( (*aSeriesIter)->getMissingValueTreatment() == ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP ) + if( (*aSeriesIter)->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP ) { if( rSeriesList.size() == 1 || nSeriesIndex == 0 ) { @@ -489,7 +489,7 @@ void NetChart::createShapes() || ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY) || ::rtl::math::isNan(fLogicZ) || ::rtl::math::isInf(fLogicZ) ) { - if( (*aSeriesIter)->getMissingValueTreatment() == ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP ) + if( (*aSeriesIter)->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP ) { drawing::PolyPolygonShape3D& rPolygon = (*aSeriesIter)->m_aPolyPolygonShape3D; sal_Int32& rIndex = (*aSeriesIter)->m_nPolygonIndex; @@ -628,23 +628,23 @@ void NetChart::createShapes() switch(nLabelPlacement) { - case ::com::sun::star::chart::DataLabelPlacement::TOP: + case css::chart::DataLabelPlacement::TOP: aScenePosition3D.PositionY -= (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_TOP; break; - case ::com::sun::star::chart::DataLabelPlacement::BOTTOM: + case css::chart::DataLabelPlacement::BOTTOM: aScenePosition3D.PositionY += (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_BOTTOM; break; - case ::com::sun::star::chart::DataLabelPlacement::LEFT: + case css::chart::DataLabelPlacement::LEFT: aScenePosition3D.PositionX -= (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_LEFT; break; - case ::com::sun::star::chart::DataLabelPlacement::RIGHT: + case css::chart::DataLabelPlacement::RIGHT: aScenePosition3D.PositionX += (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_RIGHT; break; - case ::com::sun::star::chart::DataLabelPlacement::CENTER: + case css::chart::DataLabelPlacement::CENTER: eAlignment = LABEL_ALIGN_CENTER; //todo implement this different for area charts break; @@ -657,7 +657,7 @@ void NetChart::createShapes() awt::Point aScreenPosition2D;//get the screen position for the labels sal_Int32 nOffset = 100; //todo maybe calculate this font height dependent - if( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE ) + if( nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE ) { PolarPlottingPositionHelper* pPolarPosHelper = dynamic_cast<PolarPlottingPositionHelper*>(pPosHelper); if( pPolarPosHelper ) diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx index 298c91e97211..ee98c343b8bd 100644 --- a/chart2/source/view/charttypes/NetChart.hxx +++ b/chart2/source/view/charttypes/NetChart.hxx @@ -29,8 +29,7 @@ class NetChart : public VSeriesPlotter { // public methods public: - NetChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + NetChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount , bool bNoArea , PlottingPositionHelper* pPlottingPositionHelper //takes ownership @@ -40,7 +39,7 @@ public: virtual void createShapes() override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier virtual double getMaximumX() override; @@ -48,7 +47,7 @@ public: virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; virtual LegendSymbolStyle getLegendSymbolStyle() override; - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; + virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; private: //methods //no default constructor @@ -56,11 +55,11 @@ private: //methods void impl_createSeriesShapes(); bool impl_createArea( VDataSeries* pSeries - , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly - , ::com::sun::star::drawing::PolyPolygonShape3D* pPreviousSeriesPoly + , css::drawing::PolyPolygonShape3D* pSeriesPoly + , css::drawing::PolyPolygonShape3D* pPreviousSeriesPoly , PlottingPositionHelper* pPosHelper ); bool impl_createLine( VDataSeries* pSeries - , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly + , css::drawing::PolyPolygonShape3D* pSeriesPoly , PlottingPositionHelper* pPosHelper ); private: //member @@ -69,10 +68,8 @@ private: //member bool m_bArea;//false -> line or symbol only bool m_bLine; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xSeriesTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xTextTarget; + css::uno::Reference< css::drawing::XShapes > m_xSeriesTarget; + css::uno::Reference< css::drawing::XShapes > m_xTextTarget; }; } //namespace chart #endif diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 9d0458330036..3da33c908255 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -289,13 +289,13 @@ void PieChart::createTextLabelShape( ///`AVOID_OVERLAP` as if it was of `CENTER` type; //AVOID_OVERLAP is in fact "Best fit" in the UI. - bool bMovementAllowed = ( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP ); + bool bMovementAllowed = ( nLabelPlacement == css::chart::DataLabelPlacement::AVOID_OVERLAP ); if( bMovementAllowed ) // Use center for "Best fit" for now. In the future we // may want to implement a real best fit algorithm. // But center is good enough, and close to what Excel // does. - nLabelPlacement = ::com::sun::star::chart::DataLabelPlacement::CENTER; + nLabelPlacement = css::chart::DataLabelPlacement::CENTER; ///for `OUTSIDE` (`INSIDE`) label placements an offset of 150 (-150), in the ///radius direction, is added to the final screen position of the label @@ -307,9 +307,9 @@ void PieChart::createTextLabelShape( ///these are coordinates of a virtual screen and 150 is a small value; LabelAlignment eAlignment(LABEL_ALIGN_CENTER); sal_Int32 nScreenValueOffsetInRadiusDirection = 0 ; - if( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE ) + if( nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE ) nScreenValueOffsetInRadiusDirection = (3!=m_nDimension) ? 150 : 0;//todo maybe calculate this font height dependent - else if( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::INSIDE ) + else if( nLabelPlacement == css::chart::DataLabelPlacement::INSIDE ) nScreenValueOffsetInRadiusDirection = (3!=m_nDimension) ? -150 : 0;//todo maybe calculate this font height dependent ///the scene position of the label anchor point is calculated (see notes for diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index 64acb90aeb19..b46279943f0f 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -33,20 +33,19 @@ class PieChart : public VSeriesPlotter struct ShapeParam; public: - PieChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + PieChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount, bool bExcludingPositioning ); virtual ~PieChart(); /** This method creates all shapes needed for representing the pie chart. */ virtual void createShapes() override; - virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ) override; + virtual void rearrangeLabelToAvoidOverlapIfRequested( const css::awt::Size& rPageSize ) override; virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; virtual bool shouldSnapRectToUsedArea() override; //MinimumAndMaximumSupplier @@ -100,12 +99,12 @@ private: //methods * and its entries are utilized for computing the maximum offset. */ double getMaxOffset(); - bool detectLabelOverlapsAndMove(const ::com::sun::star::awt::Size& rPageSize);//returns true when there might be more to do + bool detectLabelOverlapsAndMove(const css::awt::Size& rPageSize);//returns true when there might be more to do void resetLabelPositionsToPreviousState(); struct PieLabelInfo; bool tryMoveLabels( PieLabelInfo* pFirstBorder, PieLabelInfo* pSecondBorder , PieLabelInfo* pCenter, bool bSingleCenter, bool& rbAlternativeMoveDirection - , const ::com::sun::star::awt::Size& rPageSize ); + , const css::awt::Size& rPageSize ); bool performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); static bool performLabelBestFitOuterPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); @@ -119,20 +118,20 @@ private: //member struct PieLabelInfo { PieLabelInfo(); - bool moveAwayFrom( const PieLabelInfo* pFix, const ::com::sun::star::awt::Size& rPageSize + bool moveAwayFrom( const PieLabelInfo* pFix, const css::awt::Size& rPageSize , bool bMoveHalfWay, bool bMoveClockwise, bool bAlternativeMoveDirection ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xTextShape; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xLabelGroupShape; + css::uno::Reference< css::drawing::XShape > xTextShape; + css::uno::Reference< css::drawing::XShape > xLabelGroupShape; ::basegfx::B2IVector aFirstPosition; ::basegfx::B2IVector aOrigin; double fValue; bool bMovementAllowed; bool bMoved; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > xTextTarget; + css::uno::Reference< css::drawing::XShapes > xTextTarget; PieLabelInfo* pPrevious; PieLabelInfo* pNext; - ::com::sun::star::awt::Point aPreviousPosition; + css::awt::Point aPreviousPosition; }; ::std::vector< PieLabelInfo > m_aLabelInfoList; diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 1921fd3dae7d..3c20ed0fb159 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -664,8 +664,8 @@ void SplineCalculater::CalculateCubicSplines( // http://www.cs.mtu.edu/~shene/COURSES/cs3621/NOTES/ // [last called 2011-05-20] void SplineCalculater::CalculateBSplines( - const ::com::sun::star::drawing::PolyPolygonShape3D& rInput - , ::com::sun::star::drawing::PolyPolygonShape3D& rResult + const css::drawing::PolyPolygonShape3D& rInput + , css::drawing::PolyPolygonShape3D& rResult , sal_uInt32 nResolution , sal_uInt32 nDegree ) { diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx index 4f57e05a02c4..3454ee09f379 100644 --- a/chart2/source/view/charttypes/Splines.hxx +++ b/chart2/source/view/charttypes/Splines.hxx @@ -32,13 +32,13 @@ class SplineCalculater { public: static void CalculateCubicSplines( - const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints - , ::com::sun::star::drawing::PolyPolygonShape3D& rResult + const css::drawing::PolyPolygonShape3D& rPoints + , css::drawing::PolyPolygonShape3D& rResult , sal_uInt32 nGranularity ); static void CalculateBSplines( - const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints - , ::com::sun::star::drawing::PolyPolygonShape3D& rResult + const css::drawing::PolyPolygonShape3D& rPoints + , css::drawing::PolyPolygonShape3D& rResult , sal_uInt32 nGranularity , sal_uInt32 nSplineDepth ); }; diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 380a84dde736..b9537e9d6f6d 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -153,7 +153,7 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode , m_xChartTypeModelProps( uno::Reference< beans::XPropertySet >::query( xChartTypeModel )) , m_aZSlots() , m_bCategoryXAxis(bCategoryXAxis) - , m_nTimeResolution(::com::sun::star::chart::TimeUnit::DAY) + , m_nTimeResolution(css::chart::TimeUnit::DAY) , m_aNullDate(30,12,1899) , m_xColorScheme() , m_pExplicitCategoriesProvider(nullptr) @@ -365,7 +365,7 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VData , const uno::Reference< drawing::XShapes >& xTarget , bool bYError ) { - uno::Reference< ::com::sun::star::drawing::XShapes > &rShapeGroup = + uno::Reference< css::drawing::XShapes > &rShapeGroup = bYError ? rDataSeries.m_xErrorYBarsGroupShape : rDataSeries.m_xErrorXBarsGroupShape; uno::Reference< drawing::XShapes > xShapes( rShapeGroup ); @@ -731,15 +731,15 @@ double lcl_getErrorBarLogicLength( { switch( nErrorBarStyle ) { - 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: fResult = StatisticsHelper::getVariance( rData ); break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION: + case css::chart::ErrorBarStyle::STANDARD_DEVIATION: fResult = StatisticsHelper::getStandardDeviation( rData ); break; - case ::com::sun::star::chart::ErrorBarStyle::RELATIVE: + case css::chart::ErrorBarStyle::RELATIVE: { double fPercent = 0; if( xProp->getPropertyValue( bPositive @@ -755,12 +755,12 @@ double lcl_getErrorBarLogicLength( } } break; - case ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE: + case css::chart::ErrorBarStyle::ABSOLUTE: xProp->getPropertyValue( bPositive ? OUString("PositiveError") : OUString("NegativeError") ) >>= fResult; break; - case ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: + case css::chart::ErrorBarStyle::ERROR_MARGIN: { // todo: check if this is really what's called error-margin double fPercent = 0; @@ -784,10 +784,10 @@ double lcl_getErrorBarLogicLength( } } break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR: + case css::chart::ErrorBarStyle::STANDARD_ERROR: fResult = StatisticsHelper::getStandardError( rData ); break; - case ::com::sun::star::chart::ErrorBarStyle::FROM_DATA: + case css::chart::ErrorBarStyle::FROM_DATA: { uno::Reference< chart2::data::XDataSource > xErrorBarData( xProp, uno::UNO_QUERY ); if( xErrorBarData.is()) @@ -899,7 +899,7 @@ void VSeriesPlotter::createErrorBar( { bool bShowPositive = false; bool bShowNegative = false; - sal_Int32 nErrorBarStyle = ::com::sun::star::chart::ErrorBarStyle::VARIANCE; + sal_Int32 nErrorBarStyle = css::chart::ErrorBarStyle::VARIANCE; xErrorBarProperties->getPropertyValue( "ShowPositiveError") >>= bShowPositive; xErrorBarProperties->getPropertyValue( "ShowNegativeError") >>= bShowNegative; @@ -908,14 +908,14 @@ void VSeriesPlotter::createErrorBar( if(!bShowPositive && !bShowNegative) return; - if(nErrorBarStyle==::com::sun::star::chart::ErrorBarStyle::NONE) + if(nErrorBarStyle==css::chart::ErrorBarStyle::NONE) return; if (!m_pPosHelper) return; drawing::Position3D aUnscaledLogicPosition(rUnscaledLogicPosition); - if(nErrorBarStyle==::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION) + if(nErrorBarStyle==css::chart::ErrorBarStyle::STANDARD_DEVIATION) { if (bYError) aUnscaledLogicPosition.PositionY = rVDataSeries.getYMeanValue(); @@ -1348,7 +1348,7 @@ void VSeriesPlotter::setTimeResolutionOnXAxis( long TimeResolution, const Date& // MinimumAndMaximumSupplier long VSeriesPlotter::calculateTimeResolutionOnXAxis() { - long nRet = ::com::sun::star::chart::TimeUnit::YEAR; + long nRet = css::chart::TimeUnit::YEAR; if( m_pExplicitCategoriesProvider ) { const std::vector< double >& rDateCategories = m_pExplicitCategoriesProvider->getDateCategories(); @@ -1363,17 +1363,17 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis() for(;aIt!=aEnd;++aIt) { Date aCurrent(aNullDate); aCurrent+=static_cast<long>(rtl::math::approxFloor(*aIt)); - if( ::com::sun::star::chart::TimeUnit::YEAR == nRet ) + if( css::chart::TimeUnit::YEAR == nRet ) { if( DateHelper::IsInSameYear( aPrevious, aCurrent ) ) - nRet = ::com::sun::star::chart::TimeUnit::MONTH; + nRet = css::chart::TimeUnit::MONTH; } - if( ::com::sun::star::chart::TimeUnit::MONTH == nRet ) + if( css::chart::TimeUnit::MONTH == nRet ) { if( DateHelper::IsInSameMonth( aPrevious, aCurrent ) ) - nRet = ::com::sun::star::chart::TimeUnit::DAY; + nRet = css::chart::TimeUnit::DAY; } - if( ::com::sun::star::chart::TimeUnit::DAY == nRet ) + if( css::chart::TimeUnit::DAY == nRet ) break; aPrevious=aCurrent; } @@ -2092,7 +2092,7 @@ private: }; } // anonymous namespace -void VSeriesPlotter::setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ) +void VSeriesPlotter::setPageReferenceSize( const css::awt::Size & rPageRefSize ) { m_aPageReferenceSize = rPageRefSize; @@ -2123,7 +2123,7 @@ bool VSeriesPlotter::shouldSnapRectToUsedArea() std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( const awt::Size& rEntryKeyAspectRatio - , ::com::sun::star::chart::ChartLegendExpansion eLegendExpansion + , css::chart::ChartLegendExpansion eLegendExpansion , const Reference< beans::XPropertySet >& xTextProperties , const Reference< drawing::XShapes >& xTarget , const Reference< lang::XMultiServiceFactory >& xShapeFactory @@ -2169,7 +2169,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( // If the legend is wide and we have a stacked bar-chart the normal order // is the correct one bool bReverse = false; - if( eLegendExpansion != ::com::sun::star::chart::ChartLegendExpansion_WIDE ) + if( eLegendExpansion != css::chart::ChartLegendExpansion_WIDE ) { StackingDirection eStackingDirection( pSeries->getStackingDirection() ); bReverse = ( eStackingDirection == StackingDirection_Y_STACKING ); diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index f0e13a2f9802..5715f0a461ca 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -59,239 +59,224 @@ class AbstractShapeFactory { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> + css::uno::Reference< css::lang::XMultiServiceFactory> m_xShapeFactory; public: enum StackPosition { Top, Bottom }; - void setShapeFactory(com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> xFactory) + void setShapeFactory(css::uno::Reference< css::lang::XMultiServiceFactory> xFactory) { m_xShapeFactory = xFactory; } - static AbstractShapeFactory* getOrCreateShapeFactory(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> xFactory); + static AbstractShapeFactory* getOrCreateShapeFactory(css::uno::Reference< css::lang::XMultiServiceFactory> xFactory); virtual ~AbstractShapeFactory() {}; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + virtual css::uno::Reference< css::drawing::XShapes > createGroup2D( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ) = 0; + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const OUString& aName = OUString() ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + virtual css::uno::Reference< css::drawing::XShapes > createGroup3D( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ) = 0; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCube( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const OUString& aName = OUString() ) = 0; + + virtual css::uno::Reference< css::drawing::XShape > + createCube( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , sal_Int32 nRotateZAngleHundredthDegree - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap , bool bRounded = false) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCylinder( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createCylinder( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , sal_Int32 nRotateZAngleHundredthDegree ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPyramid( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createPyramid( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight , bool bRotateZ - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< + css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCone( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createCone( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPieSegment2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createPieSegment2D( const css::uno::Reference< css::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius - , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) = 0; + , const css::drawing::Direction3D& rOffset + , const css::drawing::HomogenMatrix& rUnitCircleToScene ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPieSegment( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createPieSegment( const css::uno::Reference< css::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius - , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene + , const css::drawing::Direction3D& rOffset + , const css::drawing::HomogenMatrix& rUnitCircleToScene , double fDepth ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createStripe( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createStripe( const css::uno::Reference< css::drawing::XShapes >& xTarget , const Stripe& rStripe - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap , bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities , bool bFlatNormals=true ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createArea3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon + virtual css::uno::Reference< css::drawing::XShape > + createArea3D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPolyPolygon , double fDepth) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createArea2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) = 0; + virtual css::uno::Reference< css::drawing::XShape > + createArea2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPolyPolygon) = 0; static sal_Int32 getSymbolCount() { return Symbol_COUNT; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createSymbol2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createSymbol2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol , sal_Int32 nBorderColor=0 , sal_Int32 nFillColor=0 ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createGraphic2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize - , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) = 0; + virtual css::uno::Reference< css::drawing::XShape > + createGraphic2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize + , const css::uno::Reference< css::graphic::XGraphic >& xGraphic ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PointSequenceSequence& rPoints + virtual css::uno::Reference< css::drawing::XShape > + createLine2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PointSequenceSequence& rPoints , const VLineProperties* pLineProperties = nullptr ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > - createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) = 0; + virtual css::uno::Reference< css::drawing::XShape > + createLine ( const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::awt::Size& rSize, const css::awt::Point& rPosition ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createLine3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints + virtual css::uno::Reference< css::drawing::XShape > + createLine3D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPoints , const VLineProperties& rLineProperties ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCircle2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize ) = 0; + virtual css::uno::Reference< css::drawing::XShape > + createCircle2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCircle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize - , const ::com::sun::star::awt::Point& rPosition ) = 0; + virtual css::uno::Reference< css::drawing::XShape > + createCircle( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::awt::Size& rSize + , const css::awt::Point& rPosition ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget2D , const OUString& rText , const tNameSequence& rPropNames , const tAnySequence& rPropValues - , const ::com::sun::star::uno::Any& rATransformation + , const css::uno::Any& rATransformation ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::uno::Sequence< OUString >& rTextParagraphs - , const ::com::sun::star::uno::Sequence< tNameSequence >& rParaPropNames - , const ::com::sun::star::uno::Sequence< tAnySequence >& rParaPropValues + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::uno::Sequence< OUString >& rTextParagraphs + , const css::uno::Sequence< tNameSequence >& rParaPropNames + , const css::uno::Sequence< tAnySequence >& rParaPropValues , const tNameSequence& rPropNames , const tAnySequence& rPropValues - , const ::com::sun::star::uno::Any& rATransformation ) = 0; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D, - const com::sun::star::awt::Size& rSize, - const com::sun::star::awt::Point& rPosition, - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > & xTextProperties, + , const css::uno::Any& rATransformation ) = 0; + + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget2D, + const css::awt::Size& rSize, + const css::awt::Point& rPosition, + css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& xFormattedString, + const css::uno::Reference< css::beans::XPropertySet > & xTextProperties, double nRotation, const OUString& aName ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createInvisibleRectangle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize ) = 0; + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::awt::Size& rSize ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createRectangle( - const com::sun::star::uno::Reference< - com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, - const com::sun::star::awt::Point& rPosition, + const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::awt::Size& rSize, + const css::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, StackPosition ePos = Top ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createRectangle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ) = 0; + const css::uno::Reference< css::drawing::XShapes >& xTarget ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > - getOrCreateChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ) = 0; + virtual css::uno::Reference< css::drawing::XShapes > + getOrCreateChartRootShape( const css::uno::Reference< css::drawing::XDrawPage>& xPage ) = 0; - virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) = 0; + virtual void setPageSize( css::uno::Reference < css::drawing::XShapes > xChartShapes, const css::awt::Size& rSize ) = 0; /** * Only necessary for stateless implementations */ - virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xRootShape, bool bInitOpenGL = true) = 0; + virtual void render(css::uno::Reference< css::drawing::XShapes > xRootShape, bool bInitOpenGL = true) = 0; - virtual bool preRender(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xRootShape, OpenGLWindow* pWindow) = 0; + virtual bool preRender(css::uno::Reference< css::drawing::XShapes > xRootShape, OpenGLWindow* pWindow) = 0; virtual void postRender(OpenGLWindow* pWindow) = 0; - virtual void clearPage(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xRootShape) = 0; + virtual void clearPage(css::uno::Reference< css::drawing::XShapes > xRootShape) = 0; - static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > - getChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ); + static css::uno::Reference< css::drawing::XShapes > + getChartRootShape( const css::uno::Reference< css::drawing::XDrawPage>& xPage ); - static void makeShapeInvisible( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + static void makeShapeInvisible( const css::uno::Reference< css::drawing::XShape >& xShape ); - static void setShapeName( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape + static void setShapeName( const css::uno::Reference< css::drawing::XShape >& xShape , const OUString& rName ); - static OUString getShapeName( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + static OUString getShapeName( const css::uno::Reference< css::drawing::XShape >& xShape ); - static ::com::sun::star::uno::Any makeTransformation( const ::com::sun::star::awt::Point& rScreenPosition2D, double fRotationAnglePi=0.0 ); + static css::uno::Any makeTransformation( const css::awt::Point& rScreenPosition2D, double fRotationAnglePi=0.0 ); static OUString getStackedString( const OUString& rString, bool bStacked=true ); - static bool hasPolygonAnyLines( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly ); - static bool isPolygonEmptyOrSinglePoint( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly ); - static void closePolygon( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly ); + static bool hasPolygonAnyLines( css::drawing::PolyPolygonShape3D& rPoly ); + static bool isPolygonEmptyOrSinglePoint( css::drawing::PolyPolygonShape3D& rPoly ); + static void closePolygon( css::drawing::PolyPolygonShape3D& rPoly ); - static ::com::sun::star::awt::Size calculateNewSizeRespectingAspectRatio( - const ::com::sun::star::awt::Size& rTargetSize - , const ::com::sun::star::awt::Size& rSourceSizeWithCorrectAspectRatio ); + static css::awt::Size calculateNewSizeRespectingAspectRatio( + const css::awt::Size& rTargetSize + , const css::awt::Size& rSourceSizeWithCorrectAspectRatio ); - static ::com::sun::star::awt::Point calculateTopLeftPositionToCenterObject( - const ::com::sun::star::awt::Point& rTargetAreaPosition - , const ::com::sun::star::awt::Size& rTargetAreaSize - , const ::com::sun::star::awt::Size& rObjectSize ); + static css::awt::Point calculateTopLeftPositionToCenterObject( + const css::awt::Point& rTargetAreaPosition + , const css::awt::Size& rTargetAreaSize + , const css::awt::Size& rObjectSize ); static ::basegfx::B2IRectangle getRectangleOfShape( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); + const css::uno::Reference< css::drawing::XShape >& xShape ); - static ::com::sun::star::awt::Size getSizeAfterRotation( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, double fRotationAngleDegree ); + static css::awt::Size getSizeAfterRotation( + const css::uno::Reference< css::drawing::XShape >& xShape, double fRotationAngleDegree ); - static void removeSubShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ); + static void removeSubShapes( const css::uno::Reference< css::drawing::XShapes >& xShapes ); }; diff --git a/chart2/source/view/inc/Clipping.hxx b/chart2/source/view/inc/Clipping.hxx index 1142c5936028..cd0e9be34cfa 100644 --- a/chart2/source/view/inc/Clipping.hxx +++ b/chart2/source/view/inc/Clipping.hxx @@ -47,9 +47,9 @@ public: the clipping area are stored into aResult whose prior content is deleted first. */ static void clipPolygonAtRectangle( - const ::com::sun::star::drawing::PolyPolygonShape3D& rPolygon + const css::drawing::PolyPolygonShape3D& rPolygon , const ::basegfx::B2DRectangle& rRectangle - , ::com::sun::star::drawing::PolyPolygonShape3D& aResult + , css::drawing::PolyPolygonShape3D& aResult , bool bSplitPiecesToDifferentPolygons = true ); }; diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx index 82f50da7f3e6..a53abf3c5088 100644 --- a/chart2/source/view/inc/LabelPositionHelper.hxx +++ b/chart2/source/view/inc/LabelPositionHelper.hxx @@ -39,19 +39,19 @@ class LabelPositionHelper public: LabelPositionHelper( sal_Int32 nDimensionCount - , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget + , const css::uno::Reference< css::drawing::XShapes >& xLogicTarget , AbstractShapeFactory* pShapeFactory ); virtual ~LabelPositionHelper(); - ::com::sun::star::awt::Point transformSceneToScreenPosition( - const ::com::sun::star::drawing::Position3D& rScenePosition3D ) const; + css::awt::Point transformSceneToScreenPosition( + const css::drawing::Position3D& rScenePosition3D ) const; static void changeTextAdjustment( tAnySequence& rPropValues, const tNameSequence& rPropNames, LabelAlignment eAlignment); static void doDynamicFontResize( tAnySequence& rPropValues, const tNameSequence& rPropNames - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisModelProps - , const ::com::sun::star::awt::Size& rNewReferenceSize ); + , const css::uno::Reference< css::beans::XPropertySet >& xAxisModelProps + , const css::awt::Size& rNewReferenceSize ); - static void correctPositionForRotation( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape2DText + static void correctPositionForRotation( const css::uno::Reference< css::drawing::XShape >& xShape2DText , LabelAlignment eLabelAlignment, const double fRotationAngle, bool bRotateAroundCenter ); private: @@ -62,8 +62,7 @@ protected: private: //these members are only necessary for transformation from 3D to 2D - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xLogicTarget; + css::uno::Reference< css::drawing::XShapes > m_xLogicTarget; AbstractShapeFactory* m_pShapeFactory; }; diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx index 3b7f58aa09d1..4b0d3c597d6f 100644 --- a/chart2/source/view/inc/LegendEntryProvider.hxx +++ b/chart2/source/view/inc/LegendEntryProvider.hxx @@ -53,32 +53,26 @@ struct ViewLegendEntry /** The legend symbol that represents a data series or other information contained in the legend */ - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > aSymbol; + css::uno::Reference< css::drawing::XShape > aSymbol; /** The descriptive text for a legend entry. */ - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XFormattedString2 > > aLabel; + css::uno::Sequence< + css::uno::Reference< css::chart2::XFormattedString2 > > aLabel; }; class LegendEntryProvider { public: - virtual ::com::sun::star::awt::Size getPreferredLegendKeyAspectRatio()=0; + virtual css::awt::Size getPreferredLegendKeyAspectRatio()=0; virtual std::vector< ViewLegendEntry > createLegendEntries( - const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, - ::com::sun::star::chart::ChartLegendExpansion eLegendExpansion, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xTextProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext + const css::awt::Size& rEntryKeyAspectRatio, + css::chart::ChartLegendExpansion eLegendExpansion, + const css::uno::Reference< css::beans::XPropertySet >& xTextProperties, + const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::uno::Reference< css::lang::XMultiServiceFactory >& xShapeFactory, + const css::uno::Reference< css::uno::XComponentContext >& xContext ) = 0; protected: diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index 127900307edf..5473b096e6a7 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -27,29 +27,29 @@ namespace chart { class Linear3DTransformation : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XTransformation + css::chart2::XTransformation > { public: - Linear3DTransformation( const ::com::sun::star::drawing::HomogenMatrix& rHomMatrix, bool bSwapXAndY ); + Linear3DTransformation( const css::drawing::HomogenMatrix& rHomMatrix, bool bSwapXAndY ); virtual ~Linear3DTransformation(); // ____ XTransformation ____ - /// @see ::com::sun::star::chart2::XTransformation - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( - const ::com::sun::star::uno::Sequence< double >& rSourceValues ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - /// @see ::com::sun::star::chart2::XTransformation + /// @see css::chart2::XTransformation + virtual css::uno::Sequence< double > SAL_CALL transform( + const css::uno::Sequence< double >& rSourceValues ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + /// @see css::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - /// @see ::com::sun::star::chart2::XTransformation + throw (css::uno::RuntimeException, std::exception) override; + /// @see css::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::drawing::HomogenMatrix m_Matrix; - bool m_bSwapXAndY; + css::drawing::HomogenMatrix m_Matrix; + bool m_bSwapXAndY; }; } // namespace chart diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index 5df15a3e7ecc..3c2baf9b0ed5 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -50,7 +50,7 @@ public: virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) = 0; virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) = 0; - //return a constant out of ::com::sun::star::chart::TimeUnit that allows to display the smallest distance between occurring dates + //return a constant out of css::chart::TimeUnit that allows to display the smallest distance between occurring dates virtual long calculateTimeResolutionOnXAxis() = 0; virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) = 0; diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx b/chart2/source/view/inc/OpenglShapeFactory.hxx index 63fbd29753a9..aa74308f951b 100644 --- a/chart2/source/view/inc/OpenglShapeFactory.hxx +++ b/chart2/source/view/inc/OpenglShapeFactory.hxx @@ -22,183 +22,172 @@ class OpenglShapeFactory : public chart::AbstractShapeFactory { public: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + virtual css::uno::Reference< css::drawing::XShapes > createGroup2D( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ) override; + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const OUString& aName = OUString() ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + virtual css::uno::Reference< css::drawing::XShapes > createGroup3D( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCube( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const OUString& aName = OUString() ) override; + + virtual css::uno::Reference< css::drawing::XShape > + createCube( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , sal_Int32 nRotateZAngleHundredthDegree - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap , bool bRounded = false) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCylinder( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createCylinder( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , sal_Int32 nRotateZAngleHundredthDegree ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPyramid( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createPyramid( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight , bool bRotateZ - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCone( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createCone( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPieSegment2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createPieSegment2D( const css::uno::Reference< css::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius - , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) override; + , const css::drawing::Direction3D& rOffset + , const css::drawing::HomogenMatrix& rUnitCircleToScene ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPieSegment( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createPieSegment( const css::uno::Reference< css::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius - , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene + , const css::drawing::Direction3D& rOffset + , const css::drawing::HomogenMatrix& rUnitCircleToScene , double fDepth ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createStripe( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createStripe( const css::uno::Reference< css::drawing::XShapes >& xTarget , const Stripe& rStripe - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap , bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities , bool bFlatNormals=true ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createArea3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon + virtual css::uno::Reference< css::drawing::XShape > + createArea3D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPolyPolygon , double fDepth) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createArea2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) override; + virtual css::uno::Reference< css::drawing::XShape > + createArea2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPolyPolygon) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createSymbol2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createSymbol2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol , sal_Int32 nBorderColor=0 , sal_Int32 nFillColor=0 ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createGraphic2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize - , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) override; + virtual css::uno::Reference< css::drawing::XShape > + createGraphic2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize + , const css::uno::Reference< css::graphic::XGraphic >& xGraphic ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PointSequenceSequence& rPoints + virtual css::uno::Reference< css::drawing::XShape > + createLine2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PointSequenceSequence& rPoints , const VLineProperties* pLineProperties = nullptr ) override; - virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > - createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) override; + virtual css::uno::Reference< css::drawing::XShape > + createLine ( const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::awt::Size& rSize, const css::awt::Point& rPosition ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createLine3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints + virtual css::uno::Reference< css::drawing::XShape > + createLine3D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPoints , const VLineProperties& rLineProperties ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCircle2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize ) override; + virtual css::uno::Reference< css::drawing::XShape > + createCircle2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCircle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize - , const ::com::sun::star::awt::Point& rPosition ) override; + virtual css::uno::Reference< css::drawing::XShape > + createCircle( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::awt::Size& rSize + , const css::awt::Point& rPosition ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget2D , const OUString& rText , const tNameSequence& rPropNames , const tAnySequence& rPropValues - , const ::com::sun::star::uno::Any& rATransformation + , const css::uno::Any& rATransformation ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::uno::Sequence< OUString >& rTextParagraphs - , const ::com::sun::star::uno::Sequence< tNameSequence >& rParaPropNames - , const ::com::sun::star::uno::Sequence< tAnySequence >& rParaPropValues + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::uno::Sequence< OUString >& rTextParagraphs + , const css::uno::Sequence< tNameSequence >& rParaPropNames + , const css::uno::Sequence< tAnySequence >& rParaPropValues , const tNameSequence& rPropNames , const tAnySequence& rPropValues - , const ::com::sun::star::uno::Any& rATransformation ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D, - const com::sun::star::awt::Size& rSize, - const com::sun::star::awt::Point& rPosition, - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > & xTextProperties, + , const css::uno::Any& rATransformation ) override; + + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget2D, + const css::awt::Size& rSize, + const css::awt::Point& rPosition, + css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& xFormattedString, + const css::uno::Reference< css::beans::XPropertySet > & xTextProperties, double nRotation, const OUString& aName ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createInvisibleRectangle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize ) override; + const css::uno::Reference< + css::drawing::XShapes >& xTarget + , const css::awt::Size& rSize ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createRectangle( - const com::sun::star::uno::Reference< - com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, - const com::sun::star::awt::Point& rPosition, + const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::awt::Size& rSize, + const css::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, StackPosition ePos = Top ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createRectangle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ) override; + const css::uno::Reference< css::drawing::XShapes >& xTarget ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > - getOrCreateChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ) override; + virtual css::uno::Reference< css::drawing::XShapes > + getOrCreateChartRootShape( const css::uno::Reference< css::drawing::XDrawPage>& xPage ) override; - virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) override; + virtual void setPageSize( css::uno::Reference < css::drawing::XShapes > xChartShapes, const css::awt::Size& rSize ) override; - virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xDrawPage, bool bInitOpenGL = true) override; + virtual void render(css::uno::Reference< css::drawing::XShapes > xDrawPage, bool bInitOpenGL = true) override; - virtual bool preRender(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xRootShape, OpenGLWindow* pWindow) override; + virtual bool preRender(css::uno::Reference< css::drawing::XShapes > xRootShape, OpenGLWindow* pWindow) override; virtual void postRender(OpenGLWindow* pWindow) override; - virtual void clearPage(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xDrawPage) override; + virtual void clearPage(css::uno::Reference< css::drawing::XShapes > xDrawPage) override; }; } diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 5b7b935dfef5..de4c9790531c 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -49,36 +49,30 @@ public: virtual ~PlotterBase(); virtual void initPlotter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xLogicTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xFinalTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& xFactory + const css::uno::Reference< css::drawing::XShapes >& xLogicTarget + , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget + , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const OUString& rCID ) throw (css::uno::RuntimeException, std::exception); virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); + virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ); virtual void createShapes() = 0; - static bool isValidPosition( const ::com::sun::star::drawing::Position3D& rPos ); + static bool isValidPosition( const css::drawing::Position3D& rPos ); protected: //methods - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > - createGroupShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget + css::uno::Reference< css::drawing::XShapes > + createGroupShape( const css::uno::Reference< + css::drawing::XShapes >& xTarget , const OUString& rName=OUString() ); protected: //member - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xLogicTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xFinalTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + css::uno::Reference< css::drawing::XShapes > m_xLogicTarget; + css::uno::Reference< css::drawing::XShapes > m_xFinalTarget; + css::uno::Reference< css::lang::XMultiServiceFactory> m_xShapeFactory; AbstractShapeFactory* m_pShapeFactory; OUString m_aCID; diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 65ed69e7f8db..1d60303b1791 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -47,13 +47,13 @@ public: virtual PlottingPositionHelper* clone() const; PlottingPositionHelper* createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale ); - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix); + virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix); virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); const ::std::vector< ExplicitScaleData >& getScales() const { return m_aScales;} //better performance for big data - inline void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); + inline void setCoordinateSystemResolution( const css::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); inline bool isSameForGivenResolution( double fX, double fY, double fZ , double fX2, double fY2, double fZ2 ); @@ -65,22 +65,22 @@ public: void clipScaledLogicValues( double* pX, double* pY, double* pZ ) const; inline bool clipYRange( double& rMin, double& rMax ) const; - inline void doLogicScaling( ::com::sun::star::drawing::Position3D& rPos ) const; + inline void doLogicScaling( css::drawing::Position3D& rPos ) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > + virtual css::uno::Reference< css::chart2::XTransformation > getTransformationScaledLogicToScene() const; - virtual ::com::sun::star::drawing::Position3D + virtual css::drawing::Position3D transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const; - virtual ::com::sun::star::drawing::Position3D + virtual css::drawing::Position3D transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const; - void transformScaledLogicToScene( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly ) const; + void transformScaledLogicToScene( css::drawing::PolyPolygonShape3D& rPoly ) const; - static com::sun::star::awt::Point transformSceneToScreenPosition( - const com::sun::star::drawing::Position3D& rScenePosition3D - , const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xSceneTarget + static css::awt::Point transformSceneToScreenPosition( + const css::drawing::Position3D& rScenePosition3D + , const css::uno::Reference< css::drawing::XShapes >& xSceneTarget , AbstractShapeFactory* pShapeFactory, sal_Int32 nDimensionCount ); inline double getLogicMinX() const; @@ -95,7 +95,7 @@ public: inline bool isMathematicalOrientationZ() const; ::basegfx::B2DRectangle getScaledLogicClipDoubleRect() const; - ::com::sun::star::drawing::Direction3D getScaledLogicWidth() const; + css::drawing::Direction3D getScaledLogicWidth() const; inline bool isSwapXAndY() const; @@ -115,8 +115,7 @@ protected: //member ::basegfx::B3DHomMatrix m_aMatrixScreenToScene; //this is calculated based on m_aScales and m_aMatrixScreenToScene - mutable ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTransformation > m_xTransformationLogicToScene; + mutable css::uno::Reference< css::chart2::XTransformation > m_xTransformationLogicToScene; bool m_bSwapXAndY;//e.g. true for bar chart and false for column chart @@ -152,12 +151,12 @@ public: virtual PlottingPositionHelper* clone() const override; - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix) override; + virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix) override; virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; ::basegfx::B3DHomMatrix getUnitCartesianToScene() const { return m_aUnitCartesianToScene;} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > + virtual css::uno::Reference< css::chart2::XTransformation > getTransformationScaledLogicToScene() const override; //the resulting values provided by the following 3 methods should be used @@ -181,18 +180,18 @@ public: */ double getWidthAngleDegree( double& fStartLogicValueOnAngleAxis, double& fEndLogicValueOnAngleAxis ) const; - virtual ::com::sun::star::drawing::Position3D + virtual css::drawing::Position3D transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const override; - virtual ::com::sun::star::drawing::Position3D + virtual css::drawing::Position3D transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const override; - ::com::sun::star::drawing::Position3D + css::drawing::Position3D transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling=true ) const; /** It returns the scene coordinates of the passed point: this point is * described through a normalized cylindrical coordinate system. * (For a pie chart the origin of the coordinate system is the pie center). */ - ::com::sun::star::drawing::Position3D + css::drawing::Position3D transformUnitCircleToScene( double fUnitAngleDegree, double fUnitRadius, double fLogicZ, bool bDoScaling=true ) const; using PlottingPositionHelper::transformScaledLogicToScene; @@ -226,20 +225,20 @@ private: bool PolarPlottingPositionHelper::isMathematicalOrientationAngle() const { const ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[1] : m_aScales[2]; - if( ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL==rScale.Orientation ) + if( css::chart2::AxisOrientation_MATHEMATICAL==rScale.Orientation ) return true; return false; } bool PolarPlottingPositionHelper::isMathematicalOrientationRadius() const { const ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[0] : m_aScales[1]; - if( ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL==rScale.Orientation ) + if( css::chart2::AxisOrientation_MATHEMATICAL==rScale.Orientation ) return true; return false; } //better performance for big data -void PlottingPositionHelper::setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ) +void PlottingPositionHelper::setCoordinateSystemResolution( const css::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ) { m_nXResolution = 1000; m_nYResolution = 1000; @@ -330,7 +329,7 @@ void PlottingPositionHelper::doUnshiftedLogicScaling( double* pX, double* pY, do *pZ = m_aScales[2].Scaling->doScaling(*pZ); } -void PlottingPositionHelper::doLogicScaling( ::com::sun::star::drawing::Position3D& rPos ) const +void PlottingPositionHelper::doLogicScaling( css::drawing::Position3D& rPos ) const { doLogicScaling( &rPos.PositionX, &rPos.PositionY, &rPos.PositionZ ); } @@ -407,15 +406,15 @@ inline double PlottingPositionHelper::getLogicMaxZ() const } inline bool PlottingPositionHelper::isMathematicalOrientationX() const { - return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[0].Orientation; + return css::chart2::AxisOrientation_MATHEMATICAL == m_aScales[0].Orientation; } inline bool PlottingPositionHelper::isMathematicalOrientationY() const { - return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[1].Orientation; + return css::chart2::AxisOrientation_MATHEMATICAL == m_aScales[1].Orientation; } inline bool PlottingPositionHelper::isMathematicalOrientationZ() const { - return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[2].Orientation; + return css::chart2::AxisOrientation_MATHEMATICAL == m_aScales[2].Orientation; } inline bool PlottingPositionHelper::isSwapXAndY() const { diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx b/chart2/source/view/inc/PolarLabelPositionHelper.hxx index cb7ae63ad887..a5bb57251574 100644 --- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx +++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx @@ -37,11 +37,11 @@ public: PolarLabelPositionHelper( PolarPlottingPositionHelper* pPosHelper , sal_Int32 nDimensionCount - , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget + , const css::uno::Reference< css::drawing::XShapes >& xLogicTarget , AbstractShapeFactory* pShapeFactory ); virtual ~PolarLabelPositionHelper(); - ::com::sun::star::awt::Point getLabelScreenPositionAndAlignmentForLogicValues( + css::awt::Point getLabelScreenPositionAndAlignmentForLogicValues( LabelAlignment& rAlignment , double fLogicValueOnAngleAxis , double fLogicValueOnRadiusAxis @@ -59,8 +59,8 @@ public: * angle defined by the horizontal axis and the ray bisecting the slice. * */ - ::com::sun::star::awt::Point getLabelScreenPositionAndAlignmentForUnitCircleValues( - LabelAlignment& rAlignment, sal_Int32 nLabelPlacement /*see ::com::sun::star::chart::DataLabelPlacement*/ + css::awt::Point getLabelScreenPositionAndAlignmentForUnitCircleValues( + LabelAlignment& rAlignment, sal_Int32 nLabelPlacement /*see css::chart::DataLabelPlacement*/ , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , double fLogicZ diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index f524e502eef6..595a34382cd6 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -30,9 +30,9 @@ namespace chart typedef ::std::map< OUString, OUString > tPropertyNameMap; typedef ::comphelper::MakeMap< OUString, OUString > tMakePropertyNameMap; -typedef ::std::map< OUString, ::com::sun::star::uno::Any > tPropertyNameValueMap; -typedef ::com::sun::star::uno::Sequence< OUString > tNameSequence; -typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > tAnySequence; +typedef ::std::map< OUString, css::uno::Any > tPropertyNameValueMap; +typedef css::uno::Sequence< OUString > tNameSequence; +typedef css::uno::Sequence< css::uno::Any > tAnySequence; /** * PropertyMapper provides easy mapping of the property names of various @@ -44,10 +44,8 @@ class OOO_DLLPUBLIC_CHARTTOOLS PropertyMapper { public: static void setMappedProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSource + const css::uno::Reference< css::beans::XPropertySet >& xTarget + , const css::uno::Reference< css::beans::XPropertySet >& xSource , const tPropertyNameMap& rMap , tPropertyNameValueMap* pOverwriteMap=nullptr ); @@ -64,14 +62,13 @@ public: static void getValueMap( tPropertyNameValueMap& rValueMap , const tPropertyNameMap& rNameMap - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp ); static void getMultiPropertyLists( tNameSequence& rNames , tAnySequence& rValues - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProp + , const css::uno::Reference< css::beans::XPropertySet >& xProp , const tPropertyNameMap& rMap ); @@ -81,12 +78,12 @@ public: , const tPropertyNameValueMap& rValueMap ); - static ::com::sun::star::uno::Any* + static css::uno::Any* getValuePointer( tAnySequence& rPropValues , const tNameSequence& rPropNames , const OUString& rPropName ); - static ::com::sun::star::uno::Any* + static css::uno::Any* getValuePointerForLimitedSpace( tAnySequence& rPropValues , const tNameSequence& rPropNames , bool bLimitedHeight ); @@ -94,8 +91,7 @@ public: static void setMultiProperties( const tNameSequence& rNames , const tAnySequence& rValues - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xTarget ); + , const css::uno::Reference< css::beans::XPropertySet >& xTarget ); static const tMakePropertyNameMap& getPropertyNameMapForCharacterProperties(); static const tMakePropertyNameMap& getPropertyNameMapForParagraphProperties(); @@ -109,8 +105,7 @@ public: static const tMakePropertyNameMap& getPropertyNameMapForTextLabelProperties(); static void getTextLabelMultiPropertyLists( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSourceProp + const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , tNameSequence& rPropNames, tAnySequence& rPropValues , bool bName=true , sal_Int32 nLimitedSpace=-1 @@ -121,8 +116,7 @@ public: defaults for auto-grow properties */ static void getPreparedTextShapePropertyLists( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSourceProp + const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , tNameSequence& rPropNames , tAnySequence& rPropValues ); }; diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx index 513cf7d6c456..98c6ce114563 100644 --- a/chart2/source/view/inc/ScaleAutomatism.hxx +++ b/chart2/source/view/inc/ScaleAutomatism.hxx @@ -41,7 +41,7 @@ class ScaleAutomatism { public: explicit ScaleAutomatism( - const ::com::sun::star::chart2::ScaleData& rSourceScale, const Date& rNullDate ); + const css::chart2::ScaleData& rSourceScale, const Date& rNullDate ); virtual ~ScaleAutomatism(); /** Expands own value range with the passed minimum and maximum. @@ -96,7 +96,7 @@ public: ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement ) const; - ::com::sun::star::chart2::ScaleData getScale() const { return m_aSourceScale;} + css::chart2::ScaleData getScale() const { return m_aSourceScale;} Date getNullDate() const { return m_aNullDate;} private: @@ -125,7 +125,7 @@ private: bool bAutoMinimum, bool bAutoMaximum ) const; private: - ::com::sun::star::chart2::ScaleData m_aSourceScale; + css::chart2::ScaleData m_aSourceScale; double m_fValueMinimum; /// Minimum of all source values. double m_fValueMaximum; /// Maximum of all source values. @@ -134,7 +134,7 @@ private: bool m_bExpandIfValuesCloseToBorder; /// true = Expand if values are too close to the borders. bool m_bExpandWideValuesToZero; /// true = Expand wide spread values to zero. bool m_bExpandNarrowValuesTowardZero; /// true = Expand narrow range toward zero (add half of range). - sal_Int32 m_nTimeResolution;// a constant out of ::com::sun::star::chart::TimeUnit + sal_Int32 m_nTimeResolution;// a constant out of css::chart::TimeUnit Date m_aNullDate; }; diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 5b05adad4e11..4c19f8f11178 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -28,134 +28,127 @@ class ShapeFactory : public AbstractShapeFactory { friend class AbstractShapeFactory; - ShapeFactory(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> xFactory) + ShapeFactory(css::uno::Reference< css::lang::XMultiServiceFactory> xFactory) {m_xShapeFactory = xFactory;} public: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + virtual css::uno::Reference< css::drawing::XShapes > createGroup2D( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ) override; + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const OUString& aName = OUString() ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + virtual css::uno::Reference< css::drawing::XShapes > createGroup3D( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCube( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const OUString& aName = OUString() ) override; + + virtual css::uno::Reference< css::drawing::XShape > + createCube( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , sal_Int32 nRotateZAngleHundredthDegree - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap , bool bRounded = false) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCylinder( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createCylinder( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , sal_Int32 nRotateZAngleHundredthDegree ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPyramid( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createPyramid( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight , bool bRotateZ - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCone( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createCone( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPieSegment2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createPieSegment2D( const css::uno::Reference< css::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius - , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) override; + , const css::drawing::Direction3D& rOffset + , const css::drawing::HomogenMatrix& rUnitCircleToScene ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createPieSegment( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createPieSegment( const css::uno::Reference< css::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius - , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene + , const css::drawing::Direction3D& rOffset + , const css::drawing::HomogenMatrix& rUnitCircleToScene , double fDepth ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createStripe( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget + virtual css::uno::Reference< css::drawing::XShape > + createStripe( const css::uno::Reference< css::drawing::XShapes >& xTarget , const Stripe& rStripe - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp + , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap , bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities , bool bFlatNormals=true ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createArea3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon + virtual css::uno::Reference< css::drawing::XShape > + createArea3D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPolyPolygon , double fDepth) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createArea2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) override; + virtual css::uno::Reference< css::drawing::XShape > + createArea2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPolyPolygon) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createSymbol2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize + virtual css::uno::Reference< css::drawing::XShape > + createSymbol2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol , sal_Int32 nBorderColor=0 , sal_Int32 nFillColor=0 ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createGraphic2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize - , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) override; + virtual css::uno::Reference< css::drawing::XShape > + createGraphic2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize + , const css::uno::Reference< css::graphic::XGraphic >& xGraphic ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PointSequenceSequence& rPoints + virtual css::uno::Reference< css::drawing::XShape > + createLine2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PointSequenceSequence& rPoints , const VLineProperties* pLineProperties = nullptr ) override; - virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > - createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) override; + virtual css::uno::Reference< css::drawing::XShape > + createLine ( const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::awt::Size& rSize, const css::awt::Point& rPosition ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createLine3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints + virtual css::uno::Reference< css::drawing::XShape > + createLine3D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::PolyPolygonShape3D& rPoints , const VLineProperties& rLineProperties ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCircle2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize ) override; + virtual css::uno::Reference< css::drawing::XShape > + createCircle2D( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPos + , const css::drawing::Direction3D& rSize ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createCircle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize - , const ::com::sun::star::awt::Point& rPosition ) override; + virtual css::uno::Reference< css::drawing::XShape > + createCircle( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::awt::Size& rSize + , const css::awt::Point& rPosition ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget2D , const OUString& rText , const tNameSequence& rPropNames , const tAnySequence& rPropValues - , const ::com::sun::star::uno::Any& rATransformation + , const css::uno::Any& rATransformation ) override; /** This method creates a text shape made up by a set of paragraphs. @@ -185,74 +178,70 @@ public: * a transformation to be applied to the text shape as final step. * */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::uno::Sequence< OUString >& rTextParagraphs - , const ::com::sun::star::uno::Sequence< tNameSequence >& rParaPropNames - , const ::com::sun::star::uno::Sequence< tAnySequence >& rParaPropValues + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::uno::Sequence< OUString >& rTextParagraphs + , const css::uno::Sequence< tNameSequence >& rParaPropNames + , const css::uno::Sequence< tAnySequence >& rParaPropValues , const tNameSequence& rPropNames , const tAnySequence& rPropValues - , const ::com::sun::star::uno::Any& rATransformation ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D, - const com::sun::star::awt::Size& rSize, - const com::sun::star::awt::Point& rPosition, - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > & xTextProperties, + , const css::uno::Any& rATransformation ) override; + + virtual css::uno::Reference< css::drawing::XShape > + createText( const css::uno::Reference< css::drawing::XShapes >& xTarget2D, + const css::awt::Size& rSize, + const css::awt::Point& rPosition, + css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& xFormattedString, + const css::uno::Reference< css::beans::XPropertySet > & xTextProperties, double nRotation, const OUString& aName ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createInvisibleRectangle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize ) override; + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::awt::Size& rSize ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createRectangle( - const com::sun::star::uno::Reference< - com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, - const com::sun::star::awt::Point& rPosition, + const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::awt::Size& rSize, + const css::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, StackPosition ePos = Top ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createRectangle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ) override; + const css::uno::Reference< css::drawing::XShapes >& xTarget ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > - getOrCreateChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ) override; + virtual css::uno::Reference< css::drawing::XShapes > + getOrCreateChartRootShape( const css::uno::Reference< + css::drawing::XDrawPage>& xPage ) override; - virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) override; + virtual void setPageSize( css::uno::Reference < css::drawing::XShapes > xChartShapes, const css::awt::Size& rSize ) override; /** * not necessary right now */ - virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >, bool ) override {} + virtual void render(css::uno::Reference< css::drawing::XShapes >, bool ) override {} - virtual bool preRender(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >, OpenGLWindow*) override { return true; } + virtual bool preRender(css::uno::Reference< css::drawing::XShapes >, OpenGLWindow*) override { return true; } virtual void postRender(OpenGLWindow*) override {} - virtual void clearPage(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > ) override {} + virtual void clearPage(css::uno::Reference< css::drawing::XShapes > ) override {} private: ShapeFactory(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - impl_createCube( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize, sal_Int32 nRotateZAngleHundredthDegree + css::uno::Reference< css::drawing::XShape > + impl_createCube( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize, sal_Int32 nRotateZAngleHundredthDegree , bool bRounded ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - impl_createConeOrCylinder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + css::uno::Reference< css::drawing::XShape > + impl_createConeOrCylinder( const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree , bool bCylinder = false); }; diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index cc17a0cabfb5..4c25af12a2ac 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -34,37 +34,37 @@ namespace chart class Stripe { public: - Stripe( const ::com::sun::star::drawing::Position3D& rPoint1 - , const ::com::sun::star::drawing::Direction3D& rDirectionToPoint2 - , const ::com::sun::star::drawing::Direction3D& rDirectionToPoint4 ); + Stripe( const css::drawing::Position3D& rPoint1 + , const css::drawing::Direction3D& rDirectionToPoint2 + , const css::drawing::Direction3D& rDirectionToPoint4 ); - Stripe( const ::com::sun::star::drawing::Position3D& rPoint1 - , const ::com::sun::star::drawing::Position3D& rPoint2 + Stripe( const css::drawing::Position3D& rPoint1 + , const css::drawing::Position3D& rPoint2 , double fDepth ); - Stripe( const ::com::sun::star::drawing::Position3D& rPoint1 - , const ::com::sun::star::drawing::Position3D& rPoint2 - , const ::com::sun::star::drawing::Position3D& rPoint3 - , const ::com::sun::star::drawing::Position3D& rPoint4 ); + Stripe( const css::drawing::Position3D& rPoint1 + , const css::drawing::Position3D& rPoint2 + , const css::drawing::Position3D& rPoint3 + , const css::drawing::Position3D& rPoint4 ); - void SetManualNormal( const ::com::sun::star::drawing::Direction3D& rNormal ); - ::com::sun::star::drawing::Direction3D getNormal() const; + void SetManualNormal( const css::drawing::Direction3D& rNormal ); + css::drawing::Direction3D getNormal() const; void InvertNormal( bool bInvertNormal ); - ::com::sun::star::uno::Any getPolyPolygonShape3D() const; - ::com::sun::star::uno::Any getNormalsPolygon() const; - static ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ); //0 to 7 are the different possibilities + css::uno::Any getPolyPolygonShape3D() const; + css::uno::Any getNormalsPolygon() const; + static css::uno::Any getTexturePolygon( short nRotatedTexture ); //0 to 7 are the different possibilities private: - ::com::sun::star::drawing::Position3D m_aPoint1; - ::com::sun::star::drawing::Position3D m_aPoint2; - ::com::sun::star::drawing::Position3D m_aPoint3; - ::com::sun::star::drawing::Position3D m_aPoint4; + css::drawing::Position3D m_aPoint1; + css::drawing::Position3D m_aPoint2; + css::drawing::Position3D m_aPoint3; + css::drawing::Position3D m_aPoint4; bool m_bInvertNormal; bool m_bManualNormalSet; - ::com::sun::star::drawing::Direction3D m_aManualNormal; + css::drawing::Direction3D m_aManualNormal; }; } //namespace chart diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 10890b9951e2..15ceaa592f3d 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -47,28 +47,24 @@ class VCoordinateSystem public: virtual ~VCoordinateSystem(); - static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel ); + static VCoordinateSystem* createCoordinateSystem( const css::uno::Reference< + css::chart2::XCoordinateSystem >& xCooSysModel ); void initPlottingTargets( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xLogicTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xFinalTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xLogicTargetForSeriesBehindAxis ) + const css::uno::Reference< css::drawing::XShapes >& xLogicTarget + , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget + , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory + , css::uno::Reference< css::drawing::XShapes >& xLogicTargetForSeriesBehindAxis ) throw (css::uno::RuntimeException, std::exception); void setParticle( const OUString& rCooSysParticle ); - void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); - ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen() { return m_aMatrixSceneToScreen;} + void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ); + css::drawing::HomogenMatrix getTransformationSceneToScreen() { return m_aMatrixSceneToScreen;} //better performance for big data - virtual ::com::sun::star::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const ::com::sun::star::awt::Size& rPageSize - , const ::com::sun::star::awt::Size& rPageResolution ); + virtual css::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const css::awt::Size& rPageSize + , const css::awt::Size& rPageResolution ); ExplicitScaleData getExplicitScale( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; ExplicitIncrementData getExplicitIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; @@ -107,17 +103,17 @@ public: void set3DWallPositions( CuboidPlanePosition eLeftWallPos, CuboidPlanePosition eBackWallPos, CuboidPlanePosition eBottomPos ); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > + css::uno::Reference< + css::chart2::XCoordinateSystem > getModel() const { return m_xCooSysModel;} /** * Create "view" axis obejcts 'VAxis' from the coordinate system model. */ virtual void createVAxisList( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument> & xChartDoc - , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ); + const css::uno::Reference< css::chart2::XChartDocument> & xChartDoc + , const css::awt::Size& rFontReferenceSize + , const css::awt::Rectangle& rMaximumSpaceForLabels ); virtual void initVAxisInList(); virtual void updateScalesAndIncrementsOnAxes(); @@ -134,52 +130,47 @@ public: sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const; bool needSeriesNamesForAxis() const; - void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< OUString >& rSeriesNames ); + void setSeriesNamesForAxis( const css::uno::Sequence< OUString >& rSeriesNames ); protected: //methods - VCoordinateSystem( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem >& xCooSys ); + VCoordinateSystem( const css::uno::Reference< + css::chart2::XCoordinateSystem >& xCooSys ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > + css::uno::Reference< css::chart2::XAxis > getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > - getGridListFromAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); + static css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > + getGridListFromAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis ); VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - OUString createCIDForAxis( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis + OUString createCIDForAxis( const css::uno::Reference< + css::chart2::XAxis >& xAxis , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - OUString createCIDForGrid( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis + OUString createCIDForGrid( const css::uno::Reference< + css::chart2::XAxis >& xAxis , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - sal_Int32 getNumberFormatKeyForAxis( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument>& xChartDoc); + sal_Int32 getNumberFormatKeyForAxis( const css::uno::Reference< + css::chart2::XAxis >& xAxis + , const css::uno::Reference< + css::chart2::XChartDocument>& xChartDoc); private: //methods static void impl_adjustDimension( sal_Int32& rDimensionIndex ); void impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex, sal_Int32& rAxisIndex ) const; protected: //member - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > m_xCooSysModel; + css::uno::Reference< css::chart2::XCoordinateSystem > m_xCooSysModel; OUString m_aCooSysParticle; typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xLogicTargetForGrids; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xLogicTargetForAxes; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xFinalTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; - ::com::sun::star::drawing::HomogenMatrix m_aMatrixSceneToScreen; + css::uno::Reference< css::drawing::XShapes > m_xLogicTargetForGrids; + css::uno::Reference< css::drawing::XShapes > m_xLogicTargetForAxes; + css::uno::Reference< css::drawing::XShapes > m_xFinalTarget; + css::uno::Reference< css::lang::XMultiServiceFactory> m_xShapeFactory; + css::drawing::HomogenMatrix m_aMatrixSceneToScreen; CuboidPlanePosition m_eLeftWallPos; CuboidPlanePosition m_eBackWallPos; @@ -192,7 +183,7 @@ protected: //member */ MergedMinimumAndMaximumSupplier m_aMergedMinMaxSupplier; - ::com::sun::star::uno::Sequence< OUString > m_aSeriesNamesForZAxis; + css::uno::Sequence< OUString > m_aSeriesNamesForZAxis; typedef std::map< tFullAxisIndex, std::shared_ptr< VAxisBase > > tVAxisMap; diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index 89eecfa41f31..9a684ea6d2b0 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -39,19 +39,19 @@ diagram. class VDiagram { public: //methods - VDiagram( const com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram>& xDiagram, - const com::sun::star::drawing::Direction3D& rPreferredAspectRatio, + VDiagram( const css::uno::Reference<css::chart2::XDiagram>& xDiagram, + const css::drawing::Direction3D& rPreferredAspectRatio, sal_Int32 nDimension = 3 ); virtual ~VDiagram(); void init( - const com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>& xTarget, - const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& xFactory ); + const css::uno::Reference<css::drawing::XShapes>& xTarget, + const css::uno::Reference<css::lang::XMultiServiceFactory>& xFactory ); - void createShapes( const ::com::sun::star::awt::Point& rPos - , const ::com::sun::star::awt::Size& rSize ); + void createShapes( const css::awt::Point& rPos + , const css::awt::Size& rSize ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > getCoordinateRegion() { return css::uno::Reference<css::drawing::XShapes>( m_xCoordinateRegionShape, css::uno::UNO_QUERY );} /** @@ -61,8 +61,8 @@ public: //methods void reduceToMimimumSize(); - ::basegfx::B2IRectangle adjustPosAndSize( const ::com::sun::star::awt::Point& rPos - , const ::com::sun::star::awt::Size& rAvailableSize ); + ::basegfx::B2IRectangle adjustPosAndSize( const css::awt::Point& rPos + , const css::awt::Size& rAvailableSize ); ::basegfx::B2IRectangle adjustInnerSize( const ::basegfx::B2IRectangle& rConsumedOuterRect ); @@ -70,44 +70,41 @@ private: //methods void createShapes_2d(); void createShapes_3d(); - ::basegfx::B2IRectangle adjustPosAndSize_2d( const ::com::sun::star::awt::Point& rPos - , const ::com::sun::star::awt::Size& rAvailableSize ); - ::basegfx::B2IRectangle adjustPosAndSize_3d( const ::com::sun::star::awt::Point& rPos - , const ::com::sun::star::awt::Size& rAvailableSize ); + ::basegfx::B2IRectangle adjustPosAndSize_2d( const css::awt::Point& rPos + , const css::awt::Size& rAvailableSize ); + ::basegfx::B2IRectangle adjustPosAndSize_3d( const css::awt::Point& rPos + , const css::awt::Size& rAvailableSize ); - void adjustAspectRatio3d( const ::com::sun::star::awt::Size& rAvailableSize ); + void adjustAspectRatio3d( const css::awt::Size& rAvailableSize ); private: //members VDiagram(const VDiagram& rD) = delete; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + css::uno::Reference< css::drawing::XShapes > m_xTarget; + css::uno::Reference< css::lang::XMultiServiceFactory> m_xShapeFactory; AbstractShapeFactory* m_pShapeFactory; // this is the surrounding shape which contains floor, wall and coordinate - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xOuterGroupShape; + css::uno::Reference< css::drawing::XShape > m_xOuterGroupShape; // this is an additional inner shape that represents the coordinate region - that is - where to place data points - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xCoordinateRegionShape; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xWall2D; + css::uno::Reference< css::drawing::XShape > m_xCoordinateRegionShape; + css::uno::Reference< css::drawing::XShape > m_xWall2D; sal_Int32 m_nDimensionCount; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > m_xDiagram; + css::uno::Reference< css::chart2::XDiagram > m_xDiagram; - ::com::sun::star::drawing::Direction3D m_aPreferredAspectRatio; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAspectRatio3D; + css::drawing::Direction3D m_aPreferredAspectRatio; + css::uno::Reference< css::beans::XPropertySet > m_xAspectRatio3D; double m_fXAnglePi; double m_fYAnglePi; double m_fZAnglePi; - ::com::sun::star::awt::Point m_aAvailablePosIncludingAxes; - ::com::sun::star::awt::Size m_aAvailableSizeIncludingAxes; + css::awt::Point m_aAvailablePosIncludingAxes; + css::awt::Size m_aAvailableSizeIncludingAxes; - ::com::sun::star::awt::Point m_aCurrentPosWithoutAxes; - ::com::sun::star::awt::Size m_aCurrentSizeWithoutAxes; + css::awt::Point m_aCurrentPosWithoutAxes; + css::awt::Size m_aCurrentSizeWithoutAxes; bool m_bRightAngledAxes; }; diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx index 463b68b8294f..5656bb1d1491 100644 --- a/chart2/source/view/inc/VLegendSymbolFactory.hxx +++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx @@ -38,19 +38,15 @@ namespace VLegendSymbolFactory PROP_TYPE_FILL_AND_LINE }; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > createSymbol( - const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& rSymbolContainer, + const css::awt::Size& rEntryKeyAspectRatio, + const css::uno::Reference< css::drawing::XShapes >& rSymbolContainer, LegendSymbolStyle eStyle, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xShapeFactory, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xLegendEntryProperties, + const css::uno::Reference< css::lang::XMultiServiceFactory > & xShapeFactory, + const css::uno::Reference< css::beans::XPropertySet > & xLegendEntryProperties, tPropertyType ePropertyType, - const ::com::sun::star::uno::Any& rExplicitSymbol /*should contain a ::com::sun::star::chart2::Symbol without automatic symbol if the charttype does support symbols else empty*/); + const css::uno::Any& rExplicitSymbol /*should contain a css::chart2::Symbol without automatic symbol if the charttype does support symbols else empty*/); } } // namespace chart diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index 51a9ea73f2ab..2e16ed29c8af 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -27,15 +27,14 @@ namespace chart struct VLineProperties { - com::sun::star::uno::Any Color; //type sal_Int32 UNO_NAME_LINECOLOR - com::sun::star::uno::Any LineStyle; //type drawing::LineStyle for property UNO_NAME_LINESTYLE - com::sun::star::uno::Any Transparence;//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE - com::sun::star::uno::Any Width;//type sal_Int32 for property UNO_NAME_LINEWIDTH - com::sun::star::uno::Any DashName;//type OUString for property "LineDashName" + css::uno::Any Color; //type sal_Int32 UNO_NAME_LINECOLOR + css::uno::Any LineStyle; //type drawing::LineStyle for property UNO_NAME_LINESTYLE + css::uno::Any Transparence;//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE + css::uno::Any Width;//type sal_Int32 for property UNO_NAME_LINEWIDTH + css::uno::Any DashName;//type OUString for property "LineDashName" VLineProperties(); - void initFromPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xProp ); + void initFromPropertySet( const css::uno::Reference< css::beans::XPropertySet >& xProp ); bool isLineVisible() const; }; diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index 24aa2d1148c3..b0a0f9f331aa 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -27,7 +27,7 @@ namespace chart { class VPolarTransformation : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::XTransformation + css::chart2::XTransformation > { public: @@ -35,17 +35,17 @@ public: virtual ~VPolarTransformation(); // ____ XTransformation ____ - /// @see ::com::sun::star::chart2::XTransformation - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( - const ::com::sun::star::uno::Sequence< double >& rSourceValues ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - /// @see ::com::sun::star::chart2::XTransformation + /// @see css::chart2::XTransformation + virtual css::uno::Sequence< double > SAL_CALL transform( + const css::uno::Sequence< double >& rSourceValues ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + /// @see css::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - /// @see ::com::sun::star::chart2::XTransformation + throw (css::uno::RuntimeException, std::exception) override; + /// @see css::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: PolarPlottingPositionHelper m_aPositionHelper; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index c6873bdf2098..f112f2828ea2 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -140,7 +140,7 @@ public: /** a value <= 0 for a directions means that this direction can be stretched arbitrary */ - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const; /** this enables you to handle series on the same x axis with different y axis the property AttachedAxisIndex at a dataseries indicates which value scale is to use @@ -153,7 +153,7 @@ public: */ void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); // MinimumAndMaximumSupplier @@ -182,54 +182,45 @@ public: // Methods for handling legends and legend entries. virtual std::vector< ViewLegendEntry > createLegendEntries( - const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, - ::com::sun::star::chart::ChartLegendExpansion eLegendExpansion, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xTextProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext + const css::awt::Size& rEntryKeyAspectRatio, + css::chart::ChartLegendExpansion eLegendExpansion, + const css::uno::Reference< css::beans::XPropertySet >& xTextProperties, + const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::uno::Reference< css::lang::XMultiServiceFactory >& xShapeFactory, + const css::uno::Reference< css::uno::XComponentContext >& xContext ) override; virtual LegendSymbolStyle getLegendSymbolStyle(); - virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio() override; + virtual css::awt::Size getPreferredLegendKeyAspectRatio() override; - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); + virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLegendSymbolForSeries( - const ::com::sun::star::awt::Size& rEntryKeyAspectRatio + css::uno::Reference< css::drawing::XShape > createLegendSymbolForSeries( + const css::awt::Size& rEntryKeyAspectRatio , const VDataSeries& rSeries - , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory ); + , const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::uno::Reference< css::lang::XMultiServiceFactory >& xShapeFactory ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLegendSymbolForPoint( - const ::com::sun::star::awt::Size& rEntryKeyAspectRatio + css::uno::Reference< css::drawing::XShape > createLegendSymbolForPoint( + const css::awt::Size& rEntryKeyAspectRatio , const VDataSeries& rSeries , sal_Int32 nPointIndex - , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory ); + , const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::uno::Reference< css::lang::XMultiServiceFactory >& xShapeFactory ); std::vector< ViewLegendEntry > createLegendEntriesForSeries( - const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, + const css::awt::Size& rEntryKeyAspectRatio, const VDataSeries& rSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xTextProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext + const css::uno::Reference< css::beans::XPropertySet >& xTextProperties, + const css::uno::Reference< css::drawing::XShapes >& xTarget, + const css::uno::Reference< css::lang::XMultiServiceFactory >& xShapeFactory, + const css::uno::Reference< css::uno::XComponentContext >& xContext ); ::std::vector< VDataSeries* > getAllSeries(); // This method creates a series plotter of the requested type; e.g. : return new PieChart .... - static VSeriesPlotter* createSeriesPlotter( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + static VSeriesPlotter* createSeriesPlotter( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount , bool bExcludingPositioning = false /*for pie and donut charts labels and exploded segments are excluded from the given size*/); @@ -237,21 +228,19 @@ public: // Methods for number formats and color schemes - void setNumberFormatsSupplier( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormatsSupplier > & xNumFmtSupplier ); + void setNumberFormatsSupplier( const css::uno::Reference< css::util::XNumberFormatsSupplier > & xNumFmtSupplier ); void setAxesNumberFormats( const AxesNumberFormats& rAxesNumberFormats ) { m_aAxesNumberFormats = rAxesNumberFormats; }; - void setColorScheme( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XColorScheme >& xColorScheme ); + void setColorScheme( const css::uno::Reference< css::chart2::XColorScheme >& xColorScheme ); void setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider ); //get series names for the z axis labels - ::com::sun::star::uno::Sequence< OUString > getSeriesNames() const; + css::uno::Sequence< OUString > getSeriesNames() const; - void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); + void setPageReferenceSize( const css::awt::Size & rPageRefSize ); //better performance for big data - void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); + void setCoordinateSystemResolution( const css::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); bool PointsWereSkipped() const { return m_bPointsWereSkipped;} //return the depth for a logic 1 @@ -259,7 +248,7 @@ public: void releaseShapes(); - virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ); + virtual void rearrangeLabelToAvoidOverlapIfRequested( const css::awt::Size& rPageSize ); bool WantToPlotInFrontOfAxisLine(); virtual bool shouldSnapRectToUsedArea(); @@ -270,41 +259,35 @@ private: protected: - VSeriesPlotter( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + VSeriesPlotter( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount , bool bCategoryXAxis=true ); // Methods for group shapes. - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > getSeriesGroupShape( VDataSeries* pDataSeries - , const::com::sun::star:: uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); + , const css:: uno::Reference< css::drawing::XShapes >& xTarget ); //the following group shapes will be created as children of SeriesGroupShape on demand //they can be used to assure that some parts of a series shape are always in front of others (e.g. symbols in front of lines) //parameter xTarget will be used as parent for the series group shape - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > getSeriesGroupShapeFrontChild( VDataSeries* pDataSeries - , const::com::sun::star:: uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + , const css:: uno::Reference< css::drawing::XShapes >& xTarget ); + css::uno::Reference< css::drawing::XShapes > getSeriesGroupShapeBackChild( VDataSeries* pDataSeries - , const::com::sun::star:: uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); + , const css:: uno::Reference< css::drawing::XShapes >& xTarget ); /// This method creates a 2D group shape for containing all text shapes /// needed for this series; the group is added to the text target; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > getLabelsGroupShape( VDataSeries& rDataSeries - , const::com::sun::star:: uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); + , const css:: uno::Reference< css::drawing::XShapes >& xTarget ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > getErrorBarsGroupShape( VDataSeries& rDataSeries - , const::com::sun::star:: uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget, bool bYError ); + , const css:: uno::Reference< css::drawing::XShapes >& xTarget, bool bYError ); /** This method creates a text shape for a label related to a data point * and append it to the root text shape group (xTarget). @@ -331,14 +314,13 @@ protected: * @return * a reference to the created text shape. */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - createDataLabel( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget + css::uno::Reference< css::drawing::XShape > + createDataLabel( const css::uno::Reference< css::drawing::XShapes >& xTarget , VDataSeries& rDataSeries , sal_Int32 nPointIndex , double fValue , double fSumValue - , const ::com::sun::star::awt::Point& rScreenPosition2D + , const css::awt::Point& rScreenPosition2D , LabelAlignment eAlignment=LABEL_ALIGN_CENTER , sal_Int32 nOffset=0 , sal_Int32 nTextWidth = 0 ); @@ -368,49 +350,38 @@ protected: for y-error bars this is true, for x-error-bars it is false. */ void createErrorBar( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D & rPos - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xErrorBarProperties + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D & rPos + , const css::uno::Reference< css::beans::XPropertySet > & xErrorBarProperties , const VDataSeries& rVDataSeries , sal_Int32 nIndex , bool bVertical , double* pfScaledLogicX ); - void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition + void createErrorBar_X( const css::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); + , const css::uno::Reference< css::drawing::XShapes >& xTarget ); - void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition + void createErrorBar_Y( const css::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget + , const css::uno::Reference< css::drawing::XShapes >& xTarget , double* pfScaledLogicX=nullptr ); void createRegressionCurvesShapes( VDataSeries& rVDataSeries - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xEquationTarget + , const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::uno::Reference< css::drawing::XShapes >& xEquationTarget , bool bMaySkipPointsInRegressionCalculation ); void createRegressionCurveEquationShapes( const OUString & rEquationCID - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xEquationProperties - , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xEquationTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator - , ::com::sun::star::awt::Point aDefaultPos ); + , const css::uno::Reference< css::beans::XPropertySet > & xEquationProperties + , const css::uno::Reference< css::drawing::XShapes >& xEquationTarget + , const css::uno::Reference< css::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator + , css::awt::Point aDefaultPos ); static void setMappedProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xTarget - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xSource + const css::uno::Reference< css::drawing::XShape >& xTarget + , const css::uno::Reference< css::beans::XPropertySet >& xSource , const tPropertyNameMap& rMap , tPropertyNameValueMap* pOverwriteMap=nullptr ); @@ -421,10 +392,8 @@ protected: protected: PlottingPositionHelper* m_pMainPosHelper; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > m_xChartTypeModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xChartTypeModelProps; + css::uno::Reference< css::chart2::XChartType > m_xChartTypeModel; + css::uno::Reference< css::beans::XPropertySet > m_xChartTypeModelProps; ::std::vector< ::std::vector< VDataSeriesGroup > > m_aZSlots; @@ -435,13 +404,12 @@ protected: std::unique_ptr< NumberFormatterWrapper > m_apNumberFormatterWrapper; AxesNumberFormats m_aAxesNumberFormats;//direct numberformats on axes, if empty ask the data series instead - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XColorScheme > m_xColorScheme; + css::uno::Reference< css::chart2::XColorScheme > m_xColorScheme; ExplicitCategoriesProvider* m_pExplicitCategoriesProvider; //better performance for big data - ::com::sun::star::uno::Sequence< sal_Int32 > m_aCoordinateSystemResolution; + css::uno::Sequence< sal_Int32 > m_aCoordinateSystemResolution; bool m_bPointsWereSkipped; private: @@ -450,7 +418,7 @@ private: typedef std::map< sal_Int32 , PlottingPositionHelper* > tSecondaryPosHelperMap; mutable tSecondaryPosHelperMap m_aSecondaryPosHelperMap; - ::com::sun::star::awt::Size m_aPageReferenceSize; + css::awt::Size m_aPageReferenceSize; }; } //namespace chart diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index b6864cafa292..1587ac704d7e 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -57,7 +57,7 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE); //legend - ppPoolDefaults[SCHATTR_LEGEND_POS - SCHATTR_START] = new SfxInt32Item(SCHATTR_LEGEND_POS, ::com::sun::star::chart2::LegendPosition_LINE_END ); + ppPoolDefaults[SCHATTR_LEGEND_POS - SCHATTR_START] = new SfxInt32Item(SCHATTR_LEGEND_POS, css::chart2::LegendPosition_LINE_END ); ppPoolDefaults[SCHATTR_LEGEND_SHOW - SCHATTR_START] = new SfxBoolItem(SCHATTR_LEGEND_SHOW, true); //text diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 2c8f6ab579d9..fc524b5096e8 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -958,21 +958,21 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& Reference< XAxis > xAxis( xCooSys->getAxisByDimension( nDimensionIndex, nAxisIndex ) ); Reference< beans::XPropertySet > xCrossingMainAxis( AxisHelper::getCrossingMainAxis( xAxis, xCooSys ), uno::UNO_QUERY ); - ::com::sun::star::chart::ChartAxisPosition eCrossingMainAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); + css::chart::ChartAxisPosition eCrossingMainAxisPos( css::chart::ChartAxisPosition_ZERO ); if( xCrossingMainAxis.is() ) { xCrossingMainAxis->getPropertyValue("CrossoverPosition") >>= eCrossingMainAxisPos; - if( ::com::sun::star::chart::ChartAxisPosition_VALUE == eCrossingMainAxisPos ) + if( css::chart::ChartAxisPosition_VALUE == eCrossingMainAxisPos ) { double fValue = 0.0; xCrossingMainAxis->getPropertyValue("CrossoverValue") >>= fValue; aExplicitScale.Origin = fValue; } - else if( ::com::sun::star::chart::ChartAxisPosition_ZERO == eCrossingMainAxisPos ) + else if( css::chart::ChartAxisPosition_ZERO == eCrossingMainAxisPos ) aExplicitScale.Origin = 0.0; - else if( ::com::sun::star::chart::ChartAxisPosition_START == eCrossingMainAxisPos ) + else if( css::chart::ChartAxisPosition_START == eCrossingMainAxisPos ) aExplicitScale.Origin = aExplicitScale.Minimum; - else if( ::com::sun::star::chart::ChartAxisPosition_END == eCrossingMainAxisPos ) + else if( css::chart::ChartAxisPosition_END == eCrossingMainAxisPos ) aExplicitScale.Origin = aExplicitScale.Maximum; } @@ -1867,27 +1867,27 @@ bool ChartView::getExplicitValuesForAxis( if( rExplicitScale.ShiftedCategoryPosition ) { //remove 'one' from max - if( rExplicitScale.AxisType == ::com::sun::star::chart2::AxisType::DATE ) + if( rExplicitScale.AxisType == css::chart2::AxisType::DATE ) { Date aMaxDate(rExplicitScale.NullDate); aMaxDate += static_cast<long>(::rtl::math::approxFloor(rExplicitScale.Maximum)); //for explicit scales with shifted categories we need one interval more switch( rExplicitScale.TimeResolution ) { - case ::com::sun::star::chart::TimeUnit::DAY: + case css::chart::TimeUnit::DAY: --aMaxDate; break; - case ::com::sun::star::chart::TimeUnit::MONTH: + case css::chart::TimeUnit::MONTH: aMaxDate = DateHelper::GetDateSomeMonthsAway(aMaxDate,-1); break; - case ::com::sun::star::chart::TimeUnit::YEAR: + case css::chart::TimeUnit::YEAR: aMaxDate = DateHelper::GetDateSomeYearsAway(aMaxDate,-1); break; } rExplicitScale.Maximum = aMaxDate - rExplicitScale.NullDate; } - else if( rExplicitScale.AxisType == ::com::sun::star::chart2::AxisType::CATEGORY ) + else if( rExplicitScale.AxisType == css::chart2::AxisType::CATEGORY ) rExplicitScale.Maximum -= 1.0; - else if( rExplicitScale.AxisType == ::com::sun::star::chart2::AxisType::SERIES ) + else if( rExplicitScale.AxisType == css::chart2::AxisType::SERIES ) rExplicitScale.Maximum -= 1.0; } return true; @@ -2262,7 +2262,7 @@ bool getAvailablePosAndSizeForDiagram( xProp->getPropertyValue( "PosSizeExcludeAxes" ) >>= bPosSizeExcludeAxes; //size: - ::com::sun::star::chart2::RelativeSize aRelativeSize; + css::chart2::RelativeSize aRelativeSize; if( xProp.is() && (xProp->getPropertyValue( "RelativeSize" )>>=aRelativeSize) ) { rParam.maRemainingSpace.Height = static_cast<sal_Int32>(aRelativeSize.Secondary*rPageSize.Height); diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 99bb50820ddb..3b37fe40d000 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -78,7 +78,7 @@ void TextCache::insertBitmap(const TextCacheKey& rKey, const BitmapEx& rBitmap) } class DummyPropertySetInfo : public cppu::WeakImplHelper< - com::sun::star::beans::XPropertySetInfo > + css::beans::XPropertySetInfo > { public: explicit DummyPropertySetInfo(const std::map<OUString, uno::Any>& rProps ): @@ -471,11 +471,11 @@ void DummyArea2D::render() sal_Int32 nPointssCount = maShapes.getLength(); for(sal_Int32 i = 0; i < nPointssCount; i++) { - const com::sun::star::uno::Sequence<com::sun::star::awt::Point>& points = maShapes[i]; + const css::uno::Sequence<css::awt::Point>& points = maShapes[i]; sal_Int32 nPointsCount = points.getLength(); for(sal_Int32 j = 0; j < nPointsCount; j++) { - const com::sun::star::awt::Point& p = points[j]; + const css::awt::Point& p = points[j]; pChart->m_GLRender.SetArea2DShapePoint((float)p.X, (float)p.Y, nPointsCount); } } @@ -655,11 +655,11 @@ void DummyLine2D::render() sal_Int32 pointsscount = maPoints.getLength(); for(sal_Int32 i = 0; i < pointsscount; i++) { - com::sun::star::uno::Sequence<com::sun::star::awt::Point>& points = maPoints[i]; + css::uno::Sequence<css::awt::Point>& points = maPoints[i]; sal_Int32 pointscount = points.getLength(); for(sal_Int32 j = 0; j < pointscount; j++) { - com::sun::star::awt::Point& p = points[j]; + css::awt::Point& p = points[j]; pChart->m_GLRender.SetLine2DShapePoint((float)p.X, (float)p.Y, pointscount); } diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 67bcb804cb2e..09a953ad9948 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -73,7 +73,7 @@ public: struct TextCacheKey { OUString maText; - std::map<OUString, com::sun::star::uno::Any> maProperties; + std::map<OUString, css::uno::Any> maProperties; bool operator==(const TextCacheKey& rKey) const { @@ -99,64 +99,64 @@ private: }; class DummyXShape : public cppu::WeakAggImplHelper6< - ::com::sun::star::drawing::XShape, - com::sun::star::beans::XPropertySet, - com::sun::star::beans::XMultiPropertySet, - com::sun::star::container::XNamed, - com::sun::star::container::XChild, - com::sun::star::lang::XServiceInfo > + css::drawing::XShape, + css::beans::XPropertySet, + css::beans::XMultiPropertySet, + css::container::XNamed, + css::container::XChild, + css::lang::XServiceInfo > { public: DummyXShape(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) 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 - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() 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; // XMultiPropertySet - 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 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 ::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 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 ::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 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 ::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 css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::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 firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() 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; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; // normal non UNO methods @@ -166,18 +166,18 @@ public: */ virtual void render(); - const com::sun::star::awt::Point& getPos() { return maPosition;} // internal API + const css::awt::Point& getPos() { return maPosition;} // internal API protected: std::map<OUString, css::uno::Any> maProperties; - com::sun::star::awt::Point maPosition; - com::sun::star::awt::Size maSize; + css::awt::Point maPosition; + css::awt::Size maSize; private: OUString maName; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxParent; + css::uno::Reference< css::uno::XInterface > mxParent; }; @@ -306,17 +306,17 @@ class DummyText : public DummyXShape { public: DummyText(const OUString& rText, const tNameSequence& rNames, - const tAnySequence& rValues, const css::uno::Any& rTrans, com::sun::star::uno::Reference< - com::sun::star::drawing::XShapes > xTarget, double nRotation); + const tAnySequence& rValues, const css::uno::Any& rTrans, css::uno::Reference< + css::drawing::XShapes > xTarget, double nRotation); virtual void render() 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 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 void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; private: - void setTransformatAsProperty(const com::sun::star::drawing::HomogenMatrix3& rMatrix); + void setTransformatAsProperty(const css::drawing::HomogenMatrix3& rMatrix); OUString maText; css::uno::Any maTrans; @@ -324,32 +324,32 @@ private: double mnRotation; }; -class DummyXShapes : public DummyXShape, public com::sun::star::drawing::XShapes +class DummyXShapes : public DummyXShape, public css::drawing::XShapes { public: - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // normal methods virtual void render() override; protected: - std::vector<com::sun::star::uno::Reference< com::sun::star::drawing::XShape > > maUNOShapes; + std::vector<css::uno::Reference< css::drawing::XShape > > maUNOShapes; std::vector<DummyXShape*> maShapes; }; @@ -360,8 +360,8 @@ public: virtual ~DummyChart(); virtual DummyChart* getRootShape() override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) 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 void SAL_CALL setPosition( const css::awt::Point& aPosition ) 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; virtual void render() override; @@ -386,10 +386,10 @@ class DummyGroup2D : public DummyXShapes public: explicit DummyGroup2D(const OUString& rName); - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() 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 setPosition( const ::com::sun::star::awt::Point& aPosition ) 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 css::awt::Size SAL_CALL getSize() 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 void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; }; class DummyGroup3D : public DummyXShapes diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index d4fd1cfa7110..b074d858c086 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -49,7 +49,7 @@ PlottingPositionHelper::PlottingPositionHelper() , m_nZResolution( 1000 ) , m_bMaySkipPointsInRegressionCalculation( true ) , m_bDateAxis(false) - , m_nTimeResolution( ::com::sun::star::chart::TimeUnit::DAY ) + , m_nTimeResolution( css::chart::TimeUnit::DAY ) , m_aNullDate(30,12,1899) , m_fScaledCategoryWidth(1.0) , m_bAllowShiftXAxisPos(false) @@ -700,10 +700,10 @@ void PlottingPositionHelper::setTimeResolution( long nTimeResolution, const Date double fCategoryWidth = 1.0; if( !m_aScales.empty() ) { - if( m_aScales[0].AxisType == ::com::sun::star::chart2::AxisType::DATE ) + if( m_aScales[0].AxisType == css::chart2::AxisType::DATE ) { m_bDateAxis = true; - if( nTimeResolution == ::com::sun::star::chart::TimeUnit::YEAR ) + if( nTimeResolution == css::chart::TimeUnit::YEAR ) { const double fMonthCount = 12.0;//todo: this depends on the DateScaling and must be adjusted in case we use more generic calendars in future fCategoryWidth = fMonthCount; diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index eefa3390b4ec..809620bb8f42 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -55,7 +55,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForLogicV double fUnitCircleRadius = m_pPosHelper->transformToRadius( fLogicValueOnRadiusAxis ); return getLabelScreenPositionAndAlignmentForUnitCircleValues( - rAlignment, ::com::sun::star::chart::DataLabelPlacement::OUTSIDE + rAlignment, css::chart::DataLabelPlacement::OUTSIDE , fUnitCircleAngleDegree, 0.0 , fUnitCircleRadius, fUnitCircleRadius, fLogicZ, nScreenValueOffsetInRadiusDirection ); } @@ -67,8 +67,8 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi , double fLogicZ , sal_Int32 nScreenValueOffsetInRadiusDirection ) const { - bool bCenter = (nLabelPlacement != ::com::sun::star::chart::DataLabelPlacement::OUTSIDE) - && (nLabelPlacement != ::com::sun::star::chart::DataLabelPlacement::INSIDE); + bool bCenter = (nLabelPlacement != css::chart::DataLabelPlacement::OUTSIDE) + && (nLabelPlacement != css::chart::DataLabelPlacement::INSIDE); double fAngleDegree = fUnitCircleStartAngleDegree + fUnitCircleWidthAngleDegree/2.0; double fRadius = 0.0; @@ -80,7 +80,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi awt::Point aRet( this->transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ+0.5 ) ) ); - if(3==m_nDimensionCount && nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE) + if(3==m_nDimensionCount && nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE) { //check whether the upper or the downer edge is more distant from the center //take the farest point to put the label to @@ -127,7 +127,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi while(fAngleDegree<0.0) fAngleDegree+=360.0; - bool bOutside = nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE; + bool bOutside = nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE; if(fAngleDegree==0.0) rAlignment = LABEL_ALIGN_CENTER; diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 461752cfd84c..81320e1d9966 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -386,8 +386,8 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesPro void PropertyMapper::setMultiProperties( const tNameSequence& rNames , const tAnySequence& rValues - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xTarget ) + , const css::uno::Reference< + css::beans::XPropertySet >& xTarget ) { bool bSuccess = false; try diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 598eeb0dfd83..6d62e1b3d659 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -134,7 +134,7 @@ void lcl_clearIfNoValuesButTextIsContained( VDataSequence& rData, const uno::Ref void lcl_maybeReplaceNanWithZero( double& rfValue, sal_Int32 nMissingValueTreatment ) { - if( nMissingValueTreatment == ::com::sun::star::chart::MissingValueTreatment::USE_ZERO + if( nMissingValueTreatment == css::chart::MissingValueTreatment::USE_ZERO && (::rtl::math::isNan(rfValue) || ::rtl::math::isInf(rfValue)) ) rfValue = 0.0; } @@ -181,7 +181,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) , m_apSymbolProperties_AttributedPoint(nullptr) , m_apSymbolProperties_InvisibleSymbolForSelection(nullptr) , m_nCurrentAttributedPoint(-1) - , m_nMissingValueTreatment(::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP) + , m_nMissingValueTreatment(css::chart::MissingValueTreatment::LEAVE_GAP) , m_bAllowPercentValueInDataLabel(false) , mpOldSeries(nullptr) , mnPercent(0.0) diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 478cd1928920..6106b658d82f 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -263,7 +263,7 @@ sal_Int32 lcl_getTextLineHeight( const std::vector< sal_Int32 >& aRowHeights, co //returns resulting legend size awt::Size lcl_placeLegendEntries( tViewLegendEntryContainer & rEntries, - ::com::sun::star::chart::ChartLegendExpansion eExpansion, + css::chart::ChartLegendExpansion eExpansion, bool bSymbolsLeftSide, double fViewFontSize, const awt::Size& rMaxSymbolExtent, @@ -272,7 +272,7 @@ awt::Size lcl_placeLegendEntries( const Reference< lang::XMultiServiceFactory > & xShapeFactory, const awt::Size & rAvailableSpace ) { - bool bIsCustomSize = (eExpansion == ::com::sun::star::chart::ChartLegendExpansion_CUSTOM); + bool bIsCustomSize = (eExpansion == css::chart::ChartLegendExpansion_CUSTOM); awt::Size aResultingLegendSize(0,0); if( bIsCustomSize ) aResultingLegendSize = rAvailableSpace; @@ -291,7 +291,7 @@ awt::Size lcl_placeLegendEntries( uno::Any* pFrameWidthAny = PropertyMapper::getValuePointer( rTextProperties.second, rTextProperties.first, "TextMaximumFrameWidth"); if(pFrameWidthAny) { - if( eExpansion == ::com::sun::star::chart::ChartLegendExpansion_HIGH ) + if( eExpansion == css::chart::ChartLegendExpansion_HIGH ) { // limit the width of texts to 30% of the total available width // #i109336# Improve auto positioning in chart @@ -315,7 +315,7 @@ awt::Size lcl_placeLegendEntries( sal_Int32 nTextLineHeight = static_cast< sal_Int32 >( fViewFontSize ); // determine layout depending on LegendExpansion - if( eExpansion == ::com::sun::star::chart::ChartLegendExpansion_CUSTOM ) + if( eExpansion == css::chart::ChartLegendExpansion_CUSTOM ) { sal_Int32 nCurrentRow=0; sal_Int32 nCurrentColumn=-1; @@ -456,7 +456,7 @@ awt::Size lcl_placeLegendEntries( } } } - else if( eExpansion == ::com::sun::star::chart::ChartLegendExpansion_HIGH ) + else if( eExpansion == css::chart::ChartLegendExpansion_HIGH ) { sal_Int32 nMaxNumberOfRows = nMaxEntryHeight ? (rAvailableSpace.Height - 2*nYPadding ) / nMaxEntryHeight @@ -473,7 +473,7 @@ awt::Size lcl_placeLegendEntries( static_cast< double >( nNumberOfColumns ) )) : 0; } - else if( eExpansion == ::com::sun::star::chart::ChartLegendExpansion_WIDE ) + else if( eExpansion == css::chart::ChartLegendExpansion_WIDE ) { sal_Int32 nMaxNumberOfColumns = nMaxEntryWidth ? (rAvailableSpace.Width - 2*nXPadding ) / nMaxEntryWidth @@ -490,7 +490,7 @@ awt::Size lcl_placeLegendEntries( static_cast< double >( nNumberOfRows ) )) : 0; } - else // ::com::sun::star::chart::ChartLegendExpansion_BALANCED + else // css::chart::ChartLegendExpansion_BALANCED { double fAspect = nMaxEntryHeight ? static_cast< double >( nMaxEntryWidth ) / static_cast< double >( nMaxEntryHeight ) @@ -508,7 +508,7 @@ awt::Size lcl_placeLegendEntries( if(nNumberOfRows<=0) return aResultingLegendSize; - if( eExpansion != ::com::sun::star::chart::ChartLegendExpansion_CUSTOM ) + if( eExpansion != css::chart::ChartLegendExpansion_CUSTOM ) { lcl_collectColumnWidths( aColumnWidths, nNumberOfRows, nNumberOfColumns, aTextShapes, nSymbolPlusDistanceWidth ); lcl_collectRowHeighs( aRowHeights, nNumberOfRows, nNumberOfColumns, aTextShapes ); @@ -840,14 +840,14 @@ void VLegend::createShapes( tPropertyValues aTextProperties; Reference< beans::XPropertySet > xLegendProp( m_xLegend, uno::UNO_QUERY ); - ::com::sun::star::chart::ChartLegendExpansion eExpansion = ::com::sun::star::chart::ChartLegendExpansion_HIGH; + css::chart::ChartLegendExpansion eExpansion = css::chart::ChartLegendExpansion_HIGH; awt::Size aLegendSize( rAvailableSpace ); if( xLegendProp.is()) { // get Expansion property xLegendProp->getPropertyValue( "Expansion") >>= eExpansion; - if( eExpansion == ::com::sun::star::chart::ChartLegendExpansion_CUSTOM ) + if( eExpansion == css::chart::ChartLegendExpansion_CUSTOM ) { RelativeSize aRelativeSize; if ((xLegendProp->getPropertyValue( "RelativeSize") >>= aRelativeSize)) @@ -856,7 +856,7 @@ void VLegend::createShapes( aLegendSize.Height = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Secondary * rPageSize.Height )); } else - eExpansion = ::com::sun::star::chart::ChartLegendExpansion_HIGH; + eExpansion = css::chart::ChartLegendExpansion_HIGH; } lcl_getProperties( xLegendProp, aLineFillProperties, aTextProperties, rPageSize ); } diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index cbaaa834c672..a864580f5bd4 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -41,21 +41,17 @@ class LegendEntryProvider; class VLegend { public: - VLegend( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend > & xLegend, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + VLegend( const css::uno::Reference< css::chart2::XLegend > & xLegend, + const css::uno::Reference< css::uno::XComponentContext > & xContext, const std::vector< LegendEntryProvider* >& rLegendEntryProviderList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTargetPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& xFactory, - ChartModel& rModel ); + const css::uno::Reference< css::drawing::XShapes >& xTargetPage, + const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory, + ChartModel& rModel ); void setDefaultWritingMode( sal_Int16 nDefaultWritingMode ); - void createShapes( const ::com::sun::star::awt::Size & rAvailableSpace, - const ::com::sun::star::awt::Size & rPageSize ); + void createShapes( const css::awt::Size & rAvailableSpace, + const css::awt::Size & rPageSize ); /** Sets the position according to its internal anchor. @@ -67,27 +63,21 @@ public: is used to calculate the offset (default 2%) from the edge. */ void changePosition( - ::com::sun::star::awt::Rectangle & rOutAvailableSpace, - const ::com::sun::star::awt::Size & rReferenceSize ); + css::awt::Rectangle & rOutAvailableSpace, + const css::awt::Size & rReferenceSize ); static bool isVisible( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend > & xLegend ); + const css::uno::Reference< css::chart2::XLegend > & xLegend ); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XLegend > m_xLegend; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > m_xShape; + css::uno::Reference< css::drawing::XShapes > m_xTarget; + css::uno::Reference< css::lang::XMultiServiceFactory> m_xShapeFactory; + css::uno::Reference< css::chart2::XLegend > m_xLegend; + css::uno::Reference< css::drawing::XShape > m_xShape; ChartModel& mrModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; std::vector< LegendEntryProvider* > m_aLegendEntryProviderList; diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index 66d34b09d461..983b34193a5c 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -32,32 +32,26 @@ namespace chart class VTitle { public: - explicit VTitle( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > & xTitle ); + explicit VTitle( const css::uno::Reference< css::chart2::XTitle > & xTitle ); virtual ~VTitle(); - void init( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTargetPage - , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory + void init( const css::uno::Reference< css::drawing::XShapes >& xTargetPage + , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const OUString& rCID ); - void createShapes( const ::com::sun::star::awt::Point& rPos - , const ::com::sun::star::awt::Size& rReferenceSize ); + void createShapes( const css::awt::Point& rPos + , const css::awt::Size& rReferenceSize ); double getRotationAnglePi() const; - ::com::sun::star::awt::Size getUnrotatedSize() const; - ::com::sun::star::awt::Size getFinalSize() const; - void changePosition( const ::com::sun::star::awt::Point& rPos ); + css::awt::Size getUnrotatedSize() const; + css::awt::Size getFinalSize() const; + void changePosition( const css::awt::Point& rPos ); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > m_xTitle; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > m_xShape; + css::uno::Reference< css::drawing::XShapes > m_xTarget; + css::uno::Reference< css::lang::XMultiServiceFactory> m_xShapeFactory; + css::uno::Reference< css::chart2::XTitle > m_xTitle; + css::uno::Reference< css::drawing::XShape > m_xShape; OUString m_aCID; double m_fRotationAngleDegree; diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index 6bfb8b019c80..b478193b583f 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -468,7 +468,7 @@ void SAL_CALL SampleAddIn::setPosition( const awt::Point& aPos ) } // XShapeDescriptor ( ::XShape ::XDiagram ) -OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException ) +OUString SAL_CALL SampleAddIn::getShapeType() throw( css::uno::RuntimeException ) { return "com.sun.star.chart.SampleAddinShape"; } diff --git a/chart2/workbench/addin/sampleaddin.hxx b/chart2/workbench/addin/sampleaddin.hxx index d4187f6f6a4f..5e32e479cb3c 100644 --- a/chart2/workbench/addin/sampleaddin.hxx +++ b/chart2/workbench/addin/sampleaddin.hxx @@ -35,27 +35,27 @@ #include <com/sun/star/chart/XChartDocument.hpp> -com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > SAL_CALL SampleAddIn_CreateInstance( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& ); class SampleAddIn : public cppu::WeakImplHelper< - com::sun::star::lang::XInitialization, - com::sun::star::chart::XDiagram, - com::sun::star::chart::XAxisXSupplier, - com::sun::star::chart::XAxisYSupplier, - com::sun::star::chart::XStatisticDisplay, - com::sun::star::lang::XServiceName, - com::sun::star::lang::XServiceInfo, - com::sun::star::util::XRefreshable, - com::sun::star::lang::XLocalizable > + css::lang::XInitialization, + css::chart::XDiagram, + css::chart::XAxisXSupplier, + css::chart::XAxisYSupplier, + css::chart::XStatisticDisplay, + css::lang::XServiceName, + css::lang::XServiceInfo, + css::util::XRefreshable, + css::lang::XLocalizable > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > mxChartDoc; - ::com::sun::star::lang::Locale maLocale; + css::uno::Reference< css::chart::XChartDocument > mxChartDoc; + css::lang::Locale maLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxMyRedLine; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxMyText; + css::uno::Reference< css::drawing::XShape > mxMyRedLine; + css::uno::Reference< css::drawing::XShape > mxMyText; public: SampleAddIn(); @@ -63,91 +63,91 @@ public: // class specific code static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - sal_Bool getLogicalPosition( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xAxis, + sal_Bool getLogicalPosition( css::uno::Reference< css::drawing::XShape >& xAxis, double fValue, sal_Bool bVertical, - ::com::sun::star::awt::Point& aOutPosition ); + css::awt::Point& aOutPosition ); // 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 ); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw( css::uno::Exception, + css::uno::RuntimeException ); // XDiagram - virtual OUString SAL_CALL getDiagramType() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); - 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 ); + virtual OUString SAL_CALL getDiagramType() throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) + throw( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) + throw( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException ); // XShape ( ::XDiagram ) - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& ) - throw( ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& ) - throw( ::com::sun::star::uno::RuntimeException ); + virtual css::awt::Size SAL_CALL getSize() + throw( css::uno::RuntimeException ); + virtual void SAL_CALL setSize( const css::awt::Size& ) + throw( css::beans::PropertyVetoException, + css::uno::RuntimeException ); + virtual css::awt::Point SAL_CALL getPosition() + throw( css::uno::RuntimeException ); + virtual void SAL_CALL setPosition( const css::awt::Point& ) + throw( css::uno::RuntimeException ); // XShapeDescriptor ( ::XShape ::XDiagram ) - virtual OUString SAL_CALL getShapeType() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getShapeType() throw( css::uno::RuntimeException ); // XAxisXSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getXAxisTitle() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXAxis() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXMainGrid() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXHelpGrid() - throw( ::com::sun::star::uno::RuntimeException ); + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getXAxisTitle() + throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getXAxis() + throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getXMainGrid() + throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getXHelpGrid() + throw( css::uno::RuntimeException ); // XAxisYSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getYAxisTitle() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYAxis() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYHelpGrid() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYMainGrid() - throw( ::com::sun::star::uno::RuntimeException ); + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getYAxisTitle() + throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getYAxis() + throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getYHelpGrid() + throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getYMainGrid() + throw( css::uno::RuntimeException ); // XStatisticDisplay - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getUpBar() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDownBar() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinMaxLine() - throw( ::com::sun::star::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getUpBar() + throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getDownBar() + throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinMaxLine() + throw( css::uno::RuntimeException ); // XServiceName - virtual OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getServiceName() 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 ); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException ); // XRefreshable - virtual void SAL_CALL refresh() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL refresh() throw( css::uno::RuntimeException ); + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw( css::uno::RuntimeException ); + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw( css::uno::RuntimeException ); // XLocalizable - virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) + throw( css::uno::RuntimeException ); + virtual css::lang::Locale SAL_CALL getLocale() + throw( css::uno::RuntimeException ); }; #endif // INCLUDED_CHART2_WORKBENCH_ADDIN_SAMPLEADDIN_HXX |