diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-05 20:58:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 13:11:54 +0100 |
| commit | 66693d82bae6c4333ac754f76550eb5f4a289b22 (patch) | |
| tree | bcb2c29b5738bbcc63de875258b4ca62fda1b913 /include | |
| parent | cad01ea74c603affcc15a5e32f75967f6dff0f87 (diff) | |
merge FillTypeLB with SvxFillTypeBox
Change-Id: Ia6229e8cc04c88e6740a12648c50cf5efca3bbd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88067
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/dlgctrl.hxx | 13 | ||||
| -rw-r--r-- | include/svx/itemwin.hxx | 7 |
2 files changed, 6 insertions, 14 deletions
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 5efe8062e13a..b8285349b5e8 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> #include <svx/rectenum.hxx> #include <vcl/customweld.hxx> -#include <vcl/lstbox.hxx> #include <vcl/weld.hxx> #include <vcl/virdev.hxx> #include <svx/xtable.hxx> @@ -213,18 +212,6 @@ public: /************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC FillTypeLB : public ListBox -{ -public: - FillTypeLB( vcl::Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} - - void Fill(); - - static void Fill(weld::ComboBox& rListBox); -}; - -/************************************************************************/ - class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLineLB { private: diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index e1a31d428724..a304405523ce 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SVX_ITEMWIN_HXX #include <vcl/field.hxx> +#include <vcl/lstbox.hxx> #include <svtools/toolbarmenu.hxx> #include <svx/dlgctrl.hxx> #include <svx/svxdllapi.h> @@ -75,11 +76,15 @@ public: void RefreshDlgUnit(); }; -class SVX_DLLPUBLIC SvxFillTypeBox final : public FillTypeLB +class SVX_DLLPUBLIC SvxFillTypeBox final : public ListBox { public: SvxFillTypeBox( vcl::Window* pParent ); + void Fill(); + + static void Fill(weld::ComboBox& rListBox); + void Selected() { bSelect = true; } virtual boost::property_tree::ptree DumpAsPropertyTree() override; |