gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing

15 files changed, 281 insertions, 56 deletions

diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
index d0527c3ec..368e3f148 100644
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@ -281,6 +281,8 @@ interface XExtensionManager
 
        Added extensions will be added to the database and removed extensions
        will be removed from the database.
+       The active extensions are determined. That is, shared or bundled extensions
+       are not necessaryly registered (<member>XPackage::registerPackage</member>).
        
        @return
               If true - then at least one extension was removed or added. Otherwise
@@ -295,6 +297,25 @@ interface XExtensionManager
                 com::sun::star::lang::IllegalArgumentException);
 
 
+    /** synchronizes the special bundled_prereg repository, which is based on
+       the bundled extensions and has its registration data folder at
+       $BUNDLED_EXTENSIONS_PREREG (for example openoffice.org3/share/prereg).
+
+       All bundled extensions are registered (<member>XPackage::registerPackage</member>).
+       The active extensions are NOT determined, because this function only works
+       with bundled extensions.
+
+       This function is intended to be called during the installation of OOo.
+       OOo will copy parts of the registration data folder to the user installation at the
+       first startup.
+    */
+
+    void synchronizeBundledPrereg(
+        [in] com::sun::star::task::XAbortChannel xAbortChannel,
+        [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
+        raises (DeploymentException);
+
+
     /** returns all extensions which are currently not in use
         because the user did not accept the license.
 
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index 7c542bfad..ddb4efc12 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -115,6 +115,13 @@ interface XPackageRegistry
                 supported <type>XPackageTypeInfo</type>s.
     */
     sequence<XPackageTypeInfo> getSupportedPackageTypes();
+
+    void packageRemoved(
+        [in] string url,
+        [in] string mediaType)
+        raises (DeploymentException,
+                com::sun::star::lang::IllegalArgumentException);
+
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/script/vba/VBAMacroResolver.idl b/offapi/com/sun/star/script/vba/VBAMacroResolver.idl
new file mode 100755
index 000000000..de0de0d82
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBAMacroResolver.idl
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ 
+#ifndef __com_sun_star_script_vba_VBAMacroResolver_idl__
+#define __com_sun_star_script_vba_VBAMacroResolver_idl__
+
+#include <com/sun/star/script/vba/XVBAMacroResolver.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star { module script { module vba {
+
+//=============================================================================
+
+service VBAMacroResolver : XVBAMacroResolver
+{
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/XVBAMacroResolver.idl b/offapi/com/sun/star/script/vba/XVBAMacroResolver.idl
new file mode 100755
index 000000000..5e4a251d1
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/XVBAMacroResolver.idl
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ 
+#ifndef __com_sun_star_script_vba_XVBAMacroResolver_idl__
+#define __com_sun_star_script_vba_XVBAMacroResolver_idl__
+
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module script { module vba {
+
+//=============================================================================
+
+/** Converts VBA macro names to script URLs and vice versa.
+ */
+interface XVBAMacroResolver
+{
+    //-------------------------------------------------------------------------
+
+    /** Returns the script URL representing the passed VBA macro name.
+
+        @param aVBAMacroName
+            The VBA macro name to be resolved to a script URL. The macro name
+            may consist of up to three parts, divided by periods. The first two
+            parts are optional. The first part represents the VBA project name.
+            The second part represents the module name. The third part
+            represents the procedure name. Example: All the VBA macro names
+            "VBAProject.Module1.TestMacro", "Module1.TestMacro",
+            "VBAProject.TestMacro", and "TestMacro" may refer to the same VBA
+            procedure located in "Module" of the project "VBAProject". If the
+            module name is missing, then all modules are searched for a macro
+            with the specified name.
+
+        @return
+            The script URL referring to the passed VBA macro.
+
+        @throws <type scope="::com::sun::star::lang">IllegalArgumentException</type>
+            if a macro with the passed name does not exist.
+    **/
+    string resolveVBAMacroToScriptURL( [in] string aVBAMacroName )
+        raises (::com::sun::star::lang::IllegalArgumentException);
+
+    //-------------------------------------------------------------------------
+
+    /** Returns the VBA macro name for a macro with the passed script URL.
+
+        @param aScriptURL
+            The script URL to be resolved to a VBA macro name. Must be a
+            document-local script.
+
+        @return
+            The VBA macro name referring to a macro with the passed script URL.
+
+        @throws <type scope="::com::sun::star::lang">IllegalArgumentException</type>
+            if a macro with the passed name does not exist.
+    **/
+    string resolveScriptURLtoVBAMacro( [in] string aScriptURL )
+        raises (::com::sun::star::lang::IllegalArgumentException);
+
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
index 4657b587d..336be1b5e 100755
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ b/offapi/com/sun/star/script/vba/makefile.mk
@@ -40,10 +40,12 @@ PACKAGE=com$/sun$/star$/script$/vba
 IDLFILES=\
     VBAEventId.idl \
     VBAEventProcessor.idl \
+    VBAMacroResolver.idl \
     VBASpreadsheetEventProcessor.idl \
     VBATextEventProcessor.idl \
     XVBACompatibility.idl \
     XVBAEventProcessor.idl \
+    XVBAMacroResolver.idl \
     XVBAModuleInfo.idl
 
 # ------------------------------------------------------------------
diff --git a/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl b/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
index f64c5690a..c9dd0cb29 100644
--- a/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
+++ b/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
@@ -56,7 +56,7 @@ constants FormulaMapGroupSpecialOffset
         constants.</li>
         <li>A <atom>string</atom> for literal text.</li>
         <li>A <atom dim="[][]">any</atom> for a literal array. The contained
-        values shall be of type <atom>double</atom> or atom>string</atom>.
+        values shall be of type <atom>double</atom> or <atom>string</atom>.
         Floating-point values and strings may occur together in an array.</li>
         <li>A struct of type <type>SingleReference</type> for a reference to a
         single cell in the own document.</li>
@@ -142,7 +142,7 @@ constants FormulaMapGroupSpecialOffset
         able to parse.
 
         <p>The <member>FormulaToken::Data</member> member shall contain a
-        <atom>string</string> with the bad data. This string will be displayed
+        <atom>string</atom> with the bad data. This string will be displayed
         literally in the formula.</p>
      */
     const long BAD = 7;
diff --git a/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl b/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
index fe57a0e0d..14a183fbc 100644
--- a/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_sheet_SheetFilterDescriptor_idl__
 #define __com_sun_star_sheet_SheetFilterDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/sheet/XSheetFilterDescriptor2.idl>
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableOrientation_idl__
 #include <com/sun/star/table/TableOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
@@ -62,7 +52,20 @@ published service SheetFilterDescriptor
 
     /** provides access to the collection of filter fields.
      */
-    interface com::sun::star::sheet::XSheetFilterDescriptor;
+    interface XSheetFilterDescriptor;
+
+    //-------------------------------------------------------------------------
+
+    /** provides access to the collection of filter fields.
+
+        <p>This interface provides a sequence of <type>TableFilterField2</type>
+        structures supporting a wider range of comparison operators, compared
+        to the <type>TableFilterField</type> structure provided by interface
+        <type>XSheetFilterDescriptor</type>.
+        
+        @since OOo 3.2
+     */
+    [optional] interface XSheetFilterDescriptor2;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl b/offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl
new file mode 100755
index 000000000..2be64a41a
--- /dev/null
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_sheet_SpreadsheetViewObjectsMode_idl__
+#define __com_sun_star_sheet_SpreadsheetViewObjectsMode_idl__
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
+/** Constants that control how embedded objects are shown in the view.
+ */
+published constants SpreadsheetViewObjectsMode
+{ 
+    //-------------------------------------------------------------------------
+
+    /** Specifies to display a specific set of objects in the spreadsheet view.
+     */
+    const short SHOW = 0;
+
+    //------------------------------------------------------------------------- 
+
+    /** Specifies to hide a specific set of objects from the spreadsheet view.
+     */
+    const short HIDE = 1;
+
+    //-------------------------------------------------------------------------
+};
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif
+
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
index 9d5c53cf1..6c692ce0f 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
@@ -149,18 +149,24 @@ published service SpreadsheetViewSettings
     //------------------------------------------------------------------------- 
      
     /** enables display of embedded objects in the view.
+
+        @see SpreadsheetViewObjectsMode
      */
     [property] short ShowObjects; 
  
     //------------------------------------------------------------------------- 
      
     /** enables the display of charts in the view.
+
+        @see SpreadsheetViewObjectsMode
      */
     [property] short ShowCharts; 
  
     //------------------------------------------------------------------------- 
      
     /** enables the display of drawing objects in the view.
+
+        @see SpreadsheetViewObjectsMode
      */
     [property] short ShowDrawing; 
  
@@ -175,14 +181,14 @@ published service SpreadsheetViewSettings
 
         @see com::sun::star::view::DocumentZoomType
     */
-        [property] short ZoomType;
+    [property] short ZoomType;
 
         //-------------------------------------------------------------------------
         /** Defines the zoom value to use.
             Valid only if the ZoomType is set to
             <member scope="com::sun::star::view::DocumentZoomType">BY_VALUE</member>.
     */
-        [property] short ZoomValue;
+    [property] short ZoomValue;
 }; 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/sheet/TableFilterField.idl b/offapi/com/sun/star/sheet/TableFilterField.idl
index b0e334e2a..4888d9abe 100644
--- a/offapi/com/sun/star/sheet/TableFilterField.idl
+++ b/offapi/com/sun/star/sheet/TableFilterField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_TableFilterField_idl__
 #define __com_sun_star_sheet_TableFilterField_idl__
 
-#ifndef __com_sun_star_sheet_FilterConnection_idl__
 #include <com/sun/star/sheet/FilterConnection.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FilterOperator_idl__
 #include <com/sun/star/sheet/FilterOperator.idl>
-#endif
 
 //=============================================================================
 
@@ -44,7 +39,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** describes a single condition in a filter descriptor.
 
-    @see com::sun::star::sheet::SheetFilterDescriptor
+    @see SheetFilterDescriptor
  */
 published struct TableFilterField
 {
@@ -52,7 +47,7 @@ published struct TableFilterField
 
     /** specifies how the condition is connected to the previous condition.
      */
-    com::sun::star::sheet::FilterConnection Connection;
+    FilterConnection Connection;
 
     //-------------------------------------------------------------------------
 
@@ -64,7 +59,7 @@ published struct TableFilterField
 
     /** specifies the type of the condition.
      */
-    com::sun::star::sheet::FilterOperator Operator;
+    FilterOperator Operator;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/TableFilterField2.idl b/offapi/com/sun/star/sheet/TableFilterField2.idl
index 5285b29f3..5bb4a4860 100644
--- a/offapi/com/sun/star/sheet/TableFilterField2.idl
+++ b/offapi/com/sun/star/sheet/TableFilterField2.idl
@@ -28,14 +28,8 @@
 #ifndef __com_sun_star_sheet_TableFilterField2_idl__
 #define __com_sun_star_sheet_TableFilterField2_idl__
 
-
-#ifndef __com_sun_star_sheet_FilterConnection_idl__
 #include <com/sun/star/sheet/FilterConnection.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FilterOperator2_idl__
 #include <com/sun/star/sheet/FilterOperator2.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +43,7 @@ module com {  module sun {  module star {  module sheet {
     member, whereas the <type>TableFilterField</type> struct uses the
     <type>FilterOperator</type> enum.</p>
 
-    @see com::sun::star::sheet::SheetFilterDescriptor
+    @see SheetFilterDescriptor
     @since OOo 3.2
  */
 published struct TableFilterField2
@@ -58,7 +52,7 @@ published struct TableFilterField2
 
     /** specifies how the condition is connected to the previous condition.
      */
-    com::sun::star::sheet::FilterConnection Connection;
+    FilterConnection Connection;
 
     //-------------------------------------------------------------------------
 
@@ -69,7 +63,7 @@ published struct TableFilterField2
     //-------------------------------------------------------------------------
 
     /** specifies the type of the condition as defined in
-    <type>FilterOperator2</type>.
+        <type>FilterOperator2</type>.
     */
     long Operator;
 
diff --git a/offapi/com/sun/star/sheet/XDatabaseRange.idl b/offapi/com/sun/star/sheet/XDatabaseRange.idl
index f61bed1c3..f9a245d1d 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRange.idl
@@ -77,7 +77,7 @@ published interface XDatabaseRange: com::sun::star::uno::XInterface
 
     /** returns the sort descriptor stored with the database range.
 
-        @see com::sun::star::sheet::SheetSortDescriptor2
+        @see SheetSortDescriptor2
      */
     sequence< com::sun::star::beans::PropertyValue > getSortDescriptor();
 
@@ -88,8 +88,10 @@ published interface XDatabaseRange: com::sun::star::uno::XInterface
         <p>If the filter descriptor is modified, the new filtering is
         carried out when <member>XDatabaseRange::refresh()</member> is
         called.</p>
+        
+        @see SheetFilterDescriptor
      */
-    com::sun::star::sheet::XSheetFilterDescriptor getFilterDescriptor();
+    XSheetFilterDescriptor getFilterDescriptor();
 
     //-------------------------------------------------------------------------
 
@@ -98,15 +100,17 @@ published interface XDatabaseRange: com::sun::star::uno::XInterface
         <p>If the subtotal descriptor is modified, the new subtotals are
         inserted when <member>XDatabaseRange::refresh()</member> is
         called.</p>
+
+        @see SubTotalDescriptor
      */
-    com::sun::star::sheet::XSubTotalDescriptor getSubTotalDescriptor();
+    XSubTotalDescriptor getSubTotalDescriptor();
 
     //-------------------------------------------------------------------------
 
     /** returns the database import descriptor stored with this database
         range.
 
-        @see com::sun::star::sheet::DatabaseImportDescriptor
+        @see DatabaseImportDescriptor
      */
     sequence< com::sun::star::beans::PropertyValue > getImportDescriptor();
 
diff --git a/offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl b/offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl
index 3f4c49d42..5c198d65a 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #define __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableFilterField_idl__
 #include <com/sun/star/sheet/TableFilterField.idl>
-#endif
+#include <com/sun/star/uno/XInterface.idl>
 
 //=============================================================================
 
@@ -44,7 +39,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** provides access to a collection of filter conditions (filter fields).
 
-    @see com::sun::star::sheet::SheetFilterDescriptor
+    @see SheetFilterDescriptor
  */
 published interface XSheetFilterDescriptor: com::sun::star::uno::XInterface
 {
@@ -52,14 +47,13 @@ published interface XSheetFilterDescriptor: com::sun::star::uno::XInterface
 
     /** returns the collection of filter fields.
      */
-    sequence< com::sun::star::sheet::TableFilterField > getFilterFields();
+    sequence< TableFilterField > getFilterFields();
 
     //-------------------------------------------------------------------------
 
     /** sets a new collection of filter fields.
      */
-    void setFilterFields(
-        [in] sequence< com::sun::star::sheet::TableFilterField > aFilterFields );
+    void setFilterFields( [in] sequence< TableFilterField > aFilterFields );
 
 };
 
diff --git a/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl b/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl
index 113f8b61d..bbc05def3 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetFilterDescriptor2_idl__
 #define __com_sun_star_sheet_XSheetFilterDescriptor2_idl__
 
-#ifndef __com_sun_star_sheet_TableFilterField2_idl__
 #include <com/sun/star/sheet/TableFilterField2.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -48,7 +43,7 @@ module com {  module sun {  module star {  module sheet {
     whereas the <type>XSheetFilterDescriptor</type> interface uses the
     <type>TableFilterField</type> struct.</p>
 
-    @see com::sun::star::sheet::SheetFilterDescriptor
+    @see SheetFilterDescriptor
     @since OOo 3.2
  */
 published interface XSheetFilterDescriptor2: com::sun::star::uno::XInterface
@@ -57,14 +52,13 @@ published interface XSheetFilterDescriptor2: com::sun::star::uno::XInterface
 
     /** returns the collection of filter fields.
      */
-    sequence< com::sun::star::sheet::TableFilterField2 > getFilterFields2();
+    sequence< TableFilterField2 > getFilterFields2();
 
     //-------------------------------------------------------------------------
 
     /** sets a new collection of filter fields.
      */
-    void setFilterFields2(
-        [in] sequence< com::sun::star::sheet::TableFilterField2 > aFilterFields );
+    void setFilterFields2( [in] sequence< TableFilterField2 > aFilterFields );
 
 };
 
diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk
index 65e8d5c40..c5b15a5b0 100644
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ b/offapi/com/sun/star/sheet/makefile.mk
@@ -198,6 +198,7 @@ IDLFILES=\
     SpreadsheetDocumentSettings.idl\
     SpreadsheetDrawPage.idl\
     SpreadsheetView.idl\
+    SpreadsheetViewObjectsMode.idl\
     SpreadsheetViewPane.idl\
     SpreadsheetViewPanesEnumeration.idl\
     SpreadsheetViewSettings.idl\