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

[Szymon KÅ‚os (via logerrit)]

 vcl/inc/salvtables.hxx        |   19 ++++++++++++++
 vcl/source/app/salvtables.cxx |   55 ++++++++++++++++++------------------------
 2 files changed, 43 insertions(+), 31 deletions(-)

New commits:
commit 2f72c9d716d930479697c19a50c0a1b6e0b665d7
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Mar 17 14:25:01 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 12 10:38:54 2020 +0200

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

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 5f78e8c09904..2ab561f480a0 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -13,6 +13,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/layout.hxx>
+#include <messagedialog.hxx>
 
 class SalInstanceBuilder : public weld::Builder
 {
@@ -692,4 +693,22 @@ public:
     virtual ~SalInstanceNotebook() override;
 };
 
+class SalInstanceMessageDialog : public SalInstanceDialog, public virtual weld::MessageDialog
+{
+private:
+    VclPtr<::MessageDialog> m_xMessageDialog;
+public:
+    SalInstanceMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* pBuilder, bool bTakeOwnership);
+
+    virtual void set_primary_text(const OUString& rText) override;
+
+    virtual OUString get_primary_text() const override;
+
+    virtual void set_secondary_text(const OUString& rText) override;
+
+    virtual OUString get_secondary_text() const override;
+
+    virtual weld::Container* weld_message_area() override;
+};
+
 #endif
\ No newline at end of file
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 30de704cb0c0..c43e6bb9c462 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -30,7 +30,6 @@
 #include <salobj.hxx>
 #include <salmenu.hxx>
 #include <svdata.hxx>
-#include <messagedialog.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <utility>
 #include <vcl/builder.hxx>
@@ -879,42 +878,36 @@ weld::Container* SalInstanceDialog::weld_content_area()
     return new SalInstanceContainer(m_xDialog->get_content_area(), m_pBuilder, false);
 }
 
-class SalInstanceMessageDialog : public SalInstanceDialog, public virtual weld::MessageDialog
+SalInstanceMessageDialog::SalInstanceMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* pBuilder, bool bTakeOwnership)
+    : SalInstanceDialog(pDialog, pBuilder, bTakeOwnership)
+    , m_xMessageDialog(pDialog)
 {
-private:
-    VclPtr<::MessageDialog> m_xMessageDialog;
-public:
-    SalInstanceMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* pBuilder, bool bTakeOwnership)
-        : SalInstanceDialog(pDialog, pBuilder, bTakeOwnership)
-        , m_xMessageDialog(pDialog)
-    {
-    }
+}
 
-    virtual void set_primary_text(const OUString& rText) override
-    {
-        m_xMessageDialog->set_primary_text(rText);
-    }
+void SalInstanceMessageDialog::set_primary_text(const OUString& rText)
+{
+    m_xMessageDialog->set_primary_text(rText);
+}
 
-    virtual OUString get_primary_text() const override
-    {
-        return m_xMessageDialog->get_primary_text();
-    }
+OUString SalInstanceMessageDialog::get_primary_text() const
+{
+    return m_xMessageDialog->get_primary_text();
+}
 
-    virtual void set_secondary_text(const OUString& rText) override
-    {
-        m_xMessageDialog->set_secondary_text(rText);
-    }
+void SalInstanceMessageDialog::set_secondary_text(const OUString& rText)
+{
+    m_xMessageDialog->set_secondary_text(rText);
+}
 
-    virtual OUString get_secondary_text() const override
-    {
-        return m_xMessageDialog->get_secondary_text();
-    }
+OUString SalInstanceMessageDialog::get_secondary_text() const
+{
+    return m_xMessageDialog->get_secondary_text();
+}
 
-    virtual Container* weld_message_area() override
-    {
-        return new SalInstanceContainer(m_xMessageDialog->get_message_area(), m_pBuilder, false);
-    }
-};
+weld::Container* SalInstanceMessageDialog::weld_message_area()
+{
+    return new SalInstanceContainer(m_xMessageDialog->get_message_area(), m_pBuilder, false);
+}
 
 class SalInstanceFrame : public SalInstanceContainer, public virtual weld::Frame
 {