summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-03-08 09:49:36 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-03-09 13:47:52 +0100
commit48bca65f1cf381cba7cb7a4c3916155a1bca0955 (patch)
treedf461652450b3e095e37a3290cbe54ab20cedfae /uui
parentc468b6910bf77e332647725da70e3cb248a9de0e (diff)
inherit welded dialogs from a common ancestor
Change-Id: Ifa6c871a134cf89bfba71b1049a115cf7c953c42 Reviewed-on: https://gerrit.libreoffice.org/50936 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui')
-rw-r--r--uui/source/sslwarndlg.cxx3
-rw-r--r--uui/source/sslwarndlg.hxx7
-rw-r--r--uui/source/unknownauthdlg.cxx4
-rw-r--r--uui/source/unknownauthdlg.hxx6
4 files changed, 5 insertions, 15 deletions
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index df20f8f71715..6687cfb68f0f 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -39,8 +39,7 @@ IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl, weld::Button&, void)
SSLWarnDialog::SSLWarnDialog(weld::Window* pParent,
const css::uno::Reference< css::security::XCertificate >& rXCert,
const css::uno::Reference< css::uno::XComponentContext >& xContext)
- : m_xBuilder(Application::CreateBuilder(pParent, "uui/ui/sslwarndialog.ui"))
- , m_xDialog(m_xBuilder->weld_message_dialog("SSLWarnDialog"))
+ : MessageDialogController(pParent, "uui/ui/sslwarndialog.ui", "SSLWarnDialog")
, m_xView(m_xBuilder->weld_button("view"))
, m_xContext(xContext)
, m_rXCert(rXCert)
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 9a56314d9f21..598ed08ae035 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -27,11 +27,9 @@
//= Https_WarnDialog
-class SSLWarnDialog
+class SSLWarnDialog : public weld::MessageDialogController
{
private:
- std::unique_ptr<weld::Builder> m_xBuilder;
- std::unique_ptr<weld::MessageDialog> m_xDialog;
std::unique_ptr<weld::Button> m_xView;
const css::uno::Reference< css::uno::XComponentContext >& m_xContext;
const css::uno::Reference< css::security::XCertificate >& m_rXCert;
@@ -44,9 +42,6 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& xContext );
void setDescription1Text(const OUString &rText) { m_xDialog->set_primary_text(rText); }
- void set_title(const OUString &rText) { m_xDialog->set_title(rText); }
-
- short run() { return m_xDialog->run(); }
};
#endif // INCLUDED_UUI_SOURCE_SSLWARNDLG_HXX
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 171d864735cd..fc2738588892 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -51,8 +51,8 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, weld::Button&, void)
UnknownAuthDialog::UnknownAuthDialog(weld::Window* pParent,
const css::uno::Reference< css::security::XCertificate >& rXCert,
const css::uno::Reference< css::uno::XComponentContext >& xContext)
- : m_xBuilder(Application::CreateBuilder(pParent, "uui/ui/unknownauthdialog.ui"))
- , m_xDialog(m_xBuilder->weld_message_dialog("UnknownAuthDialog"))
+ : MessageDialogController(pParent, "uui/ui/unknownauthdialog.ui",
+ "UnknownAuthDialog")
, m_xCommandButtonOK(m_xBuilder->weld_button("ok"))
, m_xView_Certificate(m_xBuilder->weld_button("examine"))
, m_xOptionButtonAccept(m_xBuilder->weld_radio_button("accept"))
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 2398dfa26a2e..45ac942daed4 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -27,11 +27,9 @@
//= Https_UADialog
-class UnknownAuthDialog
+class UnknownAuthDialog : public weld::MessageDialogController
{
private:
- std::unique_ptr<weld::Builder> m_xBuilder;
- std::unique_ptr<weld::MessageDialog> m_xDialog;
std::unique_ptr<weld::Button> m_xCommandButtonOK;
std::unique_ptr<weld::Button> m_xView_Certificate;
std::unique_ptr<weld::RadioButton> m_xOptionButtonAccept;
@@ -52,8 +50,6 @@ public:
{
m_xDialog->set_primary_text(rText);
}
-
- short run() { return m_xDialog->run(); }
};
#endif // INCLUDED_UUI_SOURCE_UNKNOWNAUTHDLG_HXX