targetted VBA re-work.

23 files changed, 109 insertions, 399 deletions

diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index ec8d8f4e68e1..c360af67b53d 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -52,9 +52,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\
 	ControlProvider \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/msforms,\
-	MSFormReturnTypes \
-))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\
 	Button \
 	SheetObjects \
@@ -97,9 +94,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
 	XDocumentsBase \
 	XErrObject \
 	XExecutableDialog \
-	XFileDialog \
-	XFileDialogSelectedItems \
-	XFileSearch \
 	XFontBase \
 	XFoundFiles \
 	XGlobalsBase \
@@ -473,7 +467,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
 	XPivotCache \
 	XPivotTable \
 	XPivotTables \
-	XQueryTable \
 	XRange \
 	XSeries \
 	XSeriesCollection \
@@ -533,6 +526,10 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
     fmTransitionEffect \
     fmVerticalScrollBarSide \
     fmZOrder \
+	ReturnBoolean \
+	ReturnEffect \
+	ReturnInteger \
+	ReturnSingle \
 	XButton \
 	XCheckBox \
 	XColorFormat \
@@ -553,8 +550,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
 	XPictureFormat \
 	XProgressBar \
 	XRadioButton \
-	XReturnBoolean \
-	XReturnInteger \
 	XScrollBar \
 	XShape \
 	XShapeRange \
