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 /sc/source/ui/view/cellsh3.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 'sc/source/ui/view/cellsh3.cxx')
| -rw-r--r-- | sc/source/ui/view/cellsh3.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index d40a11d2dd79..ce2c030ac55c 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -26,6 +26,7 @@ #include <sfx2/request.hxx> #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> +#include <vcl/weld.hxx> #include <sfx2/app.hxx> #include <globstr.hrc> #include <scmod.hxx> @@ -429,9 +430,11 @@ void ScCellShell::Execute( SfxRequest& rReq ) } else if( ! rReq.IsAPI() ) { - ScopedVclPtrInstance<MessageDialog> aErrorBox(pTabViewShell->GetDialogParent(), - ScGlobal::GetRscString(STR_NOAREASELECTED)); - aErrorBox->Execute(); + vcl::Window* pWin = pTabViewShell->GetDialogParent(); + std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr, + VclMessageType::Warning, VclButtonsType::Ok, + ScGlobal::GetRscString(STR_NOAREASELECTED))); + xErrorBox->run(); } } else @@ -883,8 +886,12 @@ void ScCellShell::Execute( SfxRequest& rReq ) } } else - ScopedVclPtrInstance<MessageDialog>(pDlgParent, - ScGlobal::GetRscString(STR_INVALID_AFAREA) )->Execute(); + { + std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(pDlgParent ? pDlgParent->GetFrameWeld() : nullptr, + VclMessageType::Warning, VclButtonsType::Ok, + ScGlobal::GetRscString(STR_INVALID_AFAREA))); + xErrorBox->run(); + } } break; |