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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/source/app/stdtext.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/layout.cxx | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index fcf7b9d129c7..d30784625d32 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -39,7 +39,7 @@ void ShowServiceNotAvailableError(vcl::Window* pParent, { OUString aText = GetStandardText(STANDARD_TEXT_SERVICE_NOT_AVAILABLE). replaceAll("%s", rServiceName); - ScopedVclPtrInstance< MessageDialog > aBox( pParent, aText, bError ? VCL_MESSAGE_ERROR : VCL_MESSAGE_WARNING ); + ScopedVclPtrInstance< MessageDialog > aBox( pParent, aText, bError ? VclMessageType::Error : VclMessageType::Warning ); aBox->Execute(); } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 7174c758758c..fc2a28aad420 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -801,7 +801,7 @@ void Edit::ShowTruncationWarning( vcl::Window* pParent ) ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) { - ScopedVclPtrInstance< MessageDialog > aBox( pParent, ResId(SV_EDIT_WARNING_STR, *pResMgr), VCL_MESSAGE_WARNING ); + ScopedVclPtrInstance< MessageDialog > aBox( pParent, ResId(SV_EDIT_WARNING_STR, *pResMgr), VclMessageType::Warning ); aBox->Execute(); } } diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index b099a9681021..8c583dca6285 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2001,7 +2001,7 @@ void MessageDialog::create_owned_areas() MessageDialog::MessageDialog(vcl::Window* pParent, WinBits nStyle) : Dialog(pParent, nStyle) , m_eButtonsType(VCL_BUTTONS_NONE) - , m_eMessageType(VCL_MESSAGE_INFO) + , m_eMessageType(VclMessageType::Info) , m_pOwnedContentArea(nullptr) , m_pOwnedActionArea(nullptr) , m_pGrid(nullptr) @@ -2033,7 +2033,7 @@ MessageDialog::MessageDialog(vcl::Window* pParent, MessageDialog::MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_MESSBOX) , m_eButtonsType(VCL_BUTTONS_NONE) - , m_eMessageType(VCL_MESSAGE_INFO) + , m_eMessageType(VclMessageType::Info) , m_pOwnedContentArea(nullptr) , m_pOwnedActionArea(nullptr) , m_pGrid(nullptr) @@ -2156,16 +2156,16 @@ short MessageDialog::Execute() m_pImage = VclPtr<FixedImage>::Create(m_pGrid, WB_CENTER | WB_VCENTER | WB_3DLOOK); switch (m_eMessageType) { - case VCL_MESSAGE_INFO: + case VclMessageType::Info: m_pImage->SetImage(InfoBox::GetStandardImage()); break; - case VCL_MESSAGE_WARNING: + case VclMessageType::Warning: m_pImage->SetImage(WarningBox::GetStandardImage()); break; - case VCL_MESSAGE_QUESTION: + case VclMessageType::Question: m_pImage->SetImage(QueryBox::GetStandardImage()); break; - case VCL_MESSAGE_ERROR: + case VclMessageType::Error: m_pImage->SetImage(ErrorBox::GetStandardImage()); break; } @@ -2283,15 +2283,15 @@ bool MessageDialog::set_property(const OString &rKey, const OString &rValue) set_secondary_text(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); else if (rKey == "message-type") { - VclMessageType eMode = VCL_MESSAGE_INFO; + VclMessageType eMode = VclMessageType::Info; if (rValue.equals("info")) - eMode = VCL_MESSAGE_INFO; + eMode = VclMessageType::Info; else if (rValue.equals("warning")) - eMode = VCL_MESSAGE_WARNING; + eMode = VclMessageType::Warning; else if (rValue.equals("question")) - eMode = VCL_MESSAGE_QUESTION; + eMode = VclMessageType::Question; else if (rValue.equals("error")) - eMode = VCL_MESSAGE_ERROR; + eMode = VclMessageType::Error; else { SAL_WARN("vcl.layout", "unknown message type mode" << rValue.getStr()); |