From 205c47443ea43341cacec52acbe53a470f41acc6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 26 Aug 2019 13:47:34 +0200 Subject: loplugin:unusedmethods Change-Id: I9d1abe62e7e0ae3434e0b2d440d6ccf0435e97cc Reviewed-on: https://gerrit.libreoffice.org/78131 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/control/roadmapwizard.cxx | 28 ---------------------------- vcl/source/control/wizardmachine.cxx | 33 --------------------------------- 2 files changed, 61 deletions(-) (limited to 'vcl/source/control') diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 66f098e31cb9..eb1294a95b68 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -861,34 +861,6 @@ namespace vcl return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end(); } - void RoadmapWizard::updateRoadmapItemLabel( WizardState _nState ) - { - const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] ); - RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast(rActivePath.size()); - RoadmapTypes::ItemIndex nLoopUntil = ::std::max( nUpperStepBoundary, m_pImpl->pRoadmap->GetItemCount() ); - sal_Int32 nCurrentStatePathIndex = -1; - if ( m_pImpl->nActivePath != -1 ) - nCurrentStatePathIndex = m_pImpl->getStateIndexInPath( getCurrentState(), m_pImpl->nActivePath ); - if (nCurrentStatePathIndex < 0) - return; - for ( RoadmapTypes::ItemIndex nItemIndex = nCurrentStatePathIndex; nItemIndex < nLoopUntil; ++nItemIndex ) - { - bool bExistentItem = ( nItemIndex < m_pImpl->pRoadmap->GetItemCount() ); - if ( bExistentItem ) - { - // there is an item with this index in the roadmap - does it match what is requested by - // the respective state in the active path? - RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); - WizardState nRequiredState = rActivePath[ nItemIndex ]; - if ( _nState == nRequiredState ) - { - m_pImpl->pRoadmap->ChangeRoadmapItemLabel( nPresentItemId, getStateDisplayName( nRequiredState ) ); - break; - } - } - } - } - void RoadmapWizard::InsertRoadmapItem(int nItemIndex, const OUString& rText, int nItemId, bool bEnable) { m_pImpl->pRoadmap->InsertRoadmapItem(nItemIndex, rText, nItemId, bEnable); diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index 8082df6ab39a..49dc3b47e6ec 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -992,39 +992,6 @@ namespace vcl } - void WizardMachine::skip() - { - // allowed to leave the current page? - if ( !prepareLeaveCurrentState( eTravelForward ) ) - return; - - WizardState nCurrentState = getCurrentState(); - WizardState nNextState = determineNextState(nCurrentState); - - if (WZS_INVALID_STATE == nNextState) - return; - - // remember the skipped state in the history - m_pImpl->aStateHistory.push(nCurrentState); - - // get the next state - nCurrentState = nNextState; - - // show the (n+1)th page - if (!ShowPage(nCurrentState)) - { - // TODO: this leaves us in a state where we have no current page and an inconsistent state history. - // Perhaps we should rollback the skipping here .... - OSL_FAIL("WizardMachine::skip: very unpolite ...."); - // if somebody does a skip and then does not allow to leave ... - // (can't be a commit error, as we've already committed the current page. So if ShowPage fails here, - // somebody behaves really strange ...) - return; - } - - // all fine - } - bool WizardMachine::travelNext() { // allowed to leave the current page? -- cgit