diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-31 14:25:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-01 06:46:29 +0000 |
| commit | b860b73f2ba3322663106eeb1de7e07af6959248 (patch) | |
| tree | 939d5596c023d4bfa467ecc3349548cd040d7e7d /desktop | |
| parent | bf3f3a6bfb08c2d1a2c95f1c1cf62117e0002235 (diff) | |
Convert VCL_MESSAGE to scoped enum
Change-Id: I976536849fa5585c96cee23b660c56d3d0116933
Reviewed-on: https://gerrit.libreoffice.org/25720
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/lockfile2.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx index 7636431048a6..6b883095776d 100644 --- a/desktop/source/app/lockfile2.cxx +++ b/desktop/source/app/lockfile2.cxx @@ -39,7 +39,7 @@ bool Lockfile_execWarning( Lockfile * that ) // display warning and return response ScopedVclPtrInstance<MessageDialog> aBox(nullptr, DesktopResId(STR_QUERY_USERDATALOCKED), - VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); + VclMessageType::Question, VCL_BUTTONS_YES_NO); // set box title OUString aTitle = OUString( DesktopResId( STR_TITLE_USERDATALOCKED )); aBox->SetText( aTitle ); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 95b652dc05b1..857395cd088a 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -587,7 +587,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment:: { const SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> aInfoBox(pParent, getResId(nResID), - VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL); + VclMessageType::Warning, VCL_BUTTONS_OK_CANCEL); bHadWarning = true; if ( RET_OK == aInfoBox->Execute() ) @@ -627,7 +627,7 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const { const SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> aInfo(m_pVCLWindow, getResId(RID_STR_WARNING_INSTALL_EXTENSION), - VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL); + VclMessageType::Warning, VCL_BUTTONS_OK_CANCEL); OUString sText(aInfo->get_primary_text()); sText = sText.replaceAll("%NAME", rExtensionName); @@ -788,7 +788,7 @@ bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const { const SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> aInfo(const_cast<ExtMgrDialog*>(this), getResId(RID_STR_WARNING_REMOVE_EXTENSION), - VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL); + VclMessageType::Warning, VCL_BUTTONS_OK_CANCEL); OUString sText(aInfo->get_primary_text()); sText = sText.replaceAll("%NAME", rExtensionName); diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 6794269da175..a440d9ed1722 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -449,7 +449,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & { SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, - ResId(id, *DeploymentGuiResMgr::get()), VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL); + ResId(id, *DeploymentGuiResMgr::get()), VclMessageType::Warning, VCL_BUTTONS_OK_CANCEL); OUString s; if (bEqualNames) { |