CWS-TOOLING: integrate CWS encsig09

2009-09-14 15:11:29 +0200 oc  r276125 : #i105049# MacroSignatur needs Macro
2009-09-09 17:09:46 +0200 jl  r276005 : #i103989# could not signe encrypted doc containing a formular object
2009-09-09 13:11:24 +0200 jl  r275985 : #i103989# could not signe encrypted doc containing a formular object
2009-09-08 15:54:02 +0200 mav  r275934 : #i103906# fix the automation test scenario ( tempfile should be writable for the user )
2009-09-07 14:01:39 +0200 mav  r275895 : #i103906# fix the problem with reload
2009-09-07 09:34:48 +0200 mav  r275871 : #i104786# do the ODF version check only for ODF documents
2009-09-07 08:19:06 +0200 mav  r275870 : #i104389# fix text
2009-09-06 22:24:21 +0200 mav  r275867 : #i104786# check the consistency of ODF version
2009-09-06 22:23:24 +0200 mav  r275866 : #i104786# check the consistency of ODF version
2009-09-06 22:23:00 +0200 mav  r275865 : #i104786# check the consistency of ODF version
2009-09-06 22:22:36 +0200 mav  r275864 : #i104786# check the consistency of ODF version
2009-09-06 22:22:03 +0200 mav  r275863 : #i104786# check the consistency of ODF version
2009-09-02 17:09:30 +0200 mav  r275722 : #i104715# let repairing mechanics use the streams correctly
2009-09-01 16:52:49 +0200 mav  r275670 : #i104389# notify user not to trust the corrupted document
2009-09-01 16:31:37 +0200 mav  r275668 : #i104389# use vnd.sun.star.zip: protocol to access zip files
2009-09-01 16:30:32 +0200 mav  r275667 : #i104389# use vnd.sun.star.zip: protocol to access zip files
2009-09-01 16:22:13 +0200 jl  r275666 : #i104339# small content change
2009-09-01 14:20:42 +0200 jl  r275660 : #i103519# remove some debug output
2009-09-01 13:51:52 +0200 jl  r275659 : #i103519# NSS uses '\' for escaping in distinguished names
2009-09-01 12:49:47 +0200 mav  r275655 : #i104389# use zip-mode to read from jar files
2009-09-01 12:40:22 +0200 mav  r275653 : #i104389# use zip-mode to read from jar files
2009-09-01 12:32:29 +0200 mav  r275652 : #i104389# use constants
2009-08-31 21:58:00 +0200 mav  r275637 : #i10000# fix warning
2009-08-31 21:11:17 +0200 mav  r275636 : #i104227# adding of scripting signature removes the document signature
2009-08-31 20:55:05 +0200 mav  r275635 : #i103905# ZipStorage supports Compressed property
2009-08-31 20:53:55 +0200 mav  r275634 : #i103905# adjust macro signature transfer to usage of ZipStorage
2009-08-31 15:30:49 +0200 jl  r275609 : #i103989# warning is shown as long the user does not click 'OK'
2009-08-31 14:36:10 +0200 jl  r275608 : #i103989# changed warning text when signing macro and there is a document signature. This warning is only displayed once
2009-08-31 13:34:41 +0200 mav  r275603 : #i104452# disable macros in repaired documents
2009-08-31 13:33:42 +0200 mav  r275602 : #i104452# disable macros in repaired documents
2009-08-31 13:03:56 +0200 jl  r275600 : #i45212# signature dialog could not be started when using read-only documents
2009-08-31 09:26:13 +0200 mav  r275583 : #i104578# store the additional entry as the last one to workaround parsing problem in OOo3.1 and later
2009-08-30 20:54:25 +0200 mav  r275562 : #i10000# adopt for unix
2009-08-30 10:56:00 +0200 mav  r275561 : CWS-TOOLING: rebase CWS encsig09 to trunk@275331 (milestone: DEV300:m56)
2009-08-28 16:34:00 +0200 mav  r275539 : #i104578# write necessary info in manifest.xml for ODF1.2 encrypted document
2009-08-28 14:04:22 +0200 mav  r275533 : #104587# fix handling of readonly streams
2009-08-28 13:58:10 +0200 mav  r275531 : #i104389# fix the broken document handling
2009-08-28 11:40:39 +0200 mav  r275522 : #i104389# fix the signature streams check
2009-08-27 21:48:12 +0200 mav  r275509 : #i103927# show the warning
2009-08-27 21:47:48 +0200 mav  r275508 : #i103927# show the warning
2009-08-27 16:45:59 +0200 jl  r275495 : #i45212# remove unused variable
2009-08-27 16:34:00 +0200 jl  r275494 : #i103989#
2009-08-27 13:54:28 +0200 jl  r275482 : #i103519# fixed replacement of 'S' by 'ST'
2009-08-27 12:32:21 +0200 mav  r275472 : #i10000# fix warning
2009-08-27 11:58:11 +0200 mav  r275467 : #i104389# handle the entry path correctly
2009-08-26 17:18:35 +0200 jl  r275438 : #i103519# subject and issuer distinguished names were not properly displayed. The strings were obtained by system functions (Windows, NSS), which use quotes to escape the values, when they contain special characters
2009-08-26 11:00:20 +0200 mav  r275403 : #i10000# fix warnings
2009-08-26 08:25:45 +0200 mav  r275392 : #i10000# fix warning
2009-08-26 08:02:22 +0200 mav  r275391 : #i10000# adopt for linux
2009-08-26 07:40:30 +0200 mav  r275390 : #i10000# fix warning
2009-08-26 07:35:28 +0200 mav  r275389 : #i10000# use correct include file name
2009-08-25 15:01:41 +0200 jl  r275356 : #i103989# better check for mimetype of streams
2009-08-25 09:07:09 +0200 mav  r275335 : CWS-TOOLING: rebase CWS encsig09 to trunk@274622 (milestone: DEV300:m54)
2009-08-24 18:17:02 +0200 mav  r275329 : #i103927# check the nonencrypted streams
2009-08-24 18:14:14 +0200 mav  r275328 : #i103927# check the nonencrypted streams
2009-08-24 17:59:34 +0200 mav  r275327 : #i103927#,#i104389# check the package consistency and nonencrypted streams
2009-08-24 16:18:28 +0200 jl  r275323 : #i103989# added comment
2009-08-24 13:08:47 +0200 jl  r275305 : #i45212# #i66276# only write the X509Certificate element once and allow to add remove several certificates at a time
2009-08-21 12:57:28 +0200 ufi  r275239 : 104339
2009-08-21 08:39:05 +0200 jl  r275213 : #i10398# comparing URIs of signed files with the 'element list'
2009-08-20 13:39:47 +0200 jl  r275178 : #i10398# displaying 'new partially signed' status in the status bar
2009-08-20 13:35:39 +0200 jl  r275177 : #i10398# displaying 'new partially signed' status in the status bar
2009-08-20 13:29:06 +0200 jl  r275176 : #i10398# displaying 'new partially signed' status in the status bar
2009-08-20 13:26:21 +0200 jl  r275175 : #i10398# displaying 'new partially signed' status in the status bar
2009-08-20 12:05:09 +0200 ufi  r275170 : i104339
2009-08-19 12:24:54 +0200 jl  r275146 : #i10398# displaying 'old signature' icon and status in signature dialog
2009-08-18 15:18:48 +0200 jl  r275111 : #i103989# document signatures containing manifest.xml are now validated according to the final ODF1.2 spec
2009-08-18 11:41:06 +0200 mav  r275087 : #i103927# detect if encrypted ODF1.2 document contains nonencrypted streams
2009-08-18 11:35:13 +0200 mav  r275085 : #i103927# detect if encrypted ODF1.2 document contains nonencrypted streams
2009-08-14 17:32:41 +0200 jl  r274999 : #i103989# using c14n tranformation for XML streams
2009-08-14 15:27:43 +0200 jl  r274987 : #i103989# remove special handling for encrypted document streams in UriBindingHelper::OpenInputStream, since we use zip storage this is not necessary anymore
2009-08-14 15:08:10 +0200 jl  r274983 : #i103989# Showing a message when adding or removing a macro signature, that the document signature will be removed
2009-08-14 14:57:27 +0200 jl  r274982 : #i103989# accesing Sequence at invalid index
2009-08-11 08:55:02 +0200 mav  r274846 : #i103905# let signing service know if there is already a valid document signature
2009-08-10 11:33:37 +0200 jl  r274799 : #i103905# do not truncate the stream
2009-08-10 10:43:47 +0200 mav  r274797 : #i103905# provide the storage version
2009-08-07 16:58:46 +0200 jl  r274780 : #i103989#
2009-08-07 16:56:19 +0200 jl  r274779 : #i103989# using odf version string etc.
2009-08-07 15:20:53 +0200 mav  r274771 : #i103905# provide the storage version
2009-08-07 15:19:12 +0200 mav  r274770 : #i103905# provide the storage version
2009-08-07 12:41:45 +0200 mav  r274758 : #103930# do not store thumbnail in case of encrypted document
2009-08-07 12:36:52 +0200 mav  r274757 : #i103905# provide the storage version
2009-08-07 12:15:54 +0200 mav  r274754 : #i103760# the signed state is not lost on saving
2009-08-07 12:06:19 +0200 mav  r274753 : #i103760# avoid warning regarding signature removal on export
2009-08-07 12:06:01 +0200 mav  r274752 : #i103760# avoid warning regarding signature removal on export
2009-08-06 08:47:34 +0200 mav  r274703 : #i103905# allow to transport ODF version to the signing component
2009-08-05 21:34:42 +0200 mav  r274701 : #i103905# allow to transport ODF version to the signing component
2009-08-05 15:48:17 +0200 mav  r274683 : #i103905# allow to transport ODF version to the signing component
2009-08-05 14:58:12 +0200 jl  r274673 : #i103989# documentsignature now signes all streams except documentsignatures.xml, all streams are processed as binary files
2009-08-05 12:00:32 +0200 mav  r274648 : #i103905# allow to transport ODF version to the signing component
2009-08-04 10:57:04 +0200 jl  r274612 : #i103989# added XInitialization
2009-07-31 10:32:27 +0200 mav  r274516 : #i103905# use zip storage to sign documents
2009-07-30 14:01:33 +0200 mav  r274489 : #i103906# optimize the usage of temporary medium
2009-07-30 14:00:28 +0200 mav  r274488 : #i103906# optimize the usage of temporary medium
2009-07-30 13:59:09 +0200 mav  r274487 : #i103906# optimize the usage of temporary medium
2009-07-30 13:50:44 +0200 mav  r274485 : #i103906# optimize the usage of temporary medium
2009-07-30 13:49:53 +0200 mav  r274484 : #i103906# optimize the usage of temporary medium
2009-07-30 13:49:13 +0200 mav  r274483 : #i103906# optimize the usage of temporary medium
2009-07-30 13:47:09 +0200 mav  r274482 : #i103905#,#i103906# let the signing process use zip-storage; optimize the usage of temporary medium
2009-07-21 09:10:31 +0200 mav  r274159 : CWS-TOOLING: rebase CWS encsig09 to trunk@273468 (milestone: DEV300:m51)
2009-05-05 08:39:01 +0200 mav  r271496 : #i100832# allow to sign macros only when there are any