diff --git a/oovbaapi/genconstidl/api-to-idl.pl b/oovbaapi/genconstidl/api-to-idl.pl
index d04cca73de95..4959e979f89e 100755
--- a/oovbaapi/genconstidl/api-to-idl.pl
+++ b/oovbaapi/genconstidl/api-to-idl.pl
@@ -125,9 +125,6 @@ sub generate_idls($) {
     foreach $module ( keys %result ) {
         foreach $type ( keys %{$result{$module}} ) {
             my $fname = $path . "/" . $type . ".idl";
-            if ( uc($module) eq "ADODB" || uc($module) eq "DAO" ) {
-                $fname = $path . "/" . uc($module) . "_" . $type . ".idl";
-            }
             open( IDL, ">$fname" ) || die "Cannot write $fname.";
 
             if( $module eq "vba" ) {
diff --git a/oovbaapi/ooo/vba/XDialogBase.idl b/oovbaapi/ooo/vba/XDialogBase.idl
index 1aa7db0e7f8e..7fd0467d3e6e 100644
--- a/oovbaapi/ooo/vba/XDialogBase.idl
+++ b/oovbaapi/ooo/vba/XDialogBase.idl
@@ -41,7 +41,7 @@ interface XDialogBase
 {
     interface ::ooo::vba::XHelperInterface;
 
-    boolean Show();
+    void Show();
 };
 
 }; };
diff --git a/oovbaapi/ooo/vba/XFileDialog.idl b/oovbaapi/ooo/vba/XFileDialog.idl
deleted file mode 100644
index 6471ae491694..000000000000
--- a/oovbaapi/ooo/vba/XFileDialog.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * 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 __ooo_vba_excel_XFileDialog_idl__
-#define __ooo_vba_excel_XFileDialog_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <ooo/vba/XFileDialogSelectedItems.idl>
-
-//=============================================================================
-
-module ooo {  module vba {
-
-//=============================================================================
-
-interface XFileDialog : com::sun::star::uno::XInterface
-{
-    [attribute, readonly] ooo::vba::XFileDialogSelectedItems SelectedItems;
-
-    long Show();
-};
-
-}; };
-
-#endif
diff --git a/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl b/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
deleted file mode 100644
index 787e4f4f8bb0..000000000000
--- a/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * 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 __ooo_vba_excel_XFileDialogSelectedItems_idl__
-#define __ooo_vba_excel_XFileDialogSelectedItems_idl__
-
-#include <ooo/vba/XCollection.idl>
-//=============================================================================
-
-module ooo {  module vba {
-
-//=============================================================================
-
-interface XFileDialogSelectedItems
-{
-    interface ooo::vba::XCollection;
-};
-
-}; };
-
-#endif
diff --git a/oovbaapi/ooo/vba/XFileSearch.idl b/oovbaapi/ooo/vba/XFileSearch.idl
deleted file mode 100644
index c60284a21d18..000000000000
--- a/oovbaapi/ooo/vba/XFileSearch.idl
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * 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 __ooo_vba_XFileSearch_idl__
-#define __ooo_vba_XFileSearch_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <ooo/vba/XFoundFiles.idl>
-
-//=============================================================================
-
-module ooo {  module vba {
-//=============================================================================
-
-interface XFileSearch
-{
-    interface ::com::sun::star::uno::XInterface;
-
-    [attribute] string FileName;
-    [attribute] string LookIn;
-    [attribute] boolean SearchSubFolders;
-    [attribute] boolean MatchTextExactly;
-    [attribute, readonly] XFoundFiles FoundFiles;
-
-    long Execute();
-    void NewSearch();
-};
-
-}; };
-
-#endif
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index baf646879e12..f2d7ff4abdfd 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -31,8 +31,6 @@
 #include <com/sun/star/script/XInvocation.idl>
 #include <ooo/vba/XHelperInterface.idl>
 #include <ooo/vba/XAssistant.idl>
-#include <ooo/vba/XFileDialog.idl>
-#include <ooo/vba/XFileSearch.idl>
 
 module ooo {  module vba {  module excel {
 
@@ -43,8 +41,6 @@ interface XWorksheets;
 interface XWorksheetFunction;
 interface XWindow;
 interface XWorksheet;
-interface XFileDialog;
-interface XFileSearch;
 
 interface XApplication
 {
@@ -60,10 +56,8 @@ interface XApplication
     [attribute, readonly] XWindow ActiveWindow;
     [attribute, readonly] XWorksheet ActiveSheet;
     [attribute, readonly] ooo::vba::XAssistant Assistant;
-    [attribute, readonly] ooo::vba::XFileSearch FileSearch;
     [attribute] long Calculation;
     [attribute, readonly] XWorkbook ThisWorkbook;
-    [attribute, readonly] ooo::vba::XFileDialog FileDialog;
     [attribute, readonly] string Name;
     [attribute] boolean DisplayAlerts;
     [attribute] boolean DisplayFormulaBar;
@@ -71,9 +65,6 @@ interface XApplication
     [attribute] any StatusBar;
     [attribute] long Cursor;
     [attribute] boolean EnableEvents;
-    [attribute] boolean Visible;
-    [attribute] boolean Iteration;
-    [attribute] long EnableCancelKey;
     [attribute] boolean DisplayFullScreen;
     [attribute] boolean DisplayScrollBars;
     [attribute] boolean DisplayExcel4Menus;
@@ -84,8 +75,6 @@ interface XApplication
 
     string getDefaultFilePath() raises(com::sun::star::script::BasicErrorException);
 
-    any GetOpenFilename([in] /*Optional*/ any FileFilter, [in] /*Optional*/ any FilterIndex, [in] /*Optional*/ any Title, [in] /*Optional*/ any ButtonText, [in] /*Optional*/ any MultiSelect); //minz, 2009-07-08
-
     string LibraryPath() raises(com::sun::star::script::BasicErrorException);
     string TemplatesPath() raises(com::sun::star::script::BasicErrorException);
     string PathSeparator() raises(com::sun::star::script::BasicErrorException);
@@ -109,12 +98,6 @@ interface XApplication
     void Volatile([in] any Volatile);
     any Caller( [in] any Index );
     any MenuBars( [in] any aIndex );
-    any International([in] long Index);
-    any GetSaveAsFilename( [in] any InitialFilename, [in] any FileFilter, [in] any FilterIndex, [in] any Title,[in] any ButtonText);
-    void Undo();  //2009-10-11  limingl
-    double InchesToPoints([in] double Inches);
-    void setSheetsInNewWorkbook( [in] long SheetsInNewWorkbook ) raises(com::sun::star::script::BasicErrorException);
-    long getSheetsInNewWorkbook();
 };
 
 }; }; };
diff --git a/oovbaapi/ooo/vba/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index 09a69ab045b6..b5d625955694 100644
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -45,7 +45,7 @@ interface XName
     [attribute] string Name;
     [attribute] string NameLocal;
     [attribute] boolean Visible;
-    [attribute] string Value;
+    [attribute, readonly] string Value;
     [attribute, readonly] string RefersTo;
     [attribute, readonly] string RefersToLocal;
     [attribute, readonly] string RefersToR1C1;
diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
index 8b12f550e08a..e47771ee42fe 100644
--- a/oovbaapi/ooo/vba/excel/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
@@ -39,7 +39,6 @@ module ooo {  module vba {  module excel {
 
 interface XPageSetup : com::sun::star::uno::XInterface
 {
-
 //  interface ::ooo::vba::XHelperInterface;
 
     //Attributes
@@ -60,7 +59,6 @@ interface XPageSetup : com::sun::star::uno::XInterface
     [attribute] boolean CenterVertically;
     [attribute] boolean CenterHorizontally;
     [attribute] boolean PrintHeadings;
-    [attribute] long PaperSize;
 
 };
 
diff --git a/oovbaapi/ooo/vba/excel/XPivotCache.idl b/oovbaapi/ooo/vba/excel/XPivotCache.idl
index 00a4e280524f..f96aafe5f618 100644
--- a/oovbaapi/ooo/vba/excel/XPivotCache.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotCache.idl
@@ -40,7 +40,6 @@ interface XPivotCache
 {
     interface ::ooo::vba::XHelperInterface;
 
-    [attribute] long MissingItemsLimit;
     void Refresh();
 };
 
diff --git a/oovbaapi/ooo/vba/excel/XQueryTable.idl b/oovbaapi/ooo/vba/excel/XQueryTable.idl
deleted file mode 100644
index ca284c418365..000000000000
--- a/oovbaapi/ooo/vba/excel/XQueryTable.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * 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 __ooo_vba_excel_XQueryTable_idl__
-#define __ooo_vba_excel_XQueryTable_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <ooo/vba/XHelperInterface.idl>
-
-//=============================================================================
-
-module ooo {  module vba {  module excel {
-
-//=============================================================================
-
-interface XQueryTable
-{
-    interface com::sun::star::uno::XInterface;
-    //interface ooo::vba::XHelperInterface;
-    boolean Refresh([in] any aBackgroundQuery);
-};
-
-}; }; };
-
-#endif
diff --git a/oovbaapi/ooo/vba/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index 015c68c9c90d..c7c1f464d679 100644
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -53,8 +53,6 @@ interface XBorders;
 interface XValidation;
 interface XWorksheet;
 
-interface XPivotTable;
-interface XQueryTable;
 interface XRange
 {
      interface com::sun::star::container::XEnumerationAccess;
@@ -64,7 +62,6 @@ interface XRange
     interface ::ooo::vba::excel::XFormat;
     //interface ::ooo::vba::XHelperInterface;
 
-    [attribute] any Name;
     [attribute] any Value;
     [attribute] any Formula;
     [attribute] any FormulaArray;
@@ -90,7 +87,6 @@ interface XRange
     [attribute] any Style;
     [attribute] any AddIndent;
     [attribute] any ShowDetail;
-    [attribute, readonly] XQueryTable QueryTable;
 
     XComment AddComment( [in] any Text );
     void Clear();
@@ -155,11 +151,6 @@ interface XRange
     void    Subtotal( [in] long GroupBy, [in] long Function, [in]  /*Optional*/ sequence<long> TotalList, [in]  /*Optional*/ any Replace, [in]  /*Optional*/ any PageBreaks, [in] any SummaryBelowData ) raises ( com::sun::star::script::BasicErrorException );
     XRange MergeArea( ) raises ( com::sun::star::script::BasicErrorException );
     any Hyperlinks( [in] any Index );
-    long   CopyFromRecordset([in] any Data, [in]  any MaxRows , [in]  any MaxColumns) raises ( com::sun::star::script::BasicErrorException );
-    XPivotTable PivotTable();
-    void TextToColumns([in] any Destination, [in] any DataType, [in] any TextQualifier, [in] any ConsecutiveDelimiter, [in] any Tab, [in] any Semicolon, [in] any Comma,
-        [in] any Space, [in] any Other, [in] any OtherChar, [in] any FieldInfo, [in] any DecimalSeparator, [in] any ThousandsSeparator, [in] any TrailingMinusNumbers );
-    any AdvancedFilter([in] long Action, [in] any CriteriaRange, [in] any CopyToRange, [in] any Unique) raises ( com::sun::star::script::BasicErrorException );
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 7d4a70fbb1be..1d99f43dc271 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -61,7 +61,6 @@ interface XWorkbook
     any Colors( [in] any Index ) raises (com::sun::star::script::BasicErrorException);
     void SaveCopyAs( [in] string Filename );
     void Protect( [in] any Password );
-    void SaveAs([in] string FileName, [in]any FileFormat, [in]any CreateBackup);
 };
 
 }; }; };
diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index e3128181ee61..7975984d54ab 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -62,17 +62,17 @@ interface XWorksheet
     [attribute, readonly] XWorksheet Next;
     [attribute, readonly] XWorksheet Previous;
     [attribute, readonly] string CodeName;
-     [attribute, readonly] short Index;
-     [attribute] long EnableSelection;
+    [attribute, readonly] short Index;
+    [attribute] long EnableSelection;
     [attribute] boolean AutoFilterMode;
 
     void Activate();
-    void Calculate( );
-    void Select([in] any Replace);
+    void Calculate();
+    void Select();
     void Move([in] any Before,[in] any After );
     void Copy([in] any Before,[in] any After );
     void Paste([in] any Destination,[in] any Link);
-    void Delete( );
+    void Delete();
     void Protect([in] any Password,[in] any DrawingObjects ,[in] any Contents,[in] any Scenarios,[in] any UserInterfaceOnly);
     void Unprotect([in] any Password );
     void CheckSpelling([in] any CustomDictionary,[in] any IgnoreUppercase, [in] any AlwaysSuggest,[in] any SpellingLang );
diff --git a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
deleted file mode 100644
index c2ca0877ff96..000000000000
--- a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-module msforms
-{
-    struct ReturnEffect
-    {
-        //fmDropEffect Value;
-        short Value;
-    };
-
-    struct ReturnSingle
-    {
-        float Value;
-    };
-};
diff --git a/oovbaapi/ooo/vba/msforms/ReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/ReturnBoolean.idl
new file mode 100644
index 000000000000..cd739ddf49a9
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/ReturnBoolean.idl
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+module ooo { module vba { module msforms {
+    struct ReturnBoolean
+    {
+        boolean Value;
+    };
+}; }; };
diff --git a/oovbaapi/ooo/vba/msforms/ReturnEffect.idl b/oovbaapi/ooo/vba/msforms/ReturnEffect.idl
new file mode 100644
index 000000000000..817b0cd41943
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/ReturnEffect.idl
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+module ooo { module vba { module msforms {
+    struct ReturnEffect
+    {
+        //fmDropEffect Value;
+        short Value;
+    };
+}; }; };
diff --git a/oovbaapi/ooo/vba/msforms/ReturnInteger.idl b/oovbaapi/ooo/vba/msforms/ReturnInteger.idl
new file mode 100644
index 000000000000..3b949ad3bfcf
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/ReturnInteger.idl
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+module ooo { module vba { module msforms {
+    struct ReturnInteger
+    {
+        long Value;
+    };
+}; }; };
diff --git a/oovbaapi/ooo/vba/msforms/ReturnSingle.idl b/oovbaapi/ooo/vba/msforms/ReturnSingle.idl
new file mode 100644
index 000000000000..6d2e07b09af6
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/ReturnSingle.idl
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+module ooo { module vba { module msforms {
+    struct ReturnSingle
+    {
+        float Value;
+    };
+}; }; };
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 98ce26e68a3e..03f63a099211 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -41,7 +41,7 @@ interface XListBox
 {
     [attribute] any Value;
     [attribute] string Text;
-    [attribute] long MultiSelect;
+    [attribute] boolean MultiSelect;
     [attribute] any ListIndex;
     [attribute, readonly] long ListCount;
     [attribute, readonly] XNewFont Font;
diff --git a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
deleted file mode 100644
index c85d7f7df11b..000000000000
--- a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * 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 __ooo_vba_msforms_XReturnInteger_idl__
-#define __ooo_vba_msforms_XReturnInteger_idl__
-
-#include <com/sun/star/script/XDefaultProperty.idl>
-//=============================================================================
-
-module ooo
-{
-module vba
-{
-module msforms
-{
-
-//=============================================================================
-interface XReturnBoolean: com::sun::star::script::XDefaultProperty
-{
-    [attribute] boolean Value;
-};
-//=============================================================================
-
-};
-};
-};
-
-#endif
diff --git a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
deleted file mode 100644
index 4b5192e27a76..000000000000
--- a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * 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 __ooo_vba_msforms_XReturnInteger_idl__
-#define __ooo_vba_msforms_XReturnInteger_idl__
-
-#include <com/sun/star/script/XDefaultProperty.idl>
-//=============================================================================
-
-module ooo
-{
-module vba
-{
-module msforms
-{
-
-//=============================================================================
-interface XReturnInteger: com::sun::star::script::XDefaultProperty
-{
-    [attribute] long Value;
-};
-//=============================================================================
-
-};
-};
-};
-
-#endif
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index 602b3fdf35bb..1b320d072701 100644
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -64,7 +64,6 @@ interface XShape : ooo::vba::XHelperInterface
     void ScaleHeight( [in] double Factor, [in] boolean RelativeToOriginalSize, [in] long Scale );
     void ScaleWidth( [in] double Factor, [in] boolean RelativeToOriginalSize, [in] long Scale );
     any ShapeRange( [in] any index );  // only here for convience
-    void Copy();
 };
 }; }; };