diff options
Diffstat (limited to 'chart2')
32 files changed, 47 insertions, 232 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 3624b4b6a0b3..7d1edcdb96bc 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -593,13 +593,13 @@ public: com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getChartView(); - bool isTimeBased() const; + bool isTimeBased() const { return mbTimeBased;} void setTimeBased(bool bTimeBased); void getNextTimePoint(); void setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd); - OpenGLWindow* getOpenGLWindow(); + OpenGLWindow* getOpenGLWindow() { return mpOpenGLWindow;} private: sal_Int32 mnStart; diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 7c71bb18203f..283ffea52f17 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -90,10 +90,6 @@ Reference< frame::XModel > Chart2ModelContact::getChartModel() const return Reference< frame::XModel >( m_xChartModel.get(), uno::UNO_QUERY ); } -ChartModel* Chart2ModelContact::getModel() const -{ - return mpModel; -} Reference< chart2::XChartDocument > Chart2ModelContact::getChart2Document() const { diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index c2310d3372b2..9b9e4376bce3 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -58,7 +58,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getChartModel() const; - ChartModel* getModel() const; + ChartModel* getModel() const { return mpModel;} ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getChart2Document() const; diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index caccf120ae00..cac76fe74958 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1069,10 +1069,6 @@ void ChartDocumentWrapper::setUpdateAddIn( bool bUpdateAddIn ) { m_bUpdateAddIn = bUpdateAddIn; } -bool ChartDocumentWrapper::getUpdateAddIn() const -{ - return m_bUpdateAddIn; -} Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const { diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 94174dd67114..cb3ee0527127 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -106,7 +106,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; void setStartColumn( sal_Int32 nStartColumn ); - sal_Int32 getStartColumn() const; + sal_Int32 getStartColumn() const { return m_nStartColumn;} void SetShowWarningBox( bool bShowWarning = true ); private: @@ -130,10 +130,6 @@ void SeriesHeaderEdit::setStartColumn( sal_Int32 nStartColumn ) m_nStartColumn = nStartColumn; } -sal_Int32 SeriesHeaderEdit::getStartColumn() const -{ - return m_nStartColumn; -} void SeriesHeaderEdit::SetShowWarningBox( bool bShowWarning ) { @@ -164,8 +160,8 @@ public: void SetPixelWidth( sal_Int32 nWidth ); - sal_Int32 GetStartColumn() const; - sal_Int32 GetEndColumn() const; + sal_Int32 GetStartColumn() const { return m_nStartCol;} + sal_Int32 GetEndColumn() const { return m_nEndCol;} static sal_Int32 GetRelativeAppFontXPosForNameField(); @@ -316,15 +312,7 @@ void SeriesHeader::SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol ) m_spSeriesName->setStartColumn( nStartCol ); } -sal_Int32 SeriesHeader::GetStartColumn() const -{ - return m_nStartCol; -} -sal_Int32 SeriesHeader::GetEndColumn() const -{ - return m_nEndCol; -} void SeriesHeader::Show() { @@ -740,10 +728,6 @@ bool DataBrowser::SetReadOnly( bool bNewState ) return bResult; } -bool DataBrowser::IsReadOnly() const -{ - return m_bIsReadOnly; -} void DataBrowser::SetClean() { @@ -815,10 +799,6 @@ bool DataBrowser::IsDataValid() return bValid; } -bool DataBrowser::IsEnableItem() -{ - return m_bDataValid; -} void DataBrowser::CellModified() { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index f32363a50b95..3d908aa4517c 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -92,7 +92,7 @@ public: /// @return old state bool SetReadOnly( bool bNewState ); - bool IsReadOnly() const; + bool IsReadOnly() const { return m_bIsReadOnly;} /// reset the dirty status, if changes have been saved void SetClean(); @@ -140,7 +140,7 @@ public: sal_uInt32 GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) const; - bool IsEnableItem(); + bool IsEnableItem() { return m_bDataValid;} bool IsDataValid(); void ShowWarningBox(); bool ShowQueryBox(); diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 2a3e219bac3d..cc458e57ff1d 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -179,11 +179,6 @@ void CreationWizard::enterState(WizardState nState) svt::RoadmapWizard::enterState(nState); } -bool CreationWizard::isClosable() -{ - //@todo - return m_bIsClosable; -} void CreationWizard::setInvalidPage( TabPage * /* pTabPage */ ) { diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index b279f0514b9f..859a4bf541da 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -110,10 +110,6 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString ObjectPropertiesDialogParameter::~ObjectPropertiesDialogParameter() { } -ObjectType ObjectPropertiesDialogParameter::getObjectType() const -{ - return m_eObjectType; -} OUString ObjectPropertiesDialogParameter::getLocalizedName() const { return m_aLocalizedName; @@ -313,82 +309,14 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel } } -bool ObjectPropertiesDialogParameter::HasGeometryProperties() const -{ - return m_bHasGeometryProperties; -} -bool ObjectPropertiesDialogParameter::HasStatisticProperties() const -{ - return m_bHasStatisticProperties; -} -bool ObjectPropertiesDialogParameter::ProvidesSecondaryYAxis() const -{ - return m_bProvidesSecondaryYAxis; -} -bool ObjectPropertiesDialogParameter::ProvidesOverlapAndGapWidth() const -{ - return m_bProvidesOverlapAndGapWidth; -} -bool ObjectPropertiesDialogParameter::ProvidesBarConnectors() const -{ - return m_bProvidesBarConnectors; -} -bool ObjectPropertiesDialogParameter::HasAreaProperties() const -{ - return m_bHasAreaProperties; -} -bool ObjectPropertiesDialogParameter::HasSymbolProperties() const -{ - return m_bHasSymbolProperties; -} -bool ObjectPropertiesDialogParameter::HasScaleProperties() const -{ - return m_bHasScaleProperties; -} -bool ObjectPropertiesDialogParameter::CanAxisLabelsBeStaggered() const -{ - return m_bCanAxisLabelsBeStaggered; -} -bool ObjectPropertiesDialogParameter::ShowAxisOrigin() const -{ - return m_bShowAxisOrigin; -} -bool ObjectPropertiesDialogParameter::IsSupportingAxisPositioning() const -{ - return m_bSupportingAxisPositioning; -} -bool ObjectPropertiesDialogParameter::IsCrossingAxisIsCategoryAxis() const -{ - return m_bIsCrossingAxisIsCategoryAxis; -} const uno::Sequence< OUString >& ObjectPropertiesDialogParameter::GetCategories() const { return m_aCategories; } -bool ObjectPropertiesDialogParameter::HasNumberProperties() const -{ - return m_bHasNumberProperties; -} -bool ObjectPropertiesDialogParameter::ProvidesStartingAngle() const -{ - return m_bProvidesStartingAngle; -} -bool ObjectPropertiesDialogParameter::ProvidesMissingValueTreatments() const -{ - return m_bProvidesMissingValueTreatments; -} uno::Reference< chart2::XChartDocument > ObjectPropertiesDialogParameter::getDocument() const { return m_xChartDocument; } -bool ObjectPropertiesDialogParameter::IsComplexCategoriesAxis() const -{ - return m_bComplexCategoriesAxis; -} -sal_Int32 ObjectPropertiesDialogParameter::getNbPoints() const -{ - return m_nNbPoints; -} const sal_uInt16 nNoArrowNoShadowDlg = 1101; @@ -723,10 +651,6 @@ IMPL_LINK_NOARG(SchAttribTabDlg, OKPressed) return m_aOriginalOKClickHdl.Call( this ); } -bool SchAttribTabDlg::DialogWasClosedWithOK() const -{ - return m_bOKPressed; -} } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 839f200e9172..e5e469e92978 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -67,10 +67,6 @@ void LightButton::switchLightOn(bool bOn) } } -bool LightButton::isLightOn() const -{ - return m_bLightOn; -} struct LightSource { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index f08560be63a5..7bfe1ab59602 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -40,7 +40,7 @@ public: virtual ~LightButton(); void switchLightOn(bool bOn); - bool isLightOn() const; + bool isLightOn() const { return m_bLightOn;} private: bool m_bLightOn; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 1cf5a8e81b3d..21de1e66bdd6 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -72,7 +72,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const; void setUpdateAddIn( bool bUpdateAddIn ); - bool getUpdateAddIn() const; + bool getUpdateAddIn() const { return m_bUpdateAddIn;} void setBaseDiagram( const OUString& rBaseDiagram ); OUString getBaseDiagram() const; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 84e74acfe1a0..5aaff14479b8 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -50,7 +50,7 @@ public: , sal_Int32 nOnePageOnlyIndex=-1 );//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap virtual ~CreationWizard(); - bool isClosable(); + bool isClosable() { /*@todo*/ return m_bIsClosable;} // TabPageNotifiable virtual void setInvalidPage( TabPage * pTabPage ) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 598f8fc8929e..13f14e0f402f 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -34,33 +34,33 @@ public: virtual ~ObjectPropertiesDialogParameter(); void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); - ObjectType getObjectType() const; + ObjectType getObjectType() const { return m_eObjectType;} OUString getLocalizedName() const; - bool HasGeometryProperties() const; - bool HasStatisticProperties() const; - bool ProvidesSecondaryYAxis() const; - bool ProvidesOverlapAndGapWidth() const; - bool ProvidesBarConnectors() const; - bool HasAreaProperties() const; - bool HasSymbolProperties() const; - bool HasNumberProperties() const; - bool ProvidesStartingAngle() const; - bool ProvidesMissingValueTreatments() const; - - bool HasScaleProperties() const; - bool CanAxisLabelsBeStaggered() const; - bool IsSupportingAxisPositioning() const; - bool ShowAxisOrigin() const; - bool IsCrossingAxisIsCategoryAxis() const; + bool HasGeometryProperties() const { return m_bHasGeometryProperties;} + bool HasStatisticProperties() const { return m_bHasStatisticProperties;} + bool ProvidesSecondaryYAxis() const { return m_bProvidesSecondaryYAxis;} + bool ProvidesOverlapAndGapWidth() const { return m_bProvidesOverlapAndGapWidth;} + bool ProvidesBarConnectors() const { return m_bProvidesBarConnectors;} + bool HasAreaProperties() const { return m_bHasAreaProperties;} + bool HasSymbolProperties() const { return m_bHasSymbolProperties;} + bool HasNumberProperties() const { return m_bHasNumberProperties;} + bool ProvidesStartingAngle() const { return m_bProvidesStartingAngle;} + bool ProvidesMissingValueTreatments() const { return m_bProvidesMissingValueTreatments;} + + bool HasScaleProperties() const { return m_bHasScaleProperties;} + bool CanAxisLabelsBeStaggered() const { return m_bCanAxisLabelsBeStaggered;} + bool IsSupportingAxisPositioning() const { return m_bSupportingAxisPositioning;} + bool ShowAxisOrigin() const { return m_bShowAxisOrigin;} + bool IsCrossingAxisIsCategoryAxis() const { return m_bIsCrossingAxisIsCategoryAxis;} const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getDocument() const; - bool IsComplexCategoriesAxis() const; + bool IsComplexCategoriesAxis() const { return m_bComplexCategoriesAxis;} - sal_Int32 getNbPoints() const; + sal_Int32 getNbPoints() const { return m_nNbPoints;} private: OUString m_aObjectCID; @@ -140,7 +140,7 @@ public: void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); - bool DialogWasClosedWithOK() const; + bool DialogWasClosedWithOK() const { return m_bOKPressed;} }; } //namespace chart diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 7b24560e34ae..de8c7518eca6 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -102,7 +102,7 @@ public: sal_Int32 getCategoryLevelCount() const; const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList(); + ::com::sun::star::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList() { return m_aSplitCategoriesList;} bool isDateAxis(); const std::vector< DatePlusIndex >& getDateCategories(); diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx index 2b36c2d78843..77ed6cabd501 100644 --- a/chart2/source/inc/InternalData.hxx +++ b/chart2/source/inc/InternalData.hxx @@ -66,8 +66,8 @@ public: /// @return the index of the newly appended row sal_Int32 appendRow(); - sal_Int32 getRowCount() const; - sal_Int32 getColumnCount() const; + sal_Int32 getRowCount() const { return m_nRowCount;} + sal_Int32 getColumnCount() const { return m_nColumnCount;} typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Any > > tVecVecAny; //inner index is hierarchical level diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 2465875fbeea..1fd93e871fdf 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -106,7 +106,7 @@ protected: virtual void impl_apiCallCountReachedNull() SAL_OVERRIDE; void impl_setOwnership( bool bDeliverOwnership, bool bMyVeto ); - bool impl_shouldCloseAtNextChance(); + bool impl_shouldCloseAtNextChance() { return m_bOwnership;} void impl_doClose(); void impl_init() diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index e97983801558..d199ef7b4005 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -36,7 +36,7 @@ public: NumberFormatterWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ); virtual ~NumberFormatterWrapper(); - SvNumberFormatter* getSvNumberFormatter() const; + SvNumberFormatter* getSvNumberFormatter() const { return m_pNumberFormatter;} ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; }; diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 6c3f968852dc..d1275c718a2f 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -96,7 +96,7 @@ public: void setValuesAtAllDataSeries(); private: - SAL_DLLPRIVATE bool useAutoScale() const; + SAL_DLLPRIVATE bool useAutoScale() const { return m_bUseAutoScale;} /** sets the auto-resize at all objects that support this feature for text. eNewState must be either AUTO_RESIZE_YES or AUTO_RESIZE_NO diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index e4b671892ce6..8da9ed76c9df 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1357,10 +1357,6 @@ OUString SAL_CALL ChartModel::dump() return OUString(); } -bool ChartModel::isTimeBased() const -{ - return mbTimeBased; -} void ChartModel::setTimeBased(bool bTimeBased) { @@ -1433,10 +1429,6 @@ void ChartModel::update() mpChartView->update(); } -OpenGLWindow* ChartModel::getOpenGLWindow() -{ - return mpOpenGLWindow; -} } // namespace chart diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index a425a8583f19..a4adb844ec96 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -52,10 +52,6 @@ StockDataInterpreter::StockDataInterpreter( StockDataInterpreter::~StockDataInterpreter() {} -StockChartTypeTemplate::StockVariant StockDataInterpreter::GetStockVariant() const -{ - return m_eStockVariant; -} // ____ XDataInterpreter ____ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index 472b49e3841d..6190e08915e2 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -52,7 +52,7 @@ protected: private: StockChartTypeTemplate::StockVariant m_eStockVariant; - StockChartTypeTemplate::StockVariant GetStockVariant() const; + StockChartTypeTemplate::StockVariant GetStockVariant() const { return m_eStockVariant;} }; } // namespace chart diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 31a08c7afafc..a1df24a0c641 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -139,10 +139,6 @@ Reference< chart2::data::XDataSequence > ExplicitCategoriesProvider::getOriginal return 0; } -const Sequence< Reference< data::XLabeledDataSequence> >& ExplicitCategoriesProvider::getSplitCategoriesList() -{ - return m_aSplitCategoriesList; -} bool ExplicitCategoriesProvider::hasComplexCategories() const { diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 0cc7038fcb88..71a2fd8ab466 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -484,15 +484,7 @@ void InternalData::deleteRow( sal_Int32 nAtIndex ) #endif } -sal_Int32 InternalData::getRowCount() const -{ - return m_nRowCount; -} -sal_Int32 InternalData::getColumnCount() const -{ - return m_nColumnCount; -} void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNewRowLabels ) { diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 2b17a2e516e6..62996b79fb98 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -316,10 +316,6 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b m_bOwnership = bDeliverOwnership && bMyVeto; } -bool CloseableLifeTimeManager::impl_shouldCloseAtNextChance() -{ - return m_bOwnership; -} void CloseableLifeTimeManager ::impl_apiCallCountReachedNull() diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index cef25c27f133..dc8b7b92ee6c 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -67,10 +67,6 @@ NumberFormatterWrapper::~NumberFormatterWrapper() { } -SvNumberFormatter* NumberFormatterWrapper::getSvNumberFormatter() const -{ - return m_pNumberFormatter; -} Date NumberFormatterWrapper::getNullDate() const { diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 5e4fbb88e685..1f5c84f30025 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -53,10 +53,6 @@ awt::Size ReferenceSizeProvider::getPageSize() const return m_aPageSize; } -bool ReferenceSizeProvider::useAutoScale() const -{ - return m_bUseAutoScale; -} void ReferenceSizeProvider::impl_setValuesAtTitled( const Reference< XTitled > & xTitled ) diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index c686911ed120..57ee304a49b1 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2001,10 +2001,6 @@ void VSeriesPlotter::setCoordinateSystemResolution( const Sequence< sal_Int32 >& m_aCoordinateSystemResolution = rCoordinateSystemResolution; } -bool VSeriesPlotter::PointsWereSkipped() const -{ - return m_bPointsWereSkipped; -} bool VSeriesPlotter::WantToPlotInFrontOfAxisLine() { diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 14c2bb3bc631..9aeaa9c70fd9 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -78,7 +78,7 @@ public: void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex ); void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); - sal_Int32 getTotalPointCount() const; + sal_Int32 getTotalPointCount() const { return m_nPointCount;} double getXValue( sal_Int32 index ) const; double getYValue( sal_Int32 index ) const; @@ -129,20 +129,20 @@ public: bool hasPointOwnColor( sal_Int32 index ) const; - ::com::sun::star::chart2::StackingDirection getStackingDirection() const; - sal_Int32 getAttachedAxisIndex() const; + ::com::sun::star::chart2::StackingDirection getStackingDirection() const { return m_eStackingDirection;} + sal_Int32 getAttachedAxisIndex() const { return m_nAxisIndex;} void setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex ); void doSortByXValues(); void setConnectBars( bool bConnectBars ); - bool getConnectBars() const; + bool getConnectBars() const { return m_bConnectBars;} void setGroupBarsPerAxis( bool bGroupBarsPerAxis ); - bool getGroupBarsPerAxis() const; + bool getGroupBarsPerAxis() const { return m_bGroupBarsPerAxis;} void setStartingAngle( sal_Int32 nStartingAngle ); - sal_Int32 getStartingAngle() const; + sal_Int32 getStartingAngle() const { return m_nStartingAngle;} void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ); @@ -175,7 +175,7 @@ public: void releaseShapes(); void setMissingValueTreatment( sal_Int32 nMissingValueTreatment ); - sal_Int32 getMissingValueTreatment() const; + sal_Int32 getMissingValueTreatment() const { return m_nMissingValueTreatment;} void setOldTimeBased( VDataSeries* pOldSeries, double nPercent ); VDataSeries* createCopyForTimeBased() const; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 632c81daac01..0f45b401a376 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -247,7 +247,7 @@ public: void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); //better performance for big data void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); - bool PointsWereSkipped() const; + bool PointsWereSkipped() const { return m_bPointsWereSkipped;} //return the depth for a logic 1 double getTransformedDepth() const; diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index d9caddd4dcd9..71cd03aa4d7d 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -185,10 +185,6 @@ awt::Point SAL_CALL DummyXShape::getPosition() return maPosition; } -const awt::Point& DummyXShape::getPos() -{ - return maPosition; -} void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint ) throw(uno::RuntimeException, std::exception) diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 5fc71e6a9b8f..ddee02d815f9 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -169,7 +169,7 @@ public: */ virtual void render(); - const com::sun::star::awt::Point& getPos(); // internal API + const com::sun::star::awt::Point& getPos() { return maPosition;} // internal API protected: diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 10ec3bb2bb22..7354bd88b9ef 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -421,39 +421,19 @@ void VDataSeries::setPageReferenceSize( const awt::Size & rPageRefSize ) m_aReferenceSize = rPageRefSize; } -StackingDirection VDataSeries::getStackingDirection() const -{ - return m_eStackingDirection; -} -sal_Int32 VDataSeries::getAttachedAxisIndex() const -{ - return m_nAxisIndex; -} void VDataSeries::setConnectBars( bool bConnectBars ) { m_bConnectBars = bConnectBars; } -bool VDataSeries::getConnectBars() const -{ - return m_bConnectBars; -} void VDataSeries::setGroupBarsPerAxis( bool bGroupBarsPerAxis ) { m_bGroupBarsPerAxis = bGroupBarsPerAxis; } -bool VDataSeries::getGroupBarsPerAxis() const -{ - return m_bGroupBarsPerAxis; -} void VDataSeries::setStartingAngle( sal_Int32 nStartingAngle ) { m_nStartingAngle = nStartingAngle; } -sal_Int32 VDataSeries::getStartingAngle() const -{ - return m_nStartingAngle; -} void VDataSeries::setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex ) { @@ -462,10 +442,6 @@ void VDataSeries::setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex ) m_nAxisIndex = nAttachedAxisIndex; } -sal_Int32 VDataSeries::getTotalPointCount() const -{ - return m_nPointCount; -} double VDataSeries::getXValue( sal_Int32 index ) const { @@ -1056,10 +1032,6 @@ void VDataSeries::setMissingValueTreatment( sal_Int32 nMissingValueTreatment ) m_nMissingValueTreatment = nMissingValueTreatment; } -sal_Int32 VDataSeries::getMissingValueTreatment() const -{ - return m_nMissingValueTreatment; -} VDataSeries::VDataSeries() : m_nPolygonIndex(0) |