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 /cui/source/options/optchart.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 'cui/source/options/optchart.cxx')
| -rw-r--r-- | cui/source/options/optchart.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 7cecd8e01376..0cedb6e21e9b 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -22,6 +22,7 @@ #include <dialmgr.hxx> #include <vcl/builderfactory.hxx> #include <vcl/msgbox.hxx> +#include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <svx/svxids.hrc> @@ -286,7 +287,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor, Button*, void) // RemoveChartColor -IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) +IMPL_LINK_NOARG( SvxDefaultColorOptPage, RemoveChartColor, Button*, void ) { sal_Int32 nIndex = m_pLbChartColors->GetSelectedEntryPos(); @@ -297,9 +298,10 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) { OSL_ENSURE(pColorConfig->GetColorList().size() > 1, "don't delete the last chart color"); - ScopedVclPtrInstance<MessageDialog> aQuery(pButton, "QueryDeleteChartColorDialog", - "cui/ui/querydeletechartcolordialog.ui"); - if (RET_YES == aQuery->Execute()) + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletechartcolordialog.ui")); + std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryDeleteChartColorDialog")); + + if (RET_YES == xQuery->run()) { pColorConfig->GetColorList().remove( nIndex ); |