chart2/inc/ChartModel.hxx | 576 ++++++++++++-------------- chart2/inc/ChartView.hxx | 1 chart2/source/inc/macros.hxx | 1 chart2/source/view/axes/VCoordinateSystem.cxx | 30 + chart2/source/view/inc/VCoordinateSystem.hxx | 10 chart2/source/view/main/ChartView.cxx | 86 +-- 6 files changed, 370 insertions(+), 334 deletions(-)
New commits: commit 7d0df998f7eb9e3a6f65f3a44c26d94e1a1ced7e Author: Kohei Yoshida <[email protected]> Date: Fri Oct 17 11:20:10 2014 -0400 Add macro to enable/disable axis shape caching. Disabled for now. Change-Id: I6aa4e9b28222633abccb80b33d1068c57046448d diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index d155c45..4308dbe 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -211,7 +211,6 @@ private: //methods , bool bUseHighContrast ); SdrPage* getSdrPage(); - void impl_deleteCoordinateSystems(); void impl_notifyModeChangeListener( const OUString& rNewMode ); void impl_refreshAddIn(); diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index 2319afe..9e620f5 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -31,6 +31,7 @@ ex.Message ) #define ENABLE_GL3D_BARCHART 1 +#define ENABLE_AXIS_SHAPE_CACHE 0 #endif diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 7b6e02b..25b7149 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -94,6 +94,7 @@ VCoordinateSystem::~VCoordinateSystem() { } +#if ENABLE_AXIS_SHAPE_CACHE void VCoordinateSystem::reset() { m_xLogicTargetForGrids.clear(); @@ -120,6 +121,7 @@ void VCoordinateSystem::reset() m_aAxisMap.clear(); // TODO : switch to reset() later. } +#endif void VCoordinateSystem::initPlottingTargets( const Reference< drawing::XShapes >& xLogicTarget , const Reference< drawing::XShapes >& xFinalTarget diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index f94beba..482fdc5 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -24,6 +24,7 @@ #include "ThreeDHelper.hxx" #include "ExplicitCategoriesProvider.hxx" #include "chartview/ExplicitScaleValues.hxx" +#include <macros.hxx> #include <com/sun/star/chart2/XCoordinateSystem.hpp> #include <com/sun/star/awt/Rectangle.hpp> @@ -51,7 +52,9 @@ public: static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel ); +#if ENABLE_AXIS_SHAPE_CACHE void reset(); +#endif virtual void initPlottingTargets( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 439d1f6..9774a29 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -378,14 +378,31 @@ VCoordinateSystem* addCooSysToList( std::vector< VCoordinateSystem* >& rVCooSysL return pVCooSys; } +void deleteCoordinateSystems( std::vector<VCoordinateSystem*>& rVCooSysList ) +{ + ::std::vector< VCoordinateSystem* > aVectorToDeleteObjects; + aVectorToDeleteObjects.swap(rVCooSysList); //#i109770# + ::std::vector< VCoordinateSystem* >::const_iterator aIter = aVectorToDeleteObjects.begin(); + const ::std::vector< VCoordinateSystem* >::const_iterator aEnd = aVectorToDeleteObjects.end(); + for( ; aIter != aEnd; ++aIter ) + { + delete *aIter; + } + aVectorToDeleteObjects.clear(); +} + void SeriesPlotterContainer::resetCoordinateSystems() { +#if ENABLE_AXIS_SHAPE_CACHE std::vector<VCoordinateSystem*>::iterator it = m_rVCooSysList.begin(), itEnd = m_rVCooSysList.end(); for (; it != itEnd; ++it) { VCoordinateSystem* p = *it; p->reset(); } +#else + deleteCoordinateSystems(m_rVCooSysList); +#endif } void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( @@ -1184,21 +1201,7 @@ ChartView::~ChartView() m_pDrawModelWrapper.reset(); } m_xDrawPage = NULL; - impl_deleteCoordinateSystems(); -} - -void ChartView::impl_deleteCoordinateSystems() -{ - //delete all coordinate systems - ::std::vector< VCoordinateSystem* > aVectorToDeleteObjects; - ::std::swap( aVectorToDeleteObjects, m_aVCooSysList );//#i109770# - ::std::vector< VCoordinateSystem* >::const_iterator aIter = aVectorToDeleteObjects.begin(); - const ::std::vector< VCoordinateSystem* >::const_iterator aEnd = aVectorToDeleteObjects.end(); - for( ; aIter != aEnd; ++aIter ) - { - delete *aIter; - } - aVectorToDeleteObjects.clear(); + deleteCoordinateSystems(m_aVCooSysList); } // datatransfer::XTransferable commit e01fece99fdbb62cf9e0003a7463f91a1d540b99 Author: Kohei Yoshida <[email protected]> Date: Thu Oct 16 16:08:41 2014 -0400 com::sun::star -> css Change-Id: I71638138ff35d4994d584270358230f02cac0702 diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 65a82dc..ce46982 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -80,30 +80,30 @@ namespace impl // Note: needed for queryInterface (if it calls the base-class implementation) typedef ::comphelper::WeakImplHelper23< -// ::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::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::qa::XDumper > ChartModel_Base; } @@ -125,54 +125,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; + css::uno::Sequence< css::beans::PropertyValue > m_aMediaDescriptor; + css::uno::Reference< css::document::XDocumentProperties > m_xDocumentProperties; ::rtl::Reference< UndoManager > m_pUndoManager; ::cppu::OInterfaceContainerHelper m_aControllers; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController; + 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; + 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; boost::scoped_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 @@ -180,259 +180,259 @@ 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< + css::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< + css::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 APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(ChartModel) - // ::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) SAL_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) SAL_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) SAL_OVERRIDE; + , const css::uno::Sequence< + css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getURL() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getURL() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getArgs() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getArgs() throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + connectController( const css::uno::Reference< + css::frame::XController >& xController ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + disconnectController( const css::uno::Reference< + css::frame::XController >& xController ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + lockControllers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + unlockControllers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasControllersLocked() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + setCurrentController( const css::uno::Reference< + css::frame::XController >& xController ) + throw (css::container::NoSuchElementException + , css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + dispose() throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + addEventListener( const css::uno::Reference< + css::lang::XEventListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + removeEventListener( const css::uno::Reference< + css::lang::XEventListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + throw(css::util::CloseVetoException, + css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + addCloseListener( const css::uno::Reference< + css::util::XCloseListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + removeCloseListener( const css::uno::Reference< + css::util::XCloseListener > & xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + hasLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL - isReadonly() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + isReadonly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - store() throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + store() throw (css::io::IOException + , css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + , const css::uno::Sequence< + css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::io::IOException + , css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + , const css::uno::Sequence< + css::beans::PropertyValue >& rMediaDescriptor ) + throw (css::io::IOException + , css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + isModified() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (::com::sun::star::beans::PropertyVetoException - , ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::beans::PropertyVetoException + , css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + addModifyListener( const css::uno::Reference< + css::util::XModifyListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + removeModifyListener( const css::uno::Reference< + css::util::XModifyListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isDataFlavorSupported( - const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::datatransfer::DataFlavor& aFlavor ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XTypeProvider (overloaded 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) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL + getTypes() throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL + getDocumentProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL + getUndoManager( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + // css::chart2::XChartDocument + virtual css::uno::Reference< + css::chart2::XDiagram > SAL_CALL + getFirstDiagram() throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL createInternalDataProvider( sal_Bool bCloneExistingData ) - throw (::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::util::CloseVetoException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasInternalDataProvider() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > SAL_CALL + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::chart2::data::XDataProvider > SAL_CALL getDataProvider() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; + virtual css::uno::Reference< css::chart2::XChartTypeManager > SAL_CALL getChartTypeManager() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getPageBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL createDefaultChart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -440,162 +440,162 @@ 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) SAL_OVERRIDE; + attachDataProvider( const css::uno::Reference< + css::chart2::data::XDataProvider >& xProvider ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL attachNumberFormatsSupplier( const css::uno::Reference< + css::util::XNumberFormatsSupplier >& xSupplier ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTitled ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual css::uno::Reference< + css::chart2::XTitle > SAL_CALL getTitleObject() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTitleObject( const css::uno::Reference< + css::chart2::XTitle >& Title ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; + throw (css::frame::DoubleInitializationException, + css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; // ____ XCloneable ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_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) SAL_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) SAL_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) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException, + css::embed::WrongStateException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + , const css::uno::Sequence< css::uno::Any >& Arguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL + getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_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) SAL_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) SAL_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) SAL_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) SAL_OVERRIDE; + const css::uno::Reference< css::embed::XStorage >& xStorage ) + throw (css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() + throw (css::io::IOException, + css::uno::Exception, + css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XNumberFormatsSupplier ____ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< + css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< + css::util::XNumberFormats > SAL_CALL getNumberFormats() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChild ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() + throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + const css::uno::Reference< css::uno::XInterface >& Parent ) + throw (css::lang::NoSupportException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDataSource ____ allows access to the curently 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) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // X3DChartWindowProvider virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDumper virtual OUString SAL_CALL dump() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_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); commit 60dbc487ac065a413a2bacdb5d52c2f87729e4e5 Author: Kohei Yoshida <[email protected]> Date: Thu Oct 16 15:40:32 2014 -0400 Unused private member. Change-Id: Ifbb2ebb176fb236c9975492c81f906b2e1fb7447 diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 79a1746..65a82dc 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -174,8 +174,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xXMLNamespaceMap; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyListener; - private: //private methods commit 154f2a77e726cf04014e9c8548da7f8aad6ef01b Author: Kohei Yoshida <[email protected]> Date: Thu Oct 16 15:11:08 2014 -0400 Reset VCoordinateSystem instances rather than deleting and creating them. Change-Id: I0a0df3bda534d6e32fb5520df3ba2276fb03165a diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 7e88097..7b6e02b 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -89,10 +89,38 @@ VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCoo m_aExplicitScales[2].Orientation = AxisOrientation_MATHEMATICAL; } } + VCoordinateSystem::~VCoordinateSystem() { } +void VCoordinateSystem::reset() +{ + m_xLogicTargetForGrids.clear(); + m_xLogicTargetForAxes.clear(); + m_xFinalTarget.clear(); + m_xShapeFactory.clear(); + m_aMatrixSceneToScreen = drawing::HomogenMatrix(); + m_eLeftWallPos = CuboidPlanePosition_Left; + m_eBackWallPos = CuboidPlanePosition_Back; + m_eBottomPos = CuboidPlanePosition_Bottom; + m_aMergedMinMaxSupplier.clearMinimumAndMaximumSupplierList(); + m_aSeriesNamesForZAxis.realloc(0); + + m_aExplicitScales.clear(); + m_aExplicitScales.resize(3); + + m_aExplicitIncrements.clear(); + m_aExplicitIncrements.resize(3); + + m_aSecondaryExplicitScales.clear(); + m_aSecondaryExplicitIncrements.clear(); + + m_apExplicitCategoriesProvider.reset(); + + m_aAxisMap.clear(); // TODO : switch to reset() later. +} + void VCoordinateSystem::initPlottingTargets( const Reference< drawing::XShapes >& xLogicTarget , const Reference< drawing::XShapes >& xFinalTarget , const Reference< lang::XMultiServiceFactory >& xShapeFactory diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 1420c9c..f94beba 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -51,6 +51,8 @@ public: static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel ); + void reset(); + virtual void initPlottingTargets( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 2f8abb3..439d1f6 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -356,35 +356,36 @@ VCoordinateSystem* addCooSysToList( std::vector< VCoordinateSystem* >& rVCooSysL , const uno::Reference< XCoordinateSystem >& xCooSys , ChartModel& rChartModel ) { - VCoordinateSystem* pVCooSys = findInCooSysList( rVCooSysList, xCooSys ); - if( !pVCooSys ) + VCoordinateSystem* pVCooSys = findInCooSysList(rVCooSysList, xCooSys); + if (!pVCooSys) { - pVCooSys = VCoordinateSystem::createCoordinateSystem(xCooSys ); - if(pVCooSys) - { - OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, rChartModel ) ); - pVCooSys->setParticle(aCooSysParticle); + // First time being created. Add it to the list and generate CID for it. + pVCooSys = VCoordinateSystem::createCoordinateSystem(xCooSys); + rVCooSysList.push_back(pVCooSys); - pVCooSys->setExplicitCategoriesProvider( new ExplicitCategoriesProvider(xCooSys, rChartModel) ); + OUString aCooSysParticle = + ObjectIdentifier::createParticleForCoordinateSystem(xCooSys, rChartModel); - rVCooSysList.push_back( pVCooSys ); - } + pVCooSys->setParticle(aCooSysParticle); } + + if (pVCooSys) + { + pVCooSys->setExplicitCategoriesProvider( + new ExplicitCategoriesProvider(xCooSys, rChartModel)); + } + return pVCooSys; } void SeriesPlotterContainer::resetCoordinateSystems() { - //delete all coordinate systems - ::std::vector< VCoordinateSystem* > aVectorToDeleteObjects; - ::std::swap( aVectorToDeleteObjects, m_rVCooSysList );//#i109770# - ::std::vector< VCoordinateSystem* >::const_iterator aIter = aVectorToDeleteObjects.begin(); - const ::std::vector< VCoordinateSystem* >::const_iterator aEnd = aVectorToDeleteObjects.end(); - for( ; aIter != aEnd; ++aIter ) + std::vector<VCoordinateSystem*>::iterator it = m_rVCooSysList.begin(), itEnd = m_rVCooSysList.end(); + for (; it != itEnd; ++it) { - delete *aIter; + VCoordinateSystem* p = *it; + p->reset(); } - aVectorToDeleteObjects.clear(); } void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( commit b6b5fc76f59a6ea35f14c5f8517430b6238d66b2 Author: Kohei Yoshida <[email protected]> Date: Thu Oct 16 14:01:39 2014 -0400 Just use the original m_aVCooSysList ... rather than using a reference of a reference of the original m_aVCooSysList. Change-Id: Id44f10fb0d4b29ea89cc4ad2019fa6ae6ee0b003 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 24a707a..2f8abb3 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -277,7 +277,6 @@ public: drawing::Direction3D getPreferredAspectRatio(); SeriesPlottersType& getSeriesPlotterList() { return m_aSeriesPlotterList; } - std::vector< VCoordinateSystem* >& getCooSysList() { return m_rVCooSysList; } std::vector< LegendEntryProvider* > getLegendEntryProviderList(); void AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& rModel ); @@ -1526,15 +1525,14 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D basegfx::B2IRectangle aAvailableOuterRect = BaseGFXHelper::makeRectangle(rParam.maRemainingSpace); - const std::vector< VCoordinateSystem* >& rVCooSysList( rParam.mpSeriesPlotterContainer->getCooSysList() ); SeriesPlottersType& rSeriesPlotterList = rParam.mpSeriesPlotterContainer->getSeriesPlotterList(); //create VAxis, so they can give necessary information for automatic scaling uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( static_cast< ::cppu::OWeakObject* >( &mrChartModel ), uno::UNO_QUERY ); size_t nC = 0; - for( nC=0; nC < rVCooSysList.size(); nC++) + for( nC=0; nC < m_aVCooSysList.size(); nC++) { - VCoordinateSystem* pVCooSys = rVCooSysList[nC]; + VCoordinateSystem* pVCooSys = m_aVCooSysList[nC]; if(3==nDimensionCount) { uno::Reference<beans::XPropertySet> xSceneProperties( xDiagram, uno::UNO_QUERY ); @@ -1582,9 +1580,9 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D // - create axis and grids for all coordinate systems //init all coordinate systems - for( nC=0; nC < rVCooSysList.size(); nC++) + for( nC=0; nC < m_aVCooSysList.size(); nC++) { - VCoordinateSystem* pVCooSys = rVCooSysList[nC]; + VCoordinateSystem* pVCooSys = m_aVCooSysList[nC]; pVCooSys->initPlottingTargets(xSeriesTargetInFrontOfAxis,xTextTargetShapes,m_xShapeFactory,xSeriesTargetBehindAxis); pVCooSys->setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix( @@ -1600,9 +1598,9 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D //use first coosys only so far; todo: calculate for more than one coosys if we have more in future //todo: this is just a workaround at the moment for pie and donut labels - if( !bIsPieOrDonut && (!rVCooSysList.empty()) ) + if( !bIsPieOrDonut && (!m_aVCooSysList.empty()) ) { - VCoordinateSystem* pVCooSys = rVCooSysList[0]; + VCoordinateSystem* pVCooSys = m_aVCooSysList[0]; pVCooSys->createMaximumAxesLabels(); aConsumedOuterRect = AbstractShapeFactory::getRectangleOfShape(xBoundingShape); @@ -1640,9 +1638,9 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D } //create axes and grids for the final size - for( nC=0; nC < rVCooSysList.size(); nC++) + for( nC=0; nC < m_aVCooSysList.size(); nC++) { - VCoordinateSystem* pVCooSys = rVCooSysList[nC]; + VCoordinateSystem* pVCooSys = m_aVCooSysList[nC]; pVCooSys->setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix( createTransformationSceneToScreen( aVDiagram.getCurrentRectangle() ) )); @@ -1669,7 +1667,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D } pSeriesPlotter->initPlotter( xSeriesTarget,xTextTargetShapes,m_xShapeFactory,aCID ); pSeriesPlotter->setPageReferenceSize( rPageSize ); - VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( rVCooSysList, pSeriesPlotter ); + VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( m_aVCooSysList, pSeriesPlotter ); if(2==nDimensionCount) pSeriesPlotter->setTransformationSceneToScreen( pVCooSys->getTransformationSceneToScreen() ); //better performance for big data @@ -1706,9 +1704,9 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D AbstractShapeFactory::removeSubShapes( xTextTargetShapes ); //set new transformation - for( nC=0; nC < rVCooSysList.size(); nC++) + for( nC=0; nC < m_aVCooSysList.size(); nC++) { - VCoordinateSystem* pVCooSys = rVCooSysList[nC]; + VCoordinateSystem* pVCooSys = m_aVCooSysList[nC]; pVCooSys->setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix( createTransformationSceneToScreen( aNewInnerRect ) )); } @@ -1717,7 +1715,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter ) { VSeriesPlotter* pSeriesPlotter = &(*aPlotterIter); - VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( rVCooSysList, pSeriesPlotter ); + VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( m_aVCooSysList, pSeriesPlotter ); if(2==nDimensionCount) pSeriesPlotter->setTransformationSceneToScreen( pVCooSys->getTransformationSceneToScreen() ); pSeriesPlotter->createShapes(); commit d5c71e74e758e784d6525b4857c57ec1e02c33f4 Author: Kohei Yoshida <[email protected]> Date: Thu Oct 16 11:12:45 2014 -0400 createAxesLabels doesn't need to be virtual; nobody overwrites it. And createMaximumAxesLabels too. Change-Id: Iebc2c686644d6fc2eeb5c2caaceeafadac56c953 diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index cde8c1b..1420c9c 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -98,6 +98,9 @@ public: ::com::sun::star::chart2::XCoordinateSystem > getModel() const { return m_xCooSysModel;} + void createMaximumAxesLabels(); + void createAxesLabels(); + /** * Create "view" axis obejcts 'VAxis' from the coordinate system model. */ @@ -109,8 +112,6 @@ public: virtual void initVAxisInList(); virtual void updateScalesAndIncrementsOnAxes(); - virtual void createMaximumAxesLabels(); - virtual void createAxesLabels(); virtual void updatePositions(); virtual void createAxesShapes(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
