diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-06 16:06:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-09 15:01:06 +0200 |
| commit | 854d8c418904bbb9370ca6ee0aad6bde5deb426e (patch) | |
| tree | 5031d234c155d3b8d67056b30d1b1af994a3c75b /include/sfx2 | |
| parent | f2ea65c92330ef0e36725a351f7b39027023f4bf (diff) | |
weld SfxNewStyleDlg
set some parents and replace VclComboBoxText with an entry and a treeview
Change-Id: Ied75176355f23c986eac4d5de8654472a15dbbbf
Reviewed-on: https://gerrit.libreoffice.org/52517
Tested-by: Jenkins
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/newstyle.hxx | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index dceeeec2e7ec..6fecb3378f4d 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -22,34 +22,29 @@ #include <comphelper/string.hxx> #include <sal/config.h> #include <sfx2/dllapi.h> -#include <vcl/button.hxx> -#include <vcl/layout.hxx> -#include <vcl/combobox.hxx> -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> #include <vcl/weld.hxx> class SfxStyleSheetBasePool; -class SFX2_DLLPUBLIC SfxNewStyleDlg : public ModalDialog +class SFX2_DLLPUBLIC SfxNewStyleDlg : public weld::GenericDialogController { private: - VclPtr<ComboBox> m_pColBox; - VclPtr<OKButton> m_pOKBtn; + SfxStyleSheetBasePool& m_rPool; - std::unique_ptr<weld::MessageDialog> xQueryOverwriteBox; - SfxStyleSheetBasePool& rPool; + std::unique_ptr<weld::EntryTreeView> m_xColBox; + std::unique_ptr<weld::Button> m_xOKBtn; - DECL_DLLPRIVATE_LINK( OKHdl, ComboBox&, void ); - DECL_DLLPRIVATE_LINK( OKClickHdl, Button *, void ); - DECL_DLLPRIVATE_LINK( ModifyHdl, Edit&, void ); + std::unique_ptr<weld::MessageDialog> m_xQueryOverwriteBox; + + DECL_DLLPRIVATE_LINK(OKHdl, weld::TreeView&, void); + DECL_DLLPRIVATE_LINK(OKClickHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); public: - SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& ); + SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool&); virtual ~SfxNewStyleDlg() override; - virtual void dispose() override; - OUString GetName() const { return comphelper::string::stripStart(m_pColBox->GetText(), ' '); } + OUString GetName() const { return comphelper::string::stripStart(m_xColBox->get_text(), ' '); } }; #endif |