summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-03 12:34:22 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-08-03 12:16:33 +0000
commita4fd6c4f9e5b010f00ba7cc84a4b2d5d8950813a (patch)
tree6b2aa80c50d3937cfe17053a5da48f19855dcb68 /xmlsecurity
parent5256953397b495e9271cec92cc78514d772acaf5 (diff)
inline some use-once typedefs
Change-Id: I02cbbba56a2ad83e0ac3d806265a7e0d6a29594d Reviewed-on: https://gerrit.libreoffice.org/17495 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/helper/xsecctl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/oid.hxx6
2 files changed, 3 insertions, 7 deletions
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 7b63ca0f94e0..d6aae028f2ba 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -138,8 +138,6 @@ public:
}
};
-typedef ::std::vector< InternalSignatureInformation > InternalSignatureInformations;
-
class XSecController : public cppu::WeakImplHelper4
<
com::sun::star::xml::crypto::sax::XSecurityController,
@@ -207,7 +205,7 @@ private:
/*
* Signature information
*/
- InternalSignatureInformations m_vInternalSignatureInformations;
+ std::vector< InternalSignatureInformation > m_vInternalSignatureInformations;
/*
* the previous node on the SAX chain.
diff --git a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
index 654edf1caf00..4521cc317112 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
@@ -20,12 +20,10 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_OID_HXX
#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_OID_HXX
-typedef struct OIDItemStr OIDItem;
-
-struct OIDItemStr {
+typedef struct {
char *oid;
char *desc;
-};
+} OIDItem;
OIDItem OIDs[] = {
{"1.2.840.113549", "RSA Data Security Inc."},