diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-19 16:33:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-22 22:07:38 +0100 |
| commit | 6a4c464b49dbfa2801818ead1b50bc9580824d00 (patch) | |
| tree | 3d6381b6b13576bc536670992b36784436486e95 /sfx2/source/doc/saveastemplatedlg.cxx | |
| parent | f7733528e88a6619f82b54b59e92a9bca72c0a89 (diff) | |
weld native message dialogs
just the straight-forward MessageDialog cases first
a) remove border_width from message dialog .ui so as to take
the default border width
b) retain 12 as default message dialog border for vcl widget case
c) remove layour_style from message dialog button boxes so as to
take the default mode (a no-op for vcl widget case)
d) use gtk response ids (vcl builder will converts to vcl ones)
Change-Id: I7de281093a1b64f92f71ca11e7cbba42bb658154
Reviewed-on: https://gerrit.libreoffice.org/50143
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/doc/saveastemplatedlg.cxx')
| -rw-r--r-- | sfx2/source/doc/saveastemplatedlg.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index 8096f60b9de9..168c39bc7e79 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -19,8 +19,8 @@ #include <sfx2/doctempl.hxx> #include <sfx2/docfilt.hxx> #include <vcl/edit.hxx> -#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> +#include <vcl/weld.hxx> #include <sot/storage.hxx> #include <com/sun/star/frame/DocumentTemplates.hpp> @@ -77,15 +77,15 @@ void SfxSaveAsTemplateDialog::setDocumentModel(const uno::Reference<frame::XMode IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void) { - ScopedVclPtrInstance< MessageDialog > aQueryDlg(this, OUString(), VclMessageType::Question, VclButtonsType::YesNo); - + std::unique_ptr<weld::MessageDialog> xQueryDlg(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, + OUString())); if(!IsTemplateNameUnique()) { OUString sQueryMsg(SfxResId(STR_QMSG_TEMPLATE_OVERWRITE)); sQueryMsg = sQueryMsg.replaceFirst("$1",msTemplateName); - aQueryDlg->set_primary_text(sQueryMsg.replaceFirst("$2", msSelectedCategory)); + xQueryDlg->set_primary_text(sQueryMsg.replaceFirst("$2", msSelectedCategory)); - if( aQueryDlg->Execute() == RET_NO ) + if (xQueryDlg->run() == RET_NO) return; } @@ -94,7 +94,9 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void) else { OUString sText( SfxResId(STR_ERROR_SAVEAS) ); - ScopedVclPtrInstance<MessageDialog>(this, sText.replaceFirst("$1", msTemplateName))->Execute(); + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, + sText.replaceFirst("$1", msTemplateName))); + xBox->run(); } } |