summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-05-13 10:17:08 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2020-05-14 13:00:54 +0200
commit976abc2be4ff03a34936e94ff2cbf3292e7ba9b4 (patch)
tree78888fceb0e972db0067c9fbe0898f45951cc6ef /vcl
parent5719e40defd0d7fd6681287ce6cd91efceba47da (diff)
Move SalInstanceMessageDialog to header file
Change-Id: Ie982bae356f3e13ec40012e5dd9bac45887d2925 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94098 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/salvtables.hxx21
-rw-r--r--vcl/source/app/salvtables.cxx60
2 files changed, 48 insertions, 33 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index f8347ca8cda0..779067586c29 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -22,6 +22,7 @@
#include <vcl/combobox.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/layout.hxx>
+#include "messagedialog.hxx"
class SalInstanceBuilder : public weld::Builder
{
@@ -1061,4 +1062,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 weld::Container* weld_message_area() 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 7e683bb6d433..453404f31d13 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1565,46 +1565,40 @@ IMPL_LINK(SalInstanceDialog, PopupScreenShotMenuHdl, const CommandEvent&, rCEvt,
return false;
}
-namespace
-{
-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)
- {
- }
+void SalInstanceMessageDialog::set_primary_text(const OUString& rText)
+{
+ m_xMessageDialog->set_primary_text(rText);
+}
- virtual void set_primary_text(const OUString& rText) override
- {
- m_xMessageDialog->set_primary_text(rText);
- }
+OUString SalInstanceMessageDialog::get_primary_text() const
+{
+ return m_xMessageDialog->get_primary_text();
+}
- virtual OUString get_primary_text() const override
- {
- return m_xMessageDialog->get_primary_text();
- }
+void SalInstanceMessageDialog::set_secondary_text(const OUString& rText)
+{
+ m_xMessageDialog->set_secondary_text(rText);
+}
- virtual void set_secondary_text(const OUString& rText) override
- {
- m_xMessageDialog->set_secondary_text(rText);
- }
+OUString SalInstanceMessageDialog::get_secondary_text() const
+{
+ return m_xMessageDialog->get_secondary_text();
+}
- virtual OUString get_secondary_text() const override
- {
- return m_xMessageDialog->get_secondary_text();
- }
+weld::Container* SalInstanceMessageDialog::weld_message_area()
+{
+ return new SalInstanceContainer(m_xMessageDialog->get_message_area(), m_pBuilder, false);
+}
- virtual Container* weld_message_area() override
- {
- return new SalInstanceContainer(m_xMessageDialog->get_message_area(), m_pBuilder, false);
- }
-};
+namespace
+{
class SalInstanceAssistant : public SalInstanceDialog, public virtual weld::Assistant
{