CWS-TOOLING: integrate CWS dba301a_DEV300

3 files changed, 125 insertions, 1 deletions

diff --git a/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl b/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl
new file mode 100644
index 000000000..7104b6e43
--- /dev/null
+++ b/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl
@@ -0,0 +1,68 @@
+/*************************************************************************
+* 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: FutureDocumentVersionProductUpdateRequest.idl,v $
+*
+* $Revision: 1.1.2.1 $
+*
+* 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.
+************************************************************************/
+
+#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
+
+#ifndef __com_sun_star_task_FutureDocumentVersionProductUpdateRequest_idl__
+#define __com_sun_star_task_FutureDocumentVersionProductUpdateRequest_idl__
+
+//=============================================================================
+
+module com { module sun { module star { module task { 
+
+//=============================================================================
+
+/** describes a request to the user to update OpenOffice.org to a newer version, since
+    an ODF document was encountered which conforms to an ODF version unknown to the
+    current OpenOffice.org version.
+
+    <p>An interaction request of this type usually comes with an <type>XInteractionApprove</type>,
+    and <type>XInteractionDisapprove</type>, and <type>XInteractionAskLater</type> continuation.</p>
+ */
+exception FutureDocumentVersionProductUpdateRequest : ClassifiedInteractionRequest
+{
+    /// specifies the URL of the document which conforms to a future ODF version
+    string DocumentURL;
+
+    /** the ODF version which the document conforms to
+
+        <p>If the request was not issued because of a too-new ODF version of the document, but because
+        the application detected by other means that the document was too-new, then <code>DocumentODFVersion</code>
+        is allowed to be empty</p>
+    */
+    string DocumentODFVersion;
+};
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/task/XInteractionAskLater.idl b/offapi/com/sun/star/task/XInteractionAskLater.idl
new file mode 100644
index 000000000..b9b2ae8dd
--- /dev/null
+++ b/offapi/com/sun/star/task/XInteractionAskLater.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+* 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: XInteractionAskLater.idl,v $
+*
+* $Revision: 1.1.2.1 $
+*
+* 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_XInteractionAskLater_idl__
+#define __com_sun_star_task_XInteractionAskLater_idl__
+
+#include <com/sun/star/task/XInteractionContinuation.idl> 
+
+//=============================================================================
+
+module com { module sun { module star { module task { 
+
+//=============================================================================
+
+/** specifies a continuation where the user does not actually decide the question
+    she was confronted with, but postpones the decision to a later time.
+ */
+interface XInteractionAskLater : com::sun::star::task::XInteractionContinuation
+{
+};
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index d84f39bec..890ee0bc3 100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.23 $
+# $Revision: 1.23.130.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -47,6 +47,7 @@ IDLFILES=\
     DocumentPasswordRequest.idl\
     ErrorCodeRequest.idl\
     ErrorCodeIOException.idl\
+    FutureDocumentVersionProductUpdateRequest.idl\
     InteractionClassification.idl\
     InteractionHandler.idl\
     JobExecutor.idl\
@@ -62,6 +63,7 @@ IDLFILES=\
     UserRecord.idl\
     XAsyncJob.idl\
     XInteractionApprove.idl\
+    XInteractionAskLater.idl\
     XInteractionDisapprove.idl\
     XInteractionPassword.idl\
     XJob.idl\