From 98b77ad1e6acbbdda4843a4b57c1185d53884581 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 18 Oct 2016 11:36:17 +0200
Subject: loplugin:expandablemethods in UnoControls..vbahelper

Change-Id: Iec2c5e13119d97c9ca87e083c0f7cb00227e5231
Reviewed-on: https://gerrit.libreoffice.org/29997
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 uui/source/iahndl-errorhandler.cxx | 2 +-
 uui/source/iahndl.cxx              | 6 ------
 uui/source/iahndl.hxx              | 3 ---
 uui/source/sslwarndlg.cxx          | 2 +-
 uui/source/sslwarndlg.hxx          | 2 --
 uui/source/unknownauthdlg.cxx      | 2 +-
 uui/source/unknownauthdlg.hxx      | 5 -----
 7 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'uui')

diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 4b57e264a772..167db086a965 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -249,7 +249,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             return;
 
         //TODO! remove this backwards compatibility?
-        OUString aContext(getContextProperty());
+        OUString aContext(m_aContextParam);
         if (aContext.isEmpty() && nErrorCode != 0)
         {
             SolarMutexGuard aGuard;
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index cec08b5d19df..e587a831e457 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -977,12 +977,6 @@ UUIInteractionHelper::getParentXWindow() const
     return m_xWindowParam;
 }
 
-const OUString&
-UUIInteractionHelper::getContextProperty()
-{
-    return m_aContextParam;
-}
-
 uno::Reference< task::XInteractionHandler2 >
 UUIInteractionHelper::getInteractionHandler()
 {
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 85361e2b0b38..6543b345247f 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -130,9 +130,6 @@ private:
     const css::uno::Reference< css::awt::XWindow>&
     getParentXWindow() const;
 
-    const OUString&
-    getContextProperty();
-
     css::uno::Reference< css::task::XInteractionHandler2 >
     getInteractionHandler();
 
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 53da63af1952..162df6553831 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -33,7 +33,7 @@ void SSLWarnDialog::ViewCert()
 
     xDocumentDigitalSignatures = css::security::DocumentDigitalSignatures::createDefault( m_xContext );
 
-    xDocumentDigitalSignatures.get()->showCertificate(getCert());
+    xDocumentDigitalSignatures.get()->showCertificate(m_rXCert);
 }
 
 
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 436dfdc4f350..42aa51026146 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -42,8 +42,6 @@ public:
         const css::uno::Reference< css::security::XCertificate >& rXCert,
         const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    const css::uno::Reference< css::security::XCertificate >& getCert() { return m_rXCert; }
-
     virtual void response(short nResponseId) override;
 
     void setDescription1Text(const OUString &aText) { set_primary_text(aText); }
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index e3e38e72062c..291d618c9276 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -45,7 +45,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void)
     uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures(
         css::security::DocumentDigitalSignatures::createDefault(m_xContext) );
 
-    xDocumentDigitalSignatures.get()->showCertificate(getCert());
+    xDocumentDigitalSignatures.get()->showCertificate(m_rXCert);
 }
 
 
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 6dfd3bea41f1..ad87b7579784 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -49,11 +49,6 @@ public:
     virtual ~UnknownAuthDialog() override;
     virtual void dispose() override;
 
-    const css::uno::Reference< css::security::XCertificate >& getCert()
-    {
-        return m_rXCert;
-    }
-
     void setDescriptionText(const OUString &rText)
     {
         set_primary_text(rText);
-- 
cgit