6 files changed, 67 insertions, 24 deletions

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index e4c33a274b17..ff7022fd241e 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -68,6 +68,8 @@
 #include "com/sun/star/task/ErrorCodeRequest.hpp"
 #include "com/sun/star/task/MasterPasswordRequest.hpp"
 #include "com/sun/star/task/NoMasterException.hpp"
+#include "com/sun/star/task/DocumentMacroConfirmationRequest.hpp"
+#include "com/sun/star/task/DocumentMacroConfirmationRequest2.hpp"
 #include "com/sun/star/task/XInteractionAbort.hpp"
 #include "com/sun/star/task/XInteractionApprove.hpp"
 #include "com/sun/star/task/XInteractionDisapprove.hpp"
@@ -113,6 +115,7 @@
 #include "svtools/sfxecode.hxx"
 #include "toolkit/helper/vclunohelper.hxx"
 #include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/documentconstants.hxx"
 #include "unotools/configmgr.hxx"
 
 #include "ids.hrc"
@@ -1255,7 +1258,23 @@ bool UUIInteractionHelper::handleErrorHandlerRequests(
     if (aAnyRequest >>= aMacroConfirmRequest)
     {
         handleMacroConfirmRequest(
-            aMacroConfirmRequest,
+            aMacroConfirmRequest.DocumentURL,
+            aMacroConfirmRequest.DocumentStorage,
+            ODFVER_012_TEXT,
+            aMacroConfirmRequest.DocumentSignatureInformation,
+            rRequest->getContinuations()
+        );
+        return true;
+    }
+
+    star::task::DocumentMacroConfirmationRequest2 aMacroConfirmRequest2;
+    if (aAnyRequest >>= aMacroConfirmRequest2)
+    {
+        handleMacroConfirmRequest(
+            aMacroConfirmRequest2.DocumentURL,
+            aMacroConfirmRequest2.DocumentZipStorage,
+            aMacroConfirmRequest2.DocumentVersion,
+            aMacroConfirmRequest2.DocumentSignatureInformation,
             rRequest->getContinuations()
         );
         return true;
@@ -3044,13 +3063,13 @@ UUIInteractionHelper::handleGenericErrorRequest(
     ErrCode  nError   = (ErrCode)nErrorCode;
     sal_Bool bWarning = !ERRCODE_TOERROR(nError);
 
-    if ( nError == ERRCODE_SFX_BROKENSIGNATURE )
+    if ( nError == ERRCODE_SFX_BROKENSIGNATURE
+     || nError == ERRCODE_SFX_INCOMPLETE_ENCRYPTION )
     {
-        // the broken signature warning needs a special title
+        // the security warning need a special title
         String aErrorString;
         ErrorHandler::GetErrorString( nErrorCode, aErrorString );
 
-
         std::auto_ptr< ResMgr >
             xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
         ::rtl::OUString aTitle;
@@ -3064,7 +3083,8 @@ UUIInteractionHelper::handleGenericErrorRequest(
         } catch( star::uno::Exception& )
         {}
 
-        ::rtl::OUString aErrTitle = String( ResId( STR_WARNING_BROKENSIGNATURE_TITLE, *xManager.get() ) );
+        ::rtl::OUString aErrTitle = String( ResId( nError == ERRCODE_SFX_BROKENSIGNATURE ? STR_WARNING_BROKENSIGNATURE_TITLE : STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE, *xManager.get() ) );
+
         if ( aTitle.getLength() && aErrTitle.getLength() )
             aTitle += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " - " ) );
          aTitle += aErrTitle;
@@ -3100,7 +3120,10 @@ namespace
 
 void
 UUIInteractionHelper::handleMacroConfirmRequest(
-    const star::task::DocumentMacroConfirmationRequest& _rRequest,
+    const ::rtl::OUString& aDocumentURL,
+    const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xZipStorage,
+    const ::rtl::OUString& aDocumentVersion,
+    const ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > aSignInfo,
     star::uno::Sequence< star::uno::Reference<
         star::task::XInteractionContinuation > > const & rContinuations
 )
@@ -3114,17 +3137,17 @@ UUIInteractionHelper::handleMacroConfirmRequest(
     std::auto_ptr< ResMgr > pResMgr( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
     if ( pResMgr.get() )
     {
-        bool bShowSignatures = _rRequest.DocumentSignatureInformation.getLength() > 0;
+        bool bShowSignatures = aSignInfo.getLength() > 0;
         MacroWarning aWarning( getParentProperty(), bShowSignatures, *pResMgr.get() );
 
-        aWarning.SetDocumentURL( _rRequest.DocumentURL );
-        if ( _rRequest.DocumentSignatureInformation.getLength() > 1 )
+        aWarning.SetDocumentURL( aDocumentURL );
+        if ( aSignInfo.getLength() > 1 )
         {
-            aWarning.SetStorage( _rRequest.DocumentStorage, _rRequest.DocumentSignatureInformation );
+            aWarning.SetStorage( xZipStorage, aDocumentVersion, aSignInfo );
         }
-        else if ( _rRequest.DocumentSignatureInformation.getLength() == 1 )
+        else if ( aSignInfo.getLength() == 1 )
         {
-            aWarning.SetCertificate( _rRequest.DocumentSignatureInformation[ 0 ].Signer );
+            aWarning.SetCertificate( aSignInfo[ 0 ].Signer );
         }
 
         bApprove = aWarning.Execute() == RET_OK;
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index e8ae3fec2df5..f390e70674ea 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -36,13 +36,15 @@
 #define INCLUDED_VECTOR
 #endif
 #include "osl/mutex.hxx"
-#include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/Sequence.hxx"
+
+#include "com/sun/star/beans/Optional.hpp"
+#include "com/sun/star/embed/XStorage.hpp"
 #include "com/sun/star/task/InteractionClassification.hpp"
 #include "com/sun/star/task/PasswordRequestMode.hpp"
-#include "com/sun/star/task/DocumentMacroConfirmationRequest.hpp"
 #include "com/sun/star/task/FutureDocumentVersionProductUpdateRequest.hpp"
+#include "com/sun/star/security/DocumentSignatureInformation.hpp"
 #include "tools/solar.h"
 #include "tools/errcode.hxx"
 #include "vcl/wintypes.hxx"
@@ -360,7 +362,10 @@ private:
 
     void
     handleMacroConfirmRequest(
-        const ::com::sun::star::task::DocumentMacroConfirmationRequest& _rRequest,
+        const ::rtl::OUString& aDocumentURL,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xZipStorage,
+        const ::rtl::OUString& aDocumentVersion,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > aSignInfo,
         com::sun::star::uno::Sequence<
             com::sun::star::uno::Reference<
                 com::sun::star::task::XInteractionContinuation > > const &
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index bfe6a48aed94..08624a3dda4e 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -87,7 +87,8 @@
 #define STR_ALREADYOPEN_SAVE_MSG (RID_UUI_START + 50)
 #define STR_ALREADYOPEN_RETRY_SAVE_BTN (RID_UUI_START + 51)
 #define STR_ALREADYOPEN_SAVE_BTN (RID_UUI_START + 52)
-#define RID_DLG_NEWER_VERSION_WARNING (RID_UUI_START + 36)
+#define RID_DLG_NEWER_VERSION_WARNING (RID_UUI_START + 53)
+#define STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE (RID_UUI_START + 54)
 
 #define ERRCODE_UUI_IO_ABORT (ERRCODE_AREA_UUI + 0)
 #define ERRCODE_UUI_IO_ACCESSDENIED (ERRCODE_AREA_UUI + 1)
diff --git a/uui/source/ids.src b/uui/source/ids.src
index 3f0e422c1449..cb011f27a7c0 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -50,6 +50,11 @@ String( STR_WARNING_BROKENSIGNATURE_TITLE )
     Text [ en-US ] = "Invalid Document Signature" ;
 };
 
+String( STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE )
+{
+    Text [ en-US ] = "Non-Encrypted Streams" ;
+};
+
 Resource RID_UUI_ERRHDL
 {
     String (ERRCODE_UUI_IO_ABORT & ERRCODE_RES_MASK)
@@ -313,7 +318,7 @@ Resource RID_UUI_ERRHDL
 
     String (ERRCODE_UUI_IO_BROKENPACKAGE & ERRCODE_RES_MASK)
     {
-        Text [ en-US ] = "The file '$(ARG1)' is corrupt and therefore cannot be opened. Should %PRODUCTNAME repair the file?";
+        Text [ en-US ] = "The file '$(ARG1)' is corrupt and therefore cannot be opened. %PRODUCTNAME can try to repair the file.\n\nThe corruption could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the repaired document.\nExecution of macros is disabled for this document.\n\nShould %PRODUCTNAME repair the file?\n";
     };
 
     String (ERRCODE_UUI_IO_BROKENPACKAGE_CANTREPAIR & ERRCODE_RES_MASK)
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 0b2759cbbde8..776c3b4385f2 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <comphelper/sequence.hxx>
+#include "comphelper/documentconstants.hxx"
 #include <comphelper/processfactory.hxx>
 
 #include <vcl/msgbox.hxx>
@@ -122,8 +123,10 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG )
 {
     DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" );
 
+    uno::Sequence< uno::Any > aArgs( 1 );
+    aArgs[0] = uno::makeAny( maODFVersion );
     uno::Reference< security::XDocumentDigitalSignatures > xD(
-        comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ) ), uno::UNO_QUERY );
+        comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ), aArgs ), uno::UNO_QUERY );
     if( xD.is() )
     {
         if( mxCert.is() )
@@ -139,8 +142,10 @@ IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG )
 {
     if( mbSignedMode && maAlwaysTrustCB.IsChecked() )
     {   // insert path into trusted path list
+        uno::Sequence< uno::Any > aArgs( 1 );
+        aArgs[0] = uno::makeAny( maODFVersion );
         uno::Reference< security::XDocumentDigitalSignatures > xD(
-            comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ) ), uno::UNO_QUERY );
+            comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ), aArgs ), uno::UNO_QUERY );
         if( xD.is() )
         {
             if( mxCert.is() )
@@ -337,21 +342,23 @@ void MacroWarning::FitControls()
 }
 
 void MacroWarning::SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore,
-                               const cssu::Sequence< security::DocumentSignatureInformation >& _rInfos )
+                               const ::rtl::OUString& aODFVersion,
+                               const cssu::Sequence< security::DocumentSignatureInformation >& rInfos )
 {
     mxStore = rxStore;
-    sal_Int32   nCnt = _rInfos.getLength();
+    maODFVersion = aODFVersion;
+    sal_Int32   nCnt = rInfos.getLength();
     if( mxStore.is() && nCnt > 0 )
     {
-        mpInfos = &_rInfos;
+        mpInfos = &rInfos;
         String      aCN_Id( String::CreateFromAscii( "CN" ) );
         String      s;
-        s = GetContentPart( _rInfos[ 0 ].Signer->getSubjectName(), aCN_Id );
+        s = GetContentPart( rInfos[ 0 ].Signer->getSubjectName(), aCN_Id );
 
         for( sal_Int32 i = 1 ; i < nCnt ; ++i )
         {
             s.AppendAscii( "\n" );
-            s += GetContentPart( _rInfos[ i ].Signer->getSubjectName(), aCN_Id );
+            s += GetContentPart( rInfos[ i ].Signer->getSubjectName(), aCN_Id );
         }
 
         maSignsFI.SetText( s );
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index a3bac1dcdb9f..17280ecbbac1 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -60,6 +60,7 @@ private:
 
     cssu::Reference< css::security::XCertificate >  mxCert;
     cssu::Reference< css::embed::XStorage >         mxStore;
+    ::rtl::OUString                                 maODFVersion;
     const cssu::Sequence< css::security::DocumentSignatureInformation >*    mpInfos;
 
     FixedImage          maSymbolImg;
@@ -96,6 +97,7 @@ public:
     void    SetDocumentURL( const String& rDocURL );
 
     void    SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore,
+                        const ::rtl::OUString& aODFVersion,
                         const cssu::Sequence< css::security::DocumentSignatureInformation >& _rInfos );
     void    SetCertificate( const cssu::Reference< css::security::XCertificate >& _rxCert );
 };