1 files changed, 17 insertions, 33 deletions
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 433cfe8d6143..171d864735cd 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <strings.hrc>
 #include "unknownauthdlg.hxx"
@@ -28,19 +28,19 @@
 using namespace css;
 
 
-IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl, weld::Button&, void)
 {
-    if ( m_pOptionButtonAccept->IsChecked() )
+    if (m_xOptionButtonAccept->get_active())
     {
-        EndDialog( RET_OK );
-    } else
+        m_xDialog->response(RET_OK);
+    }
+    else
     {
-        EndDialog();
+        m_xDialog->response(RET_CANCEL);
     }
 }
 
-
-IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, weld::Button&, void)
 {
     uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures(
         css::security::DocumentDigitalSignatures::createDefault(m_xContext) );
@@ -48,36 +48,20 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void)
     xDocumentDigitalSignatures.get()->showCertificate(m_rXCert);
 }
 
-
-UnknownAuthDialog::UnknownAuthDialog(vcl::Window* pParent,
+UnknownAuthDialog::UnknownAuthDialog(weld::Window* pParent,
     const css::uno::Reference< css::security::XCertificate >& rXCert,
     const css::uno::Reference< css::uno::XComponentContext >& xContext)
-    : MessageDialog(pParent, "UnknownAuthDialog",
-        "uui/ui/unknownauthdialog.ui")
+    : m_xBuilder(Application::CreateBuilder(pParent, "uui/ui/unknownauthdialog.ui"))
+    , m_xDialog(m_xBuilder->weld_message_dialog("UnknownAuthDialog"))
+    , m_xCommandButtonOK(m_xBuilder->weld_button("ok"))
+    , m_xView_Certificate(m_xBuilder->weld_button("examine"))
+    , m_xOptionButtonAccept(m_xBuilder->weld_radio_button("accept"))
+    , m_xOptionButtonDontAccept(m_xBuilder->weld_radio_button("reject"))
     , m_xContext(xContext)
     , m_rXCert(rXCert)
 {
-    get(m_pOptionButtonAccept, "accept");
-    get(m_pOptionButtonDontAccept, "reject");
-    get(m_pCommandButtonOK, "ok");
-    get(m_pView_Certificate, "examine");
-
-    m_pView_Certificate->SetClickHdl(LINK(this, UnknownAuthDialog, ViewCertHdl_Impl));
-    m_pCommandButtonOK->SetClickHdl(LINK(this, UnknownAuthDialog, OKHdl_Impl));
-}
-
-UnknownAuthDialog::~UnknownAuthDialog()
-{
-    disposeOnce();
-}
-
-void UnknownAuthDialog::dispose()
-{
-    m_pCommandButtonOK.clear();
-    m_pView_Certificate.clear();
-    m_pOptionButtonAccept.clear();
-    m_pOptionButtonDontAccept.clear();
-    MessageDialog::dispose();
+    m_xView_Certificate->connect_clicked(LINK(this, UnknownAuthDialog, ViewCertHdl_Impl));
+    m_xCommandButtonOK->connect_clicked(LINK(this, UnknownAuthDialog, OKHdl_Impl));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */