diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-15 08:48:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-17 08:25:06 +0200 |
| commit | 16690220ed6e68f2e9674a09b5008f38c5e6ed8d (patch) | |
| tree | 2f830b7ac23f136585e7dc4adf5d456f4995cc99 /chart2/source/controller/dialogs/dlg_CreationWizard.cxx | |
| parent | Use curl while getting the actual persona (diff) | |
| download | core-16690220ed6e68f2e9674a09b5008f38c5e6ed8d.tar.gz core-16690220ed6e68f2e9674a09b5008f38c5e6ed8d.zip | |
loplugin:singlevalfields
tighten up the handling of binary operators
Change-Id: I262ec57bf7142fa094d240738150a94d83fd15ee
Reviewed-on: https://gerrit.libreoffice.org/61777
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/controller/dialogs/dlg_CreationWizard.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 9 |
1 files changed, 4 insertions, 5 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); } |