diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-21 15:48:51 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2016-12-21 16:19:37 +0000 |
| commit | 6b8ee3c9ba9b9262b34743a9f4e2a5b9dda4173f (patch) | |
| tree | ba5bf03e1b94e30a76ac66d5dcd3c7749e3c568f /desktop | |
| parent | c7964e48b6d9a85d8d08ed3b7cbd58c117ac4e0a (diff) | |
convert VclButtonsType to scoped enum
Change-Id: I9b91108c18e190060dc71546977aa8a3c11f06e1
Reviewed-on: https://gerrit.libreoffice.org/32285
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
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 6b883095776d..a84584d8c21f 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), - VclMessageType::Question, VCL_BUTTONS_YES_NO); + VclMessageType::Question, VclButtonsType::YesNo); // 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 219b2fa733df..89ac27c9d6fa 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -387,7 +387,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment:: { const SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> aInfoBox(pParent, getResId(nResID), - VclMessageType::Warning, VCL_BUTTONS_OK_CANCEL); + VclMessageType::Warning, VclButtonsType::OkCancel); bHadWarning = true; if ( RET_OK == aInfoBox->Execute() ) @@ -428,7 +428,7 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const { const SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> aInfo(m_pVCLWindow, getResId(RID_STR_WARNING_INSTALL_EXTENSION), - VclMessageType::Warning, VCL_BUTTONS_OK_CANCEL); + VclMessageType::Warning, VclButtonsType::OkCancel); OUString sText(aInfo->get_primary_text()); sText = sText.replaceAll("%NAME", rExtensionName); @@ -592,7 +592,7 @@ bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const { const SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> aInfo(const_cast<ExtMgrDialog*>(this), getResId(RID_STR_WARNING_REMOVE_EXTENSION), - VclMessageType::Warning, VCL_BUTTONS_OK_CANCEL); + VclMessageType::Warning, VclButtonsType::OkCancel); 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 2167231e826d..79543cf4fcbd 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -432,7 +432,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & { SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, - ResId(id, *DeploymentGuiResMgr::get()), VclMessageType::Warning, VCL_BUTTONS_OK_CANCEL); + ResId(id, *DeploymentGuiResMgr::get()), VclMessageType::Warning, VclButtonsType::OkCancel); OUString s; if (bEqualNames) { |