diff options
Diffstat (limited to 'chart2/source/controller')
12 files changed, 29 insertions, 142 deletions
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 |