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 /include/sfx2 | |
| 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 'include/sfx2')
| -rw-r--r-- | include/sfx2/QuerySaveDocument.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/newstyle.hxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx index 09922feb60ba..00aecfeaea99 100644 --- a/include/sfx2/QuerySaveDocument.hxx +++ b/include/sfx2/QuerySaveDocument.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> -namespace vcl { class Window; } +namespace weld { class Widget; } /** Opens the general query save document dialog. @param _pParent @@ -31,7 +31,7 @@ namespace vcl { class Window; } The title of the document. */ SFX2_DLLPUBLIC short ExecuteQuerySaveDocument( - vcl::Window* _pParent, const OUString& _rTitle); + weld::Widget* _pParent, const OUString& _rTitle); #endif // INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index bbafa704f76b..dceeeec2e7ec 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -27,6 +27,7 @@ #include <vcl/combobox.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> +#include <vcl/weld.hxx> class SfxStyleSheetBasePool; @@ -36,7 +37,7 @@ private: VclPtr<ComboBox> m_pColBox; VclPtr<OKButton> m_pOKBtn; - VclPtr<MessageDialog> aQueryOverwriteBox; + std::unique_ptr<weld::MessageDialog> xQueryOverwriteBox; SfxStyleSheetBasePool& rPool; DECL_DLLPRIVATE_LINK( OKHdl, ComboBox&, void ); |