merge DEV300_m77

48 files changed, 1214 insertions, 399 deletions

diff --git a/offapi/com/sun/star/chart/XChartDataArray.idl b/offapi/com/sun/star/chart/XChartDataArray.idl
index 011597f41f66..4e7519864382 100644
--- a/offapi/com/sun/star/chart/XChartDataArray.idl
+++ b/offapi/com/sun/star/chart/XChartDataArray.idl
@@ -39,6 +39,8 @@
 
 /** gives access to data represented as an array of rows.
 
+    <p>Can be obtained from interface <type>XChartDocument</type> via method getData().</p>
+
     <p>If used for an <type>XYDiagram</type>, the row number 0
     represents the <i>x</i>-values.</p>
  */
diff --git a/offapi/com/sun/star/chart/XChartDocument.idl b/offapi/com/sun/star/chart/XChartDocument.idl
index 05966982b992..14322c6edf4a 100644
--- a/offapi/com/sun/star/chart/XChartDocument.idl
+++ b/offapi/com/sun/star/chart/XChartDocument.idl
@@ -136,20 +136,38 @@ published interface XChartDocument: com::sun::star::frame::XModel
     //-------------------------------------------------------------------------
 
     /** @returns
-            the data source of the chart.
+            the data of the chart.
 
-        @see ChartData
+        <p>The returned object supports interface <type>XChartDataArray</type>
+        which can be used to access the concrete data.</p>
+
+        <p>Since OOo 3.3 the returned object also supports interface <type>XComplexDescriptionAccess</type>
+        which can be used to access complex hierarchical axis descriptions.</p>
+
+        @see XChartData
+        @see XChartDataArray
+        @see XComplexDescriptionAccess
      */
     com::sun::star::chart::XChartData getData();
 
     //-------------------------------------------------------------------------
 
-    /** attaches an external data source to the chart.
+    /** attaches data to the chart.
+
+        <p>The given object needs to support interface <type>XChartDataArray</type>.</p>
+
+        <p>Since OOo 3.3 if the given object might support interface <type>XComplexDescriptionAccess</type>
+        which allows to set complex hierarchical axis descriptions.</p>
+
+        <p>The given data is copied before it is applied to the chart.
+        So changing xData after this call will have no effect on the chart.</p>
 
-        @see ChartData
+        @see XChartData
+        @see XChartDataArray
+        @see XComplexDescriptionAccess
 
         @param xData
-            the component that provides the new data.
+            the object that provides the new data.
      */
     void attachData( [in] com::sun::star::chart::XChartData xData );
 
diff --git a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
new file mode 100644
index 000000000000..4e5af5f3ba83
--- /dev/null
+++ b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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_chart_XComplexDescriptionAccess_idl__
+#define __com_sun_star_chart_XComplexDescriptionAccess_idl__
+
+#ifndef __com_sun_star_chart_XChartDataArray_idl__
+#include <com/sun/star/chart/XChartDataArray.idl>
+#endif
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module chart {
+
+//=============================================================================
+
+/** Offers access to complex column and row descriptions.
+
+<p>Can be obtained from interface <type>XChartDocument</type> via method getData().</p>
+
+@since OOo 3.3
+*/
+
+published interface XComplexDescriptionAccess : XChartDataArray
+{
+    //-------------------------------------------------------------------------
+
+    /** retrieves the description texts for all rows.
+
+        @returns
+            a sequence of sequences of strings representing the descriptions
+            of all rows. The outer index represents different rows.
+            The inner index represents the different levels (usually there is only one).
+     */
+    sequence< sequence< string > > getComplexRowDescriptions();
+
+    //-------------------------------------------------------------------------
+
+    /** sets the description texts for all rows.
+
+        @param rRowDescriptions
+            a sequence of sequences of strings representing the descriptions of all
+            rows. The outer index represents different rows.
+            The inner index represents the different levels (usually there is only one).
+    */
+    void setComplexRowDescriptions( [in] sequence< sequence< string > > rRowDescriptions );
+
+    //-------------------------------------------------------------------------
+
+    /** retrieves the description texts for all columns.
+
+        @returns
+            a sequence of sequences of strings representing the descriptions
+            of all columns. The outer index represents different columns.
+            The inner index represents the different levels (usually there is only one).
+     */
+    sequence< sequence< string > > getComplexColumnDescriptions();
+
+    //-------------------------------------------------------------------------
+
+    /** sets the description texts for all columns.
+
+        @param rColumnDescriptions
+            a sequence of sequences of strings which represent the descriptions of
+            all columns. The outer index represents different columns.
+            The inner index represents the different levels (usually there is only one).
+     */
+    void setComplexColumnDescriptions( [in] sequence< sequence< string > > rColumnDescriptions );
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk
index 7e3c01393824..2c0b93256b3b 100644
--- a/offapi/com/sun/star/chart/makefile.mk
+++ b/offapi/com/sun/star/chart/makefile.mk
@@ -103,6 +103,7 @@ IDLFILES=\
     XChartDataArray.idl\
     XChartDataChangeEventListener.idl\
     XChartDocument.idl\
+    XComplexDescriptionAccess.idl\
     XDiagram.idl\
     XStatisticDisplay.idl\
     XTwoAxisXSupplier.idl\
diff --git a/offapi/com/sun/star/chart2/InterpretedData.idl b/offapi/com/sun/star/chart2/InterpretedData.idl
index dfa2b27493ce..0eedd9c44df3 100644
--- a/offapi/com/sun/star/chart2/InterpretedData.idl
+++ b/offapi/com/sun/star/chart2/InterpretedData.idl
@@ -51,10 +51,6 @@ struct InterpretedData
     /**
      */
     data::XLabeledDataSequence                  Categories;
-
-    /**
-     */
-    sequence< data::XLabeledDataSequence >      UnusedData;
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
index 5f8947baaed7..05308ba7dfcf 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -78,12 +78,10 @@ interface XChartTypeTemplate : ::com::sun::star::uno::XInterface
         [in] data::XDataSource xDataSource,
         [in] sequence< com::sun::star::beans::PropertyValue > aArguments );
 
-    /** Return the names of parameters that are interpreted in the
-        <member>createDiagramByDataSource</member> method.
-
-        @see StandardChartTypeTemplateParameters
+    /** @return
+            <TRUE/> if the template does support categories
      */
-    sequence< string > getAvailableCreationParameterNames();
+    boolean supportsCategories();
 
     /** Analyses the given diagram and reinterprets its
         <type>DataSeries</type> and <type>Categories</type> and
diff --git a/offapi/com/sun/star/chart2/XDataInterpreter.idl b/offapi/com/sun/star/chart2/XDataInterpreter.idl
index d6cd1b19ee50..14238dc531a5 100644
--- a/offapi/com/sun/star/chart2/XDataInterpreter.idl
+++ b/offapi/com/sun/star/chart2/XDataInterpreter.idl
@@ -74,10 +74,6 @@ interface XDataInterpreter  : ::com::sun::star::uno::XInterface
 
     /** Re-interprets the data given in <code>aInterpretedData</code>
         while keeping the number of data series and the categories.
-
-        <p>the data passed in
-        <member>InterpretedData::UnusedData</member> may be used to be
-        added to existing <type>DataSeries</type>.</p>
      */
     InterpretedData reinterpretDataSeries( [in] InterpretedData aInterpretedData );
 
@@ -85,11 +81,6 @@ interface XDataInterpreter  : ::com::sun::star::uno::XInterface
         <member>reinterpretDataSeries</member> call can be done
         without data loss.
 
-        <p>if this method returns <TRUE/>, a call to
-        <member>reinterpretDataSeries</member> should leave the
-        <member>InterpretedData::UnusedData</member> list
-        untouched.</p>
-
         @return
             <TRUE/>, if the data given in
             <code>aInterpretedData</code> has a similar structure than
diff --git a/offapi/com/sun/star/chart2/XDiagram.idl b/offapi/com/sun/star/chart2/XDiagram.idl
index c38f8b0824f7..3836489b7aed 100644
--- a/offapi/com/sun/star/chart2/XDiagram.idl
+++ b/offapi/com/sun/star/chart2/XDiagram.idl
@@ -87,10 +87,6 @@ interface XDiagram : ::com::sun::star::uno::XInterface
         colors for data series (or data points) in the diagram.
      */
     void setDefaultColorScheme( [in] XColorScheme xColorScheme );
-
-    void setUnusedData( [in] sequence< data::XLabeledDataSequence > aUnusedData );
-
-    sequence< data::XLabeledDataSequence > getUnusedData();
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/XInternalDataProvider.idl b/offapi/com/sun/star/chart2/XInternalDataProvider.idl
index 5504e7f79abe..a1f9caa64092 100644
--- a/offapi/com/sun/star/chart2/XInternalDataProvider.idl
+++ b/offapi/com/sun/star/chart2/XInternalDataProvider.idl
@@ -39,7 +39,7 @@ module star
 module chart2
 {
 
-/** An internal DataProvider that has more access to data that a plain
+/** An internal DataProvider that has more access to data than a plain
     DataProvider.
  */
 interface XInternalDataProvider  : com::sun::star::chart2::data::XDataProvider
@@ -73,6 +73,17 @@ interface XInternalDataProvider  : com::sun::star::chart2::data::XDataProvider
         it has to be explicitly registered via this method.</p>
      */
     void registerDataSequenceForChanges( [in] data::XDataSequence xSeq );
+
+    /** insert an additional sequence for categories nLevel>=1;
+    categories at level 0 are always present and cannot be inserted or deleted
+    @since OOo 3.3
+    */
+    void insertComplexCategoryLevel( [in] long nLevel );
+    /** deletes an additional sequence for categories at nLevel>=1;
+    categories at level 0 are always present and cannot be deleted
+    @since OOo 3.3
+    */
+    void deleteComplexCategoryLevel( [in] long nLevel );
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/data/XDataReceiver.idl b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
index fa8cd9823c00..10602cee2f34 100644
--- a/offapi/com/sun/star/chart2/data/XDataReceiver.idl
+++ b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
@@ -73,24 +73,6 @@ interface XDataReceiver : ::com::sun::star::uno::XInterface
      */
     void attachDataProvider( [in] XDataProvider xProvider );
 
-    /** Sets the data for the chart as a whole.  When this method is
-        called, all currently set data is removed.  It is replaced by
-        the data that is returned by the current
-        <type>XDataProvider</type> by using the given range
-        representation.
-
-        @param aRangeRepresentation
-            This range representation must be in a format that is
-            understood by the currently attached
-            <type>XDataProvider</type>.
-
-        @throws com::sun::star::lang::IllegalArgumentException
-            If the range representation could not dealt with by the
-            current data provider, or there is currently no data
-            provider at all.
-     */
-//     void setRangeRepresentation( [in] string aRangeRepresentation )
-//         raises( com::sun::star::lang::IllegalArgumentException );
     void setArguments( [in] sequence< com::sun::star::beans::PropertyValue > aArguments )
         raises( com::sun::star::lang::IllegalArgumentException );
 
diff --git a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
index c3b98b115a52..870af90e7986 100644
--- a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
@@ -43,6 +43,10 @@ module com { module sun { module star { module configuration {
 
 /*  provides access to a configuration tree as a registry.
 
+    <p>This service is deprecated,
+    <type scope="com.sun.star.configuration">ConfigurationProvider</type> should
+    be used instead.</p>
+
     <p> Using the <type scope="com::sun::star::registry">XSimpleRegistry</type>
     interface, the service can be bound to a subtree within the
     configuration tree, as provided by an
diff --git a/offapi/com/sun/star/deployment/LicenseException.idl b/offapi/com/sun/star/deployment/LicenseException.idl
index ac4396f6db43..4d3996da191b 100644
--- a/offapi/com/sun/star/deployment/LicenseException.idl
+++ b/offapi/com/sun/star/deployment/LicenseException.idl
@@ -47,6 +47,14 @@ exception LicenseException : com::sun::star::uno::Exception
     /** contains the text of the license.
     */
     string Text;
+
+    /** indicates if the user can prevent to show the license
+
+    Represents the attribute value
+    /description/registration/simple-license/@suppress-if-required
+    from the description.xml
+    */
+    boolean SuppressIfRequired;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl b/offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl
index 67b82664c03d..4239d14f075f 100644
--- a/offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl
+++ b/offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl
@@ -45,6 +45,13 @@ exception LicenseIndividualAgreementException : com::sun::star::uno::Exception
         Contains the file name only.
      */
     string ExtensionName;
+    /** indicates if the user can prevent to show the license
+
+    Represents the attribute value
+    /description/registration/simple-license/@suppress-if-required
+    from the description.xml
+    */
+    boolean SuppressIfRequired;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/document/XDocumentRecovery.idl b/offapi/com/sun/star/document/XDocumentRecovery.idl
new file mode 100644
index 000000000000..e5bf521d07f0
--- /dev/null
+++ b/offapi/com/sun/star/document/XDocumentRecovery.idl
@@ -0,0 +1,127 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* 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 __offapcom_sun_star_document_XDocumentRecovery_idl__
+#define __offapcom_sun_star_document_XDocumentRecovery_idl__
+
+#include <com/sun/star/beans/PropertyValue.idl>
+#include <com/sun/star/io/IOException.idl>
+#include <com/sun/star/lang/WrappedTargetException.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module document {
+
+//=============================================================================
+
+/** is the interface to be implemented by documents who wish to participate in
+    the document emergency-save / recovery process.
+ */
+interface XDocumentRecovery
+{
+    /** determines whether the document has been modified since the last call to <member>storeToRecoveryFile</member>.
+
+        <p>If <code>storeToRecoveryFile</code> has not been called before, this method returns whether the document
+        has been modified since it has been loaded respectively created.</p>
+
+        <p>When saving a session, either in case of a emergency (when OpenOffice.org crashed), or during a
+        periodic session save as configured by the user, <member>storeToRecoveryFile</member> is called for every
+        document where <code>wasModifiedSinceLastSave</code> returns <TRUE/>.</p>
+
+        <p>It's allowed to implement this method sloppy, by returning <TRUE/> in cases where it is not sure whether
+        the document actually has been modified. So, the most simple implementation could simply delegate this call
+        to <member scope="com::sun::star::util">XModifiable::isModified</member>. (Well, actually that's the
+        second simple implementation, the <em>most</em> simple one would, still egitimately, always return <TRUE/>.)</p>
+
+        <p>However, in such a case, the document might be saved more often than needed. In particular during the
+        periodic session save, this might become a problem when saving is expensive, for a single document
+        or the sum of all open documents.</p>
+    */
+    boolean wasModifiedSinceLastSave();
+
+    /** does an emergency save of the document
+
+        <p>A default implementation of this method could simply delegate this call to
+        <member scope="com::sun::star::frame">XStorable::storeToURL</member>.</p>
+
+        @param TargetLocation
+            specifies the URL of the location to which the document should be emergency-saved.
+
+        @param MediaDescriptor
+            contains additional arguments for the save process, for instance an StatusIndicator.
+
+        @see MediaDescriptor
+    */
+    void    storeToRecoveryFile(
+                [in] string TargetLocation,
+                [in] sequence< ::com::sun::star::beans::PropertyValue > MediaDescriptor
+            )
+            raises  (   ::com::sun::star::io::IOException,
+                        ::com::sun::star::lang::WrappedTargetException
+                    );
+
+    /** recovers the document after a previous emergency or session save.
+
+        <p>The document itself has previously been created, but <em>not</em> loaded
+        (via <member scope="com::sun::star::frame">XLoadable::load</member>) or initialized (via
+        <member scope="com::sun::star::frame">XLoadable::initNew</member>).</p>
+
+        <p>Upon successful return, the document must be fully initialized. In particular, the
+        caller is not responsible for calling <member scope="com::sun::star::frame">XModel::attachResource</member>.
+        Instead, the implementation is responsible to do so, if required.</p>
+
+        <p>A default implementation of this method could simply delegate this call to
+        <member scope="::com::sun::star::frame:">XLodable::load</member>, followed by
+        <member scope="com::sun::star::frame">XModel::attachResource</member>.</p>
+
+        @param SourceLocation
+            specifies the URL of the location to which the document was previously emergency-saved.
+
+        @param SalvagedFile
+            specifies the original URL of the file which had been emergency-saved. If this is empty,
+            then the file should be recovered from its original location.
+
+        @param MediaDescriptor
+            contains additional arguments for the load process, for instance an StatusIndicator.
+
+        @see MediaDescriptor
+    */
+    void    recoverFromFile(
+                [in] string SourceLocation,
+                [in] string SalvagedFile,
+                [in] sequence< ::com::sun::star::beans::PropertyValue > MediaDescriptor
+            )
+            raises  (   ::com::sun::star::io::IOException,
+                        ::com::sun::star::lang::WrappedTargetException
+                    );
+};
+
+//=============================================================================
+
+}; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/document/makefile.mk b/offapi/com/sun/star/document/makefile.mk
index 2d9b6211af4e..48394a65008c 100644
--- a/offapi/com/sun/star/document/makefile.mk
+++ b/offapi/com/sun/star/document/makefile.mk
@@ -83,6 +83,7 @@ IDLFILES=\
     XDocumentInsertable.idl\
     XDocumentProperties.idl\
     XDocumentPropertiesSupplier.idl\
+    XDocumentRecovery.idl\
     XDocumentSubStorageSupplier.idl\
     XEmbeddedObjectResolver.idl\
     XEmbeddedObjectSupplier.idl\
diff --git a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
index c8baeb14a54b..733db10e61b1 100644
--- a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
+++ b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
@@ -51,6 +51,8 @@
 #include <com/sun/star/frame/XDispatchProviderInterceptor.idl>
 #endif
 
+#include <com/sun/star/embed/XStorage.idl>
+
 //============================================================================
 
 module com { module sun { module star { module embed {
@@ -89,6 +91,19 @@ service EmbeddedObjectDescriptor
     [optional,property] ::com::sun::star::frame::XDispatchProviderInterceptor
                                                 OutplaceDispatchInterceptor;
 
+    /** denotes the storage from which the embedded object is to be recovered.
+
+        <p>Upon activating the embedded object, it is normally loaded from a storage as denoted by
+        the parameters to the <type>XEmbedObjectCreator</type> method calls.</p>
+
+        <p>You can pass a non-<NULL/> <code>RecoveryStorage</code> in the object descriptor if you wish to load the
+        embedded object from an alternate storage.</p>
+
+        <p>The object will still be based on the storage denoted in the <code>XEmbedObjectCreator</code> method
+        call, i.e., subsequent save operations will still use that storage. <code>RecoveryStorage</code> is used
+        at loading time only, and then discarded.</p>
+    */
+    [optional, property] XStorage RecoveryStorage;
 };
 
 //============================================================================
diff --git a/offapi/com/sun/star/frame/XController2.idl b/offapi/com/sun/star/frame/XController2.idl
index b1e92ff63823..2c0157d99309 100644
--- a/offapi/com/sun/star/frame/XController2.idl
+++ b/offapi/com/sun/star/frame/XController2.idl
@@ -29,6 +29,7 @@
 
 #include <com/sun/star/frame/XController.idl>
 #include <com/sun/star/awt/XWindow.idl>
+#include <com/sun/star/beans/PropertyValue.idl>
 
 //=============================================================================
 
@@ -58,6 +59,16 @@ interface XController2 : XController
         - if it's passed there, a view/controller pair of the same type will be created.</p>
     */
     [readonly, attribute] string                            ViewControllerName;
+
+    /** denotes the arguments used to create the instance.
+
+        <p>Usually, controllers are created via <member>XModel2::createViewController</member>, where the
+        caller can pass not only a controller name, but also arguments parametrizing the to-be-created instance.
+        Those arguments used at creation time can subsequently be retrieved using the <code>CreationArguments</code>
+        member.</p>
+    */
+    [readonly, attribute] sequence< ::com::sun::star::beans::PropertyValue >
+                                                            CreationArguments;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rendering/TexturingMode.idl b/offapi/com/sun/star/rendering/TexturingMode.idl
index 9d54940b9dcf..b44a78eae6ce 100644
--- a/offapi/com/sun/star/rendering/TexturingMode.idl
+++ b/offapi/com/sun/star/rendering/TexturingMode.idl
@@ -36,13 +36,24 @@ module com { module sun { module star { module rendering {
  */
 constants TexturingMode
 {
+    /** Pixel outside the texture area are fully transparent.<p>
+
+        This completely switches off pixel generation outside the
+        texture coordinate range [0,1]. This results in only one
+        instance of the texture generated per textured primitive.<p>
+       */
+    const byte NONE=0;
+
+    //-------------------------------------------------------------------------
+
     /** Clamp texture coordinate.<p>
 
-        This value clamps the texture coordinate to the range
+        This value clamps the texture coordinates to the range
         [0,1]. This results in only one instance of the texture
-        generated per textured primitive.<p>
+        generated per textured primitive, with the remaining area
+        filled with the color of the outermost texels<p>
        */
-    const byte CLAMP=0;
+    const byte CLAMP=1;
 
     //-------------------------------------------------------------------------
 
@@ -51,7 +62,7 @@ constants TexturingMode
         This value repeats the texture over the textured primitive,
         for the given texture coordinate.<p>
      */
-    const byte REPEAT=1;
+    const byte REPEAT=2;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index c48f7e3e184d..a9caaefede7e 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -45,12 +45,12 @@
 #ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XBezierPolyPolygon2D.idl>
 #endif
-#ifndef __com_sun_star_rendering_XParametricPolyPolygon2DFactory_idl__
-#include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl>
-#endif
 #ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
 #endif
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
+#include <com/sun/star/lang/XMultiServiceFactory.idl>
+#endif
 
 module com { module sun { module star { module rendering {
 
@@ -217,8 +217,67 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         this is not advisable: each canvas implementation is free to
         internally generate optimized parametric polygons, which can
         be used more directly for e.g. texturing operations.
+
+        <pre>
+        Available services (all canvas implementations should provide
+        this minimal set, though are free to add more; just check the
+        getAvailableServiceNames() on the returned interface):
+
+        - Gradients - all gradients need to support two construction
+          parameters, "Colors" being a <type>sequence<Color></type>
+          and "Stops" being a <type>sequence<double></type>. Both must
+          have the same length, and at least two elements. See
+          http://www.w3.org/TR/SVG11/pservers.html#GradientStops for
+          the semantics of gradient stops and colors.
+          Required gradient services:
+
+          * "LinearGradient" - the gradient varies linearly between
+            the given colors. without coordinate system
+            transformation, the color interpolation happens in
+            increasing x direction, and is constant in y
+            direction. Equivalent to svg linear gradient
+            http://www.w3.org/TR/SVG11/pservers.html#LinearGradients
+
+          * "EllipticalGradient" - this gradient has zeroth color
+            index in the middle, and varies linearly between center
+            and final color. The services takes an additional
+            parameter named "AspectRatio" of <type>double</type>
+            (width divided by height), if this aspect ratio is 1, the
+            gradient is circular. If it's not 1, the gradient is
+            elliptical, with the special twist that the aspect ratio
+            is maintained also for the center color: the gradient will
+            not collapse into a single point, but become a line of
+            center color. If "AspectRatio" is missing, or equal to 1,
+            this gradient yields similar results as the svg radial
+            gradient
+            http://www.w3.org/TR/SVG11/pservers.html#RadialGradients
+
+          * "RectangularGradient" - this gradient has zeroth color
+            index in the middle, and varies linearly between center
+            and final color via rectangular boxes
+            around the center point. The services takes an additional
+            parameter named "AspectRatio" of <type>double</type>
+            (width divided by height), if this aspect ratio is 1, the
+            gradient is quadratic. If it's not 1, the gradient is
+            rectangular, with the special twist that the aspect ratio
+            is maintained also for the center color: the gradient will
+            not collapse into a single point, but become a line of
+            center color.
+
+        - Hatch patterns - Required hatch services:
+
+          * "VerticalLineHatch" - this hatching consists of vertical lines
+          * "OrthogonalLinesHatch" - this hatching consists of
+            crossing vertical and horizontal lines
+          * "ThreeCrossingLinesHatch" - this hatching consists of
+            vertical and horizontal lines plus diagonal lines from
+            left, top to bottom, right.
+          * "FourCrossingLinesHatch" - this hatching consists of
+            vertical and horizontal lines plus diagonal lines in both
+            directions.
+        </pre>
      */
-    XParametricPolyPolygon2DFactory getParametricPolyPolygonFactory();
+    com::sun::star::lang::XMultiServiceFactory getParametricPolyPolygonFactory();
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl b/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 2471849864a1..000000000000
--- a/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,152 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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_rendering_XParametricPolyPolygon2DFactory_idl__
-#define __com_sun_star_rendering_XParametricPolyPolygon2DFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
-#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
-#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
-
-
-module com { module sun { module star { module rendering {
-
-interface XParametricPolyPolygon2D;
-
-/** This interface provides factory methods to generate various
-    ready-made XParametricPolyPolygon2Ds
- */
-interface XParametricPolyPolygon2DFactory : ::com::sun::star::uno::XInterface
-{
-    /** Create a linear gradient.
-
-        The gradient varies linearly between colors. the color positions on <0, 1> interval are given by stops values
-        in the x direction, and has constant color for fixed x
-        coordinate value in y direction
-     */
-    XParametricPolyPolygon2D    createLinearHorizontalGradient( [in] sequence<Color> colors, [in] sequence<double> stops )
-        raises (com::sun::star::lang::IllegalArgumentException);
-
-    /** Create an axial gradient.
-
-        The gradient has middleColor in the middle, and varies
-        linearly between middleColor and endColor to both sides in the
-        x direction. For fixed x coordinate, the gradient has constant
-        color value in y direction.
-     */
-    XParametricPolyPolygon2D    createAxialHorizontalGradient( [in] sequence<Color> colors, [in] sequence<double> stops )
-        raises (com::sun::star::lang::IllegalArgumentException);
-
-    /** Create an elliptical gradient.
-
-        The gradient has centerColor in the middle, and varies
-        linearly between center and endColor via concentric ellipses
-        around the center point. Note that the absolute size of the
-        rectangle given at this method does not matter, only it's
-        aspect ratio: if this aspect ratio is 1, the gradient is
-        circular. If it's not 1, the gradient is elliptical, with the
-        special twist that the aspect ratio is maintained also for the
-        center color: the gradient will not collapse into a single
-        point, but become a line of center color.
-     */
-    XParametricPolyPolygon2D    createEllipticalGradient( [in] sequence<Color> colors, [in] sequence<double> stops, [in] ::com::sun::star::geometry::RealRectangle2D boundRect )
-        raises (com::sun::star::lang::IllegalArgumentException);
-
-    /** Create a rectangular gradient.
-
-        The gradient has centerColor in the middle, and varies
-        linearly between center and endColor via rectangular boxes
-        around the center point. Note that the absolute size of the
-        rectangle given at this method does not matter, only it's
-        aspect ratio: if this aspect ratio is 1, the gradient is
-        quadratic. If it's not 1, the gradient is rectangular, with
-        the special twist that the aspect ratio is maintained also for
-        the center color: the gradient will not collapse into a single
-        point, but become a line of center color.
-     */
-    XParametricPolyPolygon2D    createRectangularGradient( [in] sequence<Color> colors, [in] sequence<double> stops, [in] ::com::sun::star::geometry::RealRectangle2D boundRect )
-        raises (com::sun::star::lang::IllegalArgumentException);
-
-    /** Create a line hash of vertical lines.
-
-        The hashing consists of vertical lines, with colors varying
-        linearly between leftColor and rightColor, when going from
-        left to right
-     */
-    XParametricPolyPolygon2D    createVerticalLinesHatch( [in] sequence<ColorComponent> leftColor, [in] sequence<ColorComponent> rightColor )
-        raises (com::sun::star::lang::IllegalArgumentException);
-
-    /** Create a line hash of orthogonally crossing lines.
-
-        The hashing consists of vertical and horizontal lines, with
-        colors varying linearly between leftTopColor and
-        rightBottomColor, when going from left to right (for the
-        vertical lines) and from top tzo bottom (for the horizontal
-        lines).
-     */
-    XParametricPolyPolygon2D    createOrthogonalLinesHatch( [in] sequence<ColorComponent> leftTopColor, [in] sequence<ColorComponent> rightBottomColor )
-        raises (com::sun::star::lang::IllegalArgumentException);
-
-    /** Create a repeating line hash pattern of three crossing lines.
-
-        The hashing consists of vertical and horizontal lines plus
-        diagonal lines from left, top to bottom, right. Each of the
-        three groups of lines varies the line color of distinct lines
-        linearly from startColor to endColor, starting at the leftmost
-        or topmost position.
-     */
-    XParametricPolyPolygon2D    createThreeCrossingLinesHatch( [in] sequence<ColorComponent> startColor, [in] sequence<ColorComponent> endColor )
-        raises (com::sun::star::lang::IllegalArgumentException);
-
-    /** Create a repeating line hash pattern of four crossing lines.
-
-        The hashing consists of vertical and horizontal lines plus
-        diagonal lines in both directions. Each of the four groups of
-        lines varies the line color of distinct lines linearly from
-        startColor to endColor, starting at the leftmost or topmost
-        position.
-     */
-    XParametricPolyPolygon2D    createFourCrossingLinesHatch( [in] sequence<ColorComponent> startColor, [in] sequence<ColorComponent> endColor )
-        raises (com::sun::star::lang::IllegalArgumentException);
-};
-
-//=============================================================================
-
-/// Service providing a <type>XParametricPolyPolygon2DFactory</type> service
-service ParametricPolyPolygon2DFactory: XParametricPolyPolygon2DFactory;
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/rendering/makefile.mk b/offapi/com/sun/star/rendering/makefile.mk
index 3ed9cf9c27e7..6b59d156d35e 100644
--- a/offapi/com/sun/star/rendering/makefile.mk
+++ b/offapi/com/sun/star/rendering/makefile.mk
@@ -104,7 +104,6 @@ IDLFILES=\
     XIntegerReadOnlyBitmap.idl \
     XLinePolyPolygon2D.idl \
     XParametricPolyPolygon2D.idl \
-    XParametricPolyPolygon2DFactory.idl \
     XPolyPolygon2D.idl \
     XSimpleCanvas.idl \
     XSprite.idl \
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index 199737ab8c6d..9af58a8d702e 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -72,8 +72,8 @@
 #ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
 #endif
-#ifndef __com_sun_star_util_XModifiable_idl__
-#include <com/sun/star/util/XModifiable.idl>
+#ifndef __com_sun_star_util_XModifiable2_idl__
+#include <com/sun/star/util/XModifiable2.idl>
 #endif
 #ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
@@ -155,7 +155,7 @@ interface XReportDefinition
         of the document without saving any changes.
         </p>
      */
-    interface com::sun::star::util::XModifiable;
+    interface com::sun::star::util::XModifiable2;
 
     /** allows the creation of sub reports.
     */
diff --git a/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
new file mode 100644
index 000000000000..891929514826
--- /dev/null
+++ b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ * 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: InteractionHandler.idl,v $
+ * $Revision: 1.12 $
+ *
+ * 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_sdb_InteractionHandler_idl__
+#define __com_sun_star_sdb_InteractionHandler_idl__
+
+module com { module sun { module star { module task {
+    interface XInteractionHandler2;
+}; }; }; };
+
+module com {  module sun {  module star {  module sdb {
+
+/** describes a service which is able to handle database-related interactions.
+
+    <p>Usually, you will not instantiate this service directly. Instead, you'll instantiate a generic
+    <type scope="com::sun::star::task">InteractionHandler</type> service, and pass it your request. Based on
+    configuration data, this implementation will decide where to forward the request to.</p>
+
+    <p>By default, the <code>DatabaseInteractionHandler</code> feels responsible (as per configuration) for the
+    following interaction types:
+    <ul>
+        <li><b>database related errors</b><br/>
+            The general structure to transport such errors is the <type scope="com::sun::star::sdbc">SQLException</type>,
+            and if your interaction request supplies such a <code>SQLException</code> (or an instance of any derived class),
+            the handler will display a generic error dialog, which is able to travel the object chain which may be contained
+            in the exception.
+        </li>
+        <li><b>parameter requests</b><br/>
+            If your interaction request supplies an <type scope="com::sun::star::sdb">ParametersRequest</type>,
+            the handler will open a standard dialog asking the user to fill in parameter values.
+            <br/>
+            In the case you want to use this feature of the handler, you should supply a special continuation
+            (<type scope="com::sun::star::sdb">XInteractionSupplyParameters</type>) as well, so the
+            handler can return the entered information.
+        </li>
+    </ul>
+    </p>
+*/
+service DatabaseInteractionHandler: com::sun::star::task::XInteractionHandler2;
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/sdb/DefinitionContent.idl b/offapi/com/sun/star/sdb/DefinitionContent.idl
index 9538174ba3c3..d5ce22d9ff09 100644
--- a/offapi/com/sun/star/sdb/DefinitionContent.idl
+++ b/offapi/com/sun/star/sdb/DefinitionContent.idl
@@ -27,9 +27,8 @@
 #ifndef __com_sun_star_sdb_DefinitionContent_idl__
 #define __com_sun_star_sdb_DefinitionContent_idl__
 
-#ifndef __com_sun_star_ucb_Content_idl__
 #include <com/sun/star/ucb/Content.idl>
-#endif
+#include <com/sun/star/container/XHierarchicalName.idl>
 
 //=============================================================================
 
@@ -60,6 +59,11 @@ service DefinitionContent
         <p>Additional commands might be supported by derived services.</p>
     */
     service ::com::sun::star::ucb::Content;
+
+    /** provides access to the complete name of the content within its hierarchy
+        @since OOo 3.3
+    */
+    interface ::com::sun::star::container::XHierarchicalName;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sdb/DocumentDefinition.idl b/offapi/com/sun/star/sdb/DocumentDefinition.idl
index 29157d1cc9c7..c8f07fb69a18 100644
--- a/offapi/com/sun/star/sdb/DocumentDefinition.idl
+++ b/offapi/com/sun/star/sdb/DocumentDefinition.idl
@@ -71,6 +71,12 @@ service DocumentDefinition
                 the sub document could be closed. Reasons for not closing the document include vetos by
                 third parties, for instance, because the user opened a dialog modal to the sub document,
                 or a long-running task such as printing is currently running.</li>
+            <li><strong>show</strong>: shows the sub document. This is useful if you previously opened the
+                document hidden, or if you previously hide it using the <em>hide</em> command.<br/>
+                The <em>open</em> command is not available if the sub document has not been loaded, yet.</li>
+            <li><strong>hide</strong>: hides the sub document. In opposite to the <em>close</em> command,
+                only the document window is hidden, but the document is kept loaded. A subsequent execution
+                of the <em>show</em> command will show the window, again.</li>
         </ul>
     */
     service DefinitionContent;
diff --git a/offapi/com/sun/star/sdb/InteractionHandler.idl b/offapi/com/sun/star/sdb/InteractionHandler.idl
index 203cfef2008d..e76ef3d66f34 100644
--- a/offapi/com/sun/star/sdb/InteractionHandler.idl
+++ b/offapi/com/sun/star/sdb/InteractionHandler.idl
@@ -34,56 +34,11 @@ module com { module sun { module star { module task {
 module com {  module sun {  module star {  module sdb {
 
 /** is a service for user interaction for databases.
-    <p>
-    interaction requests that the handler can provide are:
-    <ul>
-        <li><b>database related errors</b><br/>
-            The general structure to transport such errors is the
-            <type scope="com::sun::star::sdbc">SQLException</type>
-            , and if your
-            <type scope="com::sun::star::task">XInteractionRequest</type>
-            supplies such a
-            <type scope="com::sun::star::sdbc">SQLException</type>
-            (or an instance of any derived class),
-            the handler will display a generic error dialog, which is able
-            to travel the object chain which may be contained in the exception.
-        </li>
-        <li><b>authentication</b><br/>
-            If your
-            <type scope="com::sun::star::task">XInteractionRequest</type>
-            (see
-            <member scope="com::sun::star::task">XInteractionHandler::handle()</member>
-            ) supplies a
-            <type scope="com::sun::star::ucb">AuthenticationRequest</type>
-            , the handler will open a standard login
-            dialog to allow user authentication.
-            <br/>
-            Besides the using the members of the AuthenticationRequest in the usual manner, the member <em>Server</em>
-            (if not empty) is interpreted as datasource name, thus leading to a slightly different message when
-            requesting the user to enter it's login data.
-            <br/>
-            In the case you want to use this authentication feature, you should supply a special authentication
-            continuation (
-            <type scope="com::sun::star::ucb">XInteractionSupplyAuthentication</type>
-            ) as well, so the
-            handler can return to you, the entered information.
-        </li>
-        <li><b>parameter requests</b><br/>
-            If your
-            <type scope="com::sun::star::task">XInteractionRequest</type>
-            supplies an
-            <type scope="com::sun::star::sdb">ParametersRequest</type>
-            , the handler will open a standard dialog asking
-            the user to fill in parameter values.
-            <br/>
-            In the case you want to use this feature of the handler, you should supply a special continuation
-            (
-            <type scope="com::sun::star::sdb">XInteractionSupplyParameters</type>
-            ) as well, so the
-            handler can return to you, the entered information.
-        </li>
-    </ul>
-    </p>
+    @deprecated
+        Do not use this service anymore. Instead, create a generic <type scope="com::sun::star::task">InteractionHandler</type>
+        instance, and pass it your request. It will determine, based on configuration data, which concrete interaction
+        handler implementation to use for a specific request. In particular, requests formerly server by this service here
+        are by default passed to a <type>DatabaseInteractionHandler</type>.
 */
 published service InteractionHandler: com::sun::star::task::XInteractionHandler;
 
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index e5d72c066bdf..7c14255045e1 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -28,30 +28,15 @@
 #ifndef __com_sun_star_sdb_application_XDatabaseDocumentUI_idl__
 #define __com_sun_star_sdb_application_XDatabaseDocumentUI_idl__
 
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
 #include <com/sun/star/sdbc/XDataSource.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
 #include <com/sun/star/sdbc/XConnection.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
+#include <com/sun/star/beans/Pair.idl>
 
 //=============================================================================
 
@@ -133,6 +118,29 @@ interface XDatabaseDocumentUI
     [attribute, readonly] sequence< ::com::sun::star::lang::XComponent >
             SubComponents;
 
+    /** identifies the given sub component
+
+        @param SubComponent
+            the component to identify. Must be one of the components in <member>SubComponents</member>.
+
+        @return
+            a record describing the sub component. The first element of the returned pair is the type
+            of the component, denoted by one of the <type>DatabaseObject</type> constants. The second
+            element is the name of the component. For object types which support nested structures (forms
+            and reports, actually), this might be a hierachical name. If the sub component has been newly created,
+            and not yet saved, this name is empty.
+
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            if the given component is not one of the controller's sub components
+    */
+    ::com::sun::star::beans::Pair< long, string >
+            identifySubComponent(
+                [in] ::com::sun::star::lang::XComponent SubComponent
+            )
+            raises (
+                ::com::sun::star::lang::IllegalArgumentException
+            );
+
     /** closes all sub components of the database document.
 
         <p>During working with the database, the user might open different sub components:
@@ -264,6 +272,52 @@ interface XDatabaseDocumentUI
         raises ( ::com::sun::star::lang::IllegalArgumentException,
                  ::com::sun::star::container::NoSuchElementException,
                  ::com::sun::star::sdbc::SQLException );
+
+    /** creates a new sub component of the given type
+
+        @param ObjectType
+            specifies the type of the object, must be one of the <type>DatabaseObject</type>
+            constants.
+
+        @param DocumentDefinition
+            Upon successful return, and if and only if <arg>ObjectType</arg> equals <member>DatabaseObject::FORM</member>
+            or <member>DatabaseObject::REPORT</member>, this will contain the <type scope="com::sun::star::sdb">DocumentDefinition</type>
+            object which controls the sub component.
+    */
+    ::com::sun::star::lang::XComponent createComponent(
+                    [in] long ObjectType,
+                    [out] ::com::sun::star::lang::XComponent DocumentDefinition )
+        raises ( ::com::sun::star::lang::IllegalArgumentException,
+                 ::com::sun::star::sdbc::SQLException );
+
+    /** creates a new sub component of the given type
+
+        <p>In opposite to <member>createComponent</member>, this method allows you to specify
+        additional arguments which are passed to the to-be-loaded component.</p>
+
+        <p>The meaning of the the arguments is defined at the service which is effectively
+        created. See the <a href="#component_types">above table</a> for a list of those
+        services.</p>
+
+        @param ObjectType
+            specifies the type of the object, must be one of the <type>DatabaseObject</type>
+            constants.
+
+        @param DocumentDefinition
+            Upon successful return, and if and only if <arg>ObjectType</arg> equals <member>DatabaseObject::FORM</member>
+            or <member>DatabaseObject::REPORT</member>, this will contain the <type scope="com::sun::star::sdb">DocumentDefinition</type>
+            object which controls the sub component.<br/>
+            You can use this object to control various aspects of the sub component. For instance, you could decide
+            to create the component hidden, by passing a <code>Hidden</code> flag (set to <TRUE/>) in <arg>Arguments</arg>,
+            manipulate the component, and then finally show it by invoking the <code>show</code> command at the
+            definition object.
+    */
+    ::com::sun::star::lang::XComponent createComponentWithArguments(
+                    [in] long ObjectType,
+                    [in] sequence< ::com::sun::star::beans::PropertyValue > Arguments,
+                    [out] ::com::sun::star::lang::XComponent DocumentDefinition )
+        raises ( ::com::sun::star::lang::IllegalArgumentException,
+                 ::com::sun::star::sdbc::SQLException );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sdb/makefile.mk b/offapi/com/sun/star/sdb/makefile.mk
index 03aa5a2460c9..975bf03e7712 100644
--- a/offapi/com/sun/star/sdb/makefile.mk
+++ b/offapi/com/sun/star/sdb/makefile.mk
@@ -58,6 +58,7 @@ IDLFILES=\
     DatabaseContext.idl \
     DatabaseDocument.idl \
     DatabaseEnvironment.idl \
+    DatabaseInteractionHandler.idl \
     DatabaseRegistrationEvent.idl \
     DataColumn.idl \
     DataSettings.idl \
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
new file mode 100644
index 000000000000..c0ec570ccf60
--- /dev/null
+++ b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.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: XConnectionSupplier.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_sdb_tools_XConnectionSupplier_idl__
+#define __com_sun_star_sdb_tools_XConnectionSupplier_idl__
+
+#include <com/sun/star/sdbc/XConnection.idl>
+#ifndef __com_sun_star_lang_XInitialization_idl__
+#include <com/sun/star/lang/XInitialization.idl>
+#endif
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+
+//=============================================================================
+module com {  module sun {  module star {  module sdb { module tools {
+//=============================================================================
+
+//-----------------------------------------------------------------------------
+/** allows to access the active connection
+
+    @see com::sun::star::sdbcx::XConnection
+
+    @since OOo 3.3
+*/
+interface XConnectionSupplier
+{
+    /** returns the source connection.
+    */
+    [attribute, readonly] com::sun::star::sdbc::XConnection ActiveConnection;
+
+    interface com::sun::star::lang::XInitialization;
+
+};
+//=============================================================================
+}; }; }; }; };
+//=============================================================================
+
+#endif
+
diff --git a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
new file mode 100644
index 000000000000..fdc7ce517ca8
--- /dev/null
+++ b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * 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: XIndexAlteration.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_sdb_tools_XIndexAlteration_idl__
+#define __com_sun_star_sdb_tools_XIndexAlteration_idl__
+
+#ifndef __com_sun_star_sdbc_SQLException_idl__
+#include <com/sun/star/sdbc/SQLException.idl>
+#endif
+#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
+#ifndef __com_sun_star_lang_XInitialization_idl__
+#include <com/sun/star/lang/XInitialization.idl>
+#endif
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+
+//=============================================================================
+module com {  module sun {  module star {  module sdb { module tools {
+//=============================================================================
+
+//-----------------------------------------------------------------------------
+/** allows to alter the indexes of a table.
+
+    @see com::sun::star::sdb::DataSource::Settings
+    @see com::sun::star::sdbcx::XAppend
+    @see com::sun::star::sdbcx::XDrop
+
+    @since OOo 3.3
+*/
+interface XIndexAlteration
+{
+    interface XConnectionSupplier;
+
+    /** drops an object of the related container identified by its name.
+        @param table
+            the table to be altered
+        @param index
+            the name of the column to be dropped
+        @throws com::sun::star::sdbc::SQLException
+            if a database access error occurs.
+     */
+    void dropIndex([in] com::sun::star::beans::XPropertySet table,[in] string index)
+        raises ( com::sun::star::sdbc::SQLException);
+
+    /** creates a new object using the given descriptor and appends it
+        to the related container.
+        <b>
+        Note:
+        </b>
+        The descriptor will not be changed and can be used again to append another object.
+        @param table
+            the table to be altered
+        @param descriptor
+            the descriptor which should be serve to append a new object
+        @throws com::sun::star::sdbc::SQLException
+            if a database access error occurs.
+     */
+    void addIndex([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor)
+        raises (com::sun::star::sdbc::SQLException);
+
+
+};
+//=============================================================================
+}; }; }; }; };
+//=============================================================================
+
+#endif
+
diff --git a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
new file mode 100644
index 000000000000..44389dfe64fd
--- /dev/null
+++ b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * 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: XKeyAlteration.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_sdb_tools_XKeyAlteration_idl__
+#define __com_sun_star_sdb_tools_XKeyAlteration_idl__
+
+#ifndef __com_sun_star_sdbc_SQLException_idl__
+#include <com/sun/star/sdbc/SQLException.idl>
+#endif
+#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
+#ifndef __com_sun_star_lang_XInitialization_idl__
+#include <com/sun/star/lang/XInitialization.idl>
+#endif
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+
+//=============================================================================
+module com {  module sun {  module star {  module sdb { module tools {
+//=============================================================================
+
+//-----------------------------------------------------------------------------
+/** allows to alter the keys of a table.
+
+    @see com::sun::star::sdb::DataSource::Settings
+    @see com::sun::star::sdbcx::XAppend
+    @see com::sun::star::sdbcx::XDrop
+
+    @since OOo 3.3
+*/
+interface XKeyAlteration
+{
+    interface XConnectionSupplier;
+
+    /** drops an object of the related container identified by its name.
+        @param table
+            the table to be altered
+        @param key
+            the key to be dropped
+        @throws com::sun::star::sdbc::SQLException
+            if a database access error occurs.
+     */
+    void dropKey([in] com::sun::star::beans::XPropertySet table,[in] com::sun::star::beans::XPropertySet key)
+        raises ( com::sun::star::sdbc::SQLException);
+
+    /** creates a new object using the given descriptor and appends it
+        to the related container.
+        <b>
+        Note:
+        </b>
+        The descriptor will not be changed and can be used again to append another object.
+        @param table
+            the table to be altered
+        @param descriptor
+            the descriptor which should be serve to append a new object
+        @throws com::sun::star::sdbc::SQLException
+            if a database access error occurs.
+     */
+    void addKey([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor)
+        raises (com::sun::star::sdbc::SQLException);
+
+
+};
+//=============================================================================
+}; }; }; }; };
+//=============================================================================
+
+#endif
+
diff --git a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
new file mode 100644
index 000000000000..fe0fe494fead
--- /dev/null
+++ b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * 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: XTableAlteration.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_sdb_tools_XTableAlteration_idl__
+#define __com_sun_star_sdb_tools_XTableAlteration_idl__
+
+#ifndef __com_sun_star_sdbc_SQLException_idl__
+#include <com/sun/star/sdbc/SQLException.idl>
+#endif
+#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
+#ifndef __com_sun_star_lang_XInitialization_idl__
+#include <com/sun/star/lang/XInitialization.idl>
+#endif
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+
+//=============================================================================
+module com {  module sun {  module star {  module sdb { module tools {
+//=============================================================================
+
+//-----------------------------------------------------------------------------
+/** allows to alter a table.
+
+    @see com::sun::star::sdb::DataSource::Settings
+    @see com::sun::star::sdbcx::ColumnDescriptor
+    @see com::sun::star::sdbcx::XAlterTable
+    @see com::sun::star::sdbcx::XAppend
+    @see com::sun::star::sdbcx::XDrop
+
+    @since OOo 3.3
+*/
+interface XTableAlteration
+{
+    interface XConnectionSupplier;
+
+    /** alter the column defined by name
+
+        @param table
+            the table to be altered
+
+        @param columnName
+            the name of the column to be changed
+
+        @param columnDescriptor
+            the column descriptor with the information of the new column definition
+
+        @throws com::sun::star::sdbc::SQLException
+        @see com::sun::star::sdbcx::XAlterTable
+    */
+    void  alterColumnByName( [in] com::sun::star::beans::XPropertySet table, [in] string columnName, [in] com::sun::star::beans::XPropertySet columnDescriptor)
+        raises ( com::sun::star::sdbc::SQLException );
+
+    /** creates a new object using the given descriptor and appends it
+        to the related container.
+        <b>
+        Note:
+        </b>
+        The descriptor will not be changed and can be used again to append another object.
+        @param table
+            the table to be altered
+        @param descriptor
+            the descriptor which should be serve to append a new object
+        @throws com::sun::star::sdbc::SQLException
+            if a database access error occurs.
+        @see com::sun::star::sdbcx::XAppend
+     */
+    void addColumn([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor)
+        raises (com::sun::star::sdbc::SQLException);
+
+    /** drops an object of the related container identified by its name.
+        @param table
+            the table to be altered
+        @param columnName
+            the name of the column to be dropped
+        @throws com::sun::star::sdbc::SQLException
+            if a database access error occurs.
+        @see com::sun::star::sdbcx::XDrop
+     */
+    void dropColumn([in] com::sun::star::beans::XPropertySet table,[in]string columnName)
+        raises ( com::sun::star::sdbc::SQLException);
+};
+//=============================================================================
+}; }; }; }; };
+//=============================================================================
+
+#endif
+
diff --git a/offapi/com/sun/star/sdb/tools/XTableRename.idl b/offapi/com/sun/star/sdb/tools/XTableRename.idl
new file mode 100644
index 000000000000..f61d736bae8c
--- /dev/null
+++ b/offapi/com/sun/star/sdb/tools/XTableRename.idl
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * 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: XTableRename.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_sdb_tools_XTableRename_idl__
+#define __com_sun_star_sdb_tools_XTableRename_idl__
+
+#ifndef __com_sun_star_sdbc_SQLException_idl__
+#include <com/sun/star/sdbc/SQLException.idl>
+#endif
+#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
+#ifndef __com_sun_star_lang_XInitialization_idl__
+#include <com/sun/star/lang/XInitialization.idl>
+#endif
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+
+//=============================================================================
+module com {  module sun {  module star {  module sdb { module tools {
+//=============================================================================
+
+//-----------------------------------------------------------------------------
+/** allows to rename table.
+
+    @see com::sun::star::sdb::DataSource::Settings
+
+    @since OOo 3.3
+*/
+interface XTableRename
+{
+    interface XConnectionSupplier;
+
+    /** rename the given table to the new name
+
+        @param table
+            the table to be renamed
+        @param newName
+            the new name of the table
+        @throws com::sun::star::sdbc::SQLException
+    */
+    void  rename( [in] com::sun::star::beans::XPropertySet table, [in] string newName)
+        raises ( com::sun::star::sdbc::SQLException );
+
+
+};
+//=============================================================================
+}; }; }; }; };
+//=============================================================================
+
+#endif
+
diff --git a/offapi/com/sun/star/sdb/tools/XViewAccess.idl b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
new file mode 100644
index 000000000000..e64727341e81
--- /dev/null
+++ b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * 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: XViewAccess.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_sdb_tools_XViewAccess_idl__
+#define __com_sun_star_sdb_tools_XViewAccess_idl__
+
+#ifndef __com_sun_star_sdbc_SQLException_idl__
+#include <com/sun/star/sdbc/SQLException.idl>
+#endif
+#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
+#ifndef __com_sun_star_lang_XInitialization_idl__
+#include <com/sun/star/lang/XInitialization.idl>
+#endif
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+
+//=============================================================================
+module com {  module sun {  module star {  module sdb { module tools {
+//=============================================================================
+
+//-----------------------------------------------------------------------------
+/** allows to fetch and to change the sql statements of views
+
+    @see com::sun::star::sdb::DataSource::Settings
+    @see com::sun::star::sdbcx::View
+
+    @since OOo 3.3
+*/
+interface XViewAccess
+{
+    interface XConnectionSupplier;
+
+    /** returns the SQL statement of the view
+
+        @param view
+            the table to be renamed
+        @throws com::sun::star::sdbc::SQLException
+    */
+    string getCommand( [in] com::sun::star::beans::XPropertySet view)
+        raises ( com::sun::star::sdbc::SQLException );
+
+    /** allows to alter the SQL statement of a view
+
+        @param view
+            the view to be altered
+
+        @param command
+            the new SQL statement
+
+        @throws com::sun::star::sdbc::SQLException
+    */
+    void  alterCommand( [in] com::sun::star::beans::XPropertySet view, [in] string command)
+        raises ( com::sun::star::sdbc::SQLException );
+};
+//=============================================================================
+}; }; }; }; };
+//=============================================================================
+
+#endif
+
diff --git a/offapi/com/sun/star/sdb/tools/makefile.mk b/offapi/com/sun/star/sdb/tools/makefile.mk
index ab57745142a4..1bc7e6b11c7d 100644
--- a/offapi/com/sun/star/sdb/tools/makefile.mk
+++ b/offapi/com/sun/star/sdb/tools/makefile.mk
@@ -44,7 +44,13 @@ IDLFILES=\
     XConnectionTools.idl \
     XDataSourceMetaData.idl \
     XObjectNames.idl \
-    XTableName.idl
+    XTableName.idl \
+    XTableRename.idl \
+    XViewAccess.idl \
+    XTableAlteration.idl \
+    XKeyAlteration.idl \
+    XIndexAlteration.idl \
+    XConnectionSupplier.idl
 
 # ------------------------------------------------------------------
 .INCLUDE :  target.mk
diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
index 8e303601cb95..992afdef5ed9 100644
--- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
@@ -40,6 +40,10 @@
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
+#ifndef __com_sun_star_beans_PropertyValue_idl__
+#include <com/sun/star/beans/PropertyValue.idl>
+#endif
+
 //=============================================================================
 
 module com { module sun { module star { module sheet {
@@ -73,6 +77,36 @@ published service DataPilotDescriptor
 
     //=========================================================================
 
+    /** specifies parameters to create the data pilot table from a database.
+
+    @see DatabaseImportDescriptor
+    @since OOo 3.3.0
+
+     */
+    [optional, property] sequence< com::sun::star::beans::PropertyValue > ImportDescriptor;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies the name of a <type>DataPilotSource</type> implementation
+        for the data pilot table.
+
+    @since OOo 3.3.0
+
+     */
+    [optional, property] string SourceServiceName;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies arguments that are passed to the implementation named by
+        <member>SourceServiceName</member>.
+
+    @since OOo 3.3.0
+
+     */
+    [optional, property] sequence< com::sun::star::beans::PropertyValue > ServiceArguments;
+
+    //-------------------------------------------------------------------------
+
     /** specifies the orientation of the field.
      */
     [optional, property] boolean IgnoreEmptyRows;
diff --git a/offapi/com/sun/star/sheet/DataPilotTable.idl b/offapi/com/sun/star/sheet/DataPilotTable.idl
index db09028abd42..c2385c46e5fa 100644
--- a/offapi/com/sun/star/sheet/DataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTable.idl
@@ -36,6 +36,10 @@
 #include <com/sun/star/sheet/XDataPilotTable.idl>
 #endif
 
+#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
+#include <com/sun/star/util/XModifyBroadcaster.idl>
+#endif
+
 //=============================================================================
 
 module com {  module sun {  module star {  module sheet {
@@ -58,6 +62,14 @@ published service DataPilotTable
      */
     interface com::sun::star::sheet::XDataPilotTable;
 
+    //-------------------------------------------------------------------------
+
+    /** allows notification of modifications to the data pilot table.
+
+    @since OOo 3.3.0
+
+    */
+    [optional] interface com::sun::star::util::XModifyBroadcaster;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
index d05158a4db82..a115e914afb8 100644
--- a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
@@ -48,7 +48,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
@@ -59,6 +60,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 cfdae9f435d3..000000000000
--- a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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/InteractionHandler.idl b/offapi/com/sun/star/task/InteractionHandler.idl
index c6785e831748..f772754d6d56 100644
--- a/offapi/com/sun/star/task/InteractionHandler.idl
+++ b/offapi/com/sun/star/task/InteractionHandler.idl
@@ -36,11 +36,15 @@ module com { module sun { module star {
 module com { module sun { module star { module task {
 
 //============================================================================
-/** An interaction request handler that lets the user handle a number of well
-    known requests via GUI dialogs (and the
-    <type scope="com::sun::star::task">PasswordContainer</type> service).
+/** An interaction request handler that lets the user handle requests via GUI dialogs.
 
-    <P>The well known requests handled by this service include
+    <p>The interaction handler service has a numerof of <a href="#built_in_handler">built-in handlers</a>, responsible
+    for a lot of well known interactions. Additionally, there's a configuration module which allows to
+    <a href="#configuring_handlers">configure additional handlers</a>, responsible for arbitrary requests.</a></p>
+
+    <a name="built_in_handler"></a>
+    <h3>Built-in Handlers</h3>
+    The following well-known requests can be dealt with by the built-in handlers:
     <UL>
         <LI><type scope="com::sun::star::ucb">AuthenticationRequest</type></LI>
         <LI><type scope="com::sun::star::ucb">CertificateValidationRequest</type></LI>
@@ -131,6 +135,26 @@ module com { module sun { module star { module task {
         only.  The names of the two volumes involved (two
         <atom>string</atom>s).</DD>
     </DL></P>
+
+    <a name="configuring_handlers"></a>
+    <h3>Configurating additional Handlers</h3>
+
+    <p>It is possible to configure additional interaction handlers, to which certain requests can be delegated. The
+    configuration node <code>/org.openoffice.Interaction/InteractionHandlers</code> is evaluated and respected
+    by the <code>InteractionHandler</code> implementation.</p>
+
+    <p>A custom interaction handler can declare itself responsible for an arbitrary number of UNO types, specified
+    by full-qualified type name. Also, for each type, it can specify whether it is responsible for only this particular
+    type, or all possibly existent derived types.</p>
+
+    <p>Whenever the <code>InteractionHandler</code> encounteres a request it cannot fulfill itself, it will examine
+    the configuration, to find a handler implementation for the request, and delegate it to the first matching
+    handler.</p>
+
+    <p>If multiple custom interaction handlers declare themself responsible for the same request type, it is not
+    defined which handler will actully be invoked. Thus, when deploying a custom interaction handler, ensure
+    that the types you specify are general enough to cover all requests you want to handle, but also specific
+    enough to not cover requests which other handlers might be interested in.</p>
  */
 published service InteractionHandler
 {
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index 98a66038bef2..3b622b469b63 100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@ -41,7 +41,6 @@ PACKAGE=com$/sun$/star$/task
 IDLFILES=\
     ClassifiedInteractionRequest.idl\
     DocumentMacroConfirmationRequest.idl\
-    DocumentMacroConfirmationRequest2.idl\
     DocumentPasswordRequest.idl\
     DocumentMSPasswordRequest.idl\
     ErrorCodeRequest.idl\
diff --git a/offapi/com/sun/star/text/RedlinePortion.idl b/offapi/com/sun/star/text/RedlinePortion.idl
index be39882474c3..c399d976e04a 100644
--- a/offapi/com/sun/star/text/RedlinePortion.idl
+++ b/offapi/com/sun/star/text/RedlinePortion.idl
@@ -52,7 +52,7 @@ published service RedlinePortion
     /** contains the name of the author of the change.*/
     [readonly, property] string RedlineAuthor;
     /** contains the date and time of the change.*/
-    [readonly, property] com::sun::star::util::DateTime RedlineDataTime;
+    [readonly, property] com::sun::star::util::DateTime RedlineDateTime;
     /** contains a comment for the change.*/
     [readonly, property] string RedlineComment;
     /** contains the type of the change
@@ -70,7 +70,7 @@ published service RedlinePortion
         <p> The elements of the sequence are:</p>
         <UL>
             <LI><P>string RedlineAuthor;                              </P>
-            <LI><P>com::sun::star::util::DateTime RedlineDataTime;    </P>
+            <LI><P>com::sun::star::util::DateTime RedlineDateTime;    </P>
             <LI><P>string RedlineComment;                             </P>
             <LI><P>string RedlineType;                                </P>
         </UL>
diff --git a/offapi/com/sun/star/text/XFormField.idl b/offapi/com/sun/star/text/XFormField.idl
index f1f2d1bab9b9..53555728ba40 100644
--- a/offapi/com/sun/star/text/XFormField.idl
+++ b/offapi/com/sun/star/text/XFormField.idl
@@ -1,26 +1,20 @@
- #ifndef __com_sun_star_text_XFormField_idl__
- #define __com_sun_star_text_XFormField_idl__
+#ifndef __com_sun_star_text_XFormField_idl__
+#define __com_sun_star_text_XFormField_idl__
 
- #ifndef __com_sun_star_uno_XInterface_idl__
- #include <com/sun/star/uno/XInterface.idl>
- #endif
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/container/XNameContainer.idl>
 
- module com {  module sun {  module star {  module text {
+module com {  module sun {  module star {  module text {
 
-/** @deprecated
- */
- interface XFormField: com::sun::star::uno::XInterface
- {
-     short getType();
-     short getRes();
-     string getDescription( );
+    /** @deprecated
+     */
+    interface XFormField : com::sun::star::uno::XInterface
+    {
+        string getFieldType();
+        void setFieldType([in] string fieldType);
+        com::sun::star::container::XNameContainer getParameters();
+    };
 
-     void setType([in] short fieldType );
-     void setRes([in] short res );
-     void setDescription([in] string description );
+}; }; }; };
 
- };
-
- }; }; }; };
-
- #endif
+#endif
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
index 962df24dcc06..d98c4be39e96 100755
--- a/offapi/com/sun/star/text/textfield/MetadataField.idl
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -54,7 +54,8 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** is a <type>TextField</type> whose content is specified by RDF metadata.
+/** is a <type scope="com::sun::star::text">TextField</type> whose content
+    is specified by RDF metadata.
 
     @since OOo 3.2
 
@@ -63,8 +64,8 @@ module com { module sun { module star { module text { module textfield {
 service MetadataField
 {
     //-------------------------------------------------------------------------
-    /** None of the properties of <type>TextContent</type> are
-        supported. */
+    /** None of the properties of
+        <type scope="com::sun::star::text">TextContent</type> are supported. */
     service  com::sun::star::text::TextField;
 
     //-------------------------------------------------------------------------
@@ -77,8 +78,8 @@ service MetadataField
     interface com::sun::star::text::XText;
 
     //-------------------------------------------------------------------------
-    /** The <type>TextContent</type>s that are contained in the
-        <type>MetadataField</type> can be enumerated. */
+    /** The <type scope="com::sun::star::text">TextContent</type>s that are
+        contained in the <type>MetadataField</type> can be enumerated. */
     interface com::sun::star::container::XEnumerationAccess;
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/util/Duration.idl b/offapi/com/sun/star/util/Duration.idl
index 1832b4af4a55..ef544189210f 100644
--- a/offapi/com/sun/star/util/Duration.idl
+++ b/offapi/com/sun/star/util/Duration.idl
@@ -87,9 +87,9 @@ struct Duration
     unsigned short Seconds;
 
     //--------------------------------------------------------------------
-    /** contains the hundredth seconds.
+    /** contains the milliseconds.
      */
-    unsigned short HundredthSeconds;
+    unsigned short MilliSeconds;
 
 };
 
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 226741529436..a0be2398f429 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -94,7 +94,7 @@ oa  offapi\com\sun\star\xsd                 nmake   -   all oa_xsd NULL
 oa  offapi\com\sun\star\inspection          nmake   -   all oa_inspection NULL
 oa	offapi\com\sun\star\ui  				nmake	-	all	oa_ui NULL
 oa	offapi\com\sun\star\ui\dialogs			nmake	-	all	oa_ui_dialogs NULL
-oa	offapi\com\sun\star  				    nmake	-	all	- NULL
+oa	offapi\com\sun\star  				    nmake	-	all	oa_starme NULL
 oa	offapi\com\sun\star\security            nmake	-	all	oa_security NULL
 oa	offapi\com\sun\star\xml\crypto\sax     	nmake	-	all	oa_crypto_sax oa_wrapper oa_csax NULL
 oa	offapi\com\sun\star\xml\crypto     	    nmake	-	all	oa_crypto oa_wrapper oa_security NULL
@@ -105,4 +105,4 @@ oa	offapi\com\sun\star\rendering	        nmake	-	all oa_rendering oa_geometry NU
 oa	offapi\com\sun\star\rdf	                nmake	-	all oa_rdf  oa_datatransfer oa_text NULL
 oa	offapi\com\sun\star\office              nmake	-	all oa_office oa_text NULL
 oa	offapi\drafts\com\sun\star\form         nmake	-	all	oa_drafts_form NULL
-oa  offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement oa_office NULL
+oa  offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement oa_office oa_prestextfield oa_starme NULL
diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt
index 70f0e1d0cb35..086397e8967e 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -141,10 +141,16 @@
   to maybevoid and deprecate. They should be removed in a future version. The 
   implementation will never return them.
   
-25/02/09 (MST, JSC): TaskID=i96209
+02/25/09 (MST, JSC): TaskID=i96209
   rename module css.text.FieldMaster to css.text.fieldmaster.
   the implementation handles both variants.
 
-15/05/09 (MST, JSC): TaskID=i101965
+05/15/09 (MST, JSC): TaskID=i101965
   fix read-only status of properties of css.text.TextPortion
 
+02/12/10 (JSC): TaskID=i107712, i107695
+  correct typo in com.sun.star.text.RedlinePortion. Property 
+  RedLineDataTime have to be RedlineDateTime.
+  Update reference type library with the version of OOo 3.2. The new
+  reference type library is taken from the release source tree OOO320 m12.
+
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index f9a30cdbbd53..22b8904052ff 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb