summaryrefslogtreecommitdiff
path: root/xmlsecurity/inc
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /xmlsecurity/inc
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'xmlsecurity/inc')
-rw-r--r--xmlsecurity/inc/xmlsecurity/biginteger.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/certvalidity.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx18
-rw-r--r--xmlsecurity/inc/xmlsecurity/sigstruct.hxx20
-rw-r--r--xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx8
6 files changed, 28 insertions, 28 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
index 8708f9b795e1..f7c3c6124a63 100644
--- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx
+++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
@@ -26,8 +26,8 @@
#include <com/sun/star/uno/Reference.hxx>
#include "com/sun/star/uno/Sequence.h"
-rtl::OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial );
-::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( rtl::OUString serialNumber );
+OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial );
+::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( OUString serialNumber );
#endif
diff --git a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
index ecf54af7ebb5..850bb6ab4f29 100644
--- a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
-rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) ;
+OUString certificateValidityToOUString( ::sal_Int32 certValidity ) ;
#endif
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 26b6c036a61c..3ca9f757a601 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -113,13 +113,13 @@ private:
//Checks if a particular stream is a valid xml stream. Those are treated differently
//when they are signed (c14n transformation)
- bool isXML(const ::rtl::OUString& rURI );
+ bool isXML(const OUString& rURI );
bool canAddRemove();
public:
DigitalSignaturesDialog( Window* pParent, cssu::Reference<
cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
- sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature);
+ sal_Bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature);
~DigitalSignaturesDialog();
// Initialize the dialog and the security environment, returns TRUE on success
diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
index c4d6fb15cb43..35315c819d2b 100644
--- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
@@ -72,21 +72,21 @@ public:
static SignatureStreamHelper OpenSignatureStream(
const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 nOpenMode,
DocumentSignatureMode eDocSigMode );
- static std::vector< rtl::OUString > CreateElementList(
+ static std::vector< OUString > CreateElementList(
const css::uno::Reference < css::embed::XStorage >& rxStore,
- const ::rtl::OUString rRootStorageName, DocumentSignatureMode eMode,
+ const OUString rRootStorageName, DocumentSignatureMode eMode,
const DocumentSignatureAlgorithm mode);
- static bool isODFPre_1_2(const ::rtl::OUString & sODFVersion);
+ static bool isODFPre_1_2(const OUString & sODFVersion);
static bool isOOo3_2_Signature(const SignatureInformation & sigInfo);
static DocumentSignatureAlgorithm getDocumentAlgorithm(
- const ::rtl::OUString & sODFVersion, const SignatureInformation & sigInfo);
- static bool checkIfAllFilesAreSigned( const ::std::vector< ::rtl::OUString > & sElementList,
+ const OUString & sODFVersion, const SignatureInformation & sigInfo);
+ static bool checkIfAllFilesAreSigned( const ::std::vector< OUString > & sElementList,
const SignatureInformation & sigInfo, const DocumentSignatureAlgorithm alg);
static bool equalsReferenceUriManifestPath(
- const ::rtl::OUString & rUri, const ::rtl::OUString & rPath);
- static ::rtl::OUString GetDocumentContentSignatureDefaultStreamName();
- static ::rtl::OUString GetScriptingContentSignatureDefaultStreamName();
- static ::rtl::OUString GetPackageSignatureDefaultStreamName();
+ const OUString & rUri, const OUString & rPath);
+ static OUString GetDocumentContentSignatureDefaultStreamName();
+ static OUString GetScriptingContentSignatureDefaultStreamName();
+ static OUString GetPackageSignatureDefaultStreamName();
};
diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
index 657ba6b61c49..77ab5d85defd 100644
--- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
+++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
@@ -36,10 +36,10 @@
struct SignatureReferenceInformation
{
sal_Int32 nType;
- rtl::OUString ouURI;
- rtl::OUString ouDigestValue;
+ OUString ouURI;
+ OUString ouDigestValue;
- SignatureReferenceInformation( sal_Int32 type, rtl::OUString uri )
+ SignatureReferenceInformation( sal_Int32 type, OUString uri )
{
nType = type;
ouURI = uri;
@@ -54,10 +54,10 @@ struct SignatureInformation
sal_Int32 nSecurityEnvironmentIndex;
::com::sun::star::xml::crypto::SecurityOperationStatus nStatus;
SignatureReferenceInformations vSignatureReferenceInfors;
- rtl::OUString ouX509IssuerName;
- rtl::OUString ouX509SerialNumber;
- rtl::OUString ouX509Certificate;
- rtl::OUString ouSignatureValue;
+ OUString ouX509IssuerName;
+ OUString ouX509SerialNumber;
+ OUString ouX509Certificate;
+ OUString ouSignatureValue;
::com::sun::star::util::DateTime stDateTime;
//We also keep the date and time as string. This is done when this
@@ -71,9 +71,9 @@ struct SignatureInformation
//milli seconds (because the document was created by an application other than OOo)
//and the converted time is written back, then the string looks different
//and the signature is broken.
- rtl::OUString ouDateTime;
- rtl::OUString ouSignatureId;
- rtl::OUString ouPropertyId;
+ OUString ouDateTime;
+ OUString ouSignatureId;
+ OUString ouPropertyId;
SignatureInformation( sal_Int32 nId )
{
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 4e06d45d75e0..b9e85e781412 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -130,7 +130,7 @@ public:
// Set the storage which should be used by the default UriBinding
// Must be set before StatrtMission().
//sODFVersion indicates the ODF version
- void SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, ::rtl::OUString sODFVersion );
+ void SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, OUString sODFVersion );
// Argument for the Link is a uno::Reference< xml::sax::XAttributeList >*
// Return 1 to verify, 0 to skip.
@@ -166,12 +166,12 @@ public:
for finding the certificate apparently use memcmp - hence they fail to find the
certificate.
*/
- void SetX509Certificate(sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName,
- const rtl::OUString& ouX509SerialNumber, const rtl::OUString& ouX509Cert);
+ void SetX509Certificate(sal_Int32 nSecurityId, const OUString& ouX509IssuerName,
+ const OUString& ouX509SerialNumber, const OUString& ouX509Cert);
void SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime );
- void AddForSigning( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool bBinary );
+ void AddForSigning( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, sal_Bool bBinary );
bool CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
bool ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream );