diff options
Diffstat (limited to 'chart2/source/controller')
4 files changed, 4 insertions, 11 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 9967c6123a76..2b7ea4405fda 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -50,7 +50,6 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame: , m_xChartModel(xChartModel,uno::UNO_QUERY) , m_xComponentContext(xContext) , m_pTemplateProvider(nullptr) - , m_nLastState(STATE_LAST) , m_aTimerTriggeredControllerLock(xChartModel) , m_bCanTravel(true) { @@ -140,18 +139,18 @@ svt::WizardTypes::WizardState CreationWizard::determineNextState( WizardState nC { if( !m_bCanTravel ) return WZS_INVALID_STATE; - if( nCurrentState == m_nLastState ) + if( nCurrentState == STATE_LAST ) return WZS_INVALID_STATE; svt::WizardTypes::WizardState nNextState = nCurrentState + 1; - while( !isStateEnabled( nNextState ) && nNextState <= m_nLastState ) + while( !isStateEnabled( nNextState ) && nNextState <= STATE_LAST ) ++nNextState; - return (nNextState==m_nLastState+1) ? WZS_INVALID_STATE : nNextState; + return (nNextState==STATE_LAST+1) ? WZS_INVALID_STATE : nNextState; } void CreationWizard::enterState(WizardState nState) { m_aTimerTriggeredControllerLock.startTimer(); enableButtons( WizardButtonFlags::PREVIOUS, nState > STATE_FIRST ); - enableButtons( WizardButtonFlags::NEXT, nState < m_nLastState ); + enableButtons( WizardButtonFlags::NEXT, nState < STATE_LAST ); if( isStateEnabled( nState )) svt::RoadmapWizard::enterState(nState); } diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 2181d9165eb9..ad8fd31cfd20 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -62,7 +62,6 @@ private: bool m_bSupportingAxisSideBySide; bool m_bGroupBarsPerAxis; - sal_Int32 m_nAllSeriesAxisIndex; bool m_bSupportingStartingAngle; sal_Int32 m_nStartingAngle; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 732968fde79f..b9ddfef66896 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -65,8 +65,6 @@ private: ChartTypeTemplateProvider* m_pTemplateProvider; std::unique_ptr<DialogModel> m_pDialogModel; - WizardState m_nLastState; - TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; bool m_bCanTravel; diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 3d195ad2bf60..7b98478e75b2 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -67,7 +67,6 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( , m_bConnectBars(false) , m_bSupportingAxisSideBySide(false) , m_bGroupBarsPerAxis(true) - , m_nAllSeriesAxisIndex(-1) , m_bSupportingStartingAngle(false) , m_nStartingAngle(90) , m_bClockwise(false) @@ -393,8 +392,6 @@ void SeriesOptionsItemConverter::FillSpecialItem( } case SCHATTR_AXIS_FOR_ALL_SERIES: { - if( m_nAllSeriesAxisIndex != - 1) - rOutItemSet.Put( SfxInt32Item(nWhichId, m_nAllSeriesAxisIndex)); break; } case SCHATTR_STARTING_ANGLE: |