From c7efb51e31a4eea48ffed291e5c7fb907b1811e4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 25 May 2015 10:30:37 +0200 Subject: convert TOTOP constants to scoped enum Change-Id: I85ba631ba298f1034dc5b6a04a5ff3d509c41bcb --- desktop/source/deployment/gui/dp_gui_service.cxx | 4 ++-- desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 4 ++-- desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'desktop') diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index f07042d44a23..3e720b5b3ef8 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -270,12 +270,12 @@ void ServiceImpl::startExecuteModal( if ( bCloseDialog ) myExtMgr->Close(); else - myExtMgr->ToTop( TOTOP_RESTOREWHENMIN ); + myExtMgr->ToTop( ToTopFlags::RestoreWhenMin ); } else { myExtMgr->Show(); - myExtMgr->ToTop( TOTOP_RESTOREWHENMIN ); + myExtMgr->ToTop( ToTopFlags::RestoreWhenMin ); } } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index ccf0b54ff150..d04c3569d3ca 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -148,7 +148,7 @@ void TheExtensionManager::SetText( const OUString &rTitle ) } -void TheExtensionManager::ToTop( sal_uInt16 nFlags ) +void TheExtensionManager::ToTop( ToTopFlags nFlags ) { const SolarMutexGuard guard; @@ -442,7 +442,7 @@ void TheExtensionManager::queryTermination( ::lang::EventObject const & ) if ( m_pExecuteCmdQueue->isBusy() || ( pDialogHelper && pDialogHelper->isBusy() ) ) { - ToTop( TOTOP_RESTOREWHENMIN ); + ToTop( ToTopFlags::RestoreWhenMin ); throw frame::TerminationVetoException( "The office cannot be closed while the Extension Manager is running", static_cast(this)); diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 2341a5ad9a3c..cde3202025e2 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -87,7 +87,7 @@ public: void SetText( const OUString &rTitle ); void Show(); - void ToTop( sal_uInt16 nFlags ); + void ToTop( ToTopFlags nFlags ); bool Close(); bool isVisible(); -- cgit