[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl vcl/source

[Szymon KÅ‚os (via logerrit)]

 include/vcl/salvtables.hxx    |   17 ++++++++++++++++
 vcl/source/app/salvtables.cxx |   43 ++++++++++++++++--------------------------
 2 files changed, 34 insertions(+), 26 deletions(-)

New commits:
commit 206462c5cee46bae2378da6ac6a55d12eac8f5a4
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Nov 17 09:03:35 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Dec 1 12:17:10 2020 +0100

    Move SalInstanceExpander decl to header file
    
    Change-Id: I5399f5aca07dd27dfc668cad66cf347936bbba7a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106926
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx
index 23db65df8525..401cbb0702a3 100644
--- a/include/vcl/salvtables.hxx
+++ b/include/vcl/salvtables.hxx
@@ -1430,4 +1430,21 @@ public:
     virtual ~SalInstanceTreeView() override;
 };
 
+class SalInstanceExpander : public SalInstanceContainer, public virtual weld::Expander
+{
+private:
+    VclPtr<VclExpander> m_xExpander;
+
+    DECL_LINK(ExpandedHdl, VclExpander&, void);
+
+public:
+    SalInstanceExpander(VclExpander* pExpander, SalInstanceBuilder* pBuilder, bool bTakeOwnership);
+
+    virtual bool get_expanded() const override;
+
+    virtual void set_expanded(bool bExpand) override;
+
+    virtual ~SalInstanceExpander() override;
+};
+
 #endif
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 39f19171db0e..12503e478646 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5320,36 +5320,27 @@ IMPL_LINK(SalInstanceTextView, CursorListener, VclWindowEvent&, rEvent, void)
         signal_cursor_position();
 }
 
-class SalInstanceExpander : public SalInstanceContainer, public virtual weld::Expander
+SalInstanceExpander::SalInstanceExpander(VclExpander* pExpander, SalInstanceBuilder* pBuilder, bool bTakeOwnership)
+    : SalInstanceContainer(pExpander, pBuilder, bTakeOwnership)
+    , m_xExpander(pExpander)
 {
-private:
-    VclPtr<VclExpander> m_xExpander;
-
-    DECL_LINK(ExpandedHdl, VclExpander&, void);
-
-public:
-    SalInstanceExpander(VclExpander* pExpander, SalInstanceBuilder* pBuilder, bool bTakeOwnership)
-        : SalInstanceContainer(pExpander, pBuilder, bTakeOwnership)
-        , m_xExpander(pExpander)
-    {
-        m_xExpander->SetExpandedHdl(LINK(this, SalInstanceExpander, ExpandedHdl));
-    }
+    m_xExpander->SetExpandedHdl(LINK(this, SalInstanceExpander, ExpandedHdl));
+}
 
-    virtual bool get_expanded() const override
-    {
-        return m_xExpander->get_expanded();
-    }
+bool SalInstanceExpander::get_expanded() const
+{
+    return m_xExpander->get_expanded();
+}
 
-    virtual void set_expanded(bool bExpand) override
-    {
-        m_xExpander->set_expanded(bExpand);
-    }
+void SalInstanceExpander::set_expanded(bool bExpand)
+{
+    m_xExpander->set_expanded(bExpand);
+}
 
-    virtual ~SalInstanceExpander() override
-    {
-        m_xExpander->SetExpandedHdl(Link<VclExpander&, void>());
-    }
-};
+SalInstanceExpander::~SalInstanceExpander()
+{
+    m_xExpander->SetExpandedHdl(Link<VclExpander&, void>());
+}
 
 IMPL_LINK_NOARG(SalInstanceExpander, ExpandedHdl, VclExpander&, void)
 {