diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-05-13 16:57:07 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-21 09:53:46 +0200 |
commit | 8477bbf8d6867e656b8132f0ddd682d08590a547 (patch) | |
tree | 11d1f70190b6478bf3b070480393f364d58c81ab /include/svtools/editbrowsebox.hxx | |
parent | sw: handle CollapseEmptyCellPara when replacing compat options (diff) | |
download | core-8477bbf8d6867e656b8132f0ddd682d08590a547.tar.gz core-8477bbf8d6867e656b8132f0ddd682d08590a547.zip |
weld ListBoxControl
Change-Id: I5a8c7d68e4c147eb938b0217dc6368c832e465c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94154
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools/editbrowsebox.hxx')
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 228edb70cf01..175dbe6edcce 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -26,7 +26,6 @@ #include <svtools/svtdllapi.h> #include <tools/ref.hxx> #include <vcl/window.hxx> -#include <vcl/lstbox.hxx> #include <svtools/brwbox.hxx> #include <svtools/brwhead.hxx> @@ -327,6 +326,8 @@ namespace svt weld::ComboBox& get_widget() { return *m_xWidget; } + virtual void dispose() override; + private: std::unique_ptr<weld::ComboBox> m_xWidget; }; @@ -348,30 +349,28 @@ namespace svt DECL_LINK(ModifyHdl, weld::ComboBox&, void); }; - //= ListBoxControl - - class SVT_DLLPUBLIC ListBoxControl final : public ListBox + class SVT_DLLPUBLIC ListBoxControl final : public InterimItemWindow { friend class ListBoxCellController; public: ListBoxControl(vcl::Window* pParent); + weld::ComboBox& get_widget() { return *m_xWidget; } + + virtual void dispose() override; private: - virtual bool PreNotify( NotifyEvent& rNEvt ) override; + std::unique_ptr<weld::ComboBox> m_xWidget; }; - //= ListBoxCellController - class SVT_DLLPUBLIC ListBoxCellController : public CellController { public: ListBoxCellController(ListBoxControl* pParent); - const ListBoxControl& GetListBox() const { return static_cast<const ListBoxControl &>(GetWindow()); } - ListBoxControl& GetListBox() { return static_cast<ListBoxControl &>(GetWindow()); } + weld::ComboBox& GetListBox() const { return static_cast<ListBoxControl&>(GetWindow()).get_widget(); } virtual bool IsModified() const override; virtual void ClearModified() override; @@ -379,12 +378,10 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK(ListBoxSelectHdl, ListBox&, void); + DECL_LINK(ListBoxSelectHdl, weld::ComboBox&, void); }; - //= FormattedFieldCellController - class SVT_DLLPUBLIC FormattedFieldCellController final : public EditCellController { public: |