diff options
Diffstat (limited to 'xmlsecurity/inc/xmlsecurity')
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/biginteger.hxx | 4 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 24 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 78 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/certvalidity.hxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 52 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx | 18 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/global.hrc | 2 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 80 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/sigstruct.hxx | 28 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/stbcontrl.hxx | 10 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/warnings.hxx | 36 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 20 |
12 files changed, 177 insertions, 177 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx index b77c7c3bb8c6..7d8d4b505d76 100644 --- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx +++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #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 ); +::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( rtl::OUString serialNumber ); #endif diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 1f822e8df096..d18deedf6a8b 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,23 +59,23 @@ private: cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts; SignatureInformations maCertsToIgnore; - FixedText maHintFT; + FixedText maHintFT; SvxSimpleTable maCertLB; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - PushButton maViewBtn; + PushButton maViewBtn; - FixedLine maBottomSepFL; - OKButton maOKBtn; + FixedLine maBottomSepFL; + OKButton maOKBtn; CancelButton maCancelBtn; - HelpButton maHelpBtn; + HelpButton maHelpBtn; - BOOL mbInitialized; + BOOL mbInitialized; - USHORT GetSelectedEntryPos( void ) const; -// DECL_LINK( Initialize, void* ); - DECL_LINK( ViewButtonHdl, Button* ); - DECL_LINK( CertificateHighlightHdl, void* ); - DECL_LINK( CertificateSelectHdl, void* ); + USHORT GetSelectedEntryPos( void ) const; +// DECL_LINK( Initialize, void* ); + DECL_LINK( ViewButtonHdl, Button* ); + DECL_LINK( CertificateHighlightHdl, void* ); + DECL_LINK( CertificateSelectHdl, void* ); void ImplShowCertificateDetails(); void ImplInitialize(); diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 10727ad63d47..180cdb044efd 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,27 +58,27 @@ private: friend class CertificateViewerDetailsTP; friend class CertificateViewerCertPathTP; - TabControl maTabCtrl; - OKButton maOkBtn; - HelpButton maHelpBtn; + TabControl maTabCtrl; + OKButton maOkBtn; + HelpButton maHelpBtn; - BOOL mbCheckForPrivateKey; + BOOL mbCheckForPrivateKey; cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; cssu::Reference< dcss::security::XCertificate > mxCert; public: CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, BOOL bCheckForPrivateKey ); - virtual ~CertificateViewer(); + virtual ~CertificateViewer(); }; class CertificateViewerTP : public TabPage { protected: - CertificateViewer* mpDlg; + CertificateViewer* mpDlg; public: CertificateViewerTP( Window* _pParent, const ResId& _rResId, CertificateViewer* _pDlg ); - inline void SetTabDlg( CertificateViewer* pTabDlg ); + inline void SetTabDlg( CertificateViewer* pTabDlg ); }; inline void CertificateViewerTP::SetTabDlg( CertificateViewer* _pTabDlg ) @@ -90,23 +90,23 @@ inline void CertificateViewerTP::SetTabDlg( CertificateViewer* _pTabDlg ) class CertificateViewerGeneralTP : public CertificateViewerTP { private: - Window maFrameWin; - FixedImage maCertImg; - FixedInfo maCertInfoFI; - FixedLine maSep1FL; - FixedInfo maHintNotTrustedFI; - FixedLine maSep2FL; - FixedInfo maIssuedToLabelFI; - FixedInfo maIssuedToFI; - FixedInfo maIssuedByLabelFI; - FixedInfo maIssuedByFI; + Window maFrameWin; + FixedImage maCertImg; + FixedInfo maCertInfoFI; + FixedLine maSep1FL; + FixedInfo maHintNotTrustedFI; + FixedLine maSep2FL; + FixedInfo maIssuedToLabelFI; + FixedInfo maIssuedToFI; + FixedInfo maIssuedByLabelFI; + FixedInfo maIssuedByFI; FixedInfo maValidDateFI; - FixedImage maKeyImg; - FixedInfo maHintCorrespPrivKeyFI; + FixedImage maKeyImg; + FixedInfo maHintCorrespPrivKeyFI; public: CertificateViewerGeneralTP( Window* pParent, CertificateViewer* _pDlg ); - virtual void ActivatePage(); + virtual void ActivatePage(); }; @@ -114,30 +114,30 @@ class CertificateViewerDetailsTP : public CertificateViewerTP { private: SvxSimpleTable maElementsLB; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - MultiLineEdit maElementML; - Font maStdFont; - Font maFixedWidthFont; + MultiLineEdit maElementML; + Font maStdFont; + Font maFixedWidthFont; - DECL_LINK( ElementSelectHdl, void* ); - void Clear( void ); - void InsertElement( const String& _rField, const String& _rValue, + DECL_LINK( ElementSelectHdl, void* ); + void Clear( void ); + void InsertElement( const String& _rField, const String& _rValue, const String& _rDetails, bool _bFixedWidthFont = false ); public: CertificateViewerDetailsTP( Window* pParent, CertificateViewer* _pDlg ); - virtual ~CertificateViewerDetailsTP(); + virtual ~CertificateViewerDetailsTP(); - virtual void ActivatePage(); + virtual void ActivatePage(); }; class CertificateViewerCertPathTP : public CertificateViewerTP { private: - FixedText maCertPathFT; - SvTreeListBox maCertPathLB; + FixedText maCertPathFT; + SvTreeListBox maCertPathLB; PushButton maViewCertPB; - FixedText maCertStatusFT; - MultiLineEdit maCertStatusML; + FixedText maCertStatusFT; + MultiLineEdit maCertStatusML; CertificateViewer* mpParent; bool mbFirstActivateDone; @@ -146,18 +146,18 @@ private: String msCertOK; String msCertNotValidated; - DECL_LINK( ViewCertHdl, void* ); - DECL_LINK( CertSelectHdl, void* ); - void Clear( void ); - SvLBoxEntry* InsertCert( SvLBoxEntry* _pParent, const String& _rName, + DECL_LINK( ViewCertHdl, void* ); + DECL_LINK( CertSelectHdl, void* ); + void Clear( void ); + SvLBoxEntry* InsertCert( SvLBoxEntry* _pParent, const String& _rName, cssu::Reference< dcss::security::XCertificate > rxCert, bool bValid); public: CertificateViewerCertPathTP( Window* pParent, CertificateViewer* _pDlg ); - virtual ~CertificateViewerCertPathTP(); + virtual ~CertificateViewerCertPathTP(); - virtual void ActivatePage(); + virtual void ActivatePage(); }; diff --git a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx index 20fb05579029..d2d75f3a9c43 100644 --- a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx +++ b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index 4d48aad47555..d8c3ffeaef84 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ class DigitalSignaturesDialog : public ModalDialog { private: cssu::Reference< cssu::XComponentContext >& mxCtx; - XMLSignatureHelper maSignatureHelper; + XMLSignatureHelper maSignatureHelper; css::uno::Reference < css::embed::XStorage > mxStore; css::uno::Reference < css::io::XStream > mxSignatureStream; @@ -73,49 +73,49 @@ private: SignatureInformations maCurrentSignatureInformations; bool mbVerifySignatures; bool mbSignaturesChanged; - DocumentSignatureMode meSignatureMode; + DocumentSignatureMode meSignatureMode; css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > m_manifest; - FixedText maHintDocFT; - FixedText maHintBasicFT; - FixedText maHintPackageFT; + FixedText maHintDocFT; + FixedText maHintBasicFT; + FixedText maHintPackageFT; SvxSimpleTable maSignaturesLB; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - FixedImage maSigsValidImg; - FixedInfo maSigsValidFI; + FixedImage maSigsValidImg; + FixedInfo maSigsValidFI; FixedImage maSigsInvalidImg; FixedInfo maSigsInvalidFI; FixedImage maSigsNotvalidatedImg; FixedInfo maSigsNotvalidatedFI; FixedInfo maSigsOldSignatureFI; - PushButton maViewBtn; - PushButton maAddBtn; - PushButton maRemoveBtn; + PushButton maViewBtn; + PushButton maAddBtn; + PushButton maRemoveBtn; - FixedLine maBottomSepFL; - OKButton maOKBtn; - HelpButton maHelpBtn; + FixedLine maBottomSepFL; + OKButton maOKBtn; + HelpButton maHelpBtn; ::rtl::OUString m_sODFVersion; - //Signals if the document contains already a document signature. This is only + //Signals if the document contains already a document signature. This is only //importent when we are signing macros and if the value is true. bool m_bHasDocumentSignature; bool m_bWarningShowSignMacro; - DECL_LINK( ViewButtonHdl, Button* ); - DECL_LINK( AddButtonHdl, Button* ); - DECL_LINK( RemoveButtonHdl, Button* ); - DECL_LINK( SignatureHighlightHdl, void* ); - DECL_LINK( SignatureSelectHdl, void* ); - DECL_LINK( StartVerifySignatureHdl, void* ); - DECL_LINK( OKButtonHdl, void* ); + DECL_LINK( ViewButtonHdl, Button* ); + DECL_LINK( AddButtonHdl, Button* ); + DECL_LINK( RemoveButtonHdl, Button* ); + DECL_LINK( SignatureHighlightHdl, void* ); + DECL_LINK( SignatureSelectHdl, void* ); + DECL_LINK( StartVerifySignatureHdl, void* ); + DECL_LINK( OKButtonHdl, void* ); void ImplGetSignatureInformations(bool bUseTempStream); void ImplFillSignaturesBox(); void ImplShowSignaturesDetails(); SignatureStreamHelper ImplOpenSignatureStream( sal_Int32 eStreamMode, bool bTempStream ); - //Checks if adding is allowed. + //Checks if adding is allowed. //See the spec at specs/www/appwide/security/Electronic_Signatures_and_Security.sxw //(6.6.2)Behaviour with regard to ODF 1.2 bool canAdd(); @@ -127,8 +127,8 @@ private: bool canAddRemove(); public: - DigitalSignaturesDialog( Window* pParent, cssu::Reference< - cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode, + DigitalSignaturesDialog( Window* pParent, cssu::Reference< + cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode, sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature); ~DigitalSignaturesDialog(); @@ -140,7 +140,7 @@ public: void SetSignatureStream( const cssu::Reference < css::io::XStream >& rxStream ); // Execute the dialog... - short Execute(); + short Execute(); // Did signatures change? sal_Bool SignaturesChanged() const { return mbSignaturesChanged; } diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx index 14d6a160bd01..78033bfcf892 100644 --- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace css = com::sun::star; Functions: 1. help to create a list of content to be signed/verified - + **********************************************************/ enum DocumentSignatureMode { SignatureModeDocumentContent, SignatureModeMacros, SignatureModePackage }; @@ -79,24 +79,24 @@ class DocumentSignatureHelper { public: - static SignatureStreamHelper OpenSignatureStream( - const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 nOpenMode, + static SignatureStreamHelper OpenSignatureStream( + const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 nOpenMode, DocumentSignatureMode eDocSigMode ); - static std::vector< rtl::OUString > CreateElementList( - const css::uno::Reference < css::embed::XStorage >& rxStore, - const ::rtl::OUString rRootStorageName, DocumentSignatureMode eMode, + static std::vector< rtl::OUString > CreateElementList( + const css::uno::Reference < css::embed::XStorage >& rxStore, + const ::rtl::OUString rRootStorageName, DocumentSignatureMode eMode, const DocumentSignatureAlgorithm mode); static bool isODFPre_1_2(const ::rtl::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, + static bool checkIfAllFilesAreSigned( const ::std::vector< ::rtl::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(); + static ::rtl::OUString GetPackageSignatureDefaultStreamName(); }; diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc index 57a9a95e88b3..8761f7170573 100644 --- a/xmlsecurity/inc/xmlsecurity/global.hrc +++ b/xmlsecurity/inc/xmlsecurity/global.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 2b4b57c00425..d251b94d7cb6 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,25 +67,25 @@ private: friend class MacroSecurityLevelTP; friend class MacroSecurityTrustedSourcesTP; - TabControl maTabCtrl; - OKButton maOkBtn; - CancelButton maCancelBtn; - HelpButton maHelpBtn; - PushButton maResetBtn; + TabControl maTabCtrl; + OKButton maOkBtn; + CancelButton maCancelBtn; + HelpButton maHelpBtn; + PushButton maResetBtn; - cssu::Reference< cssu::XComponentContext > mxCtx; - cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; - SvtSecurityOptions maSecOptions; + cssu::Reference< cssu::XComponentContext > mxCtx; + cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; + SvtSecurityOptions maSecOptions; - MacroSecurityTP* mpLevelTP; - MacroSecurityTP* mpTrustSrcTP; + MacroSecurityTP* mpLevelTP; + MacroSecurityTP* mpTrustSrcTP; - DECL_LINK( OkBtnHdl, void* ); + DECL_LINK( OkBtnHdl, void* ); public: MacroSecurity( Window* pParent, const cssu::Reference< cssu::XComponentContext>& rxCtx, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment ); - virtual ~MacroSecurity(); + virtual ~MacroSecurity(); - inline void EnableReset( bool _bEnable = true ); + inline void EnableReset( bool _bEnable = true ); }; inline void MacroSecurity::EnableReset( bool _bEnable ) @@ -96,12 +96,12 @@ inline void MacroSecurity::EnableReset( bool _bEnable ) class MacroSecurityTP : public TabPage { protected: - MacroSecurity* mpDlg; + MacroSecurity* mpDlg; public: MacroSecurityTP( Window* _pParent, const ResId& _rResId, MacroSecurity* _pDlg ); - inline void SetTabDlg( MacroSecurity* pTabDlg ); + inline void SetTabDlg( MacroSecurity* pTabDlg ); - virtual void ClosePage( void ) = 0; + virtual void ClosePage( void ) = 0; }; inline void MacroSecurityTP::SetTabDlg( MacroSecurity* _pTabDlg ) @@ -113,61 +113,61 @@ inline void MacroSecurityTP::SetTabDlg( MacroSecurity* _pTabDlg ) class MacroSecurityLevelTP : public MacroSecurityTP { private: - FixedLine maSecLevelFL; + FixedLine maSecLevelFL; ReadOnlyImage maSecReadonlyFI; RadioButton maVeryHighRB; - RadioButton maHighRB; - RadioButton maMediumRB; - RadioButton maLowRB; + RadioButton maHighRB; + RadioButton maMediumRB; + RadioButton maLowRB; USHORT mnCurLevel; protected: - DECL_LINK( RadioButtonHdl, RadioButton* ); + DECL_LINK( RadioButtonHdl, RadioButton* ); public: MacroSecurityLevelTP( Window* pParent, MacroSecurity* _pDlg ); - virtual void ClosePage( void ); + virtual void ClosePage( void ); }; class MacroSecurityTrustedSourcesTP : public MacroSecurityTP { private: - FixedLine maTrustCertFL; + FixedLine maTrustCertFL; ReadOnlyImage maTrustCertROFI; SvxSimpleTable maTrustCertLB; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - PushButton maAddCertPB; - PushButton maViewCertPB; - PushButton maRemoveCertPB; - FixedLine maTrustFileLocFL; + PushButton maAddCertPB; + PushButton maViewCertPB; + PushButton maRemoveCertPB; + FixedLine maTrustFileLocFL; ReadOnlyImage maTrustFileROFI; FixedInfo maTrustFileLocFI; - ListBox maTrustFileLocLB; - PushButton maAddLocPB; - PushButton maRemoveLocPB; + ListBox maTrustFileLocLB; + PushButton maAddLocPB; + PushButton maRemoveLocPB; cssu::Sequence< SvtSecurityOptions::Certificate > maTrustedAuthors; sal_Bool mbAuthorsReadonly; sal_Bool mbURLsReadonly; - DECL_LINK( ViewCertPBHdl, void* ); - DECL_LINK( RemoveCertPBHdl, void* ); - DECL_LINK( AddLocPBHdl, void* ); - DECL_LINK( RemoveLocPBHdl, void* ); - DECL_LINK( TrustCertLBSelectHdl, void* ); - DECL_LINK( TrustFileLocLBSelectHdl, void* ); + DECL_LINK( ViewCertPBHdl, void* ); + DECL_LINK( RemoveCertPBHdl, void* ); + DECL_LINK( AddLocPBHdl, void* ); + DECL_LINK( RemoveLocPBHdl, void* ); + DECL_LINK( TrustCertLBSelectHdl, void* ); + DECL_LINK( TrustFileLocLBSelectHdl, void* ); - void FillCertLB( void ); + void FillCertLB( void ); void ImplCheckButtons(); public: MacroSecurityTrustedSourcesTP( Window* pParent, MacroSecurity* _pDlg ); - virtual void ActivatePage(); - virtual void ClosePage( void ); + virtual void ActivatePage(); + virtual void ClosePage( void ); }; diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx index 345380835d70..773cc7b261fc 100644 --- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx +++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,27 +41,27 @@ /* * signature status */ -/* -#define STATUS_INIT 0 -#define STATUS_CREATION_SUCCEED 1 -#define STATUS_CREATION_FAIL 2 -#define STATUS_VERIFY_SUCCEED 3 -#define STATUS_VERIFY_FAIL 4 +/* +#define STATUS_INIT 0 +#define STATUS_CREATION_SUCCEED 1 +#define STATUS_CREATION_FAIL 2 +#define STATUS_VERIFY_SUCCEED 3 +#define STATUS_VERIFY_FAIL 4 */ /* * type of reference */ -#define TYPE_SAMEDOCUMENT_REFERENCE 1 -#define TYPE_BINARYSTREAM_REFERENCE 2 -#define TYPE_XMLSTREAM_REFERENCE 3 +#define TYPE_SAMEDOCUMENT_REFERENCE 1 +#define TYPE_BINARYSTREAM_REFERENCE 2 +#define TYPE_XMLSTREAM_REFERENCE 3 struct SignatureReferenceInformation { sal_Int32 nType; rtl::OUString ouURI; rtl::OUString ouDigestValue; - + SignatureReferenceInformation( sal_Int32 type, rtl::OUString uri ) { nType = type; @@ -89,11 +89,11 @@ struct SignatureInformation //XML signatures are written again (unless they have been removed). //If the date time string is converted into the DateTime structure //then information can be lost because it only holds a fractional - //of a second with a accuracy of one hundredth of second. + //of a second with a accuracy of one hundredth of second. //If the string contains //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. + //and the signature is broken. rtl::OUString ouDateTime; rtl::OUString ouSignatureId; rtl::OUString ouPropertyId; @@ -104,7 +104,7 @@ struct SignatureInformation nStatus = ::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN; nSecurityEnvironmentIndex = -1; } -}; +}; typedef ::std::vector< SignatureInformation > SignatureInformations; diff --git a/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx b/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx index b10465db2208..938c3af9e8c8 100644 --- a/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx +++ b/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class XmlSecStatusBarControl : public SfxStatusBarControl private: struct XmlSecStatusBarControl_Impl; - XmlSecStatusBarControl_Impl* mpImpl; + XmlSecStatusBarControl_Impl* mpImpl; public: SFX_DECL_STATUSBAR_CONTROL(); @@ -48,9 +48,9 @@ public: XmlSecStatusBarControl( USHORT _nId, StatusBar& _rStb, SfxBindings& _rBind ); ~XmlSecStatusBarControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Paint( const UserDrawEvent& rEvt ); + virtual void Command( const CommandEvent& rCEvt ); }; #endif diff --git a/xmlsecurity/inc/xmlsecurity/warnings.hxx b/xmlsecurity/inc/xmlsecurity/warnings.hxx index a8f0b033616d..091a788aae7a 100644 --- a/xmlsecurity/inc/xmlsecurity/warnings.hxx +++ b/xmlsecurity/inc/xmlsecurity/warnings.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,27 +57,27 @@ private: // XSecurityEnvironment is needed for building the certification path cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; -// cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts; +// cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts; cssu::Reference< dcss::security::XCertificate > mxCert; -// FixedImage maQuestionMarkFI; - FixedInfo maDocNameFI; - FixedInfo maDescr1aFI; - FixedInfo maDescr1bFI; - FixedInfo maSignsFI; - PushButton maViewSignsBtn; - FixedInfo maDescr2FI; - CheckBox maAlwaysTrustCB; - FixedLine maBottomSepFL; - PushButton maEnableBtn; - CancelButton maDisableBtn; - HelpButton maHelpBtn; +// FixedImage maQuestionMarkFI; + FixedInfo maDocNameFI; + FixedInfo maDescr1aFI; + FixedInfo maDescr1bFI; + FixedInfo maSignsFI; + PushButton maViewSignsBtn; + FixedInfo maDescr2FI; + CheckBox maAlwaysTrustCB; + FixedLine maBottomSepFL; + PushButton maEnableBtn; + CancelButton maDisableBtn; + HelpButton maHelpBtn; - const bool mbSignedMode; // modus of dialog (signed / unsigned macros) + const bool mbSignedMode; // modus of dialog (signed / unsigned macros) - DECL_LINK( ViewSignsBtnHdl, void* ); - DECL_LINK( EnableBtnHdl, void* ); -// DECL_LINK( DisableBtnHdl, void* ); + DECL_LINK( ViewSignsBtnHdl, void* ); + DECL_LINK( EnableBtnHdl, void* ); +// DECL_LINK( DisableBtnHdl, void* ); public: MacroWarning( Window* pParent, cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, cssu::Reference< dcss::security::XCertificate >& _rxCert ); diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx index 4869b4728567..2eee842c8162 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace embed { struct XMLSignatureCreationResult { - sal_Int32 nSecurityId; + sal_Int32 nSecurityId; com::sun::star::xml::crypto::SecurityOperationStatus nSignatureCreationResult; XMLSignatureCreationResult( sal_Int32 nId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) @@ -74,7 +74,7 @@ struct XMLSignatureCreationResult struct XMLSignatureVerifyResult { - sal_Int32 nSecurityId; + sal_Int32 nSecurityId; com::sun::star::xml::crypto::SecurityOperationStatus nSignatureVerifyResult; XMLSignatureVerifyResult( sal_Int32 nId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) @@ -99,7 +99,7 @@ typedef ::std::vector<XMLSignatureVerifyResult> XMLSignatureVerifyResults; 2. help to listen signature creation result; 3. help to listen signature verify result; 4. help to indicate which signature to verify. - + **********************************************************/ class XMLSignatureHelper @@ -183,19 +183,19 @@ public: for finding the certificate apparently use memcmp - hence they fail to find the certificate. */ - void SetX509Certificate(sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName, + void SetX509Certificate(sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName, const rtl::OUString& ouX509SerialNumber, const rtl::OUString& ouX509Cert); - - void SetX509Certificate(sal_Int32 nSecurityId, sal_Int32 nSecurityEnvironmentIndex, - const rtl::OUString& ouX509IssuerName, const rtl::OUString& ouX509SerialNumber, + + void SetX509Certificate(sal_Int32 nSecurityId, sal_Int32 nSecurityEnvironmentIndex, + const rtl::OUString& ouX509IssuerName, const rtl::OUString& ouX509SerialNumber, const rtl::OUString& ouX509Cert); - void SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime ); + 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 ); bool CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler ); bool CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream ); bool ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream ); - + // MT: ??? I think only for adding/removing, not for new signatures... // MM: Yes, but if you want to insert a new signature into an existing signature file, those function // will be very usefull, see Mission 3 in the new "multisigdemo" program :-) |