Kaydet (Commit) 6ed5464a authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in xmlhelp,xmlsecurity

Change-Id: Id3858365a54e6ae96bf9e6c3e27a777441ab56ae
Reviewed-on: https://gerrit.libreoffice.org/68133
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 5febdea1
...@@ -486,7 +486,7 @@ bool URLParameter::query() ...@@ -486,7 +486,7 @@ bool URLParameter::query()
if( parameter == "Language" ) if( parameter == "Language" )
m_aLanguage = value; m_aLanguage = value;
else if( parameter == "Device" ) else if( parameter == "Device" )
m_aDevice = value; ;
else if( parameter == "Program" ) else if( parameter == "Program" )
m_aProgram = value; m_aProgram = value;
else if( parameter == "Eid" ) else if( parameter == "Eid" )
......
...@@ -184,7 +184,6 @@ namespace chelp { ...@@ -184,7 +184,6 @@ namespace chelp {
OUString m_aLanguage; OUString m_aLanguage;
OUString m_aPrefix; OUString m_aPrefix;
OUString m_aDevice;
OUString m_aProgram; OUString m_aProgram;
OUString m_aSystem; OUString m_aSystem;
OUString m_aActive; OUString m_aActive;
......
...@@ -53,7 +53,6 @@ enum class UserAction ...@@ -53,7 +53,6 @@ enum class UserAction
class CertificateChooser : public weld::GenericDialogController class CertificateChooser : public weld::GenericDialogController
{ {
private: private:
css::uno::Reference< css::uno::XComponentContext > mxCtx;
std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > mxSecurityContexts; std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > mxSecurityContexts;
std::vector<std::shared_ptr<UserData>> mvUserData; std::vector<std::shared_ptr<UserData>> mvUserData;
...@@ -81,7 +80,6 @@ private: ...@@ -81,7 +80,6 @@ private:
public: public:
CertificateChooser(weld::Window* pParent, CertificateChooser(weld::Window* pParent,
css::uno::Reference< css::uno::XComponentContext> const & rxCtx,
std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > const & rxSecurityContexts, std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > const & rxSecurityContexts,
UserAction eAction); UserAction eAction);
virtual ~CertificateChooser() override; virtual ~CertificateChooser() override;
......
...@@ -48,8 +48,6 @@ class HeaderBar; ...@@ -48,8 +48,6 @@ class HeaderBar;
class DigitalSignaturesDialog : public weld::GenericDialogController class DigitalSignaturesDialog : public weld::GenericDialogController
{ {
private: private:
css::uno::Reference< css::uno::XComponentContext >& mxCtx;
DocumentSignatureManager maSignatureManager; DocumentSignatureManager maSignatureManager;
bool mbVerifySignatures; bool mbVerifySignatures;
bool mbSignaturesChanged; bool mbSignaturesChanged;
......
...@@ -652,7 +652,7 @@ DocumentDigitalSignatures::chooseCertificatesImpl(std::map<OUString, OUString>& ...@@ -652,7 +652,7 @@ DocumentDigitalSignatures::chooseCertificatesImpl(std::map<OUString, OUString>&
xSecContexts.push_back(aSignatureManager.getGpgSecurityContext()); 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); uno::Sequence< Reference< css::security::XCertificate > > xCerts(1);
xCerts[0] = Reference< css::security::XCertificate >(nullptr); xCerts[0] = Reference< css::security::XCertificate >(nullptr);
......
...@@ -38,7 +38,6 @@ using namespace comphelper; ...@@ -38,7 +38,6 @@ using namespace comphelper;
using namespace css; using namespace css;
CertificateChooser::CertificateChooser(weld::Window* _pParent, CertificateChooser::CertificateChooser(weld::Window* _pParent,
uno::Reference<uno::XComponentContext> const & _rxCtx,
std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > const & rxSecurityContexts, std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > const & rxSecurityContexts,
UserAction eAction) UserAction eAction)
: GenericDialogController(_pParent, "xmlsec/ui/selectcertificatedialog.ui", "SelectCertificateDialog") : GenericDialogController(_pParent, "xmlsec/ui/selectcertificatedialog.ui", "SelectCertificateDialog")
...@@ -65,7 +64,6 @@ CertificateChooser::CertificateChooser(weld::Window* _pParent, ...@@ -65,7 +64,6 @@ CertificateChooser::CertificateChooser(weld::Window* _pParent,
m_xCertLB->connect_row_activated( LINK( this, CertificateChooser, CertificateSelectHdl ) ); m_xCertLB->connect_row_activated( LINK( this, CertificateChooser, CertificateSelectHdl ) );
m_xViewBtn->connect_clicked( LINK( this, CertificateChooser, ViewButtonHdl ) ); m_xViewBtn->connect_clicked( LINK( this, CertificateChooser, ViewButtonHdl ) );
mxCtx = _rxCtx;
mxSecurityContexts = rxSecurityContexts; mxSecurityContexts = rxSecurityContexts;
mbInitialized = false; mbInitialized = false;
......
...@@ -110,7 +110,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( ...@@ -110,7 +110,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode, uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature) bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature)
: GenericDialogController(pParent, "xmlsec/ui/digitalsignaturesdialog.ui", "DigitalSignaturesDialog") : GenericDialogController(pParent, "xmlsec/ui/digitalsignaturesdialog.ui", "DigitalSignaturesDialog")
, mxCtx(rxCtx)
, maSignatureManager(rxCtx, eMode) , maSignatureManager(rxCtx, eMode)
, m_sODFVersion (sODFVersion) , m_sODFVersion (sODFVersion)
, m_bHasDocumentSignature(bHasDocumentSignature) , m_bHasDocumentSignature(bHasDocumentSignature)
...@@ -375,7 +374,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl, weld::Button&, void) ...@@ -375,7 +374,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl, weld::Button&, void)
if (DocumentSignatureHelper::CanSignWithGPG(maSignatureManager.mxStore, m_sODFVersion)) if (DocumentSignatureHelper::CanSignWithGPG(maSignatureManager.mxStore, m_sODFVersion))
xSecContexts.push_back(maSignatureManager.getGpgSecurityContext()); 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) if (aChooser.run() == RET_OK)
{ {
sal_Int32 nSecurityId; sal_Int32 nSecurityId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment