diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-17 16:15:51 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-20 06:34:23 +0000 |
commit | 7410217b7d84a3e4dfd35529384f190cf2962024 (patch) | |
tree | c8d0319064b2d4eba13e0b1768ce4973d51a2b0d | |
parent | 9f4f237a3834e5d58a87296424db5428f68d1550 (diff) |
loplugin:unusedmethods chart2
Change-Id: Ib7e8824e9e7f912963fbf07111ee3aa97773ceca
Reviewed-on: https://gerrit.libreoffice.org/17167
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
66 files changed, 2 insertions, 498 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index ba419e278ac9..874d195a994b 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -238,11 +238,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ChartModel( xContext )); - } // ::com::sun::star::lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index f8080ff6bc9c..a6c921b4f6ac 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -125,15 +125,6 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataPointProperties(); private: - - void SAL_CALL getStatisticsPropertyValue - ( ::com::sun::star::uno::Any& rValue, - sal_Int32 nHandle ) const; - - void SAL_CALL setStatisticsPropertyValue_NoBroadcast( - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); - ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 36beaf05a043..072384a2f4c2 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -240,8 +240,6 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; private: - void updateFromModel(); - ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index af07f63d37b3..9af794bbfba6 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -752,11 +752,6 @@ void DataBrowser::CursorMoved() m_aCursorMovedHdlLink.Call( this ); } -void DataBrowser::SetCellModifiedHdl( const Link<DataBrowser*,void>& rLink ) -{ - m_aCellModifiedLink = rLink; -} - void DataBrowser::MouseButtonDown( const BrowserMouseEvent& rEvt ) { if( !m_bDataValid ) diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index c038181eedcf..79fee95ceca9 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -129,8 +129,6 @@ public: void SetCursorMovedHdl( const Link<DataBrowser*,void>& rLink ); - void SetCellModifiedHdl( const Link<DataBrowser*,void>& rLink ); - /// confirms all pending changes to be ready to be closed bool EndEditing(); diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index f44a366c90e9..9baa8038b46c 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -183,8 +183,6 @@ private: TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; private: - void createBackup(); - void applyInterpretedData( const ::com::sun::star::chart2::InterpretedData & rNewData, const ::std::vector< ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index cfd16ff23bd6..8bdba7c33dea 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -58,7 +58,6 @@ public: DECL_LINK( RightAngledAxesToggled, void* ); private: - void fillDialogAnglesFromModel() const; void applyAnglesToModel(); void applyPerspectiveToModel(); diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 59b92bf840c3..b949f81f50e2 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -100,9 +100,6 @@ protected: */ bool updateModelFromControl( Edit * pField = 0 ); - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener > - getSelectionRangeListener(); - /** @return </sal_True>, if the edit field contains a valid range entry. If no XCellRangesAccess can be obtained, </sal_False> is returned. */ @@ -144,7 +141,6 @@ private: DialogModel & m_rDialogModel; VclPtr<Edit> m_pCurrentRangeChoosingField; bool m_bIsDirty; - sal_Int32 m_nLastChartTypeGroupIndex; VclPtr<Dialog> m_pParentDialog; TabPageNotifiable * m_pTabPageNotifiable; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 00d297bd62cc..fb84c457634a 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -165,11 +165,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ChartController( xContext )); - } // ::com::sun::star::frame::XController (required interface) virtual void SAL_CALL @@ -435,7 +430,6 @@ public: static bool isObjectDeleteable( const ::com::sun::star::uno::Any& rSelection ); void setDrawMode( ChartDrawMode eMode ) { m_eDrawMode = eMode; } - ChartDrawMode getDrawMode() const { return m_eDrawMode; } bool isShapeContext() const; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index a162ed1f4b9c..60467da74edc 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -73,11 +73,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ChartDocumentWrapper( xContext )); - } 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;} diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 014a99a2ce5e..cb33c68a38cf 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -71,11 +71,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new CreationWizardUnoDlg( xContext )); - } // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index a4041eabb677..bddb3f8148e1 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -81,8 +81,6 @@ private: DECL_LINK( MiscHdl, void* ); /// is called when the width of any column in the edit browsebox has changed DECL_LINK( BrowserColumnResized, void* ); - /// is called when the browser view was scrolled, @todo: only call on horizontal scroll - DECL_LINK( BrowserContentScrolled, void* ); void UpdateData(); /// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index d1e995a446af..2c6237feff22 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -61,11 +61,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ChartFrameLoader( xContext )); - } // ::com::sun::star::frame::XFrameLoader diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index a2d143ba614c..6a6478186348 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -86,11 +86,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ElementSelectorToolbarController( xContext )); - } // 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) SAL_OVERRIDE; diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 612071081b2b..2e461c47a412 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -83,12 +83,6 @@ public: virtual ~CachedDataSequence(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new CachedDataSequence( xContext )); - } /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index d9d2fc594e6b..6214211a9541 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -53,12 +53,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext ); SAL_DLLPRIVATE virtual ~ConfigColorScheme(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ConfigColorScheme( xContext )); - } /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 75810fe53978..7b1c4e158e07 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -46,12 +46,6 @@ public: virtual ~DataSource(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new DataSource( xContext )); - } /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index a0f4d5b10f53..8c698a20b290 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -86,11 +86,6 @@ public: ::com::sun::star::chart2::XChartDocument >& xChartDoc, bool bWithCategories = true ); - static void addRangeRepresentationsFromLabeledDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence - , ::std::vector< OUString >& rOutRangeRepresentations ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index baf307c42da2..fe6bff51229a 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -89,15 +89,7 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ErrorBar( xContext )); - } - - // XPropertySet - + // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) @@ -157,14 +149,6 @@ protected: 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; - // ____ XChild ____ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException); - 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); - private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 9c66e57c1e65..e48a1cda0696 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -91,11 +91,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new InternalDataProvider( xContext )); - } // ____ XInternalDataProvider ____ virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 0bbf37634bf6..116f961ac150 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -59,12 +59,6 @@ public: virtual ~LabeledDataSequence(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new LabeledDataSequence( xContext )); - } /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 66d40fbc6760..ea41d9b217fe 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -46,12 +46,6 @@ public: LogarithmicScaling( double fBase = 10.0 ); virtual ~LogarithmicScaling(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new LogarithmicScaling( xContext )); - } /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -97,12 +91,6 @@ public: explicit ExponentialScaling( double fBase = 10.0 ); virtual ~ExponentialScaling(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ExponentialScaling( xContext )); - } /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -148,12 +136,6 @@ public: LinearScaling( double fSlope = 1.0, double fOffset = 0.0 ); virtual ~LinearScaling(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new LinearScaling( xContext )); - } /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -198,12 +180,6 @@ public: explicit PowerScaling( double fExponent = 10.0 ); virtual ~PowerScaling(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new PowerScaling( xContext )); - } /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 0e590a67891e..6409e4368909 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -67,10 +67,6 @@ public: SAL_DLLPRIVATE void lockControllers(); SAL_DLLPRIVATE void unlockControllers(); - /// tries to get an OutputDevice from the XParent of the model to use as reference device - SAL_DLLPRIVATE void attachParentReferenceDevice( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel ); - OutputDevice* getReferenceDevice() const; SfxItemPool& GetItemPool(); diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index f73f1b5158bf..c06d192278dc 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -66,12 +66,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~CartesianCoordinateSystem2d(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new CartesianCoordinateSystem2d( xContext )); - } // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -92,12 +86,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~CartesianCoordinateSystem3d(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new CartesianCoordinateSystem3d( xContext )); - } // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 4b89039f43e6..11468679fc32 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -60,13 +60,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ChartTypeManager( xContext )); - } - protected: // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 3c1d83071ef0..537e36c16bf0 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -72,12 +72,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~DataSeries(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new DataSeries( xContext )); - } /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 335e6f515462..6968994b166e 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -65,13 +65,6 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~Diagram(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new Diagram( xContext )); - } - /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index 285d4ae5a38f..6b8a06a55f71 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -66,12 +66,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~PolarCoordinateSystem2d(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new PolarCoordinateSystem2d( xContext )); - } // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -92,12 +86,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~PolarCoordinateSystem3d(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new PolarCoordinateSystem3d( xContext )); - } // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 0c762dad3f64..b7712540d53f 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -62,12 +62,6 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~XMLFilter(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new XMLFilter( xContext )); - } /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -102,7 +96,6 @@ protected: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - inline OUString getDocumentHandler() const { return m_sDocumentHandler; } inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } virtual OUString getMediaType(bool _bOasis); @@ -181,12 +174,6 @@ public: ::com::sun::star::uno::XComponentContext > const & _xContext ) :XMLFilter(_xContext) {} - /// establish methods for factory instatiation - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new XMLReportFilterHelper( xContext )); - } static OUString getImplementationName_Static() { return OUString( "com.sun.star.comp.chart2.report.XMLFilter" ); diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index f61e5dee3712..26a8cf71e605 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -58,12 +58,6 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~Axis(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new Axis( xContext )); - } /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index a9113df9980f..bfa48c0a2d09 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -63,12 +63,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new FormattedString( xContext )); - } /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 677bf3cd76d5..d60e1a07040e 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -56,13 +56,6 @@ public: explicit GridProperties(); virtual ~GridProperties(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new GridProperties( xContext )); - } - /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index b0f362e6bb3e..3f9e40941d41 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -55,13 +55,6 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~Legend(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new Legend( xContext )); - } - /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index bbe342eb983e..4ead493a92f2 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -52,13 +52,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~PageBackground(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new PageBackground( xContext )); - } - /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index b9e4fb0b069b..10ae4fbd5e0c 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -53,13 +53,6 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~Title(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new Title( xContext )); - } - /// XServiceInfo declarations virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index 933c7d738f84..67fd286a9a82 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -45,13 +45,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new AreaChartType( xContext )); - } - protected: explicit AreaChartType( const AreaChartType & rOther ); diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 15ac210f428f..9282df5e1d32 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -45,13 +45,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new BarChartType( xContext )); - } - protected: explicit BarChartType( const BarChartType & rOther ); diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index e59799c7e3d1..4d331573c728 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -46,13 +46,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new BubbleChartType( xContext )); - } - protected: explicit BubbleChartType( const BubbleChartType & rOther ); diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index c1287e21508f..41e27def6206 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -45,13 +45,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new CandleStickChartType( xContext )); - } - protected: explicit CandleStickChartType( const CandleStickChartType & rOther ); diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 3725b8f23bd2..a6d87f925afd 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -45,13 +45,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ColumnChartType( xContext )); - } - protected: explicit ColumnChartType( const ColumnChartType & rOther ); diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 03ce04877608..1227771772b2 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -44,13 +44,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new FilledNetChartType( xContext )); - } - protected: explicit FilledNetChartType( const FilledNetChartType & rOther ); diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index c1f1e426030b..432bb4b11d20 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -40,12 +40,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new GL3DBarChartType( xContext )); - } - protected: GL3DBarChartType( const GL3DBarChartType& rOther ); diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 7a9a147300fc..2db8e90f7f82 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -46,13 +46,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new LineChartType( xContext )); - } - protected: explicit LineChartType( const LineChartType & rOther ); diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 27763a809918..09d2943d8415 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -72,13 +72,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new NetChartType( xContext )); - } - protected: explicit NetChartType( const NetChartType & rOther ); diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index fb842ba254ee..d21369d00f5f 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -46,13 +46,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new PieChartType( xContext )); - } - protected: explicit PieChartType( const PieChartType & rOther ); diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 56cdd780c167..f1b8e21bb631 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -50,13 +50,6 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ScatterChartType( xContext )); - } - protected: explicit ScatterChartType( const ScatterChartType & rOther ); diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 14a4e0cf646f..1fb9a57468e5 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -445,21 +445,6 @@ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL E return ContainerHelper::ContainerToSequence( m_aDataSequences ); } -// ____ XChild ____ -uno::Reference< uno::XInterface > SAL_CALL ErrorBar::getParent() - throw (uno::RuntimeException) -{ - return m_xParent; -} - -void SAL_CALL ErrorBar::setParent( - const uno::Reference< uno::XInterface >& Parent ) - throw (lang::NoSupportException, - uno::RuntimeException) -{ - m_xParent.set( Parent ); -} - uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 1bbb03bf554c..02864be9adc0 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -165,12 +165,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new MeanValueRegressionCurve( xContext )); - } }; class LinearRegressionCurve : public RegressionCurveModel @@ -197,12 +191,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new LinearRegressionCurve( xContext )); - } }; class LogarithmicRegressionCurve : public RegressionCurveModel @@ -229,12 +217,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new LogarithmicRegressionCurve( xContext )); - } }; class ExponentialRegressionCurve : public RegressionCurveModel @@ -261,12 +243,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new ExponentialRegressionCurve( xContext )); - } }; class PotentialRegressionCurve : public RegressionCurveModel @@ -293,12 +269,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new PotentialRegressionCurve( xContext )); - } }; class PolynomialRegressionCurve : public RegressionCurveModel @@ -325,12 +295,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new PolynomialRegressionCurve( xContext )); - } }; class MovingAverageRegressionCurve : public RegressionCurveModel @@ -357,12 +321,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new MovingAverageRegressionCurve( xContext )); - } }; } // namespace chart diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index e20bba144728..98ef6edc610b 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -76,12 +76,6 @@ public: /// merge XInterface implementations DECLARE_XINTERFACE() - /// establish methods for factory instatiation - static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) - throw(css::uno::Exception) - { - return static_cast<cppu::OWeakObject *>(new RegressionEquation( xContext )); - } protected: explicit RegressionEquation( const RegressionEquation & rOther ); diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 259708ffc606..6e09ac9cbada 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -42,8 +42,6 @@ public: virtual TickInfo* firstInfo() SAL_OVERRIDE; virtual TickInfo* nextInfo() SAL_OVERRIDE; - sal_Int32 getCurrentDepth() const { return m_nCurrentDepth; } - private: //methods sal_Int32 getIntervalCount( sal_Int32 nDepth ); bool isAtLastPartTick(); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 0a9e7e7673fe..c7d9f70f5ef1 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -149,16 +149,6 @@ drawing::Direction3D AreaChart::getPreferredDiagramAspectRatio() const return aRet; } -bool AreaChart::keepAspectRatio() const -{ - if( m_nDimension == 2 ) - { - if( !m_bSymbol ) - return false; - } - return true; -} - void AreaChart::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32 xSlot, sal_Int32 ySlot ) { if( m_bArea && pSeries ) diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index e6c2d080a001..01403500ab8d 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -41,7 +41,6 @@ public: virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; - virtual bool keepAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier virtual double getMaximumX() SAL_OVERRIDE; diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 9ad2ee4fb971..519f98f28c98 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -130,11 +130,6 @@ drawing::Direction3D BarChart::getPreferredDiagramAspectRatio() const return aRet; } -bool BarChart::keepAspectRatio() const -{ - return true; -} - awt::Point BarChart::getLabelScreenPositionAndAlignment( LabelAlignment& rAlignment, sal_Int32 nLabelPlacement , double fScaledX, double fScaledLowerYValue, double fScaledUpperYValue, double fScaledZ diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index e1099e2c5675..b6237da58bc1 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -39,7 +39,6 @@ public: virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; - virtual bool keepAspectRatio() const SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 2cc8d1eae59c..1c0d2cd6bbe8 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -116,11 +116,6 @@ drawing::Direction3D NetChart::getPreferredDiagramAspectRatio() const return drawing::Direction3D(1,1,1); } -bool NetChart::keepAspectRatio() const -{ - return true; -} - void NetChart::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32 xSlot, sal_Int32 ySlot ) { VSeriesPlotter::addSeries( pSeries, zSlot, xSlot, ySlot ); diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx index f44b5aa40b78..943a10917ff7 100644 --- a/chart2/source/view/charttypes/NetChart.hxx +++ b/chart2/source/view/charttypes/NetChart.hxx @@ -41,7 +41,6 @@ public: virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; - virtual bool keepAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier virtual double getMaximumX() SAL_OVERRIDE; diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index dca4f20136b0..01a566dc330d 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -217,13 +217,6 @@ drawing::Direction3D PieChart::getPreferredDiagramAspectRatio() const return drawing::Direction3D(1,1,1); } -bool PieChart::keepAspectRatio() const -{ - if( m_nDimension == 3 ) - return false; - return true; -} - bool PieChart::shouldSnapRectToUsedArea() { return true; diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index f5d7d5325391..8450572705dc 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -47,7 +47,6 @@ public: virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; - virtual bool keepAspectRatio() const SAL_OVERRIDE; virtual bool shouldSnapRectToUsedArea() SAL_OVERRIDE; //MinimumAndMaximumSupplier diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 3bed8aeb1201..d2c17a5a26a5 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -262,11 +262,6 @@ drawing::Direction3D VSeriesPlotter::getPreferredDiagramAspectRatio() const return aRet; } -bool VSeriesPlotter::keepAspectRatio() const -{ - return true; -} - void VSeriesPlotter::releaseShapes() { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index 39d09b419c3a..215173e5b763 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -53,8 +53,6 @@ public: virtual void render(); - OpenGL3DRenderer* getRender(); - protected: OpenGL3DRenderer* mpRenderer; sal_uInt32 mnUniqueId; @@ -94,8 +92,6 @@ public: Text(OpenGL3DRenderer* pRenderer, TextCache& rTextCache, const OUString& rStr, sal_uInt32 nId); virtual void render() SAL_OVERRIDE; - Size getSize() const { return maText.maSize;} - void setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, const glm::vec3& rBottomRight); private: diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index 4370aa8778f8..f4ae57360611 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -98,7 +98,6 @@ private: void moveToCorner(); void moveToDefault(); glm::vec3 getCornerPosition(sal_Int8 nCornerId); - void updateTimer(); void updateScreenText(); void updateRenderFPS(); void updateDataUpdateFPS(); diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index 20ba20f6657c..f7db4878fa33 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -56,11 +56,6 @@ public: ::com::sun::star::uno::Any getNormalsPolygon() const; static ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ); //0 to 7 are the different possibilities - ::com::sun::star::drawing::Position3D GetPosition1() const { return m_aPoint1; } - ::com::sun::star::drawing::Position3D GetPosition2() const { return m_aPoint2; } - ::com::sun::star::drawing::Position3D GetPosition3() const { return m_aPoint3; } - ::com::sun::star::drawing::Position3D GetPosition4() const { return m_aPoint4; } - private: ::com::sun::star::drawing::Position3D m_aPoint1; ::com::sun::star::drawing::Position3D m_aPoint2; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 84d1d3f52fde..f0c1157bc520 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -141,7 +141,6 @@ public: /** a value <= 0 for a directions means that this direction can be stretched arbitrary */ virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() 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 diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 7b6128b35cce..9cc10b4a8b67 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -46,46 +46,6 @@ using namespace ::com::sun::star; -namespace -{ -// this code is copied from sfx2/source/doc/objembed.cxx -SfxObjectShell * lcl_GetParentObjectShell( const uno::Reference< frame::XModel > & xModel ) -{ - SfxObjectShell* pResult = NULL; - - try - { - uno::Reference< container::XChild > xChildModel( xModel, uno::UNO_QUERY ); - if ( xChildModel.is() ) - { - uno::Reference< lang::XUnoTunnel > xParentTunnel( xChildModel->getParent(), uno::UNO_QUERY ); - if ( xParentTunnel.is() ) - { - SvGlobalName aSfxIdent( SFX_GLOBAL_CLASSID ); - pResult = reinterpret_cast< SfxObjectShell * >( - xParentTunnel->getSomething( uno::Sequence< sal_Int8 >( aSfxIdent.GetByteSequence() ) ) ); - } - } - } - catch( const uno::Exception& ) - { - // TODO: error handling - } - - return pResult; -} - -// this code is copied from sfx2/source/doc/objembed.cxx. It is a workaround to -// get the reference device (e.g. printer) fromthe parent document -OutputDevice * lcl_GetParentRefDevice( const uno::Reference< frame::XModel > & xModel ) -{ - SfxObjectShell * pParent = lcl_GetParentObjectShell( xModel ); - if ( pParent ) - return pParent->GetDocumentRefDev(); - return NULL; -} - -} // anonymous namespace namespace chart { @@ -291,15 +251,6 @@ void DrawModelWrapper::unlockControllers() xDrawModel->unlockControllers(); } -void DrawModelWrapper::attachParentReferenceDevice( const uno::Reference< frame::XModel > & xChartModel ) -{ - OutputDevice * pParentRefDev( lcl_GetParentRefDevice( xChartModel )); - if( pParentRefDev ) - { - SetRefDevice( pParentRefDev ); - } -} - OutputDevice* DrawModelWrapper::getReferenceDevice() const { return SdrModel::GetRefDevice(); diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 397acbae18f7..68e7e4ffd4b8 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -623,32 +623,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill) return 0; } -int OpenGLRender::CreateTextTexture(::rtl::OUString const &textValue, vcl::Font aFont, long , awt::Point aPos, awt::Size aSize, long rotation) -{ - ScopedVclPtrInstance< VirtualDevice > pDevice(*Application::GetDefaultDevice(), 0, 0); - pDevice->Erase(); - Rectangle aRect; - pDevice->SetFont(aFont); - pDevice->GetTextBoundRect(aRect, textValue); - int screenWidth = (aRect.BottomRight().X() + 3) & ~3; - int screenHeight = (aRect.BottomRight().Y() + 3) & ~3; - pDevice->SetOutputSizePixel(Size(screenWidth * 3, screenHeight)); - pDevice->SetBackground(Wallpaper(COL_TRANSPARENT)); - pDevice->DrawText(Point(0, 0), textValue); - int bmpWidth = (aRect.Right() - aRect.Left() + 3) & ~3; - int bmpHeight = (aRect.Bottom() - aRect.Top() + 3) & ~3; - BitmapEx aBitmap = BitmapEx(pDevice->GetBitmapEx(aRect.TopLeft(), Size(bmpWidth, bmpHeight))); - - sal_Int32 nXPos = aPos.X; - sal_Int32 nYPos = aPos.Y; - ::basegfx::B2DHomMatrix aM; - aM.rotate( -rotation*F_PI/180.0 );//#i78696#->#i80521# - aM.translate( nXPos, nYPos ); - drawing::HomogenMatrix3 aTrans = chart::B2DHomMatrixToHomogenMatrix3(aM); - aTrans.Line1.Column1 = 20 * bmpWidth; - aTrans.Line2.Column2 = 20 * bmpHeight; - return CreateTextTexture(aBitmap,aPos,aSize,rotation,aTrans); -} + int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, const awt::Point&, const awt::Size& aSize, long rotation, const drawing::HomogenMatrix3& rTrans) diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index c11653df4710..910c86298962 100644 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -94,7 +94,6 @@ public: int CreateTextTexture(const BitmapEx& rBitmapEx, const css::awt::Point& aPos, const css::awt::Size& aSize, long rotation, const css::drawing::HomogenMatrix3& rTrans); - int CreateTextTexture(::rtl::OUString const &textValue, vcl::Font aFont, long fontColor, css::awt::Point aPos, css::awt::Size aSize, long rotation); int RenderTextShape(); int SetArea2DShapePoint(float x, float y, int listLength); |