weld SwFrameAddPage

Change-Id: Ia63e22d01c6bcc08f50d3e1b12943094660c7fd0
Reviewed-on: https://gerrit.libreoffice.org/61758
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 10 insertions, 25 deletions

diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index fcbeba468971..cb2e1452fbba 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_FRMDIRLBOX_HXX
 #define INCLUDED_SVX_FRMDIRLBOX_HXX
 
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 #include <editeng/frmdir.hxx>
 #include <svx/svxdllapi.h>
@@ -29,39 +28,18 @@ class SvxFrameDirectionItem;
 
 namespace svx {
 
-
 /** This listbox contains entries to select horizontal text direction.
 
     The control works on the SvxFrameDirection enumeration (i.e. left-to-right,
     right-to-left), used i.e. in conjunction with the SvxFrameDirectionItem.
  */
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameDirectionListBox : public ListBox
-{
-public:
-    explicit            FrameDirectionListBox( vcl::Window* pParent, WinBits nBits );
-
-    /** Inserts a string with corresponding direction enum into the listbox. */
-    void                InsertEntryValue(
-                            const OUString& rString,
-                            SvxFrameDirection eDirection );
-
-    /** Selects the specified frame direction. */
-    void                SelectEntryValue( SvxFrameDirection eDirection );
-    /** Returns the currently selected frame direction. */
-    SvxFrameDirection   GetSelectEntryValue() const;
-};
-
-
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFrameDirectionListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameDirectionListBox
 {
 private:
     std::unique_ptr<weld::ComboBox> m_xControl;
 public:
-    explicit SvxFrameDirectionListBox(std::unique_ptr<weld::ComboBox> pControl)
-        : m_xControl(std::move(pControl))
-    {
-    }
-
+    explicit FrameDirectionListBox(std::unique_ptr<weld::ComboBox> pControl);
+    virtual ~FrameDirectionListBox();
     bool get_visible() const { return m_xControl->get_visible(); }
     void save_value() { m_xControl->save_value(); }
     bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); }
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 890d5c1ceffc..9714aceccdcd 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -111,6 +111,11 @@ public:
 
     void            SetSeparatorPos( sal_Int32  n );
 
+    /**
+     * Adds a new separator at the given position n.
+     */
+    void            AddSeparator( sal_Int32 n );
+
     void            EnableAutocomplete( bool bEnable, bool bMatchCase = false );
     bool            IsAutocompleteEnabled() const;
 
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index ec9c83c1b6fa..19aa23956bee 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -309,6 +309,8 @@ public:
     {
         insert(-1, rStr, &rId, nullptr, &rImage);
     }
+    virtual void insert_separator(int pos) = 0;
+    void append_separator() { insert_separator(-1); }
 
     virtual int get_count() const = 0;
     virtual void make_sorted() = 0;