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 /sfx2/source/dialog | |
| 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 'sfx2/source/dialog')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/newstyle.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 4739073e2e17..c321af97ff05 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1687,7 +1687,7 @@ void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool bIsFr if ( bIsFromTypeBox ) // LoseFocus of TypeBox pLine->m_bTypeLostFocus = true; vcl::Window* pParent = GetParent()->GetParent(); - if (ScopedVclPtrInstance<MessageDialog>(pParent, SfxResId(STR_SFX_QUERY_WRONG_TYPE), VclMessageType::Question, VCL_BUTTONS_OK_CANCEL)->Execute() == RET_OK) + if (ScopedVclPtrInstance<MessageDialog>(pParent, SfxResId(STR_SFX_QUERY_WRONG_TYPE), VclMessageType::Question, VclButtonsType::OkCancel)->Execute() == RET_OK) pLine->m_aTypeBox->SelectEntryPos( m_aTypeBox->GetEntryPos( reinterpret_cast<void*>(CUSTOM_TYPE_TEXT) ) ); else pLine->m_aValueEdit->GrabFocus(); diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 903a9342e9a0..11f58bb798ee 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -59,7 +59,7 @@ IMPL_LINK( SfxNewStyleDlg, ModifyHdl, Edit&, rBox, void ) SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rInPool ) : ModalDialog(pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui") , aQueryOverwriteBox(VclPtr<MessageDialog>::Create(this, SfxResId(STR_QUERY_OVERWRITE), - VclMessageType::Question, VCL_BUTTONS_YES_NO)) + VclMessageType::Question, VclButtonsType::YesNo)) , rPool(rInPool) { get(m_pColBox, "stylename"); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index fb562750e857..8e5f32ea26a5 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1888,10 +1888,10 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl() { #if defined UNX ScopedVclPtrInstance<MessageDialog> aBox(SfxGetpApp()->GetTopWindow(), aMsg, - VclMessageType::Question, VCL_BUTTONS_YES_NO); + VclMessageType::Question, VclButtonsType::YesNo); #else ScopedVclPtrInstance<MessageDialog> aBox(GetWindow(), aMsg, - VclMessageType::Question, VCL_BUTTONS_YES_NO); + VclMessageType::Question, VclButtonsType::YesNo); #endif aApproved = aBox->Execute() == RET_YES; } |