[Libreoffice-commits] core.git: vcl/inc vcl/source

[Szymon KÅ‚os (via logerrit)]

 vcl/inc/salvtables.hxx        |   15 +++++++++++++++
 vcl/source/app/salvtables.cxx |   26 +++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

New commits:
commit 7d6a6e340e7d44fd74487e74d76a65992f097dc7
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jun 9 11:22:26 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Jul 27 09:43:28 2021 +0200

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

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index a47a5df4033d..8c5e64d3deda 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1824,4 +1824,19 @@ public:
     virtual ~SalInstanceRadioButton() override;
 };
 
+class SalInstanceFrame : public SalInstanceContainer, public virtual weld::Frame
+{
+private:
+    VclPtr<VclFrame> m_xFrame;
+
+public:
+    SalInstanceFrame(VclFrame* pFrame, SalInstanceBuilder* pBuilder, bool bTakeOwnership);
+
+    virtual void set_label(const OUString& rText) override;
+
+    virtual OUString get_label() const override;
+
+    virtual std::unique_ptr<weld::Label> weld_label_widget() const 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 dcb5d34f72e0..7d876e8d33d2 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2003,27 +2003,19 @@ IMPL_LINK_NOARG(SalInstanceAssistant, UpdateRoadmap_Hdl, Timer*, void)
     enable_notify_events();
 }
 
-namespace
-{
-class SalInstanceFrame : public SalInstanceContainer, public virtual weld::Frame
+SalInstanceFrame::SalInstanceFrame(VclFrame* pFrame, SalInstanceBuilder* pBuilder,
+                                   bool bTakeOwnership)
+    : SalInstanceContainer(pFrame, pBuilder, bTakeOwnership)
+    , m_xFrame(pFrame)
 {
-private:
-    VclPtr<VclFrame> m_xFrame;
-
-public:
-    SalInstanceFrame(VclFrame* pFrame, SalInstanceBuilder* pBuilder, bool bTakeOwnership)
-        : SalInstanceContainer(pFrame, pBuilder, bTakeOwnership)
-        , m_xFrame(pFrame)
-    {
-    }
-
-    virtual void set_label(const OUString& rText) override { m_xFrame->set_label(rText); }
+}
 
-    virtual OUString get_label() const override { return m_xFrame->get_label(); }
+void SalInstanceFrame::set_label(const OUString& rText) { m_xFrame->set_label(rText); }
 
-    virtual std::unique_ptr<weld::Label> weld_label_widget() const override;
-};
+OUString SalInstanceFrame::get_label() const { return m_xFrame->get_label(); }
 
+namespace
+{
 class SalInstancePaned : public SalInstanceContainer, public virtual weld::Paned
 {
 private: