diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-01 17:28:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-01 22:30:10 +0100 |
| commit | 4a0d34fc4ec875d14d09156f7b4b3a51fb2f5e30 (patch) | |
| tree | 8592fd2bbdace94df78b58828efd49eb8e7f89ed /include | |
| parent | 98bdce2ce881fc8795a3de5068c56e5ed42475f9 (diff) | |
weld PageStylesPanel
Change-Id: I8e6842a342b242eeaa6d7a27e268dbe5691a9703
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86081
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/dlgctrl.hxx | 5 | ||||
| -rw-r--r-- | include/svx/itemwin.hxx | 4 | ||||
| -rw-r--r-- | include/svx/pagenumberlistbox.hxx | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index e68f881f8bce..eb7f19c79f91 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -215,11 +215,12 @@ public: class SAL_WARN_UNUSED SVX_DLLPUBLIC FillTypeLB : public ListBox { - public: - FillTypeLB( vcl::Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} + FillTypeLB( vcl::Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} void Fill(); + + static void Fill(weld::ComboBox& rListBox); }; /************************************************************************/ diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 13a63557f147..4f4c3ec140a0 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -112,6 +112,10 @@ public: void Fill( const XBitmapListRef &pList ); void Fill( const XPatternListRef &pList ); + static void Fill(weld::ComboBox&, const XHatchListRef &pList); + static void Fill(weld::ComboBox&, const XBitmapListRef &pList); + static void Fill(weld::ComboBox&, const XPatternListRef &pList); + private: virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool EventNotify( NotifyEvent& rNEvt ) override; diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx index 16307c03e0a9..e416fcb8d507 100644 --- a/include/svx/pagenumberlistbox.hxx +++ b/include/svx/pagenumberlistbox.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_PAGENUMBERINGHELPER_HXX #define INCLUDED_SVX_PAGENUMBERINGHELPER_HXX +#include <editeng/svxenum.hxx> #include <svx/svxdllapi.h> #include <vcl/lstbox.hxx> #include <vcl/weld.hxx> @@ -41,11 +42,13 @@ private: public: SvxPageNumberListBox(std::unique_ptr<weld::ComboBox> pControl); int get_count() const { return m_xControl->get_count(); } - OUString get_id(int pos) const { return m_xControl->get_id(pos); } + SvxNumType get_active_id() const { return static_cast<SvxNumType>(m_xControl->get_active_id().toInt32()); } + void set_active_id(SvxNumType eId) const { m_xControl->set_active_id(OUString::number(static_cast<sal_Int32>(eId))); } int get_active() const { return m_xControl->get_active(); } void set_active(int pos) { m_xControl->set_active(pos); } void save_value() { m_xControl->save_value(); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } + void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); } weld::ComboBox& get_widget() const { return *m_xControl; } }; |