merge from src641 internal ODK release

7 files changed, 127 insertions, 1045 deletions

diff --git a/offapi/com/sun/star/ucb/AnyCompareFactory.idl b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
deleted file mode 100644
index 333dd3ad4a79..000000000000
--- a/offapi/com/sun/star/ucb/AnyCompareFactory.idl
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************
- *
- *  $RCSfile: AnyCompareFactory.idl,v $
- *
- *  $Revision: 1.1 $
- *
- *  last change: $Author: mav $ $Date: 2002-01-11 17:41:31 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#ifndef __com_sun_star_ucb_AnyCompareFactory_idl__
-#define __com_sun_star_ucb_AnyCompareFactory_idl__
-
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
-#include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
-
-//=============================================================================
-
-module com { module sun { module star { module ucb {
-
-//=============================================================================
-/** is a factory to get <type>XAnyCompare</type> service implementations.
-*/
-service AnyCompareFactory
-{
-    //-------------------------------------------------------------------------
-    /** a factory to get implementations of interface
-        <type>XAnyCompare</type>.
-     */
-    interface com::sun::star::ucb::XAnyCompareFactory;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/ucb/FTPContent.idl b/offapi/com/sun/star/ucb/FTPContent.idl
deleted file mode 100644
index c47092edffc1..000000000000
--- a/offapi/com/sun/star/ucb/FTPContent.idl
+++ /dev/null
@@ -1,265 +0,0 @@
-/*************************************************************************
- *
- *  $RCSfile: FTPContent.idl,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: jsc $ $Date: 2002-11-29 14:58:19 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#ifndef __com_sun_star_ucb_FTPContent_idl__
-#define __com_sun_star_ucb_FTPContent_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
-#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
-#include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
-#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
-#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
-#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
-#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
-#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-
-//=============================================================================
-
-module com { module sun { module star { module ucb {
-
-//=============================================================================
-/** A FTPContent provides an object representing either a (ftp-server-side)
-    directory object allowing listing of children or a content object providing
-    access to a (ftp-server-side) file.
-
-    @see com::sun::star::ucb::FTPContentProvider
-*/
-service FTPContent
-{
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::lang::XComponent;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::ucb::XContent;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-
-        <p>An object representing a directory in the file system is able
-        to create a new object, which in turn can become the representation
-        of a physical file/directory being contained in the initial directory.
-        The precise way is the following:
-
-        <p>
-
-        <ol>
-        <li>
-        Let the parent folder create a new content by calling
-        <member>XContentCreator::createNewContent</member> on it. The content
-        type to use for new directories is
-        "application/vnd.sun.staroffice.ftp-folder". To create a new file
-        use the type "application/vnd.sun.staroffice.ftp-file".
-        As return value you get a new file content object.
-        </li>
-        <li>
-        Set a title at the new object by letting it execute
-        the command "setPropertyValues", which sets at least the property
-        "Title" to a non-empty value ).
-        </li>
-        <li>
-        Let the new object ( not the parent! ) execute the command "insert".
-        This will create the corresponding physical file or directory.
-        For files, you need to supply the implementation of
-        an <type scope="com::sun::star::io">XInputStream</type> with the
-        command's parameters, that provides access to the stream data.
-        </li>
-        </ol>
-
-        </p>
-     */
-    interface com::sun::star::ucb::XContentCreator;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-
-        <p>
-
-        <b>Supported Commands</b>
-
-        <ul>
-        <li>
-        getCommandInfo
-        </li>
-        <li>
-        getPropertySetInfo
-        </li>
-        <li>
-        getPropertyValues
-        </li>
-        <li>
-        setPropertyValues
-        </li>
-        <li>
-        open
-        </li>
-        <li>
-        insert
-        </li>
-        <li>
-        delete
-        </li>
-        </ul>
-
-        <b>Supported Properties</b>
-        <ul>
-        <li>
-        string ContentType ( read-only, either
-        "application/vnd.sun.staroffice.ftp-folder" or
-        "application/vnd.sun.staroffice.ftp-file" )
-        </li>
-        <li>
-        boolean IsDocument ( read-only, always <true/> for files, always
-        <false/> for directories )
-        </li>
-        <li>
-        boolean IsFolder ( read-only ), always <false/> for files, always
-        <true/> for directories )
-        </li>
-        <li>
-        boolean IsReadOnly ( read-only attribute )
-        </li>
-        <li>
-        string Title ( file name )
-        </li>
-        <li>
-        hyper Size ( file size )
-        </li>
-        <li>
-        string Title ( file name )
-        </li>
-        <li>
-        <type scope="com::sun::star::util">DateTime</type>DateCreated ( read-only )
-        </li>
-        </ul>
-        </p>
-     */
-    interface com::sun::star::ucb::XCommandProcessor;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::beans::XPropertiesChangeNotifier;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::beans::XPropertyContainer;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::beans::XPropertySetInfoChangeNotifier;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::ucb::XCommandInfoChangeNotifier;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::container::XChild;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/ucb/FTPContentProvider.idl b/offapi/com/sun/star/ucb/FTPContentProvider.idl
deleted file mode 100644
index a613f6d5c2e0..000000000000
--- a/offapi/com/sun/star/ucb/FTPContentProvider.idl
+++ /dev/null
@@ -1,101 +0,0 @@
-/*************************************************************************
- *
- *  $RCSfile: FTPContentProvider.idl,v $
- *
- *  $Revision: 1.1 $
- *
- *  last change: $Author: abi $ $Date: 2002-11-14 13:10:39 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#ifndef __com_sun_star_ucb_FTPContentProvider_idl__
-#define __com_sun_star_ucb_FTPContentProvider_idl__
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
-#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-
-//=============================================================================
-
-module com { module sun { module star { module ucb {
-
-//=============================================================================
-/** The FTP Content Provider (FCP) implements a <type>ContentProvider</type>
-    for the <Type>UniversalContentBroker</type> (UCB).
-
-    <p>The served contents enable access to directories and files on a
-    ftp-server.
-
-    @see com::sun::star::ucb::Content
-*/
-
-service FTPContentProvider
-{
-    //-------------------------------------------------------------------------
-    /** provides an object representing either a (ftp-server side) directory
-        object allowing listing of children or a content object providing
-        access a (ftp-server side) file.
-
-        @see com::sun::star::ucb::FTPContent
-     */
-
-    interface com::sun::star::ucb::XContentProvider;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/ucb/InteractiveAppException.idl b/offapi/com/sun/star/ucb/InteractiveAppException.idl
deleted file mode 100644
index d497907146d1..000000000000
--- a/offapi/com/sun/star/ucb/InteractiveAppException.idl
+++ /dev/null
@@ -1,92 +0,0 @@
-/*************************************************************************
- *
- *  $RCSfile: InteractiveAppException.idl,v $
- *
- *  $Revision: 1.1 $
- *
- *  last change: $Author: mav $ $Date: 2002-09-25 10:20:43 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
-#define __com_sun_star_ucb_InteractiveIOException_idl__
-
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
-#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
-#include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
-
-
-//=============================================================================
-
-module com { module sun { module star { module ucb {
-
-//=============================================================================
-/** An application error.
-*/
-exception InteractiveAppException: com::sun::star::task::ClassifiedInteractionRequest
-{
-    //-------------------------------------------------------------------------
-    /** The type of application error.
-    */
-    unsigned long Code;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/ucb/ODMAContent.idl b/offapi/com/sun/star/ucb/ODMAContent.idl
deleted file mode 100644
index cdfed4f7c6c8..000000000000
--- a/offapi/com/sun/star/ucb/ODMAContent.idl
+++ /dev/null
@@ -1,243 +0,0 @@
-/*************************************************************************
- *
- *  $RCSfile: ODMAContent.idl,v $
- *
- *  $Revision: 1.3 $
- *
- *  last change: $Author: obo $ $Date: 2002-08-19 16:15:02 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#ifndef __com_sun_star_ucb_ODMAContent_idl__
-#define __com_sun_star_ucb_ODMAContent_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
-#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
-#include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
-#include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
-#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
-#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
-#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
-#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-
-//=============================================================================
-
-module com { module sun { module star { module ucb {
-
-//=============================================================================
-/** A OCP content is representation of a document saved in a DMS.
-
-    <p>The document Content corresponds to a document stored in a Document Management System.
-    </p>
-
-    @see com::sun::star::ucb::ODMAContentProvider
-    @see com::sun::star::ucb::Content
-*/
-service ODMAContent
-{
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::lang::XComponent;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::ucb::XContent;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-
-        <p>
-
-        <b>Supported Commands</b>
-        <ul>
-        <li>
-        getCommandInfo
-        </li>
-        <li>
-        getPropertySetInfo
-        </li>
-        <li>
-        getPropertyValues
-        </li>
-        <li>
-        setPropertyValues
-        </li>
-        <li>
-        delete
-        </li>
-        <li>
-        open
-        </li>
-        <li>
-        close
-        </li>
-        </ul>
-
-        <b>Supported Properties</b>
-        <ul>
-        <li>
-        string ContentType ( read-only, always "application/vnd.sun.star.odma" )
-        </li>
-        <li>
-        boolean IsDocument
-        </li>
-        <li>
-        boolean IsFolder
-        </li>
-        <li>
-        <type scope="com::sun::star::util">DateTime</type> DateCreated ( read-only )
-        </li>
-        <li>
-        <type scope="com::sun::star::util">DateTime</type> DateModified ( read-only )
-        </li>
-        <li>
-        string Author
-        </li>
-        <li>
-        string Subject
-        </li>
-        <li>
-        string Keywords
-        </li>
-        <li>
-        string Size ( read-only )
-        </li>
-        <li>
-        string Title
-        </li>
-        </ul>
-
-        </p>
-     */
-    interface com::sun::star::ucb::XCommandProcessor;
-
-    //-------------------------------------------------------------------------
-    /** is an enhanced version of <type>XCommandProcessor</type> that has an
-        additional method for releasing command identifiers obtained via
-        <member>XCommandProcessor::createCommandIdentifier</member> to avoid
-        resource leaks. For a detailed description of the problem refer to
-        <member>XCommandProcessor2::releaseCommandIdentifier</member>.
-
-        <p>Where many existing <type>Content</type> implementations do not
-        (yet), every new implementation should support this interface.
-     */
-    [optional] interface com::sun::star::ucb::XCommandProcessor2;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::beans::XPropertiesChangeNotifier;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::beans::XPropertyContainer;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::beans::XPropertySetInfoChangeNotifier;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::ucb::XCommandInfoChangeNotifier;
-
-    //-------------------------------------------------------------------------
-    /** This interface is implemented according to the specification of
-        service <type>Content</type>.
-     */
-    interface com::sun::star::container::XChild;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/ucb/ODMAContentProvider.idl b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
deleted file mode 100644
index 966e8a2a4911..000000000000
--- a/offapi/com/sun/star/ucb/ODMAContentProvider.idl
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************
- *
- *  $RCSfile: ODMAContentProvider.idl,v $
- *
- *  $Revision: 1.1 $
- *
- *  last change: $Author: oj $ $Date: 2002-03-25 10:48:19 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#ifndef __com_sun_star_ucb_ODMAContentProvider_idl__
-#define __com_sun_star_ucb_ODMAContentProvider_idl__
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
-#include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-//=============================================================================
-
-module com { module sun { module star { module ucb {
-
-//=============================================================================
-/** The ODMA Content Provider (OCP) implements a <type>ContentProvider</type>
-    for the <type>UniversalContentBroker</type> (UCB).
-
-    <p>It provides access to a document structure stored on a Document Management System (DMS).</p>
-
-
-    @see com::sun::star::ucb::ContentProvider
-    @see com::sun::star::ucb::Content
-    @see com::sun::star::ucb::ODMAContent
-*/
-service ODMAContentProvider
-{
-    //-------------------------------------------------------------------------
-    /** provides two types of content; the document and the Root Folder.
-
-        <p>
-
-        <ol>
-        <li><p>The document Content corresponds to a document stored on the
-            DMS.</p>
-        <li><p>The Root Folder exists at any time and is used to show all
-            documents avaible at that time. All other OCP contents are children
-            of this folder. The OCP Root Folder can only contain OCP Documents.
-            It has the URL &bdquo;<b>vnd.sun.star.odma:/</b>&ldquo;.</p>
-        </ol>
-
-
-
-        <p><b>URL Scheme for OCP Contents</b>
-        <p>Each OCP content has an identifier corresponding to the following
-        scheme:</p>
-        <p>vnd.sun.star.odma:/&lt;name&gt;</p>
-        <p>where &lt;name&gt; is the DocumentID given by the DMS.</p>
-        <p STYLE="font-weight: medium">Examples:</p>
-        <p><b>vnd.sun.star.odma:/ </b><span STYLE="font-weight: medium">( The
-        URL of the OCP Root Folder )</span></p>
-        <p STYLE="font-weight: medium"><b>vnd.sun.star.odma:/</b> a document
-        id given by the DMS</p>
-        <p><b>vnd.sun.star.odma:/</b>::ODMA\DMS_ID\DM_SPECIFIC_INFO</p>
-
-        </p>
-     */
-    interface com::sun::star::ucb::XContentProvider;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/ucb/makefile.mk b/offapi/com/sun/star/ucb/makefile.mk
index 579e728925c7..c780fa6bf2db 100644
--- a/offapi/com/sun/star/ucb/makefile.mk
+++ b/offapi/com/sun/star/ucb/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.37 $
+#   $Revision: 1.38 $
 #
-#   last change: $Author: jsc $ $Date: 2002-11-29 14:58:34 $
+#   last change: $Author: mi $ $Date: 2003-01-21 13:43:42 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -39,7 +39,7 @@
 #   The contents of this file are subject to the Sun Industry Standards
 #   Source License Version 1.1 (the "License"); You may not use this file
 #   except in compliance with the License. You may obtain a copy of the
-#   License at http:#www.openoffice.org/license.html.
+#   License at http://www.openoffice.org/license.html.
 #
 #   Software provided under this License is provided on an "AS IS" basis,
 #   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
@@ -74,7 +74,6 @@ PACKAGE=com$/sun$/star$/ucb
 
 IDLFILES=\
     AlreadyInitializedException.idl\
-    AnyCompareFactory.idl\
     AuthenticationRequest.idl\
     CachedContentResultSet.idl\
     CachedContentResultSetFactory.idl\
@@ -84,12 +83,12 @@ IDLFILES=\
     CachedDynamicResultSetFactory.idl\
     CachedDynamicResultSetStub.idl\
     CachedDynamicResultSetStubFactory.idl\
+    CHAOSProgressStart.idl\
     ChaosContent.idl\
     ChaosContentProvider.idl\
-    CHAOSProgressStart.idl\
     Command.idl\
     CommandAbortedException.idl\
-    CommandFailedException.idl\
+        CommandFailedException.idl\
     CommandInfo.idl\
     CommandInfoChange.idl\
     CommandInfoChangeEvent.idl\
@@ -113,42 +112,38 @@ IDLFILES=\
     CookieRequest.idl\
     CrossReference.idl\
     DataContainer.idl\
-    DefaultHierarchyDataSource.idl\
+        DefaultHierarchyDataSource.idl\
     DocumentHeaderField.idl\
     DocumentStoreMode.idl\
-    DuplicateCommandIdentifierException.idl\
+        DuplicateCommandIdentifierException.idl\
     DuplicateProviderException.idl\
     DynamicResultSet.idl\
     Error.idl\
     ExportStreamInfo.idl\
     FetchError.idl\
     FetchResult.idl\
-    FileContent.idl\
     FileContentProvider.idl\
+    FileContent.idl\
     FileSystemNotation.idl\
     FolderList.idl\
     FolderListCommand.idl\
     FolderListEntry.idl\
-    FTPContent.idl\
-    FTPContentProvider.idl\
     GlobalTransferCommandArgument.idl\
     HandleCookiesRequest.idl\
     HelpContent.idl\
     HelpContentProvider.idl\
     HierarchyContentProvider.idl\
-    HierarchyDataReadAccess.idl\
-    HierarchyDataReadWriteAccess.idl\
-    HierarchyDataSource.idl\
+        HierarchyDataSource.idl\
+        HierarchyDataReadAccess.idl\
+        HierarchyDataReadWriteAccess.idl\
     HierarchyFolderContent.idl\
     HierarchyLinkContent.idl\
     HierarchyRootFolderContent.idl\
     IllegalIdentifierException.idl\
     InsertCommandArgument.idl\
-    InteractiveAppException.idl\
-    InteractiveAugmentedIOException.idl\
+        InteractiveAugmentedIOException.idl\
     InteractiveBadTransferURLException.idl\
     InteractiveCHAOSException.idl\
-    InteractiveFileIOException.idl\
     InteractiveIOException.idl\
     InteractiveNetworkConnectException.idl\
     InteractiveNetworkException.idl\
@@ -158,6 +153,7 @@ IDLFILES=\
     InteractiveNetworkResolveNameException.idl\
     InteractiveNetworkWriteException.idl\
     InteractiveWrongMediumException.idl\
+    InteractiveFileIOException.idl\
     IOErrorCode.idl\
     Link.idl\
     ListAction.idl\
@@ -169,123 +165,121 @@ IDLFILES=\
     LockEntry.idl\
     LockScope.idl\
     LockType.idl\
-     MissingInputStreamException.idl\
-     MissingPropertiesException.idl\
-     NameClash.idl\
-     NameClashException.idl\
-     NameClashResolveRequest.idl\
-     NumberedSortingInfo.idl\
-     ODMAContent.idl\
-     ODMAContentProvider.idl\
-     OpenCommandArgument.idl\
-     OpenCommandArgument2.idl\
-     OpenMode.idl\
-     OutgoingMessageState.idl\
-     PackageContentProvider.idl\
-     PackageFolderContent.idl\
-     PackageStreamContent.idl\
-     PersistentPropertySet.idl\
-     PostCommandArgument.idl\
-     PostCommandArgument2.idl\
-     Priority.idl\
-     PropertiesManager.idl\
-     PropertyMatcherFactory.idl\
-     PropertySetRegistry.idl\
-     PropertyValueInfo.idl\
-     PropertyValueState.idl\
-     RecipientInfo.idl\
-     RememberAuthentication.idl\
-     RemoteAccessContentProvider.idl\
-     RemoteContentProviderAcceptor.idl\
-     RemoteContentProviderChangeAction.idl\
-     RemoteContentProviderChangeEvent.idl\
-     RemoteProxyContentProvider.idl\
-     ResultSetException.idl\
+        MissingInputStreamException.idl\
+        MissingPropertiesException.idl\
+    NameClash.idl\
+        NameClashException.idl\
+        NameClashResolveRequest.idl\
+    NumberedSortingInfo.idl\
+    OpenCommandArgument.idl\
+    OpenCommandArgument2.idl\
+    OpenMode.idl\
+    OutgoingMessageState.idl\
+    PackageContentProvider.idl\
+    PackageFolderContent.idl\
+    PackageStreamContent.idl\
+    PersistentPropertySet.idl\
+    PostCommandArgument.idl\
+        PostCommandArgument2.idl\
+    Priority.idl\
+    PropertiesManager.idl\
+    PropertyMatcherFactory.idl\
+    PropertyValueInfo.idl\
+    PropertyValueState.idl\
+    PropertySetRegistry.idl\
+    RememberAuthentication.idl\
+    RemoteAccessContentProvider.idl\
+    RemoteContentProviderAcceptor.idl\
+    RemoteContentProviderChangeAction.idl\
+    RemoteContentProviderChangeEvent.idl\
+    RemoteProxyContentProvider.idl\
+    RecipientInfo.idl\
+    ResultSetException.idl\
     Rule.idl\
-     RuleAction.idl\
-     RuleOperator.idl\
-     RuleSet.idl\
-     RuleTerm.idl\
-     SearchCommandArgument.idl\
-     SearchCriterium.idl\
-     SearchInfo.idl\
-     SearchRecursion.idl\
-     SendInfo.idl\
-     SendMediaTypes.idl\
-     ServiceNotFoundException.idl\
-     SimpleFileAccess.idl\
-     SortedDynamicResultSetFactory.idl\
-     SortingInfo.idl\
-     Store.idl\
-     SynchronizePolicy.idl\
-     TransferCommandOperation.idl\
-     TransferInfo.idl\
-     TransferResult.idl\
-     UniversalContentBroker.idl\
-     UnsupportedCommandException.idl\
-     UnsupportedDataSinkException.idl\
-     UnsupportedNameClashException.idl\
-     UnsupportedOpenModeException.idl\
-     VerificationMode.idl\
-     WebDAVContentProvider.idl\
-     WebDAVDocumentContent.idl\
-     WebDAVFolderContent.idl\
-     WelcomeDynamicResultSetStruct.idl\
-     XAnyCompare.idl\
-     XAnyCompareFactory.idl\
-     XCachedContentResultSetFactory.idl\
-     XCachedContentResultSetStubFactory.idl\
-     XCachedDynamicResultSetFactory.idl\
-     XCachedDynamicResultSetStubFactory.idl\
-     XCommandEnvironment.idl\
-     XCommandInfo.idl\
-     XCommandInfoChangeListener.idl\
-     XCommandInfoChangeNotifier.idl\
-     XCommandProcessor.idl\
-     XCommandProcessor2.idl\
-     XContent.idl\
-     XContentAccess.idl\
-     XContentCreator.idl\
-     XContentEventListener.idl\
-     XContentIdentifier.idl\
-     XContentIdentifierFactory.idl\
-     XContentIdentifierMapping.idl\
-     XContentProvider.idl\
-     XContentProviderFactory.idl\
-     XContentProviderManager.idl\
-     XContentProviderSupplier.idl\
-     XContentTransmitter.idl\
-     XDataContainer.idl\
-     XDynamicResultSet.idl\
-     XDynamicResultSetListener.idl\
-     XFetchProvider.idl\
-     XFetchProviderForContentAccess.idl\
-     XFileIdentifierConverter.idl\
-     XInteractionCookieHandling.idl\
-     XInteractionHandlerSupplier.idl\
-     XInteractionReplaceExistingData.idl\
-     XInteractionSupplyAuthentication.idl\
-     XInteractionSupplyName.idl\
-     XParameterizedContentProvider.idl\
-     XPersistentPropertySet.idl\
-     XProgressHandler.idl\
-     XPropertyMatcher.idl\
-     XPropertyMatcherFactory.idl\
-     XPropertySetRegistry.idl\
-     XPropertySetRegistryFactory.idl\
-     XRecycler.idl\
-     XRemoteContentProviderAcceptor.idl\
-     XRemoteContentProviderActivator.idl\
-     XRemoteContentProviderChangeListener.idl\
-     XRemoteContentProviderChangeNotifier.idl\
-     XRemoteContentProviderConnectionControl.idl\
-     XRemoteContentProviderDistributor.idl\
-     XRemoteContentProviderDoneListener.idl\
-     XRemoteContentProviderSupplier.idl\
-     XSimpleFileAccess.idl\
-     XSimpleFileAccess2.idl\
-     XSortedDynamicResultSetFactory.idl\
-     XSourceInitialization.idl
+    RuleAction.idl\
+    RuleOperator.idl\
+    RuleSet.idl\
+    RuleTerm.idl\
+    SearchCommandArgument.idl\
+    SearchCriterium.idl\
+    SearchInfo.idl\
+    SearchRecursion.idl\
+    SendInfo.idl\
+    SendMediaTypes.idl\
+    ServiceNotFoundException.idl\
+    SimpleFileAccess.idl\
+    SortedDynamicResultSetFactory.idl\
+    SortingInfo.idl\
+    Store.idl\
+    SynchronizePolicy.idl\
+    TransferCommandOperation.idl\
+    TransferInfo.idl\
+    TransferResult.idl\
+    UniversalContentBroker.idl\
+    UnsupportedCommandException.idl\
+        UnsupportedDataSinkException.idl\
+        UnsupportedNameClashException.idl\
+        UnsupportedOpenModeException.idl\
+    VerificationMode.idl\
+    WebDAVContentProvider.idl\
+    WebDAVDocumentContent.idl\
+    WebDAVFolderContent.idl\
+    WelcomeDynamicResultSetStruct.idl\
+    XAnyCompare.idl\
+    XAnyCompareFactory.idl\
+    XCachedContentResultSetFactory.idl\
+    XCachedContentResultSetStubFactory.idl\
+    XCachedDynamicResultSetFactory.idl\
+    XCachedDynamicResultSetStubFactory.idl\
+    XCommandEnvironment.idl\
+    XCommandInfo.idl\
+    XCommandInfoChangeListener.idl\
+    XCommandInfoChangeNotifier.idl\
+    XCommandProcessor.idl\
+        XCommandProcessor2.idl\
+    XContent.idl\
+    XContentAccess.idl\
+    XContentCreator.idl\
+    XContentEventListener.idl\
+    XContentIdentifier.idl\
+    XContentIdentifierFactory.idl\
+    XContentIdentifierMapping.idl\
+    XContentProvider.idl\
+    XContentProviderFactory.idl\
+    XContentProviderManager.idl\
+    XContentProviderSupplier.idl\
+    XContentTransmitter.idl\
+    XDataContainer.idl\
+    XDynamicResultSet.idl\
+    XDynamicResultSetListener.idl\
+    XFetchProvider.idl\
+    XFetchProviderForContentAccess.idl\
+    XFileIdentifierConverter.idl\
+    XInteractionCookieHandling.idl\
+    XInteractionHandlerSupplier.idl\
+        XInteractionReplaceExistingData.idl\
+    XInteractionSupplyAuthentication.idl\
+        XInteractionSupplyName.idl\
+    XParameterizedContentProvider.idl\
+    XPersistentPropertySet.idl\
+    XProgressHandler.idl\
+    XPropertyMatcher.idl\
+    XPropertyMatcherFactory.idl\
+    XPropertySetRegistry.idl\
+    XPropertySetRegistryFactory.idl\
+    XRecycler.idl\
+    XRemoteContentProviderAcceptor.idl\
+    XRemoteContentProviderActivator.idl\
+    XRemoteContentProviderChangeListener.idl\
+    XRemoteContentProviderChangeNotifier.idl\
+    XRemoteContentProviderConnectionControl.idl\
+    XRemoteContentProviderDistributor.idl\
+    XRemoteContentProviderDoneListener.idl\
+    XRemoteContentProviderSupplier.idl\
+    XSimpleFileAccess.idl\
+        XSimpleFileAccess2.idl\
+    XSortedDynamicResultSetFactory.idl\
+    XSourceInitialization.idl
 
 # ------------------------------------------------------------------