impress190: merge with dev300_m80

author: sj <sj@openoffice.org> 2010-06-04 22:30:37 +0200
committer: sj <sj@openoffice.org> 2010-06-04 22:30:37 +0200
commit: 73226493957b30394174b19383d4c7e9d7c9ca17 (patch)
tree: 4919f40342e3e187587d4040d84fb62af14631fc /offapi
parent: 68ad260fd44cd87f726f00878b2010edcc2db7b7 (diff)
parent: 5c92fa80fcce16bb9dd0da89f9f5eafed3cb97b5 (diff)
116 files changed, 1087 insertions, 213 deletions
diff --git a/offapi/com/sun/star/accessibility/AccessibleRole.idl b/offapi/com/sun/star/accessibility/AccessibleRole.idl
index 7231db672c07..5fe65d04ec42 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRole.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRole.idl
@@ -686,6 +686,33 @@ published constants AccessibleRole
         @since OOo 3.0
     */
     const short TREE_TABLE = 80;
+
+    /** Comment role
+
+        <p>An object which represents a comment.</p>
+
+        <p>A comment is anchored at a certain content position in the document and
+        annotates this document content position or a certain text range of the document content.
+        In the OpenDocument file format a comment is known as an annotation.</p>
+
+        <p>See also <const>COMMENT_END</const>.</p>
+
+        @since OOo 3.2
+    */
+    const short COMMENT = 81;
+
+    /** Comment end role
+
+        <p>An invisible object which represents the end position of a text range which
+        is annotated by a comment - see <const>COMMENT</const>.</p>
+
+        <p>This object and the corresponding object representing the comment shall be
+        in relation of type <const>MEMBER_OF</const>.</p>
+
+        @since OOo 3.2
+    */
+    const short COMMENT_END = 82;
+
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index 56f5305d10f2..db69a6b5d842 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -38,6 +38,7 @@
 //=============================================================================
 
 /** If you do not want to implement the <type>XGridColumnModel</type> yourself, use this service.
+    @since OOo 3.3.0
  */
 service DefaultGridColumnModel
 {
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
index e823e451249c..c487afc79b49 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
@@ -38,6 +38,8 @@
 //=============================================================================
 
 /** If you do not want to implement the <type>XGridDataModel</type> yourself, use this service.
+
+    @since OOo 3.3.0
  */
 service DefaultGridDataModel
 {
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
index a38d6cafd903..a87aef84f7d3 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -38,6 +38,8 @@
 //=============================================================================
 
 /** Represents a column as used by the <type>DefaultGridColumnModel</type>
+
+    @since OOo 3.3.0
  */
 service GridColumn
 {
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index dfc6905d1148..caab721185a5 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -31,24 +31,14 @@
 #include <com/sun/star/lang/EventObject.idl>
 #endif
 
-#ifndef __com_sun_star_awt_grid_XGridColumn_idl__
-#include <com/sun/star/awt/grid/XGridColumn.idl>
-#endif
-
 //=============================================================================
 
 module com {  module sun {  module star {  module awt { module grid {
 
 //=============================================================================
+/** An event used by a <type>XGridColumn</type> to notify changes in the column.
 
-/** An event used by a <type>XGridColumnModel</type> to notify changes in the column
-    model to the <type>XGridControl</type>.
-    You usually need to fill this event only if you implement the <type>XGridColumnModel</type>
-    yourself.
-
-    @see XGridColumnModel
-    @see XGridControl
-    @see XGridColumnListener
+    @since OOo 3.3.0
  */
 struct GridColumnEvent: com::sun::star::lang::EventObject
 {
@@ -63,9 +53,6 @@ struct GridColumnEvent: com::sun::star::lang::EventObject
 
     /** Contains the index of the changed column**/
     long index;
-
-    /** Contains the changed column**/
-    XGridColumn column;
     //-------------------------------------------------------------------------
 };
 
diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
index 30d87a3f1c46..1e0afb610f16 100644
--- a/offapi/com/sun/star/awt/grid/GridDataEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
@@ -27,10 +27,7 @@
 #ifndef __com_sun_star_awt_grid_GridDataEvent_idl__
 #define __com_sun_star_awt_grid_GridDataEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
 
 //=============================================================================
 
@@ -46,6 +43,8 @@ module com {  module sun {  module star {  module awt {  module grid {
     @see XGridDataModel
     @see XGridControl
     @see XGridDataListener
+
+    @sonce OOo 3.3.0
  */
 struct GridDataEvent: com::sun::star::lang::EventObject
 {
@@ -67,7 +66,7 @@ struct GridDataEvent: com::sun::star::lang::EventObject
     string headerName;
 
     /** Contains the changed row**/
-    sequence<string> rowData;
+    sequence<any> rowData;
 
 
 };
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
new file mode 100644
index 000000000000..af1f90dfdc8b
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * 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: GridInvalidDataException.idl,v $
+ * $Revision: 1.0 $
+ *
+ * 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_awt_grid_GridInvalidDataException_idl__
+#define __com_sun_star_awt_grid_GridInvalidDataException_idl__
+
+#ifndef __com_sun_star_uno_RuntimeException_idl__
+#include <com/sun/star/uno/RuntimeException.idl>
+#endif
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** Exception is thrown to indicate that set data is invalid, e.g. type of data is unknown
+    or data count doesn't match with column count.
+
+    @since OOo 3.3.0
+ */
+exception GridInvalidDataException : com::sun::star::uno::RuntimeException
+{
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
new file mode 100644
index 000000000000..9d96daf624bb
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * 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: GridInvalidModelException.idl,v $
+ * $Revision: 1.0 $
+ *
+ * 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_awt_grid_GridInvalidModelException_idl__
+#define __com_sun_star_awt_grid_GridInvalidModelException_idl__
+
+#ifndef __com_sun_star_uno_RuntimeException_idl__
+#include <com/sun/star/uno/RuntimeException.idl>
+#endif
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** Exception is thrown when data or column model isn't set.
+
+    @since OOo 3.3.0
+ */
+exception GridInvalidModelException : com::sun::star::uno::RuntimeException
+{
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index 2475e59b5b26..e9b87c2fe7ed 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -50,14 +50,17 @@ struct GridSelectionEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
 
-    /** Contains the x coordinate of the selected cell**/
-    long x;
+    /** the selected row*/
+    long Row;
 
-    /** Contains the y coordinate of the selected cell**/
-    long y;
+    /** the selected column*/
+    long Column;
+
+    /**number of selected rows, if multiple rows selected*/
+    long Range;
 
     /** Contains the action <type>SelectionEventType</types> that was performed **/
-    SelectionEventType action;
+    SelectionEventType Action;
 
 };
 
diff --git a/offapi/com/sun/star/awt/grid/SelectionEventType.idl b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
index 8096ceceeb13..c7ee61498cc3 100644
--- a/offapi/com/sun/star/awt/grid/SelectionEventType.idl
+++ b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
@@ -49,7 +49,13 @@ enum SelectionEventType
 
     /** This value indicates that a selection was removed from the grid control
      */
-    REMOVE
+    REMOVE,
+
+    //-------------------------------------------------------------------------
+
+    /** This value indicates that a selection was changed
+     */
+    CHANGE
 
 };
 
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
index 7de3eda02231..542c27085dcb 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -66,6 +66,7 @@
 
     The <type>XGridSelection</type> interface provides a bunch of methods to set and get selection for the grid control.
     </p>
+    @since OOo 3.3.0
  */
 service UnoControlGrid
 {
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
index bcb28af294b8..7eea49624045 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -37,6 +37,12 @@
 
 #include <com/sun/star/view/SelectionType.idl>
 
+#include <com/sun/star/awt/FontDescriptor.idl>
+
+#include <com/sun/star/style/VerticalAlignment.idl>
+
+#include <com/sun/star/util/Color.idl>
+
 //=============================================================================
 
 module com {  module sun {  module star {  module awt { module grid {
@@ -44,6 +50,8 @@ module com {  module sun {  module star {  module awt { module grid {
 //=============================================================================
 
 /** specifies the standard model of a <type>UnoControlGridModel</type>.
+
+    @since OOo 3.3.0
  */
 service UnoControlGridModel
 {
@@ -84,11 +92,68 @@ service UnoControlGridModel
     */
     [property] boolean VScroll;
 
+    /** Specifies that the control can be reached with the TAB key.
+     */
+    [property] boolean Tabstop;
+
     /** Specifies the selection mode that is enabled for this grid control.
         <p>The default value is <member scope="com::sun::star::view">SelectionType::SINGLE</member></p>
     */
     [property] ::com::sun::star::view::SelectionType SelectionModel;
 
+    /** Specifies the background color of rows. If color for even rows is set, then specifies
+        the color of odd rows. Default value is white.
+    */
+    [property] ::com::sun::star::util::Color RowBackgroundColor;
+
+    /** Specifies the background color of even rows. Default value is white.
+    */
+    [property] ::com::sun::star::util::Color EvenRowBackgroundColor;
+
+    /** Specifies the background color of header. Default value is white.
+    */
+    [property] ::com::sun::star::util::Color HeaderBackgroundColor;
+
+    /** Specifies the text color. Default value is black.
+    */
+    [property] ::com::sun::star::util::Color TextColor;
+
+    /** Specifies the line color. Default value is white.
+    */
+    [property] ::com::sun::star::util::Color LineColor;
+
+    /** specifies the vertical alignment of the content in the control.
+
+        <pre>
+            TOP
+            MIDDLE
+            BOTTOM
+        </pre>
+     */
+    [property] com::sun::star::style::VerticalAlignment VerticalAlign;
+
+    /** specifies the font attributes of the text in the control.
+     */
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
+
+    /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
+        value of the text in the control.
+     */
+    [property] short FontEmphasisMark;
+
+    /** specifies the <type scope="com::sun::star::text">FontRelief</type>
+        value of the text in the control.
+     */
+    [property] short FontRelief;
+
+    /** specifies the help text of the control.
+     */
+    [property] string HelpText;
+
+    /** specifies the help URL of the control.
+     */
+    [property] string HelpURL;
+
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/XGridCell.idl b/offapi/com/sun/star/awt/grid/XGridCell.idl
index b64c40a3dce4..08f3cfd1b2d5 100644
--- a/offapi/com/sun/star/awt/grid/XGridCell.idl
+++ b/offapi/com/sun/star/awt/grid/XGridCell.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module awt {  module grid {
 
 //=============================================================================
 
-interface XGridCell: com::sun::star::uno::XInterface
+interface XGridCell
 {
 
     [attribute] string Value;
diff --git a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
index 825acd4af43a..7f9fa28c3307 100644
--- a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
+++ b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
@@ -37,10 +37,9 @@ module com {  module sun {  module star {  module awt { module grid {
 
 //=============================================================================
 
-/** gives access to the items of a list box and makes it possible to
-    register item and action event listeners.
+/** renderer for cells
  */
-interface XGridCellRenderer: com::sun::star::uno::XInterface
+interface XGridCellRenderer
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index 9c9981959ed3..d217ff5d4ac6 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -30,6 +30,9 @@
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
+#include <com/sun/star/style/HorizontalAlignment.idl>
+#include <com/sun/star/awt/grid/XGridColumnListener.idl>
+
 
 //=============================================================================
 
@@ -38,28 +41,67 @@ module com {  module sun {  module star {  module awt {  module grid {
 //=============================================================================
 
 /** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
+    @since OOo 3.3.0
  */
-interface XGridColumn: com::sun::star::uno::XInterface
+interface XGridColumn
 {
     /** Specifies the an idendifier of the colomn.**/
     [attribute] any Identifier;
 
     /** Specifies the default column witdth. **/
     [attribute] long ColumnWidth;
-    /*
+
+    /** Specifies the preferred column witdth. **/
     [attribute] long PreferredWidth;
 
+    /** Specifies the min column witdth. **/
     [attribute] long MinWidth;
 
+    /** Specifies the max column witdth. **/
     [attribute] long MaxWidth;
 
-    [attribute] boolean Resizable;
-    */
+    /** Specifies whether column has fixed size or not. **/
+    [attribute] boolean Resizeable;
+
+    /** Specifies the horizontal alignment of the content in the control.
+
+        <pre>
+            LEFT
+            CENTER
+            RIGHT
+        </pre>
+     */
+    [attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign;
 
     /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
     [attribute] string Title;
 
+    /** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes.
+        @param Listener
+            the listener to add.
+    */
+    [oneway] void addColumnListener( [in] XGridColumnListener  listener);
 
+    //-------------------------------------------------------------------------
+
+    /** Removes a listener previously added with <method>addColumnListener()</method>.
+        @param Listener
+            the listener to remove.
+    */
+    [oneway] void removeColumnListener( [in] XGridColumnListener listener);
+
+    /**Updates changed column widths, when column widths are being resized.
+        @param name
+            can be PrefWidth or ColWidth, depending on which was changed
+        @param width
+            the new column width
+    */
+    void updateColumn( [in] string name, [in] long width);
+    /**Sets column index
+        @param index
+            index, which is the index of the column in the column array of the column model
+    */
+    void setIndex( [in] long index );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
index a9a0e50a34ed..8a2d044f33d5 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -46,18 +46,20 @@ module com {  module sun {  module star {  module awt { module grid {
 
     <p>Usually you must not implement this interface yourself, but you must notify it correctly if
     you implement the <type>XGridColumnModel</type> yourself</p>.
+
+    @since OOo 3.3.0
  */
-interface XGridColumnListener: com::sun::star::uno::XInterface
+interface XGridColumnListener
 {
-    /**
-        Invoked after a column was added to the column model.
-    */
-    void columnAdded( [in] GridColumnEvent event );
-
-    /**
-        Invoked after a column was removed from the column model.
-    */
-    void columnRemoved( [in] GridColumnEvent event );
+ //   /**
+    //  Invoked after a column was added to the column model.
+    //*/
+    //void columnAdded( [in] GridColumnEvent event );
+    //
+ //   /**
+    //  Invoked after a column was removed from the column model.
+    //*/
+    //void columnRemoved( [in] GridColumnEvent event );
 
     /**
         Invoked after a column was modified.
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
index 51f290fcef0e..86e77680cd95 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -30,6 +30,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 
 #include <com/sun/star/awt/grid/XGridColumn.idl>
+
 #include <com/sun/star/awt/grid/XGridColumnListener.idl>
 
 //=============================================================================
@@ -42,12 +43,18 @@ module com {  module sun {  module star {  module awt { module grid {
     retrieve the column structure that is displayed in the actual control.
 
     If you do not need your own model implementation, you can also use the <type>DefaultGridColumnModel</type>.
+
+    @since OOo 3.3.0
 */
-interface XGridColumnModel: com::sun::star::uno::XInterface
+interface XGridColumnModel
 {
-    /** Specifies whether column selection is allowed
+    ///** Specifies whether column selection is allowed
+    //*/
+    //[attribute] boolean ColumnSelectionAllowed;
+
+    /**Specifies the height of column header.
     */
-    [attribute] boolean ColumnSelectionAllowed;
+    [attribute] long ColumnHeaderHeight;
 
     /** Returns the number of columns.
         @returns
@@ -81,29 +88,28 @@ interface XGridColumnModel: com::sun::star::uno::XInterface
 
     /** Returns a specific column.
         @param index
-                the position of the reuquested column.
+                the position of the requested column.
         @returns
                  the requested column.
     */
     XGridColumn getColumn( [in] long index);
 
-    /*
-    long getTotalColumnWidth();
+    /** Sets default columns to the column model.
+        @param elements
+            the number of default columns that should be set.
     */
+    void setDefaultColumns([in] long elements);
 
-    /** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes.
-        @param Listener
-            the listener to add.
+    /**Creates new XGridColumn with the settings of other column. To be used if the columns which are added to
+        the column model have the same settings.
+        @param column
+            the column, which is already created
     */
-    [oneway] void addColumnListener( [in] XGridColumnListener  listener);
-
-    //-------------------------------------------------------------------------
+    XGridColumn copyColumn( [in] XGridColumn column );
 
-    /** Removes a listener previously added with <method>addColumnListener()</method>.
-        @param Listener
-            the listener to remove.
+    /*
+    long getTotalColumnWidth();
     */
-    [oneway] void removeColumnListener( [in] XGridColumnListener listener);
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl
index 05c49aa1669d..5019a571663b 100644
--- a/offapi/com/sun/star/awt/grid/XGridControl.idl
+++ b/offapi/com/sun/star/awt/grid/XGridControl.idl
@@ -41,30 +41,25 @@ module com {  module sun {  module star {  module awt { module grid {
 /** An interface to a control that displays a tabular data.
 
     @see UnoControlGrid
+
+    @since OOo 3.3.0
  */
 interface XGridControl: XGridSelection
 {
-    /** Specifies the <type>XGridColumnModel</type> of the control.
-    */
-    [attribute] XGridColumnModel ColumnModel;
-
-    /** Specifies the <type>XGridDataModel</type> of the control.
-    */
-    [attribute] XGridDataModel DataModel;
-
-
     /** Converting
     */
 
     long getItemIndexAtPoint( [in] long x, [in] long y);
 
-    /** registers a listener for mouse events.
-     */
-    //[oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener listener );
-
-    /** unregisters a listener for mouse events.
-     */
-    //[oneway] void removeMouseListener( [in] com::sun::star::awt::XMouseListener listener );
+    /** Sets tooltip for row
+        @param textForTooltip
+            text, which will be shown as tooltip.
+            If only cell content should be displayed, leave sequence empty.
+        @param columnsForTooltip
+            column numbers, which define the cell content that should be shown in the tooltip.
+            If only text should be shown, leave this sequence empty.
+    */
+    void setToolTip( [in] sequence< string > textForTooltip, [in] sequence< long > columnsForTooltip);
 
 };
 
diff --git a/offapi/com/sun/star/awt/grid/XGridControlListener.idl b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
index ac703e8516ee..6f4fdf68ccd4 100644
--- a/offapi/com/sun/star/awt/grid/XGridControlListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
 //=============================================================================
 
-interface XGridControlListener: com::sun::star::uno::XInterface
+interface XGridControlListener
 {
 
 };
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
index cee808a178f2..d6d0d930b331 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
@@ -46,6 +46,8 @@ module com {  module sun {  module star {  module awt { module grid {
 
     <p>Usually you must not implement this interface yourself, but you must notify it correctly if
     you implement the <type>XGridDataModel</type> yourself</p>.
+
+    @since OOo 3.3.0
  */
 interface XGridDataListener: com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
index f41841cf8039..5cc4085807e1 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
@@ -1,5 +1,6 @@
 /*************************************************************************
  *
+ * $Revision: 1.8 $
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -41,6 +42,8 @@ module com {  module sun {  module star {  module awt { module grid {
     retrieve the content data that is displayed in the actual control.
 
     If you do not need your own model implementation, you can also use the <type>DefaultGridDataModel</type>.
+
+    @since OOo 3.3.0
 */
 interface XGridDataModel: ::com::sun::star::lang::XComponent
 {
@@ -54,7 +57,11 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
 
     /** Returns the content of each row.
     */
-    [attribute,readonly] sequence< sequence< string > > Data;
+    [attribute,readonly] sequence< sequence< any > > Data;
+
+    /**Specifies the width of row header.
+    */
+    [attribute] long RowHeaderWidth;
 
     /** Returns the number of rows in in the model.
         @returns
@@ -69,7 +76,7 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
         @param data
                 the content of the row.
     */
-    void addRow( [in] string headername, [in] sequence< string > data );
+    void addRow( [in] string headername, [in] sequence< any > data );
 
     /** Removes a row from the model.
 
@@ -82,6 +89,26 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
     */
     void removeAll();
 
+    /**Updates the content of a given cell.
+        @param row
+            the row index
+        @param column
+            the column index
+        @param value
+            the new value of the cell.
+    */
+    void updateCell([in] long row, [in] long column, [in] any value );
+
+    /**Updates the content of a given row.
+        @param row
+            the row index
+        @param columns
+            column indexes of the cells, which should be updated
+        @param value
+            the new values of the cells.
+    */
+    void updateRow([in] long row, [in] sequence< long > columns, [in] sequence< any > values);
+
     //-------------------------------------------------------------------------
 
     /** Adds a listener for the <type>GridDataEvent</type> posted after the grid changes.
diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl
index ecb760cb3277..5049426018b0 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
 /** This interfaces provides access to the selection of row for <type>UnoControlGrid</type>.
  */
-interface XGridSelection: com::sun::star::uno::XInterface
+interface XGridSelection
 {
     /** Returns the lowest index of the selection.
         @returns
@@ -53,21 +53,25 @@ interface XGridSelection: com::sun::star::uno::XInterface
     */
     long getMaxSelectionIndex();
 
-    /** Adds a selection intervall.
-        @param start
-                the start row index.
-        @param length
-                the number of rows to be selected.
+    /** Selects all rows.
     */
-    [oneway] void insertIndexIntervall( [in] long start, [in] long length);
+    [oneway] void selectAllRows();
 
-    /** Removes a selection intervall.
-        @param start
-                the start row index.
-        @param length
-                the number of rows to be selected.
+    /** Selects multiple rows. Previous selections will be removed.
+        @param rangeOfRows
+                array of rows indexes, which will be selected.
     */
-    [oneway] void removeIndexIntervall( [in] long start, [in] long length);
+    [oneway] void selectRows( [in] sequence< long > rangeOfRows);
+
+    /** Deselects all selected rows.
+    */
+    [oneway] void deselectAllRows();
+
+    /** Deselects selected rows. Selected rows, which aren't in the range remain selected.
+        @param rangeOfRows
+                array of rows indexes, which will be deselected.
+    */
+    [oneway] void deselectRows( [in] sequence< long > rangeOfRows);
 
     /** Returns the indicies of all selected rows.
         @returns
@@ -90,17 +94,17 @@ interface XGridSelection: com::sun::star::uno::XInterface
     boolean isSelectedIndex( [in] long index);
 
     /** Marks a row as selected.
-        @param
+        @param index
             the index of a row.
     */
-    [oneway] void selectRow( [in] long y);
+    [oneway] void selectRow( [in] long index);
 
     /*
     [oneway] void selectColumn( [in] long x);
     */
 
     /** Adds a listener for the <type>GridSelectionEvent</type> posted after the grid changes.
-        @param Listener
+        @param listener
             the listener to add.
     */
     [oneway] void addSelectionListener( [in] XGridSelectionListener  listener);
@@ -108,7 +112,7 @@ interface XGridSelection: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     /** Removes a listener previously added with <method>addSelectionListener()</method>.
-        @param Listener
+        @param listener
             the listener to remove.
     */
     [oneway] void removeSelectionListener( [in] XGridSelectionListener listener);
diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk
index 3cfe6d83b3ba..02c159f8ffec 100644
--- a/offapi/com/sun/star/awt/grid/makefile.mk
+++ b/offapi/com/sun/star/awt/grid/makefile.mk
@@ -57,7 +57,9 @@ IDLFILES=\
     ScrollBarMode.idl\
     XGridControl.idl\
     UnoControlGrid.idl\
-    UnoControlGridModel.idl
+    UnoControlGridModel.idl\
+    GridInvalidDataException.idl\
+    GridInvalidModelException.idl
 # ------------------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/offapi/com/sun/star/configuration/Update.idl b/offapi/com/sun/star/configuration/Update.idl
new file mode 100644
index 000000000000..790a4bb40235
--- /dev/null
+++ b/offapi/com/sun/star/configuration/Update.idl
@@ -0,0 +1,45 @@
+/*************************************************************************
+*
+* 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_configuration_Update_idl__
+#define __com_sun_star_configuration_Update_idl__
+
+#include "com/sun/star/configuration/XUpdate.idl"
+
+module com { module sun { module star { module configuration {
+
+/* Provides access to internal update features of the configuration provider.
+
+   <p>This singleton is unpublished and unstable.</p>
+
+   @since OOo 3.3.0
+*/
+singleton Update: XUpdate;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/configuration/XUpdate.idl b/offapi/com/sun/star/configuration/XUpdate.idl
new file mode 100644
index 000000000000..7514cbcb1b7f
--- /dev/null
+++ b/offapi/com/sun/star/configuration/XUpdate.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+*
+* 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_configuration_XUpdate_idl__
+#define __com_sun_star_configuration_XUpdate_idl__
+
+#include "com/sun/star/uno/XInterface.idl"
+
+module com { module sun { module star { module configuration {
+
+/* Provides access to internal update features of the configuration provider.
+
+   <p>This interface is unpublished and unstable.</p>
+
+   @since OOo 3.3.0
+*/
+interface XUpdate {
+    void insertExtensionXcsFile([in] boolean shared, [in] string fileUri);
+    void insertExtensionXcuFile([in] boolean shared, [in] string fileUri);
+    void insertModificationXcuFile(
+        [in] string fileUri, [in] sequence< string > includedPaths,
+        [in] sequence< string > excludedPaths);
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/configuration/makefile.mk b/offapi/com/sun/star/configuration/makefile.mk
index 0dc3a42df9ab..00525e9ba355 100644
--- a/offapi/com/sun/star/configuration/makefile.mk
+++ b/offapi/com/sun/star/configuration/makefile.mk
@@ -65,6 +65,8 @@ IDLFILES=\
     PropertyHierarchy.idl\
     XTemplateContainer.idl\
     XTemplateInstance.idl\
+    Update.idl \
+    XUpdate.idl
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/document/DocumentProperties.idl b/offapi/com/sun/star/document/DocumentProperties.idl
index c8e0ee9ca493..5b00f6c9a8e2 100755
--- a/offapi/com/sun/star/document/DocumentProperties.idl
+++ b/offapi/com/sun/star/document/DocumentProperties.idl
@@ -49,7 +49,7 @@ module com {   module sun {   module star {   module document {
     @see XDocumentProperties
     @see XDocumentPropertiesSupplier
  */
-service DocumentProperties : XDocumentProperties
+published service DocumentProperties : XDocumentProperties
 {
     /** constructs default-initialized instance
      */
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index 72690a45eccd..89a3141a443d 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -51,6 +51,10 @@
 #include <com/sun/star/task/XStatusIndicator.idl>
 #endif
 
+#ifndef __com_sun_star_frame_XFrame_idl__
+#include <com/sun/star/frame/XFrame.idl>
+#endif
+
 //=============================================================================
 
 module com { module sun { module star { module document {
@@ -594,6 +598,11 @@ published service MediaDescriptor
         @since OOo 3.0
      */
     [optional,property] string ViewControllerName;
+    //-------------------------------------------------------------------------
+
+    /** specifies the frame containing the document. May be empty.
+     */
+    [optional,property] com::sun::star::frame::XFrame Frame;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/OfficeDocument.idl b/offapi/com/sun/star/document/OfficeDocument.idl
index 98d3b09e39e3..4a3418e4da64 100644
--- a/offapi/com/sun/star/document/OfficeDocument.idl
+++ b/offapi/com/sun/star/document/OfficeDocument.idl
@@ -71,6 +71,10 @@
 #include <com/sun/star/document/XEmbeddedScripts.idl>
 #endif
 
+#ifndef __com_sun_star_document_XDocumentPropertiesSupplier_idl__
+#include <com/sun/star/document/XDocumentPropertiesSupplier.idl>
+#endif
+
 //=============================================================================
 
 module com {   module sun {   module star {   module document {
@@ -158,6 +162,8 @@ published service OfficeDocument
         Instead of the <type>StandaloneDocumentInfo</type> service the <type>DocumentInfo</type>
         will be available on an already opened document only.
         </p>
+
+        @deprecated     Use <type>XDocumentPropertiesSupplier</type> instead.
      */
     [optional] interface XDocumentInfoSupplier;
 
@@ -180,6 +186,13 @@ published service OfficeDocument
     [optional] interface XEmbeddedScripts;
 
     //-------------------------------------------------------------------------
+    /** access to the <type>DocumentProperties</type>.
+
+        @since OOo 3.0
+     */
+    [optional] interface XDocumentPropertiesSupplier;
+
+    //-------------------------------------------------------------------------
     /** controls the focus behaviour of the form controls in the document
 
         <p>
diff --git a/offapi/com/sun/star/document/XDocumentProperties.idl b/offapi/com/sun/star/document/XDocumentProperties.idl
index 943fbd586f8f..8a3b2c1843aa 100755
--- a/offapi/com/sun/star/document/XDocumentProperties.idl
+++ b/offapi/com/sun/star/document/XDocumentProperties.idl
@@ -88,7 +88,7 @@ module com {   module sun {   module star {   module document {
             for getting access to an instance from a loaded document
     @see DocumentProperties     for a service that implements this interface
  */
-interface XDocumentProperties
+published interface XDocumentProperties
 {
     //-------------------------------------------------------------------------
     /** contains the initial author of the document.
@@ -352,8 +352,6 @@ interface XDocumentProperties
                  if thrown when trying to open a stream in the given storage
         @throws com::sun::star::io::IOException
                  if thrown when trying to open a stream in the given storage
-        @throws com::sun::star::uno::Exception
-                 in various unspecified circumstances
      */
 
     void loadFromStorage( [in] com::sun::star::embed::XStorage Storage,
@@ -361,15 +359,10 @@ interface XDocumentProperties
         raises( com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::io::WrongFormatException,
                 com::sun::star::lang::WrappedTargetException,
-                com::sun::star::io::IOException,
-                com::sun::star::uno::Exception );
+                com::sun::star::io::IOException );
 
     //-------------------------------------------------------------------------
     /** loads document properties from an ODF package or an OLE container.
-        <p>
-        For compatibility reasons this method also supports the import from
-        former StarOffice binary file formats.
-        </p>
 
         @param URL
             the URL of the source document
@@ -389,16 +382,13 @@ interface XDocumentProperties
                  if thrown when trying to open a stream in the given storage
         @throws com::sun::star::io::IOException
                  if thrown when trying to open a stream in the given storage
-        @throws com::sun::star::uno::Exception
-                 in various unspecified circumstances
      */
 
     void loadFromMedium( [in] string URL,
                 [in] sequence < com::sun::star::beans::PropertyValue > Medium )
         raises( com::sun::star::io::WrongFormatException,
                 com::sun::star::lang::WrappedTargetException,
-                com::sun::star::io::IOException,
-                com::sun::star::uno::Exception );
+                com::sun::star::io::IOException );
 
     //-------------------------------------------------------------------------
     /** stores document properties to an ODF package.
@@ -428,23 +418,16 @@ interface XDocumentProperties
                  if thrown when trying to open a stream in the given storage
         @throws com::sun::star::io::IOException
                  if thrown when writing to the storage
-        @throws com::sun::star::uno::Exception
-                 in various unspecified circumstances
      */
 
     void storeToStorage( [in] com::sun::star::embed::XStorage Storage,
                 [in] sequence < com::sun::star::beans::PropertyValue > Medium )
         raises( com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::lang::WrappedTargetException,
-                com::sun::star::io::IOException,
-                com::sun::star::uno::Exception );
+                com::sun::star::io::IOException );
 
     //-------------------------------------------------------------------------
     /** stores document properties to an ODF package or an OLE container.
-        <p>
-        For compatibility reasons this method also supports the export to former
-        StarOffice binary file formats.
-        </p>
 
         @param URL
             the URL of the target document
@@ -462,15 +445,12 @@ interface XDocumentProperties
                  if thrown when trying to open a stream in the given storage
         @throws com::sun::star::io::IOException
                  if thrown when writing to the storage
-        @throws com::sun::star::uno::Exception
-                 in various unspecified circumstances
      */
 
     void storeToMedium( [in] string URL,
                 [in] sequence < com::sun::star::beans::PropertyValue > Medium )
         raises( com::sun::star::lang::WrappedTargetException,
-                com::sun::star::io::IOException,
-                com::sun::star::uno::Exception );
+                com::sun::star::io::IOException );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
index 52fa61aa5f12..811513d7a026 100644
--- a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
@@ -52,7 +52,7 @@ module com {   module sun {   module star {   module document {
     @see XDocumentProperties
     @see DocumentProperties
  */
-interface XDocumentPropertiesSupplier
+published interface XDocumentPropertiesSupplier
 {
     //-------------------------------------------------------------------------
     /** provides the document properties object.
diff --git a/offapi/com/sun/star/embed/Actions.idl b/offapi/com/sun/star/embed/Actions.idl
index a65766a4ed79..48ad78eb0ab2 100644
--- a/offapi/com/sun/star/embed/Actions.idl
+++ b/offapi/com/sun/star/embed/Actions.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module embed {
 /** This constant set contains possible actions that could be approved by
 <type>ActionsApproval</type> implementation.
 */
-constants Actions
+published constants Actions
 {
     //------------------------------------------------------------------------
     /** "Prevent Close" - throws veto excetion if target object is going to
diff --git a/offapi/com/sun/star/embed/Aspects.idl b/offapi/com/sun/star/embed/Aspects.idl
index 3b0d13ba50c8..28431b60f87e 100644
--- a/offapi/com/sun/star/embed/Aspects.idl
+++ b/offapi/com/sun/star/embed/Aspects.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module embed {
 
     @see XEmbeddedObject
 */
-constants Aspects
+published constants Aspects
 {
     // MS OLE aspects
 
diff --git a/offapi/com/sun/star/embed/BaseStorage.idl b/offapi/com/sun/star/embed/BaseStorage.idl
index 776e9b992cbe..81df39792b75 100644
--- a/offapi/com/sun/star/embed/BaseStorage.idl
+++ b/offapi/com/sun/star/embed/BaseStorage.idl
@@ -44,7 +44,7 @@
 //============================================================================
 /** This is a service that allows to get access to a storage hierarchy.
  */
-service BaseStorage
+published service BaseStorage
 {
     // -----------------------------------------------------------------------
     /** This is a general interface representing storage functionality.
diff --git a/offapi/com/sun/star/embed/DocumentCloser.idl b/offapi/com/sun/star/embed/DocumentCloser.idl
index 89c020c8caa6..9b0eaf617527 100644
--- a/offapi/com/sun/star/embed/DocumentCloser.idl
+++ b/offapi/com/sun/star/embed/DocumentCloser.idl
@@ -65,7 +65,7 @@ module com {  module sun {  module star {  module embed {
     from the container system window.
     </p>
 */
-service DocumentCloser : com::sun::star::lang::XComponent
+published service DocumentCloser : com::sun::star::lang::XComponent
 {
     /** is used to initialize the object on it's creation.
 
diff --git a/offapi/com/sun/star/embed/ElementModes.idl b/offapi/com/sun/star/embed/ElementModes.idl
index d579c7f67be3..314036fd45ec 100644
--- a/offapi/com/sun/star/embed/ElementModes.idl
+++ b/offapi/com/sun/star/embed/ElementModes.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module embed {
 
     @see <type>XStorage</type>
 */
-constants ElementModes
+published constants ElementModes
 {
     //------------------------------------------------------------------------
     /** specifies opening of an element for reading.
diff --git a/offapi/com/sun/star/embed/EmbedMapUnits.idl b/offapi/com/sun/star/embed/EmbedMapUnits.idl
index 7888eea876b7..ff8a3cebada5 100644
--- a/offapi/com/sun/star/embed/EmbedMapUnits.idl
+++ b/offapi/com/sun/star/embed/EmbedMapUnits.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module embed {
 
     @see XVisualObject
 */
-constants EmbedMapUnits
+published constants EmbedMapUnits
 {
     // ----------------------------------------------------------------------
     /** In this type of map mode one logical point is equal to one-hundredth
diff --git a/offapi/com/sun/star/embed/EmbedMisc.idl b/offapi/com/sun/star/embed/EmbedMisc.idl
index 1fa8204a44b0..a1e05224b00b 100644
--- a/offapi/com/sun/star/embed/EmbedMisc.idl
+++ b/offapi/com/sun/star/embed/EmbedMisc.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module embed {
 
     @see XEmbeddedObject
 */
-constants EmbedMisc
+published constants EmbedMisc
 {
     // analog of the MS OLEMISC enum
 
diff --git a/offapi/com/sun/star/embed/EmbedStates.idl b/offapi/com/sun/star/embed/EmbedStates.idl
index 3f63bec2e607..df94cfa045a5 100644
--- a/offapi/com/sun/star/embed/EmbedStates.idl
+++ b/offapi/com/sun/star/embed/EmbedStates.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module embed {
 /** This constant set contains possible states for
 <type>EmbeddedObject</type>.
 */
-constants EmbedStates
+published constants EmbedStates
 {
     //------------------------------------------------------------------------
     /** "Loaded" - the persistent representation of the object is loaded in
diff --git a/offapi/com/sun/star/embed/EmbedUpdateModes.idl b/offapi/com/sun/star/embed/EmbedUpdateModes.idl
index 17213598d92a..9060aa965909 100644
--- a/offapi/com/sun/star/embed/EmbedUpdateModes.idl
+++ b/offapi/com/sun/star/embed/EmbedUpdateModes.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module embed {
 
     @see XEmbeddedObject
 */
-constants EmbedUpdateModes
+published constants EmbedUpdateModes
 {
     // -----------------------------------------------------------------------
     /** An object representation should be updated as often as possible.
diff --git a/offapi/com/sun/star/embed/EmbedVerbs.idl b/offapi/com/sun/star/embed/EmbedVerbs.idl
index cc92013b83d5..5d34fb1e8153 100644
--- a/offapi/com/sun/star/embed/EmbedVerbs.idl
+++ b/offapi/com/sun/star/embed/EmbedVerbs.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module embed {
 
     @see XEmbeddedObject
 */
-constants EmbedVerbs
+published constants EmbedVerbs
 {
     //------------------------------------------------------------------------
     /** lets the object do default activation, as by doubleclick.
diff --git a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
index 733db10e61b1..5a47c8f8fafc 100644
--- a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
+++ b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
@@ -71,7 +71,7 @@ module com { module sun { module star { module embed {
 
     @see com::sun::star::beans::PropertyValue
  */
-service EmbeddedObjectDescriptor
+published service EmbeddedObjectDescriptor
 {
     //------------------------------------------------------------------------
     /** lets the graphical representation of embedded document be stored.
diff --git a/offapi/com/sun/star/embed/EntryInitModes.idl b/offapi/com/sun/star/embed/EntryInitModes.idl
index 2517670dacf9..ae67192d323a 100644
--- a/offapi/com/sun/star/embed/EntryInitModes.idl
+++ b/offapi/com/sun/star/embed/EntryInitModes.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module embed {
 
     @see XEmbedPersist
 */
-constants EntryInitModes
+published constants EntryInitModes
 {
     // -----------------------------------------------------------------------
     /** In case object persistance is created based on existing entry,
diff --git a/offapi/com/sun/star/embed/FileSystemStorage.idl b/offapi/com/sun/star/embed/FileSystemStorage.idl
index 76d07e3f9aeb..2b4d7d456751 100644
--- a/offapi/com/sun/star/embed/FileSystemStorage.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorage.idl
@@ -40,7 +40,7 @@
 /** This is a service that allows to get access to a file system folder using
     storage hierarchy.
  */
-service FileSystemStorage
+published service FileSystemStorage
 {
     // -----------------------------------------------------------------------
     /** This service describes the base functionality of storages.
diff --git a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
index 30f7f1fa15db..d27541d703ef 100644
--- a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
@@ -42,7 +42,7 @@
     create a <type>FileSystemStorage</type> based on URL. The URL must point
     to a folder.
  */
-service FileSystemStorageFactory
+published service FileSystemStorageFactory
 {
     // ----------------------------------------------------------------------
     /** A storage can be created through this interface.
diff --git a/offapi/com/sun/star/embed/InsertedObjectInfo.idl b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
index a07529ee34cc..dedfabb75a8f 100644
--- a/offapi/com/sun/star/embed/InsertedObjectInfo.idl
+++ b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
@@ -43,7 +43,7 @@
 
 /** is intended to provide result of creation of an embedded object by dialog.
  */
-struct InsertedObjectInfo
+published struct InsertedObjectInfo
 {
     //-------------------------------------------------------------------------
     /** The new created embedded object.
diff --git a/offapi/com/sun/star/embed/InstanceLocker.idl b/offapi/com/sun/star/embed/InstanceLocker.idl
index 15716cc4fceb..3258dc3b9365 100644
--- a/offapi/com/sun/star/embed/InstanceLocker.idl
+++ b/offapi/com/sun/star/embed/InstanceLocker.idl
@@ -57,7 +57,7 @@ module com {  module sun {  module star {  module embed {
     the listener throw related veto exception until the service is disposed.
     </p>
 */
-service InstanceLocker : com::sun::star::lang::XComponent
+published service InstanceLocker : com::sun::star::lang::XComponent
 {
     /** is used to initialize the object on it's creation.
 
diff --git a/offapi/com/sun/star/embed/InvalidStorageException.idl b/offapi/com/sun/star/embed/InvalidStorageException.idl
index a8eeb067d237..f4eabfb8908e 100644
--- a/offapi/com/sun/star/embed/InvalidStorageException.idl
+++ b/offapi/com/sun/star/embed/InvalidStorageException.idl
@@ -44,7 +44,7 @@
     For example in case it is broken one.
     </p>
  */
-exception InvalidStorageException: com::sun::star::io::IOException
+published exception InvalidStorageException: com::sun::star::io::IOException
 {
 };
 
diff --git a/offapi/com/sun/star/embed/LinkageMisuseException.idl b/offapi/com/sun/star/embed/LinkageMisuseException.idl
index 769938f9ccba..fec43851a373 100644
--- a/offapi/com/sun/star/embed/LinkageMisuseException.idl
+++ b/offapi/com/sun/star/embed/LinkageMisuseException.idl
@@ -44,7 +44,7 @@
     Or if embedded object is misused as a linked object.
     </p>
  */
-exception LinkageMisuseException: com::sun::star::uno::Exception
+published exception LinkageMisuseException: com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/embed/NeedsRunningStateException.idl b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
index 4c5149e36454..8853049ab64f 100644
--- a/offapi/com/sun/star/embed/NeedsRunningStateException.idl
+++ b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
@@ -47,7 +47,7 @@
     addition to the loaded state. Other states and possible verbs can be
     detected only after object is switched to running state.
  */
-exception NeedsRunningStateException: WrongStateException
+published exception NeedsRunningStateException: WrongStateException
 {
 };
 
diff --git a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
index 9262e9f0ee31..c5f8e5935b46 100644
--- a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
+++ b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
@@ -41,7 +41,7 @@
 /** This exception can be thrown in case the object can not provide own visual
     area currently.
  */
-exception NoVisualAreaSizeException: com::sun::star::uno::Exception
+published exception NoVisualAreaSizeException: com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/embed/OLESimpleStorage.idl b/offapi/com/sun/star/embed/OLESimpleStorage.idl
index d83078dfb315..8aa4630acd6b 100644
--- a/offapi/com/sun/star/embed/OLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/OLESimpleStorage.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module embed {
 /** This service provides a simple functionality to allow
     read/write the storages in OLE storage format.
 */
-service OLESimpleStorage: XOLESimpleStorage
+published service OLESimpleStorage: XOLESimpleStorage
 {
     // CONSTRUCTORS ----------------------------------------------------------
     /** is used to initialize the object on it's creation.
diff --git a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
index cd75d9c0eb94..3d0252e912fe 100644
--- a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
+++ b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
@@ -43,7 +43,7 @@
 
     @see XEmbeddedClient
  */
-exception ObjectSaveVetoException: com::sun::star::uno::Exception
+published exception ObjectSaveVetoException: com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/embed/StateChangeInProgressException.idl b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
index fe6e50f221b9..648e839383ba 100644
--- a/offapi/com/sun/star/embed/StateChangeInProgressException.idl
+++ b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
@@ -42,7 +42,7 @@
     to call requested functionality currently because the object is changing
     state.
  */
-exception StateChangeInProgressException: com::sun::star::embed::WrongStateException
+published exception StateChangeInProgressException: com::sun::star::embed::WrongStateException
 {
     //------------------------------------------------------------------------
     /** contains the target state the object tries to reach currently.
diff --git a/offapi/com/sun/star/embed/Storage.idl b/offapi/com/sun/star/embed/Storage.idl
index 93709d335b2b..d34d736cf5cb 100644
--- a/offapi/com/sun/star/embed/Storage.idl
+++ b/offapi/com/sun/star/embed/Storage.idl
@@ -75,7 +75,7 @@
     of a parent storage.
     </p>
  */
-service Storage
+published service Storage
 {
     // -----------------------------------------------------------------------
     /** This service describes the base functionality of storages.
diff --git a/offapi/com/sun/star/embed/StorageFactory.idl b/offapi/com/sun/star/embed/StorageFactory.idl
index 0f653069f07e..4b4b40d01a4c 100644
--- a/offapi/com/sun/star/embed/StorageFactory.idl
+++ b/offapi/com/sun/star/embed/StorageFactory.idl
@@ -41,7 +41,7 @@
 /** The <type>StorageFactory</type> is a service that allows to create
     a storage based on either stream or URL.
  */
-service StorageFactory
+published service StorageFactory
 {
     // ----------------------------------------------------------------------
     /** A storage can be created through this interface.
@@ -82,13 +82,22 @@ service StorageFactory
 
             <dt>parameter 3</dt>
             <dd>
-                      allowes to provide
+                      this paramenter represents
+                      <type scope="com::sun::star::uno">Any</type>
+                      containing a sequence of
+                      <type scope="com::sun::star::beans">PropertyValue</type>.<br>
+                      The parameter can contain entries from
                       <type scope="com::sun::star::document">MediaDescryptor</type>
-                      to the storage so some parts can be used for
+                      to transport some document info during the storage
                       initialization, it can be for example
                       <type scope="com::sun::star::task">XInteractionHandler</type>
                       implementation, password for the storage and repair
-                      package flag.
+                      package flag.<br>
+                      Additionaly the parameter might contain property with the name
+                      "StorageFormat" that can take values from
+                      <type scope="com::sun::star::embed">StorageFormats</type>.
+                      If the property is not provided a storage of package format
+                      is created.
             </dd>
         </dl>
 
diff --git a/offapi/com/sun/star/embed/StorageFormats.idl b/offapi/com/sun/star/embed/StorageFormats.idl
new file mode 100644
index 000000000000..128fb1190b15
--- /dev/null
+++ b/offapi/com/sun/star/embed/StorageFormats.idl
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * 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_embed_StorageFormats_idl__
+#define __com_sun_star_embed_StorageFormats_idl__
+
+
+//============================================================================
+
+module com { module sun { module star { module embed {
+
+//============================================================================
+/** The constant set contains IDs of formats that are supported by
+    <type>StorageFactory</type>.
+
+    @see <type>StorageFactory</type>
+    @since OOo 3.3
+*/
+published constants StorageFormats
+{
+    //------------------------------------------------------------------------
+    /** specifies package format
+     */
+    const long PACKAGE = 1;
+
+    //------------------------------------------------------------------------
+    /** specifies zip format
+     */
+    const long ZIP = 2;
+
+    //------------------------------------------------------------------------
+    /** specifies Office Open XML format
+     */
+    const long OFOPXML = 3;
+};
+
+//============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/embed/StorageStream.idl b/offapi/com/sun/star/embed/StorageStream.idl
index eb08391619dd..1fb6733605f0 100644
--- a/offapi/com/sun/star/embed/StorageStream.idl
+++ b/offapi/com/sun/star/embed/StorageStream.idl
@@ -64,7 +64,7 @@
     of the stream can exist.
     </p>
  */
-service StorageStream
+published service StorageStream
 {
     // -----------------------------------------------------------------------
     /** allows to get access to <type scope="com::sun::star::io">XInputStream</type>
diff --git a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
index 038d2fb9194f..aed449eb90a1 100644
--- a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
+++ b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
@@ -41,7 +41,7 @@
 /** This exception can wrap an exception thrown during <type>XStorage</type>
     methods execution.
  */
-exception StorageWrappedTargetException: com::sun::star::lang::WrappedTargetException
+published exception StorageWrappedTargetException: com::sun::star::lang::WrappedTargetException
 {
 };
 
diff --git a/offapi/com/sun/star/embed/UnreachableStateException.idl b/offapi/com/sun/star/embed/UnreachableStateException.idl
index e0347b7894e5..be53beda3bc3 100644
--- a/offapi/com/sun/star/embed/UnreachableStateException.idl
+++ b/offapi/com/sun/star/embed/UnreachableStateException.idl
@@ -40,7 +40,7 @@
 
 /** This exception can be thrown in case specified state can not be reached.
  */
-exception UnreachableStateException: com::sun::star::uno::Exception
+published exception UnreachableStateException: com::sun::star::uno::Exception
 {
     // -----------------------------------------------------------------------
     /** The current state of the object.
diff --git a/offapi/com/sun/star/embed/UseBackupException.idl b/offapi/com/sun/star/embed/UseBackupException.idl
index 34c19b6b59ec..e7d74d30f52c 100644
--- a/offapi/com/sun/star/embed/UseBackupException.idl
+++ b/offapi/com/sun/star/embed/UseBackupException.idl
@@ -51,7 +51,7 @@
     internally, and can be used as a temporary storage usually used.
     </p>
  */
-exception UseBackupException: com::sun::star::io::IOException
+published exception UseBackupException: com::sun::star::io::IOException
 {
     /** The URL of the temporary file the storage is based on now.
      */
diff --git a/offapi/com/sun/star/embed/VerbAttributes.idl b/offapi/com/sun/star/embed/VerbAttributes.idl
index f8ee208831c5..742e782eb5c9 100644
--- a/offapi/com/sun/star/embed/VerbAttributes.idl
+++ b/offapi/com/sun/star/embed/VerbAttributes.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module embed {
 
     @see VerbDescriptor
 */
-constants VerbAttributes
+published constants VerbAttributes
 {
     // -----------------------------------------------------------------------
     /** Execution of the verb with this attribute must not modify the
diff --git a/offapi/com/sun/star/embed/VerbDescriptor.idl b/offapi/com/sun/star/embed/VerbDescriptor.idl
index c286e1ef23d0..f213c5969952 100644
--- a/offapi/com/sun/star/embed/VerbDescriptor.idl
+++ b/offapi/com/sun/star/embed/VerbDescriptor.idl
@@ -36,7 +36,7 @@
 
 /** describes a verb.
  */
-struct VerbDescriptor
+published struct VerbDescriptor
 {
     //------------------------------------------------------------------------
     /** specifies the id of the verb.
diff --git a/offapi/com/sun/star/embed/VisualRepresentation.idl b/offapi/com/sun/star/embed/VisualRepresentation.idl
index d41c9acfbe3f..8d07575008bb 100644
--- a/offapi/com/sun/star/embed/VisualRepresentation.idl
+++ b/offapi/com/sun/star/embed/VisualRepresentation.idl
@@ -39,7 +39,7 @@
 
 /** can contain a graphical representation in an arbitrary format.
  */
-struct VisualRepresentation
+published struct VisualRepresentation
 {
     //-------------------------------------------------------------------------
     /** The format of the visual representation.
diff --git a/offapi/com/sun/star/embed/WrongStateException.idl b/offapi/com/sun/star/embed/WrongStateException.idl
index f7a2a31d9058..809389c3a1fa 100644
--- a/offapi/com/sun/star/embed/WrongStateException.idl
+++ b/offapi/com/sun/star/embed/WrongStateException.idl
@@ -41,7 +41,7 @@
 /** This exception can be thrown in case the object's state does not allow
     to call requested functionality.
  */
-exception WrongStateException: com::sun::star::uno::Exception
+published exception WrongStateException: com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/embed/XActionsApproval.idl b/offapi/com/sun/star/embed/XActionsApproval.idl
index 904ae103101a..d3b64367a97b 100644
--- a/offapi/com/sun/star/embed/XActionsApproval.idl
+++ b/offapi/com/sun/star/embed/XActionsApproval.idl
@@ -44,7 +44,7 @@
     possible actions must be documented in documentation of the object.
     </p>
  */
-interface XActionsApproval: com::sun::star::uno::XInterface
+published interface XActionsApproval: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** requests an approval for the specified action.
diff --git a/offapi/com/sun/star/embed/XClassifiedObject.idl b/offapi/com/sun/star/embed/XClassifiedObject.idl
index 37ca9249cb30..2cde70fa8566 100644
--- a/offapi/com/sun/star/embed/XClassifiedObject.idl
+++ b/offapi/com/sun/star/embed/XClassifiedObject.idl
@@ -43,7 +43,7 @@
 //============================================================================
 /** represents common functionality for embedded objects
  */
-interface XClassifiedObject: com::sun::star::uno::XInterface
+published interface XClassifiedObject: com::sun::star::uno::XInterface
 {
     // -----------------------------------------------------------------------
     /** retrieves class ID of the object.
diff --git a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
index 2f07ce1e3015..8b82c44965e0 100644
--- a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
@@ -59,7 +59,7 @@
 /** specifies common implementation for embedded objects and links
     persistence.
  */
-interface XCommonEmbedPersist: com::sun::star::uno::XInterface
+published interface XCommonEmbedPersist: com::sun::star::uno::XInterface
 {
      //------------------------------------------------------------------------
     /** lets the object or the link store itself.
diff --git a/offapi/com/sun/star/embed/XComponentSupplier.idl b/offapi/com/sun/star/embed/XComponentSupplier.idl
index de1044bd2901..548b5aa24510 100644
--- a/offapi/com/sun/star/embed/XComponentSupplier.idl
+++ b/offapi/com/sun/star/embed/XComponentSupplier.idl
@@ -38,7 +38,7 @@
 //=============================================================================
 /** provides access to a component.
  */
-interface XComponentSupplier: com::sun::star::uno::XInterface
+published interface XComponentSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** allows to get access to a component.
diff --git a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
index b0e3c68b512c..45f3aef06cd6 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
@@ -67,7 +67,7 @@
     an embedded object based on system clipboard.
     </p>
  */
-interface XEmbedObjectClipboardCreator: com::sun::star::uno::XInterface
+published interface XEmbedObjectClipboardCreator: com::sun::star::uno::XInterface
 {
     // -----------------------------------------------------------------------
     /** creates a new object and initializes it from the system clipboard.
diff --git a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
index 09227bd26aa0..a214851922ad 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
@@ -63,7 +63,7 @@
     an embedded object.
     </p>
  */
-interface XEmbedObjectCreator: com::sun::star::uno::XInterface
+published interface XEmbedObjectCreator: com::sun::star::uno::XInterface
 {
     // -----------------------------------------------------------------------
     /** creates a new object and initializes it as a new one.
diff --git a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
index f5b73f1d3dc3..67a355054c48 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
@@ -61,7 +61,7 @@
     This interface provides user with full control over object creation.
     </p>
  */
-interface XEmbedObjectFactory: com::sun::star::uno::XInterface
+published interface XEmbedObjectFactory: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** creates a new object and transport parameters for persistent
diff --git a/offapi/com/sun/star/embed/XEmbedPersist.idl b/offapi/com/sun/star/embed/XEmbedPersist.idl
index 6eaf57c21a18..73f807188ba6 100644
--- a/offapi/com/sun/star/embed/XEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XEmbedPersist.idl
@@ -67,7 +67,7 @@
     representation.
     </p>
  */
-interface XEmbedPersist: XCommonEmbedPersist
+published interface XEmbedPersist: XCommonEmbedPersist
 {
     //------------------------------------------------------------------------
     /** provides object with a parent storage and a name for object's entry.
diff --git a/offapi/com/sun/star/embed/XEmbeddedClient.idl b/offapi/com/sun/star/embed/XEmbeddedClient.idl
index 1704f719287a..f361ea2d8653 100644
--- a/offapi/com/sun/star/embed/XEmbeddedClient.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedClient.idl
@@ -52,7 +52,7 @@
 //============================================================================
 /** represents common functionality for embedded clients.
  */
-interface XEmbeddedClient: XComponentSupplier
+published interface XEmbeddedClient: XComponentSupplier
 {
     //------------------------------------------------------------------------
     /** asks client to let the object store itself.
diff --git a/offapi/com/sun/star/embed/XEmbeddedObject.idl b/offapi/com/sun/star/embed/XEmbeddedObject.idl
index 37de00b0221f..e0368736279f 100644
--- a/offapi/com/sun/star/embed/XEmbeddedObject.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedObject.idl
@@ -92,7 +92,7 @@
 //============================================================================
 /** represents common functionality for embedded objects.
  */
-interface XEmbeddedObject
+published interface XEmbeddedObject
 {
     // INTERFACES
     //
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
index 1bcb03110a3b..9a71b99e871b 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
@@ -42,7 +42,7 @@
 //============================================================================
 /** This interface allows to set a password for an object.
  */
-interface XEncryptionProtectedSource: com::sun::star::uno::XInterface
+published interface XEncryptionProtectedSource: com::sun::star::uno::XInterface
 {
     // -----------------------------------------------------------------------
     /** sets a password for the object.
diff --git a/offapi/com/sun/star/embed/XExtendedStorageStream.idl b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
index e061c74c7337..397358db57ec 100644
--- a/offapi/com/sun/star/embed/XExtendedStorageStream.idl
+++ b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
@@ -63,7 +63,7 @@
 /** This interface allows access to an extended storage stream that might be
     transacted.
  */
-interface XExtendedStorageStream
+published interface XExtendedStorageStream
 {
     // INTERFACES
     //
diff --git a/offapi/com/sun/star/embed/XHatchWindow.idl b/offapi/com/sun/star/embed/XHatchWindow.idl
index 735a556ab0f5..33733958f6cd 100644
--- a/offapi/com/sun/star/embed/XHatchWindow.idl
+++ b/offapi/com/sun/star/embed/XHatchWindow.idl
@@ -56,7 +56,7 @@
     Thus the window can not resize/move itself.
     </p>
  */
-interface XHatchWindow: com::sun::star::lang::XComponent
+published interface XHatchWindow: com::sun::star::lang::XComponent
 {
     //------------------------------------------------------------------------
     /** sets the object that will control resizing/moving, if the object is
diff --git a/offapi/com/sun/star/embed/XHatchWindowController.idl b/offapi/com/sun/star/embed/XHatchWindowController.idl
index d4158db605fc..7ec2e0c5a5bb 100644
--- a/offapi/com/sun/star/embed/XHatchWindowController.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowController.idl
@@ -49,7 +49,7 @@
     rectangle size.
     </p>
  */
-interface XHatchWindowController: com::sun::star::uno::XInterface
+published interface XHatchWindowController: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** requests window owner to resize/move the window.
diff --git a/offapi/com/sun/star/embed/XHatchWindowFactory.idl b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
index 5f6ebf5d5998..79d8db04832d 100644
--- a/offapi/com/sun/star/embed/XHatchWindowFactory.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
@@ -55,7 +55,7 @@
 
 /** creates a hatch window implementation.
  */
-interface XHatchWindowFactory: com::sun::star::uno::XInterface
+published interface XHatchWindowFactory: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** creates a new hatch window instance.
diff --git a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
index d3a05b0b9de5..1f2cdcf132f9 100644
--- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
+++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
@@ -95,7 +95,7 @@
     opened ( it is locked by hierarchical access ).
     </p>
  */
-interface XHierarchicalStorageAccess
+published interface XHierarchicalStorageAccess
 {
     // METHODS
     //
diff --git a/offapi/com/sun/star/embed/XInplaceObject.idl b/offapi/com/sun/star/embed/XInplaceObject.idl
index 53462a78fe88..3ca6bdf359fb 100644
--- a/offapi/com/sun/star/embed/XInplaceObject.idl
+++ b/offapi/com/sun/star/embed/XInplaceObject.idl
@@ -52,7 +52,7 @@
 //============================================================================
 /** represents common functionality for inplace embedded objects.
  */
-interface XInplaceObject: com::sun::star::uno::XInterface
+published interface XInplaceObject: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** sets the visible part of the inplace object.
diff --git a/offapi/com/sun/star/embed/XInsertObjectDialog.idl b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
index 84ee0816ea8d..7b98a1c767a2 100644
--- a/offapi/com/sun/star/embed/XInsertObjectDialog.idl
+++ b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
@@ -62,7 +62,7 @@
 //=============================================================================
 /** allows to create and initialize a new embedded object using GUI dialog.
  */
-interface XInsertObjectDialog: com::sun::star::uno::XInterface
+published interface XInsertObjectDialog: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** creates a new object using GUI dialog.
diff --git a/offapi/com/sun/star/embed/XLinkCreator.idl b/offapi/com/sun/star/embed/XLinkCreator.idl
index 676d112848c9..be4bbe613288 100644
--- a/offapi/com/sun/star/embed/XLinkCreator.idl
+++ b/offapi/com/sun/star/embed/XLinkCreator.idl
@@ -62,7 +62,7 @@
     it will be detected.
     </p>
  */
-interface XLinkCreator: com::sun::star::uno::XInterface
+published interface XLinkCreator: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** creates a new object based on
diff --git a/offapi/com/sun/star/embed/XLinkFactory.idl b/offapi/com/sun/star/embed/XLinkFactory.idl
index 73cd218d35ca..cd77fbfe0dbb 100644
--- a/offapi/com/sun/star/embed/XLinkFactory.idl
+++ b/offapi/com/sun/star/embed/XLinkFactory.idl
@@ -58,7 +58,7 @@
 //============================================================================
 /** allows to create and initialize a new link of specified type.
  */
-interface XLinkFactory: com::sun::star::uno::XInterface
+published interface XLinkFactory: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** creates a new link and transport parameters for persistent
diff --git a/offapi/com/sun/star/embed/XLinkageSupport.idl b/offapi/com/sun/star/embed/XLinkageSupport.idl
index eb321989d182..a4a53c36e7a8 100644
--- a/offapi/com/sun/star/embed/XLinkageSupport.idl
+++ b/offapi/com/sun/star/embed/XLinkageSupport.idl
@@ -54,7 +54,7 @@
 //============================================================================
 /** specifies an additional implementation for linked embedded object support.
  */
-interface XLinkageSupport: XCommonEmbedPersist
+published interface XLinkageSupport: XCommonEmbedPersist
 {
     //------------------------------------------------------------------------
     /** breaks the link and provides the object with a parent storage and a
diff --git a/offapi/com/sun/star/embed/XOLESimpleStorage.idl b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
index 9f8b19573953..ac39370e8a8f 100644
--- a/offapi/com/sun/star/embed/XOLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
@@ -58,7 +58,7 @@ module com { module sun { module star { module embed {
     subcomponents are either OLE storages themself or streams.
     </p>
 */
-interface XOLESimpleStorage
+published interface XOLESimpleStorage
 {
     //INTERFACES
     //
diff --git a/offapi/com/sun/star/embed/XOptimizedStorage.idl b/offapi/com/sun/star/embed/XOptimizedStorage.idl
index e43a63bb6586..d51371fadfbb 100644
--- a/offapi/com/sun/star/embed/XOptimizedStorage.idl
+++ b/offapi/com/sun/star/embed/XOptimizedStorage.idl
@@ -97,7 +97,7 @@
     time and will be depricated soon!
     Another solution will be introduced as final one.
  */
-interface XOptimizedStorage
+published interface XOptimizedStorage
 {
     // -----------------------------------------------------------------------
     /** allows to insert a raw stream representing nonencrypted stream with
diff --git a/offapi/com/sun/star/embed/XPackageStructureCreator.idl b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
index 193232cdfdc1..c76d4c787cc7 100644
--- a/offapi/com/sun/star/embed/XPackageStructureCreator.idl
+++ b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
@@ -42,7 +42,7 @@
 //=============================================================================
 /** allows to convert file system folder tree in to a package.
  */
-interface XPackageStructureCreator: com::sun::star::uno::XInterface
+published interface XPackageStructureCreator: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** converts file system folder tree in to a package.
diff --git a/offapi/com/sun/star/embed/XPersistanceHolder.idl b/offapi/com/sun/star/embed/XPersistanceHolder.idl
index f6d171218549..5528fe62e143 100644
--- a/offapi/com/sun/star/embed/XPersistanceHolder.idl
+++ b/offapi/com/sun/star/embed/XPersistanceHolder.idl
@@ -46,7 +46,7 @@
 //=============================================================================
 /** allows to disconnect an object from its persistence.
  */
-interface XPersistanceHolder: com::sun::star::uno::XInterface
+published interface XPersistanceHolder: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** disconnects the object from the persistance.
diff --git a/offapi/com/sun/star/embed/XRelationshipAccess.idl b/offapi/com/sun/star/embed/XRelationshipAccess.idl
index 8a527df38a4d..3c934caf1f33 100644
--- a/offapi/com/sun/star/embed/XRelationshipAccess.idl
+++ b/offapi/com/sun/star/embed/XRelationshipAccess.idl
@@ -62,7 +62,7 @@
     this tag is used as a uniqued identified of an entry.
     </p>
  */
-interface XRelationshipAccess : ::com::sun::star::uno::XInterface
+published interface XRelationshipAccess : ::com::sun::star::uno::XInterface
 {
     // -----------------------------------------------------------------------
     /** allows to detect whether there is an entry with specified value of
diff --git a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
index e50c54c182ff..91a47e8f6288 100644
--- a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module embed {
 
 /** broadcasts message in case embedded object object changes it's state.
  */
-interface XStateChangeBroadcaster: com::sun::star::uno::XInterface
+published interface XStateChangeBroadcaster: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** adds the specified listener to receive events about states change
diff --git a/offapi/com/sun/star/embed/XStateChangeListener.idl b/offapi/com/sun/star/embed/XStateChangeListener.idl
index 13bde974ceaf..3c552de33222 100644
--- a/offapi/com/sun/star/embed/XStateChangeListener.idl
+++ b/offapi/com/sun/star/embed/XStateChangeListener.idl
@@ -48,7 +48,7 @@ module com {  module sun {  module star {  module embed {
 /** makes it possible to receive events when an embedded object changes it's
     state.
  */
-interface XStateChangeListener: com::sun::star::lang::XEventListener
+published interface XStateChangeListener: com::sun::star::lang::XEventListener
 {
     //------------------------------------------------------------------------
     /** is called just before the object changes state.
diff --git a/offapi/com/sun/star/embed/XStorage.idl b/offapi/com/sun/star/embed/XStorage.idl
index a03190caddab..0a98cfa3e8eb 100644
--- a/offapi/com/sun/star/embed/XStorage.idl
+++ b/offapi/com/sun/star/embed/XStorage.idl
@@ -91,7 +91,7 @@
 //============================================================================
 /** This interface represents main storage functionality.
  */
-interface XStorage
+published interface XStorage
 {
     // INTERFACES
     //
diff --git a/offapi/com/sun/star/embed/XStorageRawAccess.idl b/offapi/com/sun/star/embed/XStorageRawAccess.idl
index 64031325f628..b70b2e3c1235 100644
--- a/offapi/com/sun/star/embed/XStorageRawAccess.idl
+++ b/offapi/com/sun/star/embed/XStorageRawAccess.idl
@@ -79,7 +79,7 @@
 //============================================================================
 /** This interface represents main storage functionality.
  */
-interface XStorageRawAccess
+published interface XStorageRawAccess
 {
     // -----------------------------------------------------------------------
     /** allows to get a plain raw stream representing a package stream.
diff --git a/offapi/com/sun/star/embed/XTransactedObject.idl b/offapi/com/sun/star/embed/XTransactedObject.idl
index afefd0f2d2c5..80f86187a7c6 100644
--- a/offapi/com/sun/star/embed/XTransactedObject.idl
+++ b/offapi/com/sun/star/embed/XTransactedObject.idl
@@ -46,7 +46,7 @@
 //============================================================================
 /** allows transacted access to an object.
  */
-interface XTransactedObject: com::sun::star::uno::XInterface
+published interface XTransactedObject: com::sun::star::uno::XInterface
 {
     // -----------------------------------------------------------------------
     /** commits the changes made for object.
diff --git a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
index 66e62538f083..fb5b7d2acc06 100644
--- a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module embed {
 
 /** broadcasts messege in case transacted object is commited or reverted.
  */
-interface XTransactionBroadcaster: com::sun::star::uno::XInterface
+published interface XTransactionBroadcaster: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** adds the specified listener to receive events about commits and
diff --git a/offapi/com/sun/star/embed/XTransactionListener.idl b/offapi/com/sun/star/embed/XTransactionListener.idl
index acfa889386ca..89e80956cf11 100644
--- a/offapi/com/sun/star/embed/XTransactionListener.idl
+++ b/offapi/com/sun/star/embed/XTransactionListener.idl
@@ -48,7 +48,7 @@ module com {  module sun {  module star {  module embed {
 /** makes it possible to receive events when a transacted object is commited
     or reverted.
  */
-interface XTransactionListener: com::sun::star::lang::XEventListener
+published interface XTransactionListener: com::sun::star::lang::XEventListener
 {
     //------------------------------------------------------------------------
     /** is called just before the object is commited.
diff --git a/offapi/com/sun/star/embed/XTransferableSupplier.idl b/offapi/com/sun/star/embed/XTransferableSupplier.idl
index 76034df05231..d22c6fb27769 100644
--- a/offapi/com/sun/star/embed/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/embed/XTransferableSupplier.idl
@@ -40,7 +40,7 @@
     <type scope="com::sun::star::datatransfer">XTransferable</type>
     implementation from the object.
  */
-interface XTransferableSupplier: com::sun::star::uno::XInterface
+published interface XTransferableSupplier: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** allows to get access to
diff --git a/offapi/com/sun/star/embed/XVisualObject.idl b/offapi/com/sun/star/embed/XVisualObject.idl
index 62430e41778a..bed94da4fa7d 100644
--- a/offapi/com/sun/star/embed/XVisualObject.idl
+++ b/offapi/com/sun/star/embed/XVisualObject.idl
@@ -55,7 +55,7 @@
 //=============================================================================
 /** represents common visualisation functionality for embedded objects.
  */
-interface XVisualObject: ::com::sun::star::uno::XInterface
+published interface XVisualObject: ::com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** sets the size of object's visual area.
diff --git a/offapi/com/sun/star/embed/XWindowSupplier.idl b/offapi/com/sun/star/embed/XWindowSupplier.idl
index 3ff344ab60d9..e878a65d21d2 100644
--- a/offapi/com/sun/star/embed/XWindowSupplier.idl
+++ b/offapi/com/sun/star/embed/XWindowSupplier.idl
@@ -38,7 +38,7 @@
 //============================================================================
 /** provides access to a vcl window implementation.
  */
-interface XWindowSupplier: com::sun::star::uno::XInterface
+published interface XWindowSupplier: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** allows to get access to a vcl window implementation.
diff --git a/offapi/com/sun/star/embed/makefile.mk b/offapi/com/sun/star/embed/makefile.mk
index 404f14ceab1c..349017452ef3 100644
--- a/offapi/com/sun/star/embed/makefile.mk
+++ b/offapi/com/sun/star/embed/makefile.mk
@@ -57,6 +57,7 @@ IDLFILES=\
     Storage.idl\
     StorageStream.idl\
     StorageFactory.idl\
+    StorageFormats.idl\
     VerbAttributes.idl\
     VisualRepresentation.idl\
     VerbDescriptor.idl\
diff --git a/offapi/com/sun/star/packages/NoEncryptionException.idl b/offapi/com/sun/star/packages/NoEncryptionException.idl
index 5d057c91cc8f..cffecf7bd637 100644
--- a/offapi/com/sun/star/packages/NoEncryptionException.idl
+++ b/offapi/com/sun/star/packages/NoEncryptionException.idl
@@ -41,7 +41,7 @@
 // DocMerge from xml: exception com::sun::star::packages::NoEncryptionException
 /** This exception can be thrown in case object is not encrypted one as expected.
  */
-exception NoEncryptionException: com::sun::star::uno::Exception
+published exception NoEncryptionException: com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/packages/NoRawFormatException.idl b/offapi/com/sun/star/packages/NoRawFormatException.idl
index 111b8fdcc90c..a2730b41da62 100644
--- a/offapi/com/sun/star/packages/NoRawFormatException.idl
+++ b/offapi/com/sun/star/packages/NoRawFormatException.idl
@@ -42,7 +42,7 @@
 /** This exception can be thrown in case provided stream is not a raw stream
     representing encrypted package stream.
  */
-exception NoRawFormatException: com::sun::star::io::IOException
+published exception NoRawFormatException: com::sun::star::io::IOException
 {
 };
 
diff --git a/offapi/com/sun/star/packages/WrongPasswordException.idl b/offapi/com/sun/star/packages/WrongPasswordException.idl
index 2e014e310dfb..954e0bd68afc 100644
--- a/offapi/com/sun/star/packages/WrongPasswordException.idl
+++ b/offapi/com/sun/star/packages/WrongPasswordException.idl
@@ -41,7 +41,7 @@
 // DocMerge from xml: exception com::sun::star::packages::WrongPasswordException
 /** This exception can be thrown in case wrong password was provided.
  */
-exception WrongPasswordException: com::sun::star::uno::Exception
+published exception WrongPasswordException: com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl b/offapi/com/sun/star/rdf/XDocumentRepository.idl
index ee42faf0c51c..215fd89fa954 100644
--- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
+++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
@@ -28,6 +28,10 @@
 #ifndef __com_sun_star_rdf_XDocumentRepository_idl__
 #define __com_sun_star_rdf_XDocumentRepository_idl__
 
+#ifndef __com_sun_star_beans_Pair_idl__
+#include <com/sun/star/beans/Pair.idl>
+#endif
+
 #ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
 #endif
@@ -84,13 +88,6 @@ interface XDocumentRepository : XRepository
             <code>Subject Predicate XLiteral(RDFaContent^^RDFaDatatype)</code>
             </li>
             </ul>
-            Further, add the following RDF statement to the same unspecified
-            named graph:
-            <ul>
-            <li>
-            <code>Subject rdfs:label XLiteral(Object->getText())</code>
-            </li>
-            </ul>
         </li>
         </ol>
         </p>
@@ -172,13 +169,13 @@ interface XDocumentRepository : XRepository
             <li>if the element has no RDFa meta-data attributes:
                 the empty sequence.</li>
             <li>if the element has RDFa meta-data attributes:
-                and no <code>rdfa:content</code> attached:
-                a sequence with the RDFa-statements corresponding to the
-                attributes</li>
-            <li>if the element has RDFa meta-data attributes,
-                and also <code>rdfa:content</code> attached:
-                a sequence with the RDFa-statements corresponding to the
-                attributes, including the RDFa-labels-statement</li>
+                <ul>
+                <li>a sequence with the RDFa-statements corresponding to the
+                attributes.</li>
+                <li>a flag indicating whether there is a xhtml:content
+                attribute.</li>
+                </ul>
+            </li>
             </ul>
 
         @throws com::sun::star::lang::IllegalArgumentException
@@ -190,7 +187,8 @@ interface XDocumentRepository : XRepository
 
         @see Statement
      */
-    sequence<Statement> getStatementRDFa([in] XMetadatable Element)
+    com::sun::star::beans::Pair< sequence<Statement>, boolean >
+            getStatementRDFa([in] XMetadatable Element)
         raises( com::sun::star::lang::IllegalArgumentException,
                 RepositoryException );
 
diff --git a/offapi/com/sun/star/script/ModuleInfo.idl b/offapi/com/sun/star/script/ModuleInfo.idl
new file mode 100644
index 000000000000..158ba387be6b
--- /dev/null
+++ b/offapi/com/sun/star/script/ModuleInfo.idl
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: ModuleInfo.idl,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: rt $ $Date: 2006/05/05 10:14:46 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_ModuleInfo_idl__
+#define __com_sun_star_script_ModuleInfo_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+//=============================================================================
+module com {  module sun {  module star { module script {
+struct ModuleInfo
+{
+    com::sun::star::uno::XInterface ModuleObject;
+    long ModuleType;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/script/ModuleType.idl b/offapi/com/sun/star/script/ModuleType.idl
new file mode 100644
index 000000000000..a9bde042fa5a
--- /dev/null
+++ b/offapi/com/sun/star/script/ModuleType.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: ModuleType.idl,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: rt $ $Date: 2006/05/05 10:14:46 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_ModuleType_idl__
+#define __com_sun_star_script_ModuleType_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star { module script {
+
+published constants ModuleType
+{
+    // ------------------------------------------------------------------------
+
+    const long UNKNOWN = 0;
+
+    // ------------------------------------------------------------------------
+
+    const long NORMAL = 1;
+
+    // ------------------------------------------------------------------------
+
+    const long CLASS = 2;
+
+    // ------------------------------------------------------------------------
+
+    const long FORM = 3;
+
+    // ------------------------------------------------------------------------
+
+    const long DOCUMENT = 4;
+
+    // ------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/script/XVBACompat.idl b/offapi/com/sun/star/script/XVBACompat.idl
new file mode 100644
index 000000000000..09da54eb27cd
--- /dev/null
+++ b/offapi/com/sun/star/script/XVBACompat.idl
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * 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: XLibraryContainer.idl,v $
+ * $Revision: 1.4 $
+ *
+ * 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_script_XVBACompat_idl__
+#define __com_sun_star_script_XVBACompat_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module script {
+
+interface XVBACompat: com::sun::star::uno::XInterface
+{
+
+//=============================================================================
+    [attribute ] boolean VBACompatModeOn;
+
+}; }; }; };
+};
+#endif
diff --git a/offapi/com/sun/star/script/XVBAModuleInfo.idl b/offapi/com/sun/star/script/XVBAModuleInfo.idl
new file mode 100644
index 000000000000..f9c4e64223c3
--- /dev/null
+++ b/offapi/com/sun/star/script/XVBAModuleInfo.idl
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * 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: XLibraryContainer.idl,v $
+ * $Revision: 1.4 $
+ *
+ * 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_script_XVBACompat_idl__
+#define __com_sun_star_script_XVBACompat_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+#ifndef __com_sun_star_script_ModuleInfo_idl__
+#include <com/sun/star/script/ModuleInfo.idl>
+#endif
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+#ifndef __com_sun_star_container_ElementExistException_idl__
+#include <com/sun/star/container/ElementExistException.idl>
+#endif
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__
+#include <com/sun/star/lang/WrappedTargetException.idl>
+#endif
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
+#include <com/sun/star/container/NoSuchElementException.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module script {
+
+interface XVBAModuleInfo: com::sun::star::uno::XInterface
+{
+
+    com::sun::star::script::ModuleInfo  getModuleInfo( [in] string ModuleName )
+        raises( com::sun::star::container::NoSuchElementException,
+                com::sun::star::lang::WrappedTargetException );
+    boolean  hasModuleInfo( [in] string ModuleName );
+    void insertModuleInfo( [in] string ModuleName,
+                           [in] com::sun::star::script::ModuleInfo ModuleInfo )
+        raises( com::sun::star::lang::IllegalArgumentException,
+                com::sun::star::container::ElementExistException,
+                com::sun::star::lang::WrappedTargetException );
+    void removeModuleInfo( [in] string ModuleName )
+        raises( com::sun::star::container::NoSuchElementException,
+                com::sun::star::lang::WrappedTargetException );
+}; }; }; };
+};
+#endif
diff --git a/offapi/com/sun/star/script/makefile.mk b/offapi/com/sun/star/script/makefile.mk
index 579174390ec4..b694a753f7d7 100644
--- a/offapi/com/sun/star/script/makefile.mk
+++ b/offapi/com/sun/star/script/makefile.mk
@@ -48,6 +48,10 @@ IDLFILES=\
     XPersistentLibraryContainer.idl\
     XStorageBasedLibraryContainer.idl\
     ModuleSizeExceededRequest.idl\
+    XVBACompat.idl\
+        XVBAModuleInfo.idl\
+    ModuleInfo.idl\
+    ModuleType.idl\
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/text/InContentMetadata.idl b/offapi/com/sun/star/text/InContentMetadata.idl
index f6aec7bbee63..5eac10714576 100755
--- a/offapi/com/sun/star/text/InContentMetadata.idl
+++ b/offapi/com/sun/star/text/InContentMetadata.idl
@@ -32,6 +32,10 @@
 #include <com/sun/star/container/XEnumerationAccess.idl>
 #endif
 
+#ifndef __com_sun_star_container_XChild_idl__
+#include <com/sun/star/container/XChild.idl>
+#endif
+
 #ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
 #endif
@@ -68,6 +72,12 @@ service InContentMetadata
         annotated range of text can be enumerated. */
     interface com::sun::star::container::XEnumerationAccess;
 
+    //-------------------------------------------------------------------------
+    /** The <type>TextContent</type> that is the parent of this text range.
+        @since OOo 3.3
+     */
+    interface com::sun::star::container::XChild;
+
 };
 
 
diff --git a/offapi/com/sun/star/text/TextMarkupType.idl b/offapi/com/sun/star/text/TextMarkupType.idl
index d99942e0d12f..5137d47d217f 100644
--- a/offapi/com/sun/star/text/TextMarkupType.idl
+++ b/offapi/com/sun/star/text/TextMarkupType.idl
@@ -58,6 +58,12 @@ constants TextMarkupType
     /// An inivisible markup used to identify sentence boundaries.
     /// @since OOo 3.0.1
     const long SENTENCE = 4;
+
+    /// Markups originates from change tracking.
+        /// @since OOo 3.3
+    const long TRACK_CHANGE_INSERTION = 5;
+    const long TRACK_CHANGE_DELETION = 6;
+    const long TRACK_CHANGE_FORMATCHANGE = 7;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/text/TextRangeContentProperties.idl b/offapi/com/sun/star/text/TextRangeContentProperties.idl
new file mode 100644
index 000000000000..74acb67cf9ed
--- /dev/null
+++ b/offapi/com/sun/star/text/TextRangeContentProperties.idl
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
+ * 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_text_TextRangeContentProperties_idl__
+#define __com_sun_star_text_TextRangeContentProperties_idl__
+
+#ifndef __com_sun_star_table_XCell_idl__
+#include <com/sun/star/table/XCell.idl>
+#endif
+
+#ifndef __com_sun_star_text_XTextContent_idl__
+#include <com/sun/star/text/XTextContent.idl>
+#endif
+
+#ifndef __com_sun_star_text_XDocumentIndex_idl__
+#include <com/sun/star/text/XDocumentIndex.idl>
+#endif
+
+#ifndef __com_sun_star_text_XTextTable_idl__
+#include <com/sun/star/text/XTextTable.idl>
+#endif
+
+#ifndef __com_sun_star_text_XTextFrame_idl__
+#include <com/sun/star/text/XTextFrame.idl>
+#endif
+
+#ifndef __com_sun_star_text_XTextSection_idl__
+#include <com/sun/star/text/XTextSection.idl>
+#endif
+
+#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
+#include <com/sun/star/text/XDocumentIndexMark.idl>
+#endif
+
+#ifndef __com_sun_star_text_XFootnote_idl__
+#include <com/sun/star/text/XFootnote.idl>
+#endif
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module text {
+
+//=============================================================================
+
+/** describes the structural properties to retrieve text contents.
+
+    @since OOo 3.3
+ */
+service TextRangeContentProperties
+{
+    //-------------------------------------------------------------------------
+    /** may contain a document index. */
+    [optional, readonly, property] com::sun::star::text::XDocumentIndex
+        DocumentIndex;
+
+    //-------------------------------------------------------------------------
+    /** may contain a text table. */
+    [optional, readonly, property] com::sun::star::text::XTextTable
+        TextTable;
+
+    //-------------------------------------------------------------------------
+    /** may contain a table cell. */
+    [optional, readonly, property] com::sun::star::table::XCell Cell;
+
+    //-------------------------------------------------------------------------
+    /** may contain a text frame. */
+    [optional, readonly, property] com::sun::star::text::XTextFrame
+        TextFrame;
+
+    //-------------------------------------------------------------------------
+    /** may contain a text section. */
+    [optional, readonly, property] com::sun::star::text::XTextSection
+        TextSection;
+
+    //-------------------------------------------------------------------------
+    /** may contain a document index mark. */
+    [optional, readonly, property] com::sun::star::text::XDocumentIndexMark
+        DocumentIndexMark;
+
+    //-------------------------------------------------------------------------
+    /** may contain a reference mark. */
+    [optional, readonly, property] com::sun::star::text::XTextContent
+        ReferenceMark;
+
+    //-------------------------------------------------------------------------
+    /** may contain a footnote. */
+    [optional, readonly, property] com::sun::star::text::XFootnote Footnote;
+
+    //-------------------------------------------------------------------------
+    /** may contain a endnote. */
+    [optional, readonly, property] com::sun::star::text::XFootnote Endnote;
+
+    //-------------------------------------------------------------------------
+    /** may contain a nested text content.
+
+        For example, may contain an <type>InContentMetadata</type> or a
+        <type scope="com::sun::star::text::textfield">MetadataField</type>.
+     */
+    [optional, readonly, property] com::sun::star::text::XTextContent
+        NestedTextContent;
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/text/makefile.mk b/offapi/com/sun/star/text/makefile.mk
index 28c3d1eaece3..4e6d24746af8 100644
--- a/offapi/com/sun/star/text/makefile.mk
+++ b/offapi/com/sun/star/text/makefile.mk
@@ -173,6 +173,7 @@ IDLFILES=\
       TextPortionEnumeration.idl\
       TextRange.idl\
       TextRanges.idl\
+      TextRangeContentProperties.idl\
       TextSection.idl\
       TextSections.idl\
       TextSortable.idl\
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
index 85541457aef7..d98c4be39e96 100755
--- a/offapi/com/sun/star/text/textfield/MetadataField.idl
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -32,6 +32,10 @@
 #include <com/sun/star/container/XEnumerationAccess.idl>
 #endif
 
+#ifndef __com_sun_star_container_XChild_idl__
+#include <com/sun/star/container/XChild.idl>
+#endif
+
 #ifndef __com_sun_star_text_TextField_idl__
 #include <com/sun/star/text/TextField.idl>
 #endif
@@ -79,6 +83,13 @@ service MetadataField
     interface com::sun::star::container::XEnumerationAccess;
 
     //-------------------------------------------------------------------------
+    /** The <type scope="com::sun::star::text">TextContent</type>
+        that is the parent of this <type>MetadataField</type>.
+        @since OOo 3.3
+     */
+    interface com::sun::star::container::XChild;
+
+    //-------------------------------------------------------------------------
     /** this is the number format for this field.
         @see com::sun::star::util::NumberFormatter
     */
author	sj <sj@openoffice.org>	2010-06-04 22:30:37 +0200
committer	sj <sj@openoffice.org>	2010-06-04 22:30:37 +0200
commit	73226493957b30394174b19383d4c7e9d7c9ca17 (patch)
tree	4919f40342e3e187587d4040d84fb62af14631fc /offapi
parent	68ad260fd44cd87f726f00878b2010edcc2db7b7 (diff)
parent	5c92fa80fcce16bb9dd0da89f9f5eafed3cb97b5 (diff)