summaryrefslogtreecommitdiffstats
path: root/xmlsecurity
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-11-08 15:36:48 +0200
committerTor Lillqvist <tml@collabora.com>2016-11-08 15:43:47 +0200
commit248dbe1de5eeea9e9173e53a0b1891f63ff73d68 (patch)
tree02faaf9fcd75f49c4667cc9d983b345aa7f024b6 /xmlsecurity
parentAdd fill-column: 100 to the Emacs mode line (diff)
downloadcore-248dbe1de5eeea9e9173e53a0b1891f63ff73d68.tar.gz
core-248dbe1de5eeea9e9173e53a0b1891f63ff73d68.zip
Bin pointless (overloaded) member function
The XSecController::setX509Certificate() overload that took a sal_Int32 nSecurityEnvironmentIndex was called in just one place, and -1 was always passed for the nSecurityEnvironmentIndex. Change-Id: Ic37b7053c90a6fbb8b4e5b6485483d34c605b965
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/helper/xsecctl.hxx8
-rw-r--r--xmlsecurity/source/helper/xsecsign.cxx15
2 files changed, 2 insertions, 21 deletions
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index eaf4e66da1e7..e2d606fd70cf 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -381,14 +381,6 @@ public:
const OUString& ouX509SerialNumber,
const OUString& ouX509Cert,
const OUString& ouX509CertDigest);
- // see the other setX509Certifcate function
- void setX509Certificate(
- sal_Int32 nSecurityId,
- const sal_Int32 nSecurityEnvironmentIndex,
- const OUString& ouX509IssuerName,
- const OUString& ouX509SerialNumber,
- const OUString& ouX509Cert,
- const OUString& ouX509CertDigest);
void setDate(
sal_Int32 nSecurityId,
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index a6b5a21b041d..8e4c5d9b6103 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -234,23 +234,12 @@ void XSecController::setX509Certificate(
const OUString& ouX509Cert,
const OUString& ouX509CertDigest)
{
- setX509Certificate(nSecurityId, -1, ouX509IssuerName, ouX509SerialNumber, ouX509Cert, ouX509CertDigest);
-}
-
-void XSecController::setX509Certificate(
- sal_Int32 nSecurityId,
- const sal_Int32 nSecurityEnvironmentIndex,
- const OUString& ouX509IssuerName,
- const OUString& ouX509SerialNumber,
- const OUString& ouX509Cert,
- const OUString& ouX509CertDigest)
-{
int index = findSignatureInfor( nSecurityId );
if ( index == -1 )
{
InternalSignatureInformation isi(nSecurityId, nullptr);
- isi.signatureInfor.nSecurityEnvironmentIndex = nSecurityEnvironmentIndex;
+ isi.signatureInfor.nSecurityEnvironmentIndex = -1;
isi.signatureInfor.ouX509IssuerName = ouX509IssuerName;
isi.signatureInfor.ouX509SerialNumber = ouX509SerialNumber;
isi.signatureInfor.ouX509Certificate = ouX509Cert;
@@ -265,7 +254,7 @@ void XSecController::setX509Certificate(
si.ouX509SerialNumber = ouX509SerialNumber;
si.ouX509Certificate = ouX509Cert;
si.ouCertDigest = ouX509CertDigest;
- si.nSecurityEnvironmentIndex = nSecurityEnvironmentIndex;
+ si.nSecurityEnvironmentIndex = -1;
}
}