ab71: merge with DEV300_m63

62 files changed, 3244 insertions, 137 deletions

diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 2a876af40885..d848f84cb322 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -367,6 +367,22 @@ published constants AccessibleEventId
         old and new accessible objects representing the table summary.
     */
     const short TABLE_SUMMARY_CHANGED = 31;
+
+    /** Constant used to indicate that a list box entry has been expanded.
+        <member>AccessibleEventObject::OldValue</member> is empty.
+        <member>AccessibleEventObject::NewValue</member> contains the expanded list box entry.
+
+        @since OOo 3.2
+    */
+    const short LISTBOX_ENTRY_EXPANDED = 32;
+
+    /** Constant used to indicate that a list box entry has been collapsed.
+        <member>AccessibleEventObject::OldValue</member> is empty.
+        <member>AccessibleEventObject::NewValue</member> contains the collapsed list box entry.
+
+        @since OOo 3.2
+    */
+    const short LISTBOX_ENTRY_COLLAPSED = 33;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
new file mode 100644
index 000000000000..67e5b7572de3
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: UnoControlEdit.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_DefaultGridColumnModel_idl__
+#define __com_sun_star_awt_DefaultGridColumnModel_idl__
+
+#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__
+#include <com/sun/star/awt/grid/XGridColumnModel.idl>
+#endif
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module awt {  module grid {
+
+//=============================================================================
+
+/** If you do not want to implement the <type>XGridColumnModel</type> yourself, use this service.
+ */
+service DefaultGridColumnModel
+{
+    interface com::sun::star::awt::grid::XGridColumnModel;
+};
+
+//=============================================================================
+
+}; }; }; };};
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
new file mode 100644
index 000000000000..40a77668887c
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: UnoControlEdit.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_DefaultGridDataModel_idl__
+#define __com_sun_star_awt_DefaultGridDataModel_idl__
+
+#ifndef __com_sun_star_awt_grid_XGridDataModel_idl__
+#include <com/sun/star/awt/grid/XGridDataModel.idl>
+#endif
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module awt {  module grid {
+
+//=============================================================================
+
+/** If you do not want to implement the <type>XGridDataModel</type> yourself, use this service.
+ */
+service DefaultGridDataModel
+{
+    interface com::sun::star::awt::grid::XGridDataModel;
+};
+
+//=============================================================================
+
+}; }; }; };};
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
new file mode 100644
index 000000000000..90db6f82b258
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: UnoControlEdit.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_GridColumn_idl__
+#define __com_sun_star_awt_GridColumn_idl__
+
+#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 {
+
+//=============================================================================
+
+/** Represents a column as used by the <type>DefaultGridColumnModel</type>
+ */
+service GridColumn
+{
+    interface com::sun::star::awt::grid::XGridColumn;
+};
+
+//=============================================================================
+
+}; }; }; };};
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
new file mode 100644
index 000000000000..c6c5ac646cdf
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * 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: ActionEvent.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_GridColumnEvent_idl__
+#define __com_sun_star_awt_grid_GridColumnEvent_idl__
+
+#ifndef __com_sun_star_lang_EventObject_idl__
+#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>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
+ */
+struct GridColumnEvent: com::sun::star::lang::EventObject
+{
+    /** Contains the property name of the changed value **/
+    string valueName;
+
+    /** Contains the old value **/
+    any oldValue;
+
+    /** Contains the new value **/
+    any newValue;
+
+    /** Contains the index of the changed column**/
+    long index;
+
+    /** Contains the changed column**/
+    XGridColumn column;
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/GridControlEvent.idl b/offapi/com/sun/star/awt/grid/GridControlEvent.idl
new file mode 100644
index 000000000000..87b3a9064387
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridControlEvent.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: ActionEvent.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_GridControlEvent_idl__
+#define __com_sun_star_awt_GridControlEvent_idl__
+
+#ifndef __com_sun_star_lang_EventObject_idl__
+#include <com/sun/star/lang/EventObject.idl>
+#endif
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+
+struct GridControlEvent: com::sun::star::lang::EventObject
+{
+    //-------------------------------------------------------------------------
+
+    string ActionCommand;
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
new file mode 100644
index 000000000000..a4ff1a58d5c7
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * 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: ActionEvent.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_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
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt {  module grid {
+
+//=============================================================================
+
+/** An event used by a <type>XGridDataModel</type> to notify changes in the data
+    model to the <type>XGridControl</type>.
+    You usually need to fill this event only if you implement the <type>XGridDataModel</type>
+    yourself.
+
+    @see XGridDataModel
+    @see XGridControl
+    @see XGridDataListener
+ */
+struct GridDataEvent: com::sun::star::lang::EventObject
+{
+    //-------------------------------------------------------------------------
+
+    /** Contains the property name of the changed value **/
+    string valueName;
+
+    /** Contains the old value **/
+    any oldValue;
+
+    /** Contains the new value **/
+    any newValue;
+
+    /** Contains the index of the changed row**/
+    long index;
+
+    /** Contains the header name of the changed row**/
+    string headerName;
+
+    /** Contains the changed row**/
+    sequence<string> rowData;
+
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
new file mode 100644
index 000000000000..a2ec28361ca0
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: ActionEvent.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_GridSelectionEvent_idl__
+#define __com_sun_star_awt_GridSelectionEvent_idl__
+
+#ifndef __com_sun_star_lang_EventObject_idl__
+#include <com/sun/star/lang/EventObject.idl>
+#endif
+
+#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__
+#include <com/sun/star/awt/grid/SelectionEventType.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** An event used by a <type>XGridControl</type> to notify changes in the selection.
+
+    @see XGridControl
+    @see XGridSelectionListener
+ */
+struct GridSelectionEvent: com::sun::star::lang::EventObject
+{
+    //-------------------------------------------------------------------------
+
+    /** Contains the x coordinate of the selected cell**/
+    long x;
+
+    /** Contains the y coordinate of the selected cell**/
+    long y;
+
+    /** Contains the action <type>SelectionEventType</types> that was performed **/
+    SelectionEventType action;
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/ScrollBarMode.idl b/offapi/com/sun/star/awt/grid/ScrollBarMode.idl
new file mode 100644
index 000000000000..579ca0bab1ae
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/ScrollBarMode.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: AdjustmentType.idl,v $
+ * $Revision: 1.7 $
+ *
+ * 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_ScrollBarMode_idl__
+#define __com_sun_star_awt_grid_ScrollBarMode_idl__
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt {  module grid {
+
+//=============================================================================
+
+/** specifies the adjustment type.
+ */
+enum ScrollBarMode
+{
+    //-------------------------------------------------------------------------
+
+    /** adjustment is originated by a line jump.
+
+        <p>A line jump can, for example, be caused by a click on
+        one of the pointer buttons.</p>
+     */
+    AUTO,
+
+    //-------------------------------------------------------------------------
+
+    /** adjustment is originated by a page jump.
+
+        <p>A page jump can, for example, be caused by a click in the
+        background area of the scrollbar (neither one of the pointer
+        buttons, nor the thumb).</p>
+     */
+    ON,
+
+    OFF
+
+
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/SelectionEventType.idl b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
new file mode 100644
index 000000000000..4d8aa7fc0cdb
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * 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: AdjustmentType.idl,v $
+ * $Revision: 1.7 $
+ *
+ * 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_SelectionEventType_idl__
+#define __com_sun_star_awt_grid_SelectionEventType_idl__
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt {  module grid {
+
+//=============================================================================
+
+/** specifies the type of a selection event, as used by
+    <type>GridSelectionEvent</type>.
+ */
+enum SelectionEventType
+{
+    //-------------------------------------------------------------------------
+
+    /** This value indicates that a selection was added to the grid control
+     */
+    ADD,
+
+    //-------------------------------------------------------------------------
+
+    /** This value indicates that a selection was removed from the grid control
+     */
+    REMOVE
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
new file mode 100644
index 000000000000..d45bf024afb1
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * 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: UnoControlEdit.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_UnoControlGrid_idl__
+#define __com_sun_star_awt_UnoControlGrid_idl__
+
+#ifndef __com_sun_star_awt_UnoControl_idl__
+#include <com/sun/star/awt/UnoControl.idl>
+#endif
+
+#ifndef __com_sun_star_awt_grid_XGridControl_idl__
+#include <com/sun/star/awt/grid/XGridControl.idl>
+#endif
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module awt {  module grid {
+
+//=============================================================================
+
+//=============================================================================
+
+/** A control that displays a set of tabular data.
+
+    <p>
+    <h4>The Column Model</h4>
+    <p>The horizontal structure of the grid is defined by the <type>XGridColumnModel</type> implemented in <type>DefaultGridColumnModel</type>
+    The <type>XGridColumn</type> implemented in <typeGridColumn</type> describes the properties and behavior of a single column. Use the <member>XGridColumnModel::addColumn()</member> to add a column to the column model.
+    </p>
+    <p>
+    <h4>The Data Model</h4>
+    <p> All row data are stored in the <type>XGridDataModel</type>.
+    Use the <type>DefaultGridDataModel</type> to add  <member>XGridDataModel::addRow()</member> or remove <member>XGridDataModel::removeRow()</member> rows.
+    </p>
+
+    <p>The column and data model must be set at the <member>UnoControlGridModel::ColumnModel</member> and <member>UnoControlGridModel::GridDataModel</member> properties.</p>
+
+    <h4>Selection</h4>
+    <p>If you are interested in knowing when the selection changes implement a
+    <type>XGridSelectionListener</type> and add the instance with the method
+    <member>XGridSelection::addSelectionListener()</member>.
+    You than will be notified for any selection change.
+
+    The <type>XGridSelection</type> interface provides a bunch of methods to set and get selection for the grid control.
+    </p>
+ */
+service UnoControlGrid
+{
+    service com::sun::star::awt::UnoControl;
+
+    interface com::sun::star::awt::grid::XGridControl;
+};
+
+//=============================================================================
+
+}; }; }; };};
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
new file mode 100644
index 000000000000..eabe7515fb5c
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -0,0 +1,101 @@
+/*************************************************************************
+ *
+ * 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: UnoControlEditModel.idl,v $
+ * $Revision: 1.16 $
+ *
+ * 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_UnoControlGridModel_idl__
+#define __com_sun_star_awt_grid_UnoControlGridModel_idl__
+
+#include <com/sun/star/awt/grid/XGridColumnModel.idl>
+
+#include <com/sun/star/awt/grid/XGridDataModel.idl>
+
+#include <com/sun/star/awt/grid/ScrollBarMode.idl>
+
+#include <com/sun/star/awt/UnoControlModel.idl>
+
+#include <com/sun/star/view/SelectionType.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** specifies the standard model of a <type>UnoControlGridModel</type>.
+ */
+service UnoControlGridModel
+{
+    /** specifies the standard model of an <type scope="com::sun::star::awt">UnoControl</type>. */
+    service com::sun::star::awt::UnoControlModel;
+
+    /** Specifies whether the grid control should display a special header column.
+        <p>The default value is <FALSE/></p>
+    */
+    [property] boolean ShowRowHeader;
+
+    /** Specifies whether the grid control should display a title row.
+        <p>The default value is <TRUE/></p>
+    */
+    [property] boolean ShowColumnHeader;
+
+    /** Specifies the <type>XGridColumnModel</type> that is providing the column structure.
+
+        <p>You can implement your own instance of <type>XGridColumnModel</type> or use
+        the <type>DefaultGridColumnModel</type>.
+    */
+    [property] XGridColumnModel ColumnModel;
+
+    /** Specifies the <type>XGridDataModel</type> that is providing the hierarchical data.
+
+        <p>You can implement your own instance of <type>XGridDataModel</type> or use
+        the <type>DefaultGridDataModel</type>.
+    */
+    [property] XGridDataModel DataModel;
+
+    /** Specifies the vertical scrollbar mode.
+        <p>The default value is <FALSE/></p>
+    */
+    [property] boolean HScroll;
+
+    /** Specifies the horizontal scrollbar mode.
+        <p>The default value is <FALSE/></p>
+    */
+    [property] boolean VScroll;
+
+    /** 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;
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridCell.idl b/offapi/com/sun/star/awt/grid/XGridCell.idl
new file mode 100644
index 000000000000..40f55109e24c
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridCell.idl
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridCell_idl__
+#define __com_sun_star_awt_grid_XGridCell_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt {  module grid {
+
+//=============================================================================
+
+interface XGridCell: com::sun::star::uno::XInterface
+{
+
+    [attribute] string Value;
+
+    [attribute] boolean Editable;
+
+    [attribute] any Data;
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
new file mode 100644
index 000000000000..88fd77697876
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridCellRenderer_idl__
+#define __com_sun_star_awt_grid_XGridCellRenderer_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+//=============================================================================
+
+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.
+ */
+interface XGridCellRenderer: com::sun::star::uno::XInterface
+{
+    //-------------------------------------------------------------------------
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
new file mode 100644
index 000000000000..741af231ed03
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * 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: XGridColumn.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridColumn_idl__
+#define __com_sun_star_awt_grid_XGridColumn_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+//=============================================================================
+
+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
+ */
+interface XGridColumn: com::sun::star::uno::XInterface
+{
+    /** Specifies the an idendifier of the colomn.**/
+    [attribute] any Identifier;
+
+    /** Specifies the default column witdth. **/
+    [attribute] long ColumnWidth;
+    /*
+    [attribute] long PreferredWidth;
+
+    [attribute] long MinWidth;
+
+    [attribute] long MaxWidth;
+
+    [attribute] boolean Resizable;
+    */
+
+    /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
+    [attribute] string Title;
+
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
new file mode 100644
index 000000000000..09a2b602e800
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridColumnListener_idl__
+#define __com_sun_star_awt_grid_XGridColumnListener_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__
+#include <com/sun/star/awt/grid/GridColumnEvent.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** An instance of this interface is used by the <type>XGridColumnModel</type> to
+    get notifications about column model changes.
+
+    <p>Usually you must not implement this interface yourself, but you must notify it correctly if
+    you implement the <type>XGridColumnModel</type> yourself</p>.
+ */
+interface XGridColumnListener: com::sun::star::uno::XInterface
+{
+    /**
+        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.
+    */
+    void columnChanged( [in] GridColumnEvent event );
+};
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
new file mode 100644
index 000000000000..f4cf2a7a3694
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridColumnModel_idl__
+#define __com_sun_star_awt_grid_XGridColumnModel_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+#include <com/sun/star/awt/grid/XGridColumn.idl>
+#include <com/sun/star/awt/grid/XGridColumnListener.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** An instance of this interface is used by the <type>UnoControlGrid</type> to
+    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>.
+*/
+interface XGridColumnModel: com::sun::star::uno::XInterface
+{
+    /** Specifies whether column selection is allowed
+    */
+    [attribute] boolean ColumnSelectionAllowed;
+
+    /** Returns the number of columns.
+        @returns
+                the number of columns.
+    */
+    long getColumnCount();
+
+    /** Adds a column to the model.
+        @param column
+            the column to add to the model.
+
+        @returns
+                the index of new created column.
+    */
+    long addColumn( [in] XGridColumn column );
+
+    /*
+    long getSelectedCount();
+
+    sequence<XGridColumn> getSelectedColumns();
+
+    sequence<long> getSelectedIndex();
+
+    */
+
+    /** Returns all columns of the model.
+        @returns
+                 all columns associated with the model in a sequence of <type>XGridColumn</type>.
+    */
+    sequence<XGridColumn> getColumns();
+
+    /** Returns a specific column.
+        @param index
+                the position of the reuquested column.
+        @returns
+                 the requested column.
+    */
+    XGridColumn getColumn( [in] long index);
+
+    /*
+    long getTotalColumnWidth();
+    */
+
+    /** 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);
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl
new file mode 100644
index 000000000000..fc7c23c720a1
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridControl.idl
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridControl_idl__
+#define __com_sun_star_awt_grid_XGridControl_idl__
+
+#include <com/sun/star/awt/grid/XGridSelection.idl>
+#include <com/sun/star/awt/grid/XGridColumnModel.idl>
+#include <com/sun/star/awt/grid/XGridDataModel.idl>
+#include <com/sun/star/awt/XMouseListener.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** An interface to a control that displays a tabular data.
+
+    @see UnoControlGrid
+ */
+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 );
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridControlListener.idl b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
new file mode 100644
index 000000000000..c7fa1fd41e2f
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridControlListener_idl__
+#define __com_sun_star_awt_grid_XGridControlListener_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+interface XGridControlListener: com::sun::star::uno::XInterface
+{
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
new file mode 100644
index 000000000000..ce6479496034
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridDataListener_idl__
+#define __com_sun_star_awt_grid_XGridDataListener_idl__
+
+#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__
+#include <com/sun/star/awt/grid/GridDataEvent.idl>
+#endif
+
+#ifndef __com_sun_star_lang_XEventListener_idl__
+#include <com/sun/star/lang/XEventListener.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** An instance of this interface is used by the <type>XGridDataModel</type> to
+    get notifications about data model changes.
+
+    <p>Usually you must not implement this interface yourself, but you must notify it correctly if
+    you implement the <type>XGridDataModel</type> yourself</p>.
+ */
+interface XGridDataListener: com::sun::star::lang::XEventListener
+{
+
+    /**
+        Invoked after a row was added to the data model.
+    */
+    void rowAdded( [in] GridDataEvent Event );
+
+    /**
+        Invoked after a row was added to the data model.
+    */
+    void rowRemoved( [in] GridDataEvent Event );
+
+    /**
+        Invoked after a row was added to the data model.
+    */
+    void dataChanged( [in] GridDataEvent Event );
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
new file mode 100644
index 000000000000..17e224fa6b41
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridDataModel_idl__
+#define __com_sun_star_awt_grid_XGridDataModel_idl__
+
+
+#include <com/sun/star/lang/XComponent.idl>
+#include <com/sun/star/awt/grid/XGridDataListener.idl>
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+/** An instance of this interface is used by the <type>UnoControlGrid</type> to
+    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>.
+*/
+interface XGridDataModel: ::com::sun::star::lang::XComponent
+{
+    /** Specifies the height of each row.
+    */
+    [attribute] long RowHeight;
+
+    /** Contains the row header.
+    */
+    [attribute] sequence< string > RowHeaders;
+
+    /** Returns the content of each row.
+    */
+    [attribute,readonly] sequence< sequence< string > > Data;
+
+    /** Returns the number of rows in in the model.
+        @returns
+                the number of rows.
+    */
+    long getRowCount();
+
+    /** Adds a row to the model.
+
+        @param headername
+                specifies the name of the row.
+        @param data
+                the content of the row.
+    */
+    void addRow( [in] string headername, [in] sequence< string > data );
+
+    /** Removes a row from the model.
+
+        @param index
+                the index of the row that should be removed.
+    */
+    void removeRow( [in] long index);
+
+    /** Removes all rows from the model.
+    */
+    void removeAll();
+
+    //-------------------------------------------------------------------------
+
+    /** Adds a listener for the <type>GridDataEvent</type> posted after the grid changes.
+        @param Listener
+            the listener to add.
+    */
+    [oneway] void addDataListener( [in] XGridDataListener  listener);
+
+    //-------------------------------------------------------------------------
+
+    /** Removes a listener previously added with <method>addDataListener()</method>.
+        @param Listener
+            the listener to remove.
+    */
+    [oneway] void removeDataListener( [in] XGridDataListener listener);
+
+};
+
+//=============================================================================
+
+}; }; }; };};
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl
new file mode 100644
index 000000000000..b567b7570ddc
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@ -0,0 +1,126 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridSelection_idl__
+#define __com_sun_star_awt_grid_XGridSelection_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/awt/grid/XGridSelectionListener.idl>
+#include <com/sun/star/view/SelectionType.idl>
+
+//=============================================================================
+
+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
+{
+    /** Returns the lowest index of the selection.
+        @returns
+            the lowest index.
+    */
+    long getMinSelectionIndex();
+
+    /** Returns the highest index of the selection.
+        @returns
+            the highest index.
+    */
+    long getMaxSelectionIndex();
+
+    /** Adds a selection intervall.
+        @param start
+                the start row index.
+        @param length
+                the number of rows to be selected.
+    */
+    [oneway] void insertIndexIntervall( [in] long start, [in] long length);
+
+    /** Removes a selection intervall.
+        @param start
+                the start row index.
+        @param length
+                the number of rows to be selected.
+    */
+    [oneway] void removeIndexIntervall( [in] long start, [in] long length);
+
+    /** Returns the indicies of all selected rows.
+        @returns
+            a sequence of indicies.
+    */
+    sequence< long > getSelection();
+
+    /** Returns whether rows are selected.
+        @returns
+            <true/> if rows are selected otherwise <false/>.
+    */
+    boolean isSelectionEmpty();
+
+    /** Returns whether a specific row is selected.
+        @param
+            the index of a row.
+        @returns
+            <true/> if row are selected otherwise <false/>.
+    */
+    boolean isSelectedIndex( [in] long index);
+
+    /** Marks a row as selected.
+        @param
+            the index of a row.
+    */
+    [oneway] void selectRow( [in] long y);
+
+    /*
+    [oneway] void selectColumn( [in] long x);
+    */
+
+    /** Adds a listener for the <type>GridSelectionEvent</type> posted after the grid changes.
+        @param Listener
+            the listener to add.
+    */
+    [oneway] void addSelectionListener( [in] XGridSelectionListener  listener);
+
+    //-------------------------------------------------------------------------
+
+    /** Removes a listener previously added with <method>addSelectionListener()</method>.
+        @param Listener
+            the listener to remove.
+    */
+    [oneway] void removeSelectionListener( [in] XGridSelectionListener listener);
+
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
new file mode 100644
index 000000000000..eba8d794d3c0
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * 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: XListBox.idl,v $
+ * $Revision: 1.8 $
+ *
+ * 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_XGridSelectionListener_idl__
+#define __com_sun_star_awt_grid_XGridSelectionListener_idl__
+
+#ifndef __com_sun_star_lang_XEventListener_idl__
+#include <com/sun/star/lang/XEventListener.idl>
+#endif
+
+#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__
+#include <com/sun/star/awt/grid/GridSelectionEvent.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
+
+/** An instance of this interface is used by the <type>XGridSelection</type> to
+    get notifications about selection changes.
+
+    <p>Usually you must not implement this interface yourself, but you must notify it correctly if
+    you implement the <type>XGridSelection</type> yourself</p>.
+ */
+interface XGridSelectionListener: com::sun::star::lang::XEventListener
+{
+    //-------------------------------------------------------------------------
+    /** Invoked after a selection was changed.
+     */
+    [oneway] void selectionChanged( [in] GridSelectionEvent gridSelectionEvent);
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk
new file mode 100644
index 000000000000..124ca44edd09
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/makefile.mk
@@ -0,0 +1,68 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.3 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/..$/..
+
+PRJNAME=api
+
+TARGET=cssawtgrid
+PACKAGE=com$/sun$/star$/awt$/grid
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# ------------------------------------------------------------------------
+IDLFILES=\
+    GridColumnEvent.idl\
+    GridControlEvent.idl\
+    GridDataEvent.idl\
+    SelectionEventType.idl\
+    GridSelectionEvent.idl\
+    XGridControlListener.idl\
+    XGridSelectionListener.idl\
+    XGridSelection.idl\
+    XGridColumn.idl\
+     XGridColumnListener.idl\
+    XGridDataListener.idl\
+    XGridCell.idl\
+    XGridCellRenderer.idl\
+    DefaultGridDataModel.idl\
+    XGridDataModel.idl\
+    XGridColumnModel.idl\
+    ScrollBarMode.idl\
+    XGridControl.idl\
+    UnoControlGrid.idl\
+    UnoControlGridModel.idl
+# ------------------------------------------------------------------
+
+.INCLUDE :  target.mk
+.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
index 81e98b301954..8ea308f69a6f 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
@@ -62,7 +62,7 @@ interface XTreeDataModelListener: com::sun::star::lang::XEventListener
         Example: the name of a file has changed, but it is in the same location in the file system.
 
         To indicate the root has changed, <member>TreeDataModelEvent::Nodes</member> will contain
-        the root node and and <member>TreeDataModelEvent::ParentNode</member will be empty.
+        the root node and <member>TreeDataModelEvent::ParentNode</member> will be empty.
     */
     void treeNodesChanged( [in] TreeDataModelEvent Event );
 
diff --git a/offapi/com/sun/star/chart/FilledNetDiagram.idl b/offapi/com/sun/star/chart/FilledNetDiagram.idl
new file mode 100644
index 000000000000..64fba52e3339
--- /dev/null
+++ b/offapi/com/sun/star/chart/FilledNetDiagram.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * 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: FilledNetDiagram.idl,v $
+ * $Revision: 1.10 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_chart_FilledNetDiagram_idl__
+#define __com_sun_star_chart_FilledNetDiagram_idl__
+
+#ifndef __com_sun_star_chart_Diagram_idl__
+#include <com/sun/star/chart/Diagram.idl>
+#endif
+
+#ifndef __com_sun_star_chart_StackableDiagram_idl__
+#include <com/sun/star/chart/StackableDiagram.idl>
+#endif
+
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
+#include <com/sun/star/chart/ChartAxisXSupplier.idl>
+#endif
+
+#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
+#include <com/sun/star/chart/ChartAxisYSupplier.idl>
+#endif
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module chart {
+
+//=============================================================================
+
+/** specifies filled net diagrams. @since OOo 3.2
+
+    <p>Net diagrams are also known as radar diagrams.</p>
+ */
+published service FilledNetDiagram
+{
+    service com::sun::star::chart::Diagram;
+    service com::sun::star::chart::ChartAxisXSupplier;
+    service com::sun::star::chart::ChartAxisYSupplier;
+    service com::sun::star::chart::StackableDiagram;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk
index 802c832ea154..781c78d08177 100644
--- a/offapi/com/sun/star/chart/makefile.mk
+++ b/offapi/com/sun/star/chart/makefile.mk
@@ -91,6 +91,7 @@ IDLFILES=\
     Diagram.idl\
     Dim3DDiagram.idl\
     DonutDiagram.idl\
+    FilledNetDiagram.idl\
     LineDiagram.idl\
     MissingValueTreatment.idl\
     NetDiagram.idl\
diff --git a/offapi/com/sun/star/chart2/XDataSeries.idl b/offapi/com/sun/star/chart2/XDataSeries.idl
index 206dac223578..eeebc966511c 100644
--- a/offapi/com/sun/star/chart2/XDataSeries.idl
+++ b/offapi/com/sun/star/chart2/XDataSeries.idl
@@ -58,22 +58,28 @@ module chart2
  */
 interface XDataSeries : ::com::sun::star::uno::XInterface
 {
-    /** set the coordinate system in which this series should be
-        represented.
-     */
-//     void setCoordinateSystem( [in] XCoordinateSystem aCoordSystem );
-
     /** @returns
             the element at the specified index.
 
-        @param Index
-            specifies the position in the array. The first index is 0.
+        @param nIndex
+            specifies the index of the data point within the series. The first index is 0.
 
         @throws com::sun::star::lang::IndexOutOfBoundException
             if the index is not valid.
      */
     ::com::sun::star::beans::XPropertySet getDataPointByIndex( [in] long nIndex )
         raises( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+    /** the formatting of the specified data point is cleared
+
+        @param nIndex
+            specifies the index of the data point within the series. The first index is 0.
+     */
+    void resetDataPoint( [in] long nIndex );
+
+    /** all data point formattings are cleared
+     */
+    void resetAllDataPoints();
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
new file mode 100644
index 000000000000..a834bb310eda
--- /dev/null
+++ b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XDefaultSizeTransmitter.idl,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef com_sun_star_chart2_xdefaultsizetransmitter_idl
+#define com_sun_star_chart2_xdefaultsizetransmitter_idl
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_awt_Size_idl__
+#include <com/sun/star/awt/Size.idl>
+#endif
+
+module com
+{
+module sun
+{
+module star
+{
+module chart2
+{
+
+/** Allows to set a default size. This size will be used in case no further informations are available.
+ */
+interface XDefaultSizeTransmitter : ::com::sun::star::uno::XInterface
+{
+    /** set a default size
+        @param aSize_100TH_MM
+            specifies a size in hundredth mm.
+     */
+    void setDefaultSize( [in] ::com::sun::star::awt::Size aSize_100TH_MM );
+};
+
+} ; // chart2
+} ; // com
+} ; // sun
+} ; // star
+
+
+#endif
diff --git a/offapi/com/sun/star/chart2/makefile.mk b/offapi/com/sun/star/chart2/makefile.mk
index d82862c69268..700ecc633d7a 100644
--- a/offapi/com/sun/star/chart2/makefile.mk
+++ b/offapi/com/sun/star/chart2/makefile.mk
@@ -85,6 +85,7 @@ IDLFILES= \
     XDataInterpreter.idl \
     XDataSeries.idl \
     XDataSeriesContainer.idl \
+    XDefaultSizeTransmitter.idl \
     XDiagram.idl \
     XDiagramProvider.idl \
     XFastPropertyState.idl \
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 4847f09090a2..36799875eee1 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPackage.idl,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -102,6 +99,25 @@ interface XPackage
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException);
 
+    /** checks if the dependencies for this package are still satisfied
+
+        After updateing the OpenOffice.org, some dependencies for packages might
+        no longer be satisfied.
+
+        @since OOo 3.2.0
+
+        @param xCmdEnv
+               command environment for error handling and other interaction.
+
+        @return
+            true - all dependencies are satisfied
+            false - at least one dependency failed.
+     */
+    boolean checkDependencies(
+        [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
+        raises (DeploymentException,
+                com::sun::star::ucb::CommandFailedException);
+
 
     /** determines whether the package is currently is registered, i.e.
         whether it is active.
diff --git a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
new file mode 100644
index 000000000000..761070eb7443
--- /dev/null
+++ b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#if ! defined INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+#define INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+
+#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
+#include <com/sun/star/awt/XWindow.idl>
+
+
+module com { module sun { module star { module deployment { module ui {
+
+/** The <type>UpdateRequiredDialog</type> is used to show a list of extensions not compatible with this office version.
+
+    @since OOo 3.2.0
+*/
+service UpdateRequiredDialog : com::sun::star::ui::dialogs::XExecutableDialog
+{
+    /** Create a GUI using the specific parent window and focus on the
+        given context.
+
+        @param xParent
+               parent window
+    */
+    create();
+};
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/deployment/ui/makefile.mk b/offapi/com/sun/star/deployment/ui/makefile.mk
index d91d20001bb5..f733c762a80c 100644
--- a/offapi/com/sun/star/deployment/ui/makefile.mk
+++ b/offapi/com/sun/star/deployment/ui/makefile.mk
@@ -39,8 +39,9 @@ PACKAGE = com$/sun$/star$/deployment$/ui
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 IDLFILES = \
-        PackageManagerDialog.idl \
-    LicenseDialog.idl
+    PackageManagerDialog.idl \
+    LicenseDialog.idl \
+    UpdateRequiredDialog.idl
 
 .INCLUDE : target.mk
 .INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index 7fb3698f90b7..49c9cf285b3a 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -84,6 +84,12 @@ module com { module sun { module star { module document {
 published service MediaDescriptor
 {
     //-------------------------------------------------------------------------
+    /** May be set by filters or detection services if user has choosen to
+        abort loading/saving, e.g. while entering a password.
+     */
+    [optional,property] boolean Aborted;
+
+    //-------------------------------------------------------------------------
     /** document is a template
 
         <p>
diff --git a/offapi/com/sun/star/document/PDFDialog.idl b/offapi/com/sun/star/document/PDFDialog.idl
new file mode 100644
index 000000000000..91d2628e3eab
--- /dev/null
+++ b/offapi/com/sun/star/document/PDFDialog.idl
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile:$
+ * $Revision:$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_document_PDFDialog_idl__
+#define __com_sun_star_document_PDFDialog_idl__
+
+#ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
+#include <com/sun/star/ui/dialogs/FilterOptionsDialog.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module document {
+
+//=============================================================================
+
+/** This service is for a PDFDialog
+ */
+service PDFDialog
+{
+    service com::sun::star::ui::dialogs::FilterOptionsDialog;
+
+    //-------------------------------------------------------------------------
+    /** PDFDialog options can be set as sequence of
+        com.sun.star.beans.PropertyValue at the FilterData property of the
+        MediaDescriptor. The PropertyValues which are supported within the
+        sequence are described in the registry at Office.Common/Filter/PDF/Export
+
+        The source of this registry can be found in following file:
+        "officecfg/registry/schema/org/openoffice/Office/Common.xcs"
+    */
+
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/document/makefile.mk b/offapi/com/sun/star/document/makefile.mk
index 107412ed919d..27211146a4c9 100644
--- a/offapi/com/sun/star/document/makefile.mk
+++ b/offapi/com/sun/star/document/makefile.mk
@@ -71,6 +71,7 @@ IDLFILES=\
     OfficeDocument.idl\
     OleEmbeddedServerRegistration.idl\
     OwnLockOnDocumentRequest.idl\
+    PDFDialog.idl\
     PrinterIndependentLayout.idl\
     RedlineDisplayType.idl \
     Settings.idl\
@@ -105,7 +106,7 @@ IDLFILES=\
     XLinkTargetSupplier.idl\
     XMimeTypeInfo.idl\
     XOOXMLDocumentPropertiesImporter.idl\
-        XRedlinesSupplier.idl \
+    XRedlinesSupplier.idl \
     XScriptInvocationContext.idl\
     XStandaloneDocumentInfo.idl\
     XStorageBasedDocument.idl\
diff --git a/offapi/com/sun/star/drawing/framework/XPane2.idl b/offapi/com/sun/star/drawing/framework/XPane2.idl
new file mode 100644
index 000000000000..d1b646f73a31
--- /dev/null
+++ b/offapi/com/sun/star/drawing/framework/XPane2.idl
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * 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: XPane.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_drawing_framework_XPane2_idl__
+#define __com_sun_star_drawing_framework_XPane2_idl__
+
+#ifndef __com_sun_star_accessibility_XAccessible_idl__
+#include <com/sun/star/accessibility/XAccessible.idl>
+#endif
+
+module com { module sun { module star { module drawing { module framework {
+
+/** An extension of the XPane interface that adds support for
+    a) showing and hiding the windows that internally belong to the pane and
+    b) setting the accessibility object.
+    This is typically an optional interface.
+*/
+interface XPane2
+{
+    /** Return whether all windows that are used to implement the pane are
+        visible.
+        @Returns <TRUE> when all windows of the pane are visible.
+    */
+    boolean isVisible ();
+
+    /** Hide or show the pane.  If there is more than one window used to
+        implement the pane then it is left to the implementation if one,
+        some, or all windows are hidden or shown as long as the pane becomes
+        hidden or visible.
+        @param bIsVisible
+            When <TRUE> then show the pane.  Hide it otherwise.
+    */
+    void setVisible ([in] boolean bIsVisible);
+
+    /** Set the accessibility object for the pane. When there is more than
+        one window used to implement the pane then the given accessibility
+        object is usually set at the topmost window.  However, the details
+        are implementation dependent.
+        @param xAccessible
+            May be an empty reference.
+    */
+    void setAccessible ([in] ::com::sun::star::accessibility::XAccessible xAccessible);
+
+    /** Return the accessibility object that is currently associated with
+        the windows that implement the pane.
+    */
+    ::com::sun::star::accessibility::XAccessible getAccessible ();
+};
+
+}; }; }; }; }; // ::com::sun::star::drawing::framework
+
+#endif
diff --git a/offapi/com/sun/star/drawing/framework/makefile.mk b/offapi/com/sun/star/drawing/framework/makefile.mk
index 9b6706ad14d6..b5dd8cbcc936 100644
--- a/offapi/com/sun/star/drawing/framework/makefile.mk
+++ b/offapi/com/sun/star/drawing/framework/makefile.mk
@@ -62,6 +62,7 @@ IDLFILES=									\
     XControllerManager.idl					\
     XModuleController.idl					\
     XPane.idl								\
+    XPane2.idl								\
     XPaneBorderPainter.idl					\
     XRelocatableResource.idl				\
     XResource.idl							\
diff --git a/offapi/com/sun/star/embed/Storage.idl b/offapi/com/sun/star/embed/Storage.idl
index b7c85707cf7f..70e91a66e765 100644
--- a/offapi/com/sun/star/embed/Storage.idl
+++ b/offapi/com/sun/star/embed/Storage.idl
@@ -347,6 +347,19 @@ service Storage
         </p>
      */
     [property, optional, readonly] boolean HasEncryptedEntries;
+
+    // -----------------------------------------------------------------------
+    /** allows to detect if the storage contains nonencrypted entries.
+
+        <p>
+        In case it is set to <TRUE/> the storage itself and/or a tree of
+        substorages contains nonencrypted streams. Usually in case this
+        property is supported the implementation supports
+        <type>XEncryptionProtectedSource</type> interface.
+        </p>
+     */
+    [property, optional, readonly] boolean HasNonEncryptedEntries;
+
 };
 
 //============================================================================
diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index 4a0f4efcd12c..d91c8edad1ff 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -90,6 +90,9 @@ module datatransfer {};
 /// Office document related interfaces.
 module document {};
 
+/// Office document content related interfaces.
+module office {};
+
 /// Drawing and shape specific interfaces.
 module drawing {};
 
diff --git a/offapi/com/sun/star/office/XAnnotation.idl b/offapi/com/sun/star/office/XAnnotation.idl
new file mode 100644
index 000000000000..ff7c4127bb82
--- /dev/null
+++ b/offapi/com/sun/star/office/XAnnotation.idl
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * 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: XGalleryItem.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_office_XAnnotation_idl__
+#define __com_sun_star_office_XAnnotation_idl__
+
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+
+#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
+#include <com/sun/star/beans/XMultiPropertySet.idl>
+#endif
+
+#ifndef __com_sun_star_util_DateTime_idl__
+#include <com/sun/star/util/DateTime.idl>
+#endif
+
+#ifndef __com_sun_star_text_XText_idl__
+#include <com/sun/star/text/XText.idl>
+#endif
+
+#ifndef __com_sun_star_geometry_RealPoint2D_idl__
+#include <com/sun/star/geometry/RealPoint2D.idl>
+#endif
+
+#ifndef __com_sun_star_geometry_RealSize2D_idl__
+#include <com/sun/star/geometry/RealSize2D.idl>
+#endif
+
+#ifndef __com_sun_star_lang_XComponent_idl__
+#include <com/sun/star/lang/XComponent.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module office {
+
+//=============================================================================
+
+/** This interface gives access to an annotation inside a document.
+ */
+interface XAnnotation
+{
+    /** All attributes are also available as properties. */
+    interface ::com::sun::star::beans::XPropertySet;
+
+    /** manages the lifetime of this annotation, should only be used
+        by the owner of the annotation which should be the document itself. */
+    interface ::com::sun::star::lang::XComponent;
+
+    /** a reference to the document content this annotation is anchored to. */
+    [attribute, readonly] any Anchor;
+
+    /** this is an optional position that gives the user interface a hint where
+        the annotation should be rendered. This could be an offset to the
+        annotations anchor. */
+    [attribute] ::com::sun::star::geometry::RealPoint2D Position;
+
+    /** this is an optional size that gives the user interface a hint how
+        large the annotation should be rendered. */
+    [attribute] ::com::sun::star::geometry::RealSize2D Size;
+
+    /** stores the full name of the author who created this annotation. */
+    [attribute] string Author;
+
+    /** stores the date and time this annotation was last edited. */
+    [attribute] ::com::sun::star::util::DateTime DateTime;
+
+    /** gives access to the annotations text. */
+    [attribute, readonly] ::com::sun::star::text::XText TextRange;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/office/XAnnotationAccess.idl b/offapi/com/sun/star/office/XAnnotationAccess.idl
new file mode 100644
index 000000000000..074312ef6fec
--- /dev/null
+++ b/offapi/com/sun/star/office/XAnnotationAccess.idl
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * 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: XGalleryItem.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_office_XAnnotationAccess_idl__
+#define __com_sun_star_office_XAnnotationAccess_idl__
+
+#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
+#include <com/sun/star/office/XAnnotationEnumeration.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/office/IllegalArgumentException.idl>
+#endif
+
+#ifndef __com_sun_star_office_XAnnotation_idl__
+#include <com/sun/star/office/XAnnotation.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module office {
+
+//=============================================================================
+
+/** This interface gives access to the annotation for a document content.
+ */
+interface XAnnotationAccess
+{
+    /** creates a new annotation and inserts it into the document content.
+    */
+    XAnnotation createAndInsertAnnotation();
+
+    /** removes the annotation from this document content.
+    */
+    void removeAnnotation( [in] XAnnotation annotation ) raises ( com::sun::star::lang::IllegalArgumentException );
+
+    /** @returns
+            a new enumeration object for this annotation container.
+            It returns NULL if there are no objects in this container.
+     */
+    XAnnotationEnumeration createAnnotationEnumeration();
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/office/XAnnotationEnumeration.idl b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
new file mode 100644
index 000000000000..e81666e0b698
--- /dev/null
+++ b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * 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: XEnumeration.idl,v $
+ * $Revision: 1.12 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
+#define __com_sun_star_office_XAnnotationEnumeration_idl__
+
+#ifndef __com_sun_star_office_XAnnotation_idl__
+#include <com/sun/star/office/XAnnotation.idl>
+#endif
+
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
+#include <com/sun/star/container/NoSuchElementException.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module office {
+
+//=============================================================================
+
+/** An enumeration for a set of annotations.
+ */
+interface XAnnotationEnumeration
+{
+    //-------------------------------------------------------------------------
+
+    /** tests whether this enumeration contains more elements.
+     */
+    boolean hasMoreElements();
+
+    //-------------------------------------------------------------------------
+
+    /** @returns
+            the next element of this enumeration.
+
+        @throws  NoSuchElementException
+            if no more elements exist.
+    */
+    XAnnotation nextElement()
+            raises( com::sun::star::container::NoSuchElementException );
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/office/makefile.mk b/offapi/com/sun/star/office/makefile.mk
new file mode 100644
index 000000000000..404c23c45e32
--- /dev/null
+++ b/offapi/com/sun/star/office/makefile.mk
@@ -0,0 +1,51 @@
+#*************************************************************************
+#
+# 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: makefile.mk,v $
+#
+# $Revision: 1.5 $
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/..
+PRJNAME=offapi
+TARGET=cssoffice
+PACKAGE=com$/sun$/star$/office
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# ------------------------------------------------------------------------
+
+IDLFILES=\
+    XAnnotation.idl\
+    XAnnotationEnumeration.idl\
+    XAnnotationAccess.idl
+
+# ------------------------------------------------------------------
+
+.INCLUDE :  target.mk
+.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/security/DocumentSignatureInformation.idl b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
index da418ebac2d4..4ed6d972705c 100644
--- a/offapi/com/sun/star/security/DocumentSignatureInformation.idl
+++ b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
@@ -59,6 +59,25 @@ struct DocumentSignatureInformation
        <type scope="com::sun::star::security">CertificateValidity</type>.
      */
     long CertificateStatus;
+    /* indicates what content of a document is signed.
+        <p>
+        This value can be ignored when this struct is returned as part of
+        a macro signature validation.
+        As of OpenOffice.org 3.2 and ODF 1.2 the document signature comprises
+        all files except the signature file itself.
+        Signatures in OOo 2.x were only
+        applied to the files in the root of the document, except mimetype, the
+        Pictures and ObjectReplacements/Objects folder. That is, macros
+        were not part of the document signature.
+        OOo 3.0 signed everthing, execept mimetype and the META-INF folder.
+        <p>
+        If PartialDocumentSignature is true, then the signature was created by OOo
+        with a version less then 3.2. In this case, not all files are signed. The
+        signature can still be regarded as valid, as long as SignatureIsValid is true
+        and the certificate could be validated. However, users should be notified about
+        the fact, that not everything in this document is signed.
+    */
+    boolean PartialDocumentSignature;
 
 };
 
diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl
index eff5c91aa645..23574e24dd18 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -448,6 +448,15 @@ published service ParagraphProperties
          */
         [optional, property] string ListId;
 
+        //-------------------------------------------------------------------------
+        /** specifies the outline level to which the paragraph belongs
+
+            @since OOo 3.1
+
+            <p>Value 0 indicates that the paragraph belongs to the body text.</p>
+            <p>Values [1..10] indicates that the paragraph belongs to the corresponding outline level.</p>
+         */
+        [optional, property] short OutlineLevel;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
index 6e4adec10720..717e590c12ba 100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module task {
     the mentioned service are Abort and Approve.
     </P>
 
-    @since OOo 3.x.x
+    @since OOo 3.2
 */
 published exception DocumentMSPasswordRequest: PasswordRequest
 {
diff --git a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl
new file mode 100644
index 000000000000..422f1ab2a9d0
--- /dev/null
+++ b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * 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: DocumentMacroConfirmationRequest.idl,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_task_DocumentMacroConfirmationRequest2_idl__
+#define __com_sun_star_task_DocumentMacroConfirmationRequest2_idl__
+
+#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
+#include <com/sun/star/embed/XStorage.idl>
+#include <com/sun/star/security/DocumentSignatureInformation.idl>
+
+
+//=============================================================================
+
+module com { module sun { module star { module task {
+
+//=============================================================================
+
+/** describes the request to approve or deny the execution of macros contained in
+    a document.
+ */
+exception DocumentMacroConfirmationRequest2 : ClassifiedInteractionRequest
+{
+    /** specifies the URL of the document which contains macros whose execution
+        should be approved or rejected.
+    */
+    string  DocumentURL;
+
+    /** refers to the zip-storage related to the last commited version of the
+        document.
+
+        This storage is necessary e.g. for displaying the existing signatures to
+        the user, to allow him a decision whether or not to trust those signatures
+        and thus the signed macros.
+
+        @see ::com::sun::star::security::XDocumentDigitalSignatures::showScriptingContentSignatures
+    */
+    ::com::sun::star::embed::XStorage
+            DocumentZipStorage;
+
+    /** contains informations about the ODF version of the document
+    */
+    string DocumentVersion;
+
+    /** contains informations about the signatures in the document
+    */
+    sequence< ::com::sun::star::security::DocumentSignatureInformation >
+            DocumentSignatureInformation;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
new file mode 100644
index 000000000000..93839e68fb07
--- /dev/null
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * 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: XPasswordContainer.idl,v $
+ * $Revision: 1.9 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_task_XUrlContainer_idl__
+#define __com_sun_star_task_XUrlContainer_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_task_XInteractionHandler_idl__
+#include <com/sun/star/task/XInteractionHandler.idl>
+#endif
+
+
+//=============================================================================
+
+module com { module sun { module star { module task {
+
+//=============================================================================
+/** Allows to store and retrieve URLs. URLs can be stored persistently or
+    until end of OOo session.
+*/
+/*published*/ interface XUrlContainer : com::sun::star::uno::XInterface
+{
+    //-------------------------------------------------------------------------
+    /** Add a URL to the container.
+
+        @param Url        URL to add to the container
+        @param MakePersistent indicates whether the URL shall be stored
+                          persistently or just in memory (until end of
+                          OOo session)
+    */
+    void addUrl( [in] string Url, [in] boolean MakePersistent );
+
+    //-------------------------------------------------------------------------
+    /** Lookup a URL in the container.
+
+        @param Url     URL to lookup.
+         @returns       Best matched URL or empty string.
+    */
+    string findUrl( [in] string Url );
+
+    //-------------------------------------------------------------------------
+    /** Remove a URL from the container.
+
+        @param Url      URL to remove.
+    */
+    void removeUrl( [in] string Url );
+
+    //-------------------------------------------------------------------------
+    /** Get all URLs.
+
+        @param OnlyPersistent Only URLs taht are stored persistently shall
+                        be returned.
+        @returns        List of URLs.
+    */
+    sequence<string> getUrls( [in] boolean OnlyPersistent );
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index 1559901f740c..dc54f6fd3883 100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@ -45,6 +45,7 @@ PACKAGE=com$/sun$/star$/task
 IDLFILES=\
     ClassifiedInteractionRequest.idl\
     DocumentMacroConfirmationRequest.idl\
+    DocumentMacroConfirmationRequest2.idl\
     DocumentPasswordRequest.idl\
     DocumentMSPasswordRequest.idl\
     ErrorCodeRequest.idl\
@@ -79,7 +80,8 @@ IDLFILES=\
     XStatusIndicatorSupplier.idl\
     XAbortChannel.idl\
     XInteractionRequestStringResolver.idl\
-    InteractionRequestStringResolver.idl
+    InteractionRequestStringResolver.idl\
+    XUrlContainer.idl
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl
index 792cac35f583..eadf841134e3 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -354,6 +354,26 @@ published service BaseFrameProperties
      */
     [optional, property, maybevoid] com::sun::star::awt::Size LayoutSize;
 
+    //-------------------------------------------------------------------------
+        /** contains short title for the object
+
+            <p>This short title is visible as an alternative tag in HTML format.
+            Accessibility tools can read this text.</p>
+
+            @since OOo 3.2
+        */
+        [optional, property] string Title;
+
+    //-------------------------------------------------------------------------
+        /** contains description for the object
+
+            <p>The long description text can be entered to describe a object in
+            more detail to users with screen reader software. The description is
+            visible as an alternative tag for accessibility tools.</p>
+
+            @since OOo 3.2
+        */
+        [optional, property] string Description;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/InContentMetadata.idl b/offapi/com/sun/star/text/InContentMetadata.idl
new file mode 100755
index 000000000000..7a7a20adc877
--- /dev/null
+++ b/offapi/com/sun/star/text/InContentMetadata.idl
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * 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: TextField.idl,v $
+ * $Revision: 1.11 $
+ *
+ * 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_InContentMetadata_idl__
+#define __com_sun_star_text_InContentMetadata_idl__
+
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__
+#include <com/sun/star/container/XEnumerationAccess.idl>
+#endif
+
+#ifndef __com_sun_star_text_TextContent_idl__
+#include <com/sun/star/text/TextContent.idl>
+#endif
+
+#ifndef __com_sun_star_rdf_XMetadatable_idl__
+#include <com/sun/star/rdf/XMetadatable.idl>
+#endif
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module text {
+
+//=============================================================================
+
+/** is a <type>TextContent</type> that can be used to attach RDF metadata
+    to a range of text.
+
+    @since OOo 3.2
+ */
+service InContentMetadata
+{
+    //-------------------------------------------------------------------------
+    /** None of the properties of <type>TextContent</type> are
+        supported. */
+    service com::sun::star::text::TextContent;
+
+    //-------------------------------------------------------------------------
+    /** The <type>InContentMetadata</type> can have RDF metadata attached. */
+    interface com::sun::star::rdf::XMetadatable;
+
+    //-------------------------------------------------------------------------
+    /** The <type>TextContent</type>s that are contained in the
+        annotated range of text can be enumerated. */
+    interface com::sun::star::container::XEnumerationAccess;
+
+};
+
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/text/TextPortion.idl b/offapi/com/sun/star/text/TextPortion.idl
index 26ad5bd5ba6c..d4ab79f88323 100644
--- a/offapi/com/sun/star/text/TextPortion.idl
+++ b/offapi/com/sun/star/text/TextPortion.idl
@@ -113,6 +113,7 @@ published service TextPortion
         <dt>Ruby</dt><dd>a ruby attribute which is used in Asian text</dd>
         <dt>Frame</dt><dd>a frame</dd>
         <dt>SoftPageBreak</dt><dd>a soft page break</dd>
+        <dt>InContentMetadata</dt><dd>a text range with attached metadata</dd>
     </dl>
     <p>For Reference marks, document index marks, etc., 2 text portions
        will be generated, one for the start position and one for the
@@ -123,6 +124,7 @@ published service TextPortion
     //-------------------------------------------------------------------------
     /** contains the control character of a text portion of type
         ControlCharacter.
+        @deprecated type ControlCharacter no longer implemented
      */
     [readonly, property] short ControlCharacter;
 
@@ -153,6 +155,13 @@ published service TextPortion
     ::com::sun::star::text::XTextField TextField;
 
     //-------------------------------------------------------------------------
+    /** contains the text range of a text portion of type InContentMetadata.
+        @since OOo 3.2
+     */
+    [optional, readonly, property]
+    ::com::sun::star::text::XTextContent InContentMetadata;
+
+    //-------------------------------------------------------------------------
     /** contains whether the portion is a point only. */
     [optional, readonly, property] boolean IsCollapsed;
 
diff --git a/offapi/com/sun/star/text/makefile.mk b/offapi/com/sun/star/text/makefile.mk
index 18ad6abbe2a1..c018c9479049 100644
--- a/offapi/com/sun/star/text/makefile.mk
+++ b/offapi/com/sun/star/text/makefile.mk
@@ -107,6 +107,7 @@ IDLFILES=\
      HorizontalAdjust.idl\
      HypertextDocument.idl\
     IllustrationsIndex.idl\
+    InContentMetadata.idl\
      InvalidTextContentException.idl\
         LabelFollow.idl\
      LineNumberingProperties.idl\
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
new file mode 100755
index 000000000000..f82276213527
--- /dev/null
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -0,0 +1,102 @@
+/*************************************************************************
+ *
+ * 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: MetadataField.idl,v $
+ * $Revision: 1.12 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_text_textfield_MetadataField_idl__
+#define __com_sun_star_text_textfield_MetadataField_idl__
+
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__
+#include <com/sun/star/container/XEnumerationAccess.idl>
+#endif
+
+#ifndef __com_sun_star_text_TextField_idl__
+#include <com/sun/star/text/TextField.idl>
+#endif
+
+#ifndef __com_sun_star_text_XText_idl__
+#include <com/sun/star/text/XText.idl>
+#endif
+
+#ifndef __com_sun_star_rdf_XMetadatable_idl__
+#include <com/sun/star/rdf/XMetadatable.idl>
+#endif
+
+
+//=============================================================================
+
+module com { module sun { module star { module text { module textfield {
+
+//=============================================================================
+/** is a <type>TextField</type> whose content is specified by RDF metadata.
+
+    @since OOo 3.2
+
+    @see com::sun::star::rdf
+*/
+service MetadataField
+{
+    //-------------------------------------------------------------------------
+    /** None of the properties of <type>TextContent</type> are
+        supported. */
+    service  com::sun::star::text::TextField;
+
+    //-------------------------------------------------------------------------
+    /** The <type>MetadataField</type> can have RDF metadata attached. */
+    interface com::sun::star::rdf::XMetadatable;
+
+    //-------------------------------------------------------------------------
+    /** Allows for insertion of text content into, and creating cursors
+        that are bound within, the <type>MetadataField</type>. */
+    interface com::sun::star::text::XText;
+
+    //-------------------------------------------------------------------------
+    /** The <type>TextContent</type>s that are contained in the
+        <type>MetadataField</type> can be enumerated. */
+    interface com::sun::star::container::XEnumerationAccess;
+
+    //-------------------------------------------------------------------------
+    /** this is the number format for this field.
+        @see com::sun::star::util::NumberFormatter
+    */
+    [optional, property] long NumberFormat;
+
+    //-------------------------------------------------------------------------
+    /** determines whether changes in language attributes at the
+        position of the text field also change the number format
+        as appropriate for this language.
+     */
+    [optional, property] boolean IsFixedLanguage;
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/text/textfield/makefile.mk b/offapi/com/sun/star/text/textfield/makefile.mk
index 46506a4eff8c..0defebd69dfc 100644
--- a/offapi/com/sun/star/text/textfield/makefile.mk
+++ b/offapi/com/sun/star/text/textfield/makefile.mk
@@ -70,6 +70,7 @@ IDLFILES=\
     InputUser.idl\
     JumpEdit.idl\
     Macro.idl\
+    MetadataField.idl\
     PageCount.idl\
     PageNumber.idl\
     ParagraphCount.idl\
diff --git a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
new file mode 100644
index 000000000000..1b19830df81e
--- /dev/null
+++ b/offapi/com/sun/star/ucb/URLAuthenticationRequest.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: AuthenticationRequest.idl,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_ucb_URLAuthenticationRequest_idl__
+#define __com_sun_star_ucb_URLAuthenticationRequest_idl__
+
+#ifndef __com_sun_star_ucb_AuthenticationRequest_idl__
+#include <com/sun/star/ucb/AuthenticationRequest.idl>
+#endif
+
+
+//=============================================================================
+
+module com { module sun { module star { module ucb {
+
+//=============================================================================
+/** An error specifing lack of correct authentication data (e.g., to log into
+    an account).
+*/
+/*published*/ exception URLAuthenticationRequest : AuthenticationRequest
+{
+    //-------------------------------------------------------------------------
+    /** The URL for which authentication is requested.
+     */
+    string URL;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
new file mode 100644
index 000000000000..a3c4bdb3d5f3
--- /dev/null
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * 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: XInteractionSupplyAuthentication.idl,v $
+ * $Revision: 1.9 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication2_idl__
+#define __com_sun_star_ucb_XInteractionSupplyAuthentication2_idl__
+
+#ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
+#include <com/sun/star/ucb/XInteractionSupplyAuthentication.idl>
+#endif
+
+
+
+//=============================================================================
+
+module com { module sun { module star { module ucb {
+
+//=============================================================================
+/** An interaction continuation handing back some authentication data.
+
+    <p> This continuation is typically used in conjunction with
+    <type>AuthenticationRequest</type>. </p>
+*/
+/*published*/ interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication
+{
+    //-------------------------------------------------------------------------
+    /** Specifies if 'system credentials' can be obtained and used by the issuer
+        of the authentiction request.
+
+        @param Default
+        Returns the default behavior for system credentials handling (to be
+        initially displayed to the user).
+
+        @returns
+        <true/> if the issuer is able to obtain and use system credentials.
+        <false/> otherwise.
+    */
+    boolean canUseSystemCredentials( [out] boolean Default );
+
+    //-------------------------------------------------------------------------
+    /** Set a new 'use system credentials' value to hand back.
+
+        @param UseSystemCredentials
+        <true/> means the request issuer shall obtain and use system credentials.
+     */
+    void setUseSystemCredentials( [in] boolean UseSystemCredentials );
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/ucb/makefile.mk b/offapi/com/sun/star/ucb/makefile.mk
index 2cf5394dcaf4..19320b716634 100644
--- a/offapi/com/sun/star/ucb/makefile.mk
+++ b/offapi/com/sun/star/ucb/makefile.mk
@@ -45,6 +45,7 @@ IDLFILES=\
     AlreadyInitializedException.idl\
     AnyCompareFactory.idl\
     AuthenticationRequest.idl\
+    URLAuthenticationRequest.idl\
     CachedContentResultSet.idl\
     CachedContentResultSetFactory.idl\
     CachedContentResultSetStub.idl\
@@ -99,7 +100,7 @@ IDLFILES=\
     FTPContent.idl\
     FTPContentProvider.idl\
     GlobalTransferCommandArgument.idl\
-        GIOContentProvider.idl\
+    GIOContentProvider.idl\
     GnomeVFSContentProvider.idl\
     GnomeVFSDocumentContent.idl\
     GnomeVFSFolderContent.idl\
@@ -142,125 +143,126 @@ IDLFILES=\
     LockType.idl\
     MissingInputStreamException.idl\
     MissingPropertiesException.idl\
-     NameClash.idl\
-     NameClashException.idl\
-     NameClashResolveRequest.idl\
-     NumberedSortingInfo.idl\
-     ODMAContent.idl\
-     ODMAContentProvider.idl\
-     OpenCommandArgument.idl\
-     OpenCommandArgument2.idl\
-     OpenMode.idl\
-     OutgoingMessageState.idl\
-     PackageContentProvider.idl\
-     PackageFolderContent.idl\
-     PackageStreamContent.idl\
-     PersistentPropertySet.idl\
-     PostCommandArgument.idl\
-     PostCommandArgument2.idl\
-     Priority.idl\
-     PropertiesManager.idl\
-     PropertySetRegistry.idl\
-     PropertyValueInfo.idl\
-     PropertyValueState.idl\
-     RecipientInfo.idl\
-     RememberAuthentication.idl\
-     RemoteAccessContentProvider.idl\
-     RemoteContentProviderAcceptor.idl\
-     RemoteContentProviderChangeAction.idl\
-     RemoteContentProviderChangeEvent.idl\
-     RemoteProxyContentProvider.idl\
-     ResultSetException.idl\
+    NameClash.idl\
+    NameClashException.idl\
+    NameClashResolveRequest.idl\
+    NumberedSortingInfo.idl\
+    ODMAContent.idl\
+    ODMAContentProvider.idl\
+    OpenCommandArgument.idl\
+    OpenCommandArgument2.idl\
+    OpenMode.idl\
+    OutgoingMessageState.idl\
+    PackageContentProvider.idl\
+    PackageFolderContent.idl\
+    PackageStreamContent.idl\
+    PersistentPropertySet.idl\
+    PostCommandArgument.idl\
+    PostCommandArgument2.idl\
+    Priority.idl\
+    PropertiesManager.idl\
+    PropertySetRegistry.idl\
+    PropertyValueInfo.idl\
+    PropertyValueState.idl\
+    RecipientInfo.idl\
+    RememberAuthentication.idl\
+    RemoteAccessContentProvider.idl\
+    RemoteContentProviderAcceptor.idl\
+    RemoteContentProviderChangeAction.idl\
+    RemoteContentProviderChangeEvent.idl\
+    RemoteProxyContentProvider.idl\
+    ResultSetException.idl\
     Rule.idl\
-     RuleAction.idl\
-     RuleOperator.idl\
-     RuleSet.idl\
-     RuleTerm.idl\
-     SearchCommandArgument.idl\
-     SearchCriterium.idl\
-     SearchInfo.idl\
-     SearchRecursion.idl\
-     SendInfo.idl\
-     SendMediaTypes.idl\
-     ServiceNotFoundException.idl\
-     SimpleFileAccess.idl\
-     SortedDynamicResultSetFactory.idl\
-     SortingInfo.idl\
-     Store.idl\
-     SynchronizePolicy.idl\
-     TransferCommandOperation.idl\
-     TransferInfo.idl\
-     TransferResult.idl\
+    RuleAction.idl\
+    RuleOperator.idl\
+    RuleSet.idl\
+    RuleTerm.idl\
+    SearchCommandArgument.idl\
+    SearchCriterium.idl\
+    SearchInfo.idl\
+    SearchRecursion.idl\
+    SendInfo.idl\
+    SendMediaTypes.idl\
+    ServiceNotFoundException.idl\
+    SimpleFileAccess.idl\
+    SortedDynamicResultSetFactory.idl\
+    SortingInfo.idl\
+    Store.idl\
+    SynchronizePolicy.idl\
+    TransferCommandOperation.idl\
+    TransferInfo.idl\
+    TransferResult.idl\
     TransientDocumentsContentProvider.idl\
     TransientDocumentsRootContent.idl\
     TransientDocumentsDocumentContent.idl\
     TransientDocumentsFolderContent.idl\
     TransientDocumentsStreamContent.idl\
-     UniversalContentBroker.idl\
-     UnsupportedCommandException.idl\
-     UnsupportedDataSinkException.idl\
-     UnsupportedNameClashException.idl\
-     UnsupportedOpenModeException.idl\
-     VerificationMode.idl\
-     WebDAVContentProvider.idl\
-     WebDAVDocumentContent.idl\
-     WebDAVFolderContent.idl\
-     WelcomeDynamicResultSetStruct.idl\
-     XAnyCompare.idl\
-     XAnyCompareFactory.idl\
-     XCachedContentResultSetFactory.idl\
-     XCachedContentResultSetStubFactory.idl\
-     XCachedDynamicResultSetFactory.idl\
-     XCachedDynamicResultSetStubFactory.idl\
-     XCommandEnvironment.idl\
-     XCommandInfo.idl\
-     XCommandInfoChangeListener.idl\
-     XCommandInfoChangeNotifier.idl\
-     XCommandProcessor.idl\
-     XCommandProcessor2.idl\
-     XContent.idl\
-     XContentAccess.idl\
-     XContentCreator.idl\
-     XContentEventListener.idl\
-     XContentIdentifier.idl\
-     XContentIdentifierFactory.idl\
-     XContentIdentifierMapping.idl\
-     XContentProvider.idl\
-     XContentProviderFactory.idl\
-     XContentProviderManager.idl\
-     XContentProviderSupplier.idl\
-     XContentTransmitter.idl\
-     XDataContainer.idl\
-     XDynamicResultSet.idl\
-     XDynamicResultSetListener.idl\
-     XFetchProvider.idl\
-     XFetchProviderForContentAccess.idl\
-     XFileIdentifierConverter.idl\
-     XInteractionCookieHandling.idl\
-     XInteractionHandlerSupplier.idl\
-     XInteractionReplaceExistingData.idl\
-     XInteractionSupplyAuthentication.idl\
-     XInteractionSupplyName.idl\
-     XParameterizedContentProvider.idl\
-     XPersistentPropertySet.idl\
-     XProgressHandler.idl\
-     XPropertyMatcher.idl\
-     XPropertyMatcherFactory.idl\
-     XPropertySetRegistry.idl\
-     XPropertySetRegistryFactory.idl\
-     XRecycler.idl\
-     XRemoteContentProviderAcceptor.idl\
-     XRemoteContentProviderActivator.idl\
-     XRemoteContentProviderChangeListener.idl\
-     XRemoteContentProviderChangeNotifier.idl\
-     XRemoteContentProviderConnectionControl.idl\
-     XRemoteContentProviderDistributor.idl\
-     XRemoteContentProviderDoneListener.idl\
-     XRemoteContentProviderSupplier.idl\
-     XSimpleFileAccess.idl\
-     XSimpleFileAccess2.idl\
-     XSimpleFileAccess3.idl\
-     XSortedDynamicResultSetFactory.idl\
+    UniversalContentBroker.idl\
+    UnsupportedCommandException.idl\
+    UnsupportedDataSinkException.idl\
+    UnsupportedNameClashException.idl\
+    UnsupportedOpenModeException.idl\
+    VerificationMode.idl\
+    WebDAVContentProvider.idl\
+    WebDAVDocumentContent.idl\
+    WebDAVFolderContent.idl\
+    WelcomeDynamicResultSetStruct.idl\
+    XAnyCompare.idl\
+    XAnyCompareFactory.idl\
+    XCachedContentResultSetFactory.idl\
+    XCachedContentResultSetStubFactory.idl\
+    XCachedDynamicResultSetFactory.idl\
+    XCachedDynamicResultSetStubFactory.idl\
+    XCommandEnvironment.idl\
+    XCommandInfo.idl\
+    XCommandInfoChangeListener.idl\
+    XCommandInfoChangeNotifier.idl\
+    XCommandProcessor.idl\
+    XCommandProcessor2.idl\
+    XContent.idl\
+    XContentAccess.idl\
+    XContentCreator.idl\
+    XContentEventListener.idl\
+    XContentIdentifier.idl\
+    XContentIdentifierFactory.idl\
+    XContentIdentifierMapping.idl\
+    XContentProvider.idl\
+    XContentProviderFactory.idl\
+    XContentProviderManager.idl\
+    XContentProviderSupplier.idl\
+    XContentTransmitter.idl\
+    XDataContainer.idl\
+    XDynamicResultSet.idl\
+    XDynamicResultSetListener.idl\
+    XFetchProvider.idl\
+    XFetchProviderForContentAccess.idl\
+    XFileIdentifierConverter.idl\
+    XInteractionCookieHandling.idl\
+    XInteractionHandlerSupplier.idl\
+    XInteractionReplaceExistingData.idl\
+    XInteractionSupplyAuthentication.idl\
+    XInteractionSupplyAuthentication2.idl\
+    XInteractionSupplyName.idl\
+    XParameterizedContentProvider.idl\
+    XPersistentPropertySet.idl\
+    XProgressHandler.idl\
+    XPropertyMatcher.idl\
+    XPropertyMatcherFactory.idl\
+    XPropertySetRegistry.idl\
+    XPropertySetRegistryFactory.idl\
+    XRecycler.idl\
+    XRemoteContentProviderAcceptor.idl\
+    XRemoteContentProviderActivator.idl\
+    XRemoteContentProviderChangeListener.idl\
+    XRemoteContentProviderChangeNotifier.idl\
+    XRemoteContentProviderConnectionControl.idl\
+    XRemoteContentProviderDistributor.idl\
+    XRemoteContentProviderDoneListener.idl\
+    XRemoteContentProviderSupplier.idl\
+    XSimpleFileAccess.idl\
+    XSimpleFileAccess2.idl\
+    XSimpleFileAccess3.idl\
+    XSortedDynamicResultSetFactory.idl\
     XSourceInitialization.idl\
     XWebDAVCommandEnvironment.idl \
     CertificateValidationRequest.idl
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index 6fc5e45430f2..1d1d32bf17a8 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -78,14 +78,26 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
     com::sun::star::security::XCertificate createCertificateFromAscii( [in] string asciiCertificate ) raises( com::sun::star::uno::SecurityException ) ;
 
     /**
-     * Verify a certificate.
-     *
-     * The method provides a way to verify a certificate.
-     *
-     * The validation status will returned as a bit-wise long, please refer to
-     * CertificateValidity definition.
+      Verify a certificate.
+
+      The method provides a way to verify a certificate.
+      @param xEECertificate
+          The certificate which is to be validated.
+
+      @param intermediateCertificates
+          Additional certificates which can be used by the method in constructing
+          the certificate chain. The root certificate may also be contained. However,
+          the implementation must check if the root certificate is indeed trusted by
+          the user.
+          All entries of the sequence must be non-null references.
+
+      @return
+          The validation status will returned as a bit-wise long, please refer to
+          CertificateValidity definition.
      */
-    long verifyCertificate( [in] com::sun::star::security::XCertificate xCertificate ) raises( com::sun::star::uno::SecurityException ) ;
+    long verifyCertificate( [in] com::sun::star::security::XCertificate xEECertificate,
+        [in] sequence< com::sun::star::security::XCertificate > intermediateCertificates)
+        raises( com::sun::star::uno::SecurityException ) ;
 
     /**
      * Get a certificate characters.
diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
new file mode 100644
index 000000000000..de5f8df99397
--- /dev/null
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -0,0 +1,102 @@
+/*************************************************************************
+ *
+ * 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: XSAXSerializable.idl,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_xml_sax_XFastSAXSerializable_idl__
+#define __com_sun_star_xml_sax_XFastSAXSerializable_idl__
+
+#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
+#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
+#endif
+
+#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
+#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
+#endif
+
+#ifndef __com_sun_star_beans_StringPair_idl__
+#include <com/sun/star/beans/StringPair.idl>
+#endif
+
+#ifndef __com_sun_star_beans_Pair_idl__
+#include <com/sun/star/beans/Pair.idl>
+#endif
+
+module com { module sun { module star { module xml { module sax {
+
+//=============================================================================
+/** serializes a DOM tree by generating FastSAX events.
+
+    <p>
+    </p>
+
+    @since OOo 3.1
+
+*/
+interface XFastSAXSerializable
+{
+
+    //-------------------------------------------------------------------------
+    /** serializes an object (e.g. a DOM tree) that represents an XML document
+        by generating fast SAX events.
+
+        @param  handler
+            the SAX event handler that should receive the generated events
+        @param  tokenHandler
+            the fast SAX token handler that is used to translate names
+        @param  namespaces
+            a list of namespace declarations that will be added to the root
+            element node of the XML document
+            <p>
+            This is necessary mostly because the DOM implementation does
+            not permit attaching namespaces declarations directly to nodes,
+            which may lead to duplicate namespace declarations on export,
+            and thus larger documents.
+            Note that the first part of each tuple is the prefix,
+            e.g. "office", and the second is the numeric namespace identifier.
+            </p>
+        @param  registerNamespaces
+            a list of namespace url / namespace token pairs. you need
+            to register all namespace in order to have them recognized
+            during export. Namespace tokens must be greater than
+            FastToken::NAMESPACE.
+            </p>
+
+        @throws com::sun::star::xml::sax::SAXException
+                 if serializing the XML document fails
+     */
+    void fastSerialize([in] sax::XFastDocumentHandler handler,
+                       [in] sax::XFastTokenHandler tokenHandler,
+                       [in] sequence< beans::StringPair > namespaces,
+                       [in] sequence< beans::Pair<string, long> > registerNamespaces)
+        raises( com::sun::star::xml::sax::SAXException );
+};
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/xml/sax/makefile.mk b/offapi/com/sun/star/xml/sax/makefile.mk
index 2fe672ffb219..87319dca8a9a 100644
--- a/offapi/com/sun/star/xml/sax/makefile.mk
+++ b/offapi/com/sun/star/xml/sax/makefile.mk
@@ -58,6 +58,7 @@ IDLFILES=\
     XFastParser.idl\
     XFastDocumentHandler.idl\
     XFastContextHandler.idl\
+    XFastSAXSerializable.idl\
     XFastSerializer.idl\
     XFastShapeContextHandler.idl\
     XFastTokenHandler.idl\