From 65af6fda33bc40670d41055f63e010c763f5b0b1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 1 Jul 2021 10:27:41 +0200 Subject: loplugin:unusedmethods Change-Id: I3ff5333c1e73ca61b0a7339e4b7dcfce211b88e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118207 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/inc/wizdlg.hxx | 14 -------------- vcl/source/control/roadmapwizard.cxx | 30 ------------------------------ vcl/source/control/wizardmachine.cxx | 33 --------------------------------- 3 files changed, 77 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index c997741958d3..bfae0641a5ce 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -133,12 +133,6 @@ namespace vcl void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } - /// enable (or disable) buttons - void enableButtons(WizardButtonFlags _nWizardButtonFlags, bool _bEnable); - - /// determines whether there is a next state to which we can advance - bool canAdvance() const; - void SetRoadmapHelpId( const OString& _rId ); void InsertRoadmapItem(int nIndex, const OUString& rLabel, int nId, bool bEnabled); @@ -174,13 +168,6 @@ namespace vcl /// travel to the previous state void travelPrevious(); - /** enables the automatic enabled/disabled state of the "Next" button - - If this is , then upon entering a new state, the "Next" button will automatically be - enabled if and only if determineNextState does not return WZS_INVALID_STATE. - */ - bool isAutomaticNextButtonStateEnabled() const; - /** removes a page from the history. Should be called when the page is being disabled */ void removePageFromHistory(WizardTypes::WizardState nToRemove); @@ -267,7 +254,6 @@ namespace vcl DECL_LINK(OnPrevPage, Button*, void); DECL_LINK(OnFinish, Button*, void); - void implUpdateTitle(); void implConstruct( const WizardButtonFlags _nButtonFlags ); }; diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 9f574ef19635..9530d8df3848 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -534,36 +534,6 @@ namespace vcl return aActivePathPos->second[ nNextStateIndex ]; } - bool RoadmapWizard::canAdvance() const - { - if ( !m_xRoadmapImpl->bActivePathIsDefinite ) - { - // check how many paths are still allowed - const WizardPath& rActivePath( m_xRoadmapImpl->aPaths[ m_xRoadmapImpl->nActivePath ] ); - sal_Int32 nCurrentStatePathIndex = RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath ); - - size_t nPossiblePaths(0); - for (auto const& path : m_xRoadmapImpl->aPaths) - { - // the index from which on both paths differ - sal_Int32 nDivergenceIndex = RoadmapWizardImpl::getFirstDifferentIndex( rActivePath, path.second ); - - if ( nDivergenceIndex > nCurrentStatePathIndex ) - // this path is still a possible path - nPossiblePaths += 1; - } - - // if we have more than one path which is still possible, then we assume - // to always have a next state. Though there might be scenarios where this - // is not true, but this is too sophisticated (means not really needed) right now. - if ( nPossiblePaths > 1 ) - return true; - } - - const WizardPath& rPath = m_xRoadmapImpl->aPaths[ m_xRoadmapImpl->nActivePath ]; - return *rPath.rbegin() != getCurrentState(); - } - bool RoadmapWizardMachine::canAdvance() const { if ( !m_pImpl->bActivePathIsDefinite ) diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index f084804657ff..cbb414800372 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -384,20 +384,6 @@ namespace vcl Dialog::Resize(); } - void RoadmapWizard::implUpdateTitle() - { - OUString sCompleteTitle(m_xWizardImpl->sTitleBase); - - // append the page title - TabPage* pCurrentPage = GetPage(getCurrentState()); - if ( pCurrentPage && !pCurrentPage->GetText().isEmpty() ) - { - sCompleteTitle += " - " + pCurrentPage->GetText(); - } - - SetText(sCompleteTitle); - } - void RoadmapWizard::CalcAndSetSize() { Size aDlgSize = GetPageSizePixel(); @@ -653,20 +639,6 @@ namespace vcl OSL_FAIL( "RoadmapWizard::RemoveButton() - Button not in list" ); } - void RoadmapWizard::enableButtons(WizardButtonFlags _nWizardButtonFlags, bool _bEnable) - { - if (m_pFinish && (_nWizardButtonFlags & WizardButtonFlags::FINISH)) - m_pFinish->Enable(_bEnable); - if (m_pNextPage && (_nWizardButtonFlags & WizardButtonFlags::NEXT)) - m_pNextPage->Enable(_bEnable); - if (m_pPrevPage && (_nWizardButtonFlags & WizardButtonFlags::PREVIOUS)) - m_pPrevPage->Enable(_bEnable); - if (m_pHelp && (_nWizardButtonFlags & WizardButtonFlags::HELP)) - m_pHelp->Enable(_bEnable); - if (m_pCancel && (_nWizardButtonFlags & WizardButtonFlags::CANCEL)) - m_pCancel->Enable(_bEnable); - } - IMPL_LINK_NOARG(RoadmapWizard, OnFinish, Button*, void) { if ( isTravelingSuspended() ) @@ -787,11 +759,6 @@ namespace vcl } } - bool RoadmapWizard::isAutomaticNextButtonStateEnabled() const - { - return m_xWizardImpl->m_bAutoNextButtonState; - } - IMPL_LINK_NOARG(RoadmapWizard, OnPrevPage, Button*, void) { if ( isTravelingSuspended() ) -- cgit