[Libreoffice-commits] core.git: xmlhelp/source xmlsecurity/inc xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Feb 21 11:05:17 UTC 2019
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 2 +-
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 1 -
xmlsecurity/inc/certificatechooser.hxx | 2 --
xmlsecurity/inc/digitalsignaturesdialog.hxx | 2 --
xmlsecurity/source/component/documentdigitalsignatures.cxx | 2 +-
xmlsecurity/source/dialogs/certificatechooser.cxx | 2 --
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 3 +--
7 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit 6ed5464a69de171a479e3c042b236bbd64554ba1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Feb 21 09:51:26 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Feb 21 12:04:47 2019 +0100
loplugin:unusedfields in xmlhelp,xmlsecurity
Change-Id: Id3858365a54e6ae96bf9e6c3e27a777441ab56ae
Reviewed-on: https://gerrit.libreoffice.org/68133
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index a0f0c94a434d..10970e8c50e6 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -486,7 +486,7 @@ bool URLParameter::query()
if( parameter == "Language" )
m_aLanguage = value;
else if( parameter == "Device" )
- m_aDevice = value;
+ ;
else if( parameter == "Program" )
m_aProgram = value;
else if( parameter == "Eid" )
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index ff917d6def08..5fe4627fcaa1 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -184,7 +184,6 @@ namespace chelp {
OUString m_aLanguage;
OUString m_aPrefix;
- OUString m_aDevice;
OUString m_aProgram;
OUString m_aSystem;
OUString m_aActive;
diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx
index b98b30fdc6b3..7f551937d2ba 100644
--- a/xmlsecurity/inc/certificatechooser.hxx
+++ b/xmlsecurity/inc/certificatechooser.hxx
@@ -53,7 +53,6 @@ enum class UserAction
class CertificateChooser : public weld::GenericDialogController
{
private:
- css::uno::Reference< css::uno::XComponentContext > mxCtx;
std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > mxSecurityContexts;
std::vector<std::shared_ptr<UserData>> mvUserData;
@@ -81,7 +80,6 @@ private:
public:
CertificateChooser(weld::Window* pParent,
- css::uno::Reference< css::uno::XComponentContext> const & rxCtx,
std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > const & rxSecurityContexts,
UserAction eAction);
virtual ~CertificateChooser() override;
diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx
index 6fd74ad70964..459beafcc956 100644
--- a/xmlsecurity/inc/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -48,8 +48,6 @@ class HeaderBar;
class DigitalSignaturesDialog : public weld::GenericDialogController
{
private:
- css::uno::Reference< css::uno::XComponentContext >& mxCtx;
-
DocumentSignatureManager maSignatureManager;
bool mbVerifySignatures;
bool mbSignaturesChanged;
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 8e1044f414af..e27181d95129 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -652,7 +652,7 @@ DocumentDigitalSignatures::chooseCertificatesImpl(std::map<OUString, OUString>&
xSecContexts.push_back(aSignatureManager.getGpgSecurityContext());
}
- CertificateChooser aChooser(Application::GetFrameWeld(mxParentWindow), mxCtx, xSecContexts, eAction);
+ CertificateChooser aChooser(Application::GetFrameWeld(mxParentWindow), xSecContexts, eAction);
uno::Sequence< Reference< css::security::XCertificate > > xCerts(1);
xCerts[0] = Reference< css::security::XCertificate >(nullptr);
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index d6a552b7e105..91e43835d5f5 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -38,7 +38,6 @@ using namespace comphelper;
using namespace css;
CertificateChooser::CertificateChooser(weld::Window* _pParent,
- uno::Reference<uno::XComponentContext> const & _rxCtx,
std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > const & rxSecurityContexts,
UserAction eAction)
: GenericDialogController(_pParent, "xmlsec/ui/selectcertificatedialog.ui", "SelectCertificateDialog")
@@ -65,7 +64,6 @@ CertificateChooser::CertificateChooser(weld::Window* _pParent,
m_xCertLB->connect_row_activated( LINK( this, CertificateChooser, CertificateSelectHdl ) );
m_xViewBtn->connect_clicked( LINK( this, CertificateChooser, ViewButtonHdl ) );
- mxCtx = _rxCtx;
mxSecurityContexts = rxSecurityContexts;
mbInitialized = false;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 9a3f8bf17de9..05c37d478b05 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -110,7 +110,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature)
: GenericDialogController(pParent, "xmlsec/ui/digitalsignaturesdialog.ui", "DigitalSignaturesDialog")
- , mxCtx(rxCtx)
, maSignatureManager(rxCtx, eMode)
, m_sODFVersion (sODFVersion)
, m_bHasDocumentSignature(bHasDocumentSignature)
@@ -375,7 +374,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl, weld::Button&, void)
if (DocumentSignatureHelper::CanSignWithGPG(maSignatureManager.mxStore, m_sODFVersion))
xSecContexts.push_back(maSignatureManager.getGpgSecurityContext());
- CertificateChooser aChooser(m_xDialog.get(), mxCtx, xSecContexts, UserAction::Sign);
+ CertificateChooser aChooser(m_xDialog.get(), xSecContexts, UserAction::Sign);
if (aChooser.run() == RET_OK)
{
sal_Int32 nSecurityId;
More information about the Libreoffice-commits
mailing list