[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/inc vcl/source

[Szymon KÅ‚os (via logerrit)]

 vcl/inc/salvtables.hxx        |   11 +++++++++++
 vcl/source/app/salvtables.cxx |   31 +++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

New commits:
commit 08edd08cddfe379e0e7888b4f4a6f46cc1d44cc6
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Aug 20 18:33:49 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Sep 24 14:32:19 2021 +0200

    Move SalInstanceBox decl to header
    
    Change-Id: I945fdbb17caf417990d3531175328099f1a6c93f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120791
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122560
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index bbe49cdc0dd4..53288170c764 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1879,4 +1879,15 @@ public:
     virtual void popdown() override;
 };
 
+class SalInstanceBox : public SalInstanceContainer, public virtual weld::Box
+{
+private:
+    VclPtr<VclBox> m_xBox;
+
+public:
+    SalInstanceBox(VclBox* pContainer, SalInstanceBuilder* pBuilder, bool bTakeOwnership);
+    virtual void reorder_child(weld::Widget* pWidget, int nNewPosition) override;
+    virtual void sort_native_button_order() override;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 7daa582cd565..888376ac0351 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1255,28 +1255,23 @@ void SalInstanceWidget::draw(OutputDevice& rOutput, const tools::Rectangle& rRec
     m_xWidget->SetSizePixel(aOrigSize);
 }
 
-namespace
+SalInstanceBox::SalInstanceBox(VclBox* pContainer, SalInstanceBuilder* pBuilder,
+                               bool bTakeOwnership)
+    : SalInstanceContainer(pContainer, pBuilder, bTakeOwnership)
+    , m_xBox(pContainer)
 {
-class SalInstanceBox : public SalInstanceContainer, public virtual weld::Box
+}
+void SalInstanceBox::reorder_child(weld::Widget* pWidget, int nNewPosition)
 {
-private:
-    VclPtr<VclBox> m_xBox;
+    SalInstanceWidget* pVclWidget = dynamic_cast<SalInstanceWidget*>(pWidget);
+    assert(pVclWidget);
+    pVclWidget->getWidget()->reorderWithinParent(nNewPosition);
+}
 
-public:
-    SalInstanceBox(VclBox* pContainer, SalInstanceBuilder* pBuilder, bool bTakeOwnership)
-        : SalInstanceContainer(pContainer, pBuilder, bTakeOwnership)
-        , m_xBox(pContainer)
-    {
-    }
-    virtual void reorder_child(weld::Widget* pWidget, int nNewPosition) override
-    {
-        SalInstanceWidget* pVclWidget = dynamic_cast<SalInstanceWidget*>(pWidget);
-        assert(pVclWidget);
-        pVclWidget->getWidget()->reorderWithinParent(nNewPosition);
-    }
-    virtual void sort_native_button_order() override { ::sort_native_button_order(*m_xBox); }
-};
+void SalInstanceBox::sort_native_button_order() { ::sort_native_button_order(*m_xBox); }
 
+namespace
+{
 void CollectChildren(const vcl::Window& rCurrent, const basegfx::B2IPoint& rTopLeft,
                      weld::ScreenShotCollection& rControlDataCollection)
 {