diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2020-03-17 14:25:01 +0100 |
---|---|---|
committer | Szymon Kłos <eszkadev@gmail.com> | 2020-05-14 14:38:06 +0200 |
commit | ddbab2afdb7043e109073c6b647c35d40d54b8a2 (patch) | |
tree | 91ec5fb605362baaee81a6275fa0bc6209a4a9c4 | |
parent | 91074fce875e68978f34c1103982d2d5887a0894 (diff) |
Move SalInstanceMessageDialog to header file
Change-Id: Ie982bae356f3e13ec40012e5dd9bac45887d2925
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93976
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
-rw-r--r-- | vcl/inc/salvtables.hxx | 21 | ||||
-rw-r--r-- | vcl/source/app/salvtables.cxx | 54 |
2 files changed, 45 insertions, 30 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index a786788065ae..d126db67a116 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 { @@ -903,4 +904,24 @@ 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 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 4ae946df7ba5..058d7a39bf72 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1593,42 +1593,36 @@ IMPL_LINK(SalInstanceDialog, PopupScreenShotMenuHdl, const CommandEvent&, rCEvt, return 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 SalInstanceAboutDialog : public SalInstanceDialog, public virtual weld::AboutDialog { |