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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index c992e03070fe..bb2e6c71eabb 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -73,7 +73,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/layout.hxx> +#include <vcl/weld.hxx> #include <osl/mutex.hxx> #include <sfx2/sidebar/SidebarController.hxx> @@ -1340,10 +1340,11 @@ void ChartController::executeDispatch_SourceData() SolarMutexGuard aSolarGuard; - ScopedVclPtrInstance< MessageDialog > aQueryBox( GetChartWindow(), SchResId( STR_DLG_REMOVE_DATA_TABLE ), VclMessageType::Question, VclButtonsType::YesNo); - + VclPtr<ChartWindow> xChartWindow(GetChartWindow()); + std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(xChartWindow ? xChartWindow->GetFrameWeld() : nullptr, + VclMessageType::Question, VclButtonsType::YesNo, SchResId(STR_DLG_REMOVE_DATA_TABLE))); // If "No" then just return - if (aQueryBox->Execute() == RET_NO) + if (xQueryBox->run() == RET_NO) return; // Remove data table |