3 files changed, 6 insertions, 85 deletions
diff --git a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
index de6c5b3d070b..923d4433abfa 100644
--- a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
@@ -51,7 +51,8 @@ exception DocumentMacroConfirmationRequest : ClassifiedInteractionRequest
     */
     string  DocumentURL;
 
-    /** refers to the storage which the document was last committed to.
+    /** refers to the storage related to the last commited version of the
+        document.
 
         This storage is necessary e.g. for displaying the existing signatures to
         the user, to allow him a decision whether or not to trust those signatures
@@ -62,6 +63,10 @@ exception DocumentMacroConfirmationRequest : ClassifiedInteractionRequest
     ::com::sun::star::embed::XStorage
             DocumentStorage;
 
+    /** contains informations about the ODF version of the document
+    */
+    string DocumentVersion;
+
     /** contains informations about the signatures in the document
     */
     sequence< ::com::sun::star::security::DocumentSignatureInformation >
diff --git a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl
deleted file mode 100644
index 422f1ab2a9d0..000000000000
--- a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl
+++ /dev/null
@@ -1,83 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DocumentMacroConfirmationRequest.idl,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __com_sun_star_task_DocumentMacroConfirmationRequest2_idl__
-#define __com_sun_star_task_DocumentMacroConfirmationRequest2_idl__
-
-#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#include <com/sun/star/embed/XStorage.idl>
-#include <com/sun/star/security/DocumentSignatureInformation.idl>
-
-
-//=============================================================================
-
-module com { module sun { module star { module task {
-
-//=============================================================================
-
-/** describes the request to approve or deny the execution of macros contained in
-    a document.
- */
-exception DocumentMacroConfirmationRequest2 : ClassifiedInteractionRequest
-{
-    /** specifies the URL of the document which contains macros whose execution
-        should be approved or rejected.
-    */
-    string  DocumentURL;
-
-    /** refers to the zip-storage related to the last commited version of the
-        document.
-
-        This storage is necessary e.g. for displaying the existing signatures to
-        the user, to allow him a decision whether or not to trust those signatures
-        and thus the signed macros.
-
-        @see ::com::sun::star::security::XDocumentDigitalSignatures::showScriptingContentSignatures
-    */
-    ::com::sun::star::embed::XStorage
-            DocumentZipStorage;
-
-    /** contains informations about the ODF version of the document
-    */
-    string DocumentVersion;
-
-    /** contains informations about the signatures in the document
-    */
-    sequence< ::com::sun::star::security::DocumentSignatureInformation >
-            DocumentSignatureInformation;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-//=============================================================================
-
-#endif
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index d77b1d6022e7..ac6dac61bc06 100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@ -45,7 +45,6 @@ PACKAGE=com$/sun$/star$/task
 IDLFILES=\
     ClassifiedInteractionRequest.idl\
     DocumentMacroConfirmationRequest.idl\
-    DocumentMacroConfirmationRequest2.idl\
     DocumentPasswordRequest.idl\
     DocumentMSPasswordRequest.idl\
     ErrorCodeRequest.idl\