CWS-TOOLING: integrate CWS kso42

13 files changed, 463 insertions, 19 deletions

diff --git a/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl b/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl
new file mode 100644
index 000000000000..ded6c6c23f77
--- /dev/null
+++ b/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * 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: $
+ * $Revision: $
+ *
+ * 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_PasswordContainerInteractionHandler_idl__
+#define __com_sun_star_task_PasswordContainerInteractionHandler_idl__
+
+module com { module sun { module star {
+    module task { published interface XInteractionHandler; };
+}; }; };
+
+module com { module sun { module star { module task {
+
+//============================================================================
+/** An interaction request handler that uses the
+    <type scope="com::sun::star::task">PasswordContainer</type> service to
+    handle <type scope="com::sun::star::ucb">AuthenticationRequest</type>s.
+
+    If the password container contains credentials matching the authentication
+    request, the service implementation selects the
+    <type scope="com::sun::star::ucb">XInteractionSupplyAuthentication</type>
+    continuation, that should be supplied with the interaction request.
+
+    If the password container does not contain credentials matching the
+    authentication request, the service implementation selects no continuation.
+
+    @since OOo 3.3
+ */
+published service PasswordContainerInteractionHandler
+   : com::sun::star::task::XInteractionHandler;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
index 93839e68fb07..9ac704c56ba0 100644
--- a/offapi/com/sun/star/task/XUrlContainer.idl
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -46,6 +46,8 @@ module com { module sun { module star { module task {
 //=============================================================================
 /** Allows to store and retrieve URLs. URLs can be stored persistently or
     until end of OOo session.
+
+    @since OOo 3.2
 */
 /*published*/ interface XUrlContainer : com::sun::star::uno::XInterface
 {
@@ -63,7 +65,7 @@ module com { module sun { module star { module task {
     /** Lookup a URL in the container.
 
         @param Url     URL to lookup.
-         @returns       Best matched URL or empty string.
+        @returns       Best matched URL or empty string.
     */
     string findUrl( [in] string Url );
 
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index dc54f6fd3883..d77b1d6022e7 100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 # Copyright IBM Corporation 2009.
 #
@@ -59,6 +59,7 @@ IDLFILES=\
     MasterPasswordRequest.idl\
     NoMasterException.idl\
     PasswordContainer.idl\
+    PasswordContainerInteractionHandler.idl\
     PasswordRequest.idl\
     PasswordRequestMode.idl\
     UnsupportedOverwriteRequest.idl\
diff --git a/offapi/com/sun/star/ucb/CommandEnvironment.idl b/offapi/com/sun/star/ucb/CommandEnvironment.idl
new file mode 100644
index 000000000000..a1ca2aa72fc4
--- /dev/null
+++ b/offapi/com/sun/star/ucb/CommandEnvironment.idl
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * 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: SmoketestCommandEnvironment.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_ucb_CommandEnvironment_idl_
+#define _com_sun_star_ucb_CommandEnvironment_idl_
+
+#include <com/sun/star/ucb/XCommandEnvironment.idl>
+#include <com/sun/star/task/XInteractionHandler.idl>
+#include <com/sun/star/ucb/XProgressHandler.idl>
+
+module com { module sun { module star { module ucb {
+
+ /* This service implements an <type>XCommandEnvironment</type> that can be
+    initialized with any implementation of
+    <type scope="com::sun::star::task">XInteractionHandler</type> and
+    <type scope="com::sun::star::ucb">XProgressHandler</type>. The respective
+    get methods will simply return these handlers.
+
+    @since OOo 3.3
+ */
+ published service CommandEnvironment : ::com::sun::star::ucb::XCommandEnvironment
+ {
+    //-------------------------------------------------------------------------
+    /** Constructor.
+
+        @param InteractionHandler the interaction handler instance that will be
+                                  returned by this service' implementation of
+                                  <method>XCommandEnvironemt::getInteractionHandler</method>
+
+        @param ProgressHandler    the progress handler instance that will be
+                                  returned by this service' implementation of
+                                  <method>XCommandEnvironemt::getProgressHandler</method>
+    */
+     create( [in] com::sun::star::task::XInteractionHandler InteractionHandler,
+             [in] com::sun::star::ucb::XProgressHandler ProgressHandler );
+ };
+
+};};};};
+
+#endif
diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl
index 2e8f68067883..eef4f474e527 100644
--- a/offapi/com/sun/star/ucb/Content.idl
+++ b/offapi/com/sun/star/ucb/Content.idl
@@ -137,7 +137,7 @@ published service Content
                 [parameter type and name]
 
         -----------------------------------------------------------------------
-        Requiered commands:
+        Mandatory commands:
         -----------------------------------------------------------------------
 
         // This command obtains an interface which allows to query
@@ -218,7 +218,7 @@ published service Content
         //                sequence is the same as the order of result set
         //                columns. First element of sequence will be row
         //                number one, second will be row number two, ...
-        // SortingInfo  : contains sort criteria, if result set shall
+        // SortingInfo      : contains sort criteria, if result set shall
         //                be sorted, otherwise it can be left empty.
         //
         // The exceution must be aborted by the implementation of this command
@@ -236,12 +236,12 @@ published service Content
         //
         // Mode         : DOCUMENT or DOCUMENT_SHARE_DENY_NONE or
         //                DOCUMENT_SHARE_DENY_WRITE. Support for DOCUMENT
-         //                is mandatory, all others are optional.
+        //                is mandatory, all others are optional.
         // Priority     : can be set, but implementation may ignore the value
         // Sink         : a sink, where the implementation can put the
         //                document data into.
         // Properties   : empty ( ignored )
-        // SortingInfo  : empty ( ignored )
+        // SortingInfo      : empty ( ignored )
         //
         // The exceution must be aborted by the implementation of this command
         // (by throwing a <type>CommandAbortedException</type>), if an
@@ -296,8 +296,8 @@ published service Content
                 void
 
         // (1) This command inserts a new content. It commits the process of
-        // creating a new content via calling another content's method
-        // <member>XContentCreator::createNewContent</member>
+        // creating a new content via executing the command "createNewContent"
+        // and initializing it via setting properties, afterwards.
         // The command is not called on the content which created the new
         // content, because the new object already knows where it is to be
         // inserted (i.e. Calling createNewContent with the content type for a
@@ -350,7 +350,7 @@ published service Content
         // Transfers without the transfer command can be done as follows:
         //
         // 1) Create a new content at the target folder
-        //    --> targetContent = target.XContentCreator::createNewContent(...)
+        //    --> targetContent = target.execute( "createNewContent", type )
         // 2) Transfer data from source to target content
         //    --> props = sourceContent.execute( "getPropertyValues", ... )
         //    --> dataStream = sourceContent.execute( "open", ... )
@@ -366,12 +366,57 @@ published service Content
             <B>transfer</B>
                 <type>TransferInfo</type> aTransferInfo
 
+        // This command obtains an exlusive write lock for the resource. The
+        // lock is active until command "unlock" is executed or the OOo
+        // session that obtained the lock ends or until the lock is released by
+        // a third party (e.g. a system administrator).
+        void
+            <B>lock</B>
+                void
+        Exceptions: <type>InteractiveLockingLockedException</type>
+                    <type>InteractiveLockingLockExpiredException</type>
+
+        // This command removes a lock obtained by executing the command "lock"
+        // from the resource.
+        void
+            <B>unlock</B>
+                void
+        Exceptions: <type>InteractiveLockingNotLockedException</type>
+                    <type>InteractiveLockingLockExpiredException</type>
+
+        // Note that <type>InteractiveLockingLockExpiredException</type> might
+        // be raised by any command that requires a previously obtained lock.
+
+        // This command creates a new non-persistent content of a given type.
+        //
+        // <p>Creation of a new (persistent) content:
+        // <ol>
+        //    <li>creatabletypes = obtain "CreatableContentsInfo" property<br>
+        //        from creator
+        //    <li>choose a suitable type from creatabletypes
+        //    <li>newObject = execute command "createNewContent(type)" at<br>
+        //        creator
+        //    <li>initialize the new object (i.e. newObject.Property1 = ...)
+        //    <li>execute command "insert" at new content. This command
+        //        commits the data and makes the new content persistent.
+        // </ol>
+        //
+        // This command must be supported by every Content that supports the
+        // property "CreatableContentsInfo" if the returned property value
+        // contains a non-empty sequence of creatable types.
+        //
+        // Note: This command is part of the replacement for the deprecated
+        // interface <type>XContentCreator</type>.
+        <type>XContent</type> >
+            <B>createNewContent</B>
+                <type>ContentInfo<type> contentinfo
+
         =======================================================================
         Properties:
         =======================================================================
 
         -----------------------------------------------------------------------
-        Requiered properties:
+        Mandatory properties:
         -----------------------------------------------------------------------
 
         // contains a unique(!) type string for the content ( i.e.
@@ -380,8 +425,8 @@ published service Content
         // content. Media types may be provided through the optional property
         // "MediaType".
         // The value of this property should match the information on creatable
-        // contents given by UCB contents that implement the interface
-        // <type>XContentCreator</type>.
+        // contents given by UCB contents that implement the property
+        // "CreatableContentsInfo".
         string ContentType
 
         // indicates, whether a content can contain other contents.
@@ -570,7 +615,6 @@ published service Content
         </dt><dd>Show in new task
         </dd></dl>
         </p>
-
         string TargetFrames
 
         // for contents that are links to other contents, contains the URL of
@@ -586,6 +630,17 @@ published service Content
 
         // describes a verification policy.
         <type>VerificationMode</type> VerificationMode
+
+        // contains the types of Contents a Content object can create via
+        // command "createNewContent".
+        //
+        // If the property value can be a non-empty sequence, the Content must
+        // also support command "createNewContent".
+        //
+        // Note: This property is part of the replacement for the deprecated
+        // interface <type>XContentCreator</type>.
+        sequence <type>ContentInfo</type> CreatableContentsInfo
+
         </pre>
      */
     interface com::sun::star::ucb::XCommandProcessor;
@@ -675,6 +730,11 @@ published service Content
 
         <p>This interface is optional. It should be implemented by contents
         which shall be able to create new objects.
+
+        @deprecated
+
+        <p>This interface is <b>deprecated</b>. Use property
+        "CreatableContentsInfo" and command "createNewContent" instead.
      */
     [optional] interface com::sun::star::ucb::XContentCreator;
 
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingException.idl b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
new file mode 100644
index 000000000000..8d96358566fa
--- /dev/null
+++ b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * 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: $
+ * $Revision: $
+ *
+ * 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_ucb_InteractiveLockingException_idl__
+#define __com_sun_star_ucb_InteractiveLockingException_idl__
+
+#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
+#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
+#endif
+
+
+//=============================================================================
+
+module com { module sun { module star { module ucb {
+
+//=============================================================================
+/** An error related to locking operations.
+
+    <p> Various meaningful errors are derived from this exception. </p>
+
+    @since OOo 3.3
+*/
+/*published*/ exception InteractiveLockingException : com::sun::star::task::ClassifiedInteractionRequest
+{
+    //-------------------------------------------------------------------------
+    /** The Url of the resource this exception is related to.
+    */
+    string Url;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
new file mode 100644
index 000000000000..63ddfa58bf2f
--- /dev/null
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * 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: $
+ * $Revision: $
+ *
+ * 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_ucb_InteractiveLockingLockExpiredException_idl__
+#define __com_sun_star_ucb_InteractiveLockingLockExpiredException_idl__
+
+#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
+#include <com/sun/star/ucb/InteractiveLockingException.idl>
+#endif
+
+
+//=============================================================================
+
+module com { module sun { module star { module ucb {
+
+//=============================================================================
+/** An error indicating that a lock that has been previously obtained by this
+    OOo session has expired.
+
+    @since OOo 3.3
+*/
+/*published*/ exception InteractiveLockingLockExpiredException : com::sun::star::ucb::InteractiveLockingException
+{
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
new file mode 100644
index 000000000000..33f309ec0b81
--- /dev/null
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * 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: $
+ * $Revision: $
+ *
+ * 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_ucb_InteractiveLockingLockedException_idl__
+#define __com_sun_star_ucb_InteractiveLockingLockedException_idl__
+
+#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
+#include <com/sun/star/ucb/InteractiveLockingException.idl>
+#endif
+
+
+//=============================================================================
+
+module com { module sun { module star { module ucb {
+
+//=============================================================================
+/** An error indicating that the resource is locked.
+
+    @since OOo 3.3
+*/
+/*published*/ exception InteractiveLockingLockedException : com::sun::star::ucb::InteractiveLockingException
+{
+    //-------------------------------------------------------------------------
+    /** The owner of the lock.
+
+        <true/>, the lock has been obtained by this OOo session.
+        <false/> the lock has been obtained by another principal.
+    */
+    boolean SelfOwned;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
new file mode 100644
index 000000000000..88d587b4cb24
--- /dev/null
+++ b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * 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: $
+ * $Revision: $
+ *
+ * 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_ucb_InteractiveLockingNotLockedException_idl__
+#define __com_sun_star_ucb_InteractiveLockingNotLockedException_idl__
+
+#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
+#include <com/sun/star/ucb/InteractiveLockingException.idl>
+#endif
+
+
+//=============================================================================
+
+module com { module sun { module star { module ucb {
+
+//=============================================================================
+/** An error indicating that the resource is not locked.
+
+    <p>This error for instance can occure when trying to unlock a resource
+       that is not locked.
+    </p>
+
+    @since OOo 3.3
+*/
+/*published*/ exception InteractiveLockingNotLockedException : com::sun::star::ucb::InteractiveLockingException
+{
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
index 1b19830df81e..84d5f7d6cb7c 100644
--- a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
@@ -42,6 +42,8 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** An error specifing lack of correct authentication data (e.g., to log into
     an account).
+
+    @since OOo 3.2
 */
 /*published*/ exception URLAuthenticationRequest : AuthenticationRequest
 {
diff --git a/offapi/com/sun/star/ucb/XContentCreator.idl b/offapi/com/sun/star/ucb/XContentCreator.idl
index 72b2dd02f6b5..df0c89a1b398 100644
--- a/offapi/com/sun/star/ucb/XContentCreator.idl
+++ b/offapi/com/sun/star/ucb/XContentCreator.idl
@@ -52,12 +52,19 @@ module com { module sun { module star { module ucb {
 
     <p>Creation of a new (persistent) content:
     <ol>
-        <li>newObject = creator.createNewContent( ... )
+        <li>creatabletypes = creator.queryCreatableContentsInfo()
+        <li>choose a suitable type from creatabletypes
+        <li>newObject = creator.createNewContent( type )
         <li>initialize the new object (i.e. newObject.Property1 = ...)
         <li>let the new content execute the command "insert". That command
             commits the data and makes the new content persistent.
     </ol>
 
+    @deprecated
+
+    <p>This interface is deprecated.  Use <type>Content</type> property
+       "CreatableContentsInfo" and command "createNewContent" instead.
+
     @version  1.0
     @author   Kai Sommerfeld
     @see      XContent
@@ -74,13 +81,13 @@ published interface XContentCreator: com::sun::star::uno::XInterface
     sequence<com::sun::star::ucb::ContentInfo> queryCreatableContentsInfo();
 
     //-------------------------------------------------------------------------
-    /** creates a new content of given type..
+    /** creates a new content of given type.
 
         @param Info
         the content information.
 
         @returns
-        the new content, if operation was succesful.
+        the new content, if operation was successful.
     */
     com::sun::star::ucb::XContent createNewContent(
                         [in] com::sun::star::ucb::ContentInfo Info );
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
index a3c4bdb3d5f3..01241f108950 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
@@ -45,6 +45,8 @@ module com { module sun { module star { module ucb {
 
     <p> This continuation is typically used in conjunction with
     <type>AuthenticationRequest</type>. </p>
+
+    @since OOo 3.2
 */
 /*published*/ interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication
 {
diff --git a/offapi/com/sun/star/ucb/makefile.mk b/offapi/com/sun/star/ucb/makefile.mk
index 19320b716634..573453e554e5 100644
--- a/offapi/com/sun/star/ucb/makefile.mk
+++ b/offapi/com/sun/star/ucb/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -55,8 +55,10 @@ IDLFILES=\
     CachedDynamicResultSetStub.idl\
     CachedDynamicResultSetStubFactory.idl\
     CHAOSProgressStart.idl\
+    CertificateValidationRequest.idl\
     Command.idl\
     CommandAbortedException.idl\
+    CommandEnvironment.idl\
     CommandFailedException.idl\
     CommandInfo.idl\
     CommandInfoChange.idl\
@@ -122,6 +124,10 @@ IDLFILES=\
     InteractiveCHAOSException.idl\
     InteractiveFileIOException.idl\
     InteractiveIOException.idl\
+    InteractiveLockingException.idl\
+    InteractiveLockingLockedException.idl\
+    InteractiveLockingLockExpiredException.idl\
+    InteractiveLockingNotLockedException.idl\
     InteractiveNetworkConnectException.idl\
     InteractiveNetworkException.idl\
     InteractiveNetworkGeneralException.idl\
@@ -264,8 +270,7 @@ IDLFILES=\
     XSimpleFileAccess3.idl\
     XSortedDynamicResultSetFactory.idl\
     XSourceInitialization.idl\
-    XWebDAVCommandEnvironment.idl \
-    CertificateValidationRequest.idl
+    XWebDAVCommandEnvironment.idl
 
 # ------------------------------------------------------------------