summaryrefslogtreecommitdiff
path: root/oovbaapi/ooo/vba/excel
diff options
context:
space:
mode:
Diffstat (limited to 'oovbaapi/ooo/vba/excel')
-rw-r--r--oovbaapi/ooo/vba/excel/Globals.idl3
-rw-r--r--oovbaapi/ooo/vba/excel/Hyperlink.idl3
-rw-r--r--oovbaapi/ooo/vba/excel/Range.idl3
-rw-r--r--oovbaapi/ooo/vba/excel/TextFrame.idl3
-rw-r--r--oovbaapi/ooo/vba/excel/Window.idl3
-rw-r--r--oovbaapi/ooo/vba/excel/Workbook.idl3
-rw-r--r--oovbaapi/ooo/vba/excel/Worksheet.idl7
-rw-r--r--oovbaapi/ooo/vba/excel/XApplication.idl32
-rw-r--r--oovbaapi/ooo/vba/excel/XAxes.idl12
-rw-r--r--oovbaapi/ooo/vba/excel/XAxis.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XAxisTitle.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XBorder.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XBorders.idl6
-rw-r--r--oovbaapi/ooo/vba/excel/XCharacters.idl6
-rw-r--r--oovbaapi/ooo/vba/excel/XChart.idl7
-rw-r--r--oovbaapi/ooo/vba/excel/XChartObject.idl6
-rw-r--r--oovbaapi/ooo/vba/excel/XChartObjects.idl8
-rw-r--r--oovbaapi/ooo/vba/excel/XChartTitle.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XCharts.idl8
-rw-r--r--oovbaapi/ooo/vba/excel/XComments.idl6
-rw-r--r--oovbaapi/ooo/vba/excel/XDataLabel.idl7
-rw-r--r--oovbaapi/ooo/vba/excel/XDataLabels.idl7
-rw-r--r--oovbaapi/ooo/vba/excel/XDialog.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XDialogs.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XFont.idl7
-rw-r--r--oovbaapi/ooo/vba/excel/XFormat.idl4
-rw-r--r--oovbaapi/ooo/vba/excel/XFormatCondition.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XFormatConditions.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XGlobals.idl13
-rw-r--r--oovbaapi/ooo/vba/excel/XHPageBreak.idl2
-rw-r--r--oovbaapi/ooo/vba/excel/XHPageBreaks.idl10
-rw-r--r--oovbaapi/ooo/vba/excel/XInterior.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XMenu.idl49
-rw-r--r--oovbaapi/ooo/vba/excel/XMenuBar.idl46
-rw-r--r--oovbaapi/ooo/vba/excel/XMenuBars.idl50
-rw-r--r--oovbaapi/ooo/vba/excel/XMenuItem.idl49
-rw-r--r--oovbaapi/ooo/vba/excel/XMenuItems.idl54
-rw-r--r--oovbaapi/ooo/vba/excel/XMenus.idl54
-rw-r--r--oovbaapi/ooo/vba/excel/XName.idl17
-rw-r--r--oovbaapi/ooo/vba/excel/XNames.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XOLEObject.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XOLEObjects.idl2
-rw-r--r--oovbaapi/ooo/vba/excel/XOutline.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XPageBreak.idl8
-rw-r--r--oovbaapi/ooo/vba/excel/XPageSetup.idl6
-rw-r--r--oovbaapi/ooo/vba/excel/XPivotCache.idl6
-rw-r--r--oovbaapi/ooo/vba/excel/XPivotTable.idl8
-rw-r--r--oovbaapi/ooo/vba/excel/XPivotTables.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XQueryTable.idl50
-rw-r--r--oovbaapi/ooo/vba/excel/XRange.idl30
-rw-r--r--oovbaapi/ooo/vba/excel/XSeries.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XSeriesCollection.idl4
-rw-r--r--oovbaapi/ooo/vba/excel/XStyle.idl7
-rw-r--r--oovbaapi/ooo/vba/excel/XStyles.idl8
-rw-r--r--oovbaapi/ooo/vba/excel/XTextFrame.idl2
-rw-r--r--oovbaapi/ooo/vba/excel/XTitle.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XVPageBreak.idl2
-rw-r--r--oovbaapi/ooo/vba/excel/XVPageBreaks.idl11
-rw-r--r--oovbaapi/ooo/vba/excel/XValidation.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XWindows.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XWorkbook.idl16
-rw-r--r--oovbaapi/ooo/vba/excel/XWorkbooks.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/XWorksheet.idl17
-rw-r--r--oovbaapi/ooo/vba/excel/XWorksheetFunction.idl12
-rw-r--r--oovbaapi/ooo/vba/excel/XWorksheets.idl6
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/makefile.mk8
66 files changed, 420 insertions, 358 deletions
diff --git a/oovbaapi/ooo/vba/excel/Globals.idl b/oovbaapi/ooo/vba/excel/Globals.idl
index 499bc9a596a0..50d6b662a631 100644
--- a/oovbaapi/ooo/vba/excel/Globals.idl
+++ b/oovbaapi/ooo/vba/excel/Globals.idl
@@ -28,10 +28,7 @@
#ifndef __ooo_vba_excel_Globals_idl__
#define __ooo_vba_excel_Globals_idl__
-#ifndef __ooo_vba_excel_XGlobals_idl__
#include <ooo/vba/excel/XGlobals.idl>
-#endif
-
#include <com/sun/star/uno/XComponentContext.idl>
#include <com/sun/star/table/XCellRange.idl>
diff --git a/oovbaapi/ooo/vba/excel/Hyperlink.idl b/oovbaapi/ooo/vba/excel/Hyperlink.idl
index cdc058e4c762..a4796baa9743 100644
--- a/oovbaapi/ooo/vba/excel/Hyperlink.idl
+++ b/oovbaapi/ooo/vba/excel/Hyperlink.idl
@@ -28,10 +28,7 @@
#ifndef __ooo_vba_excel_Hyperlink_idl__
#define __ooo_vba_excel_Hyperlink_idl__
-#ifndef __ooo_vba_excel_XHyperlink_idl__
#include <ooo/vba/excel/XHyperlink.idl>
-#endif
-
#include <com/sun/star/uno/XComponentContext.idl>
#include <com/sun/star/frame/XModel.idl>
diff --git a/oovbaapi/ooo/vba/excel/Range.idl b/oovbaapi/ooo/vba/excel/Range.idl
index 854f5ff58758..5f0af0f8c56b 100644
--- a/oovbaapi/ooo/vba/excel/Range.idl
+++ b/oovbaapi/ooo/vba/excel/Range.idl
@@ -28,10 +28,7 @@
#ifndef __ooo_vba_excel_Range_idl__
#define __ooo_vba_excel_Range_idl__
-#ifndef __ooo_vba_excel_XRange_idl__
#include <ooo/vba/excel/XRange.idl>
-#endif
-
#include <com/sun/star/uno/XComponentContext.idl>
#include <com/sun/star/table/XCellRange.idl>
diff --git a/oovbaapi/ooo/vba/excel/TextFrame.idl b/oovbaapi/ooo/vba/excel/TextFrame.idl
index cef8dd002eab..cf7957588d16 100644
--- a/oovbaapi/ooo/vba/excel/TextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/TextFrame.idl
@@ -28,10 +28,7 @@
#ifndef __ooo_vba_excel_TextFrame_idl__
#define __ooo_vba_excel_TextFrame_idl__
-#ifndef __ooo_vba_excel_XTextFrame_idl__
#include <ooo/vba/excel/XTextFrame.idl>
-#endif
-
#include <com/sun/star/uno/XComponentContext.idl>
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/Window.idl b/oovbaapi/ooo/vba/excel/Window.idl
index b367b8e900cf..c0a7e37ed5a5 100644
--- a/oovbaapi/ooo/vba/excel/Window.idl
+++ b/oovbaapi/ooo/vba/excel/Window.idl
@@ -28,10 +28,7 @@
#ifndef __ooo_vba_excel_Window_idl__
#define __ooo_vba_excel_Window_idl__
-#ifndef __ooo_vba_excel_XWindow_idl__
#include <ooo/vba/excel/XWindow.idl>
-#endif
-
#include <com/sun/star/uno/XComponentContext.idl>
#include <com/sun/star/frame/XModel.idl>
diff --git a/oovbaapi/ooo/vba/excel/Workbook.idl b/oovbaapi/ooo/vba/excel/Workbook.idl
index deb2f36cfd40..1c4c09b8ca82 100644
--- a/oovbaapi/ooo/vba/excel/Workbook.idl
+++ b/oovbaapi/ooo/vba/excel/Workbook.idl
@@ -28,10 +28,7 @@
#ifndef __ooo_vba_excel_Workbook_idl__
#define __ooo_vba_excel_Workbook_idl__
-#ifndef __ooo_vba_excel_XWorkbook_idl__
#include <ooo/vba/excel/XWorkbook.idl>
-#endif
-
#include <com/sun/star/uno/XComponentContext.idl>
#include <com/sun/star/frame/XModel.idl>
diff --git a/oovbaapi/ooo/vba/excel/Worksheet.idl b/oovbaapi/ooo/vba/excel/Worksheet.idl
index f288d6395d50..330690ffa5e0 100644
--- a/oovbaapi/ooo/vba/excel/Worksheet.idl
+++ b/oovbaapi/ooo/vba/excel/Worksheet.idl
@@ -28,16 +28,9 @@
#ifndef __ooo_vba_excel_Worksheet_idl__
#define __ooo_vba_excel_Worksheet_idl__
-#ifndef __ooo_vba_excel_XWorksheet_idl__
#include <ooo/vba/excel/XWorksheet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XComponentContext_idl__
#include <com/sun/star/uno/XComponentContext.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
module ooo { module vba { module excel {
service Worksheet : XWorksheet
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index 267c9589bfae..e9bee9bae44d 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -31,6 +31,8 @@
#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 {
@@ -41,6 +43,8 @@ interface XWorksheets;
interface XWorksheetFunction;
interface XWindow;
interface XWorksheet;
+interface XFileDialog;
+interface XFileSearch;
interface XApplication
{
@@ -56,8 +60,10 @@ 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;
@@ -65,11 +71,19 @@ interface XApplication
[attribute] any StatusBar;
[attribute] long Cursor;
[attribute] boolean EnableEvents;
- [attribute] string DefaultFilePath;
- [attribute, readonly] string LibraryPath;
- [attribute, readonly] string TemplatesPath;
- [attribute, readonly] string PathSeparator;
+ [attribute] boolean Visible;
+ [attribute] boolean Iteration;
+ [attribute] long EnableCancelKey;
+ void setDefaultFilePath([in] string DefaultFilePath) raises(com::sun::star::script::BasicErrorException);
+
+ 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);
//any CommandBars( [in] any Index );
any Workbooks( [in] any Index );
any Worksheets( [in] any Index );
@@ -88,10 +102,14 @@ interface XApplication
XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
raises(com::sun::star::script::BasicErrorException);
void Volatile([in] any Volatile);
- void DoEvents();
any Caller( [in] any Index );
- any GetOpenFilename( [in] any FileFilter, [in] any FilterIndex, [in] any Title, [in] any ButtonText, [in] any MultiSelect );
- any GetSaveAsFilename( [in] any InitialFileName, [in] any FileFilter, [in] any FilterIndex, [in] any Title, [in] any ButtonText );
+ 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/XAxes.idl b/oovbaapi/ooo/vba/excel/XAxes.idl
index f472bcde8a44..9837cc170915 100644
--- a/oovbaapi/ooo/vba/excel/XAxes.idl
+++ b/oovbaapi/ooo/vba/excel/XAxes.idl
@@ -28,21 +28,11 @@
#ifndef __ooo_vba_excel_XAxes_idl__
#define __ooo_vba_excel_XAxes_idl__
-#ifndef __ooo_vba_excel_XAxis_idl__
#include <ooo/vba/excel/XAxis.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
+
module ooo { module vba { module excel {
interface XAxes
diff --git a/oovbaapi/ooo/vba/excel/XAxis.idl b/oovbaapi/ooo/vba/excel/XAxis.idl
index 5bcd3370a40b..5c8c52c3897c 100644
--- a/oovbaapi/ooo/vba/excel/XAxis.idl
+++ b/oovbaapi/ooo/vba/excel/XAxis.idl
@@ -28,13 +28,8 @@
#ifndef __ooo_vba_excel_XAxis_idl__
#define __ooo_vba_excel_XAxis_idl__
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module excel {
interface XAxisTitle;
diff --git a/oovbaapi/ooo/vba/excel/XAxisTitle.idl b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
index 8d30c04a4fa2..8b952a1fa69d 100644
--- a/oovbaapi/ooo/vba/excel/XAxisTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
@@ -28,13 +28,8 @@
#ifndef __ooo_vba_excel_XAxisTitle_idl__
#define __ooo_vba_excel_XAxisTitle_idl__
-#ifndef __ooo_vba_excel_XTitle_idl__
#include <ooo/vba/excel/XTitle.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XBorder.idl b/oovbaapi/ooo/vba/excel/XBorder.idl
index f227ce6cb06b..178f1abf2ed5 100644
--- a/oovbaapi/ooo/vba/excel/XBorder.idl
+++ b/oovbaapi/ooo/vba/excel/XBorder.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XBorder_idl__
#define __ooo_vba_excel_XBorder_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XBorders.idl b/oovbaapi/ooo/vba/excel/XBorders.idl
index 16d75327824a..33c838b2d030 100644
--- a/oovbaapi/ooo/vba/excel/XBorders.idl
+++ b/oovbaapi/ooo/vba/excel/XBorders.idl
@@ -27,15 +27,9 @@
#ifndef __ooo_vba_excel_XBorders_idl__
#define __ooo_vba_excel_XBorders_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XBorder_idl__
#include <ooo/vba/excel/XBorder.idl>
-#endif
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XCharacters.idl b/oovbaapi/ooo/vba/excel/XCharacters.idl
index 023b93f16dfe..6237ce85c227 100644
--- a/oovbaapi/ooo/vba/excel/XCharacters.idl
+++ b/oovbaapi/ooo/vba/excel/XCharacters.idl
@@ -27,15 +27,9 @@
#ifndef __ooo_vba_excel_XCharacters_idl__
#define __ooo_vba_excel_XCharacters_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XFont_idl__
#include <ooo/vba/excel/XFont.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XChart.idl b/oovbaapi/ooo/vba/excel/XChart.idl
index d30bfb07bb94..fe32058427a3 100644
--- a/oovbaapi/ooo/vba/excel/XChart.idl
+++ b/oovbaapi/ooo/vba/excel/XChart.idl
@@ -27,16 +27,9 @@
#ifndef __ooo_vba_excel_XChart_idl__
#define __ooo_vba_excel_XChart_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XChartObject.idl b/oovbaapi/ooo/vba/excel/XChartObject.idl
index accaab8b504c..aa0e5edd9a1d 100644
--- a/oovbaapi/ooo/vba/excel/XChartObject.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObject.idl
@@ -27,15 +27,9 @@
#ifndef __ooo_vba_excel_XChartObject_idl__
#define __ooo_vba_excel_XChartObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XChartObjects.idl b/oovbaapi/ooo/vba/excel/XChartObjects.idl
index 7fcd09b5e086..a56e9057724b 100644
--- a/oovbaapi/ooo/vba/excel/XChartObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObjects.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_excel_XChartObjects_idl__
#define __ooo_vba_excel_XChartObjects_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XChartTitle.idl b/oovbaapi/ooo/vba/excel/XChartTitle.idl
index 64fce8b72d40..b591aa7d5059 100644
--- a/oovbaapi/ooo/vba/excel/XChartTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XChartTitle.idl
@@ -28,13 +28,8 @@
#ifndef __ooo_vba_excel_XChartTitle_idl__
#define __ooo_vba_excel_XChartTitle_idl__
-#ifndef __ooo_vba_excel_XTitle_idl__
#include <ooo/vba/excel/XTitle.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XCharts.idl b/oovbaapi/ooo/vba/excel/XCharts.idl
index 0e72d12c5aed..5a42996b1cb7 100644
--- a/oovbaapi/ooo/vba/excel/XCharts.idl
+++ b/oovbaapi/ooo/vba/excel/XCharts.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_excel_XChart_idl__
#define __ooo_vba_excel_XChart_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XComments.idl b/oovbaapi/ooo/vba/excel/XComments.idl
index fbd8b5ba1b5b..08926247a356 100644
--- a/oovbaapi/ooo/vba/excel/XComments.idl
+++ b/oovbaapi/ooo/vba/excel/XComments.idl
@@ -27,15 +27,9 @@
#ifndef __ooo_vba_excel_XComments_idl__
#define __ooo_vba_excel_XComments_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XDataLabel.idl b/oovbaapi/ooo/vba/excel/XDataLabel.idl
index bb21e09d7f46..ceeecfbde50a 100644
--- a/oovbaapi/ooo/vba/excel/XDataLabel.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabel.idl
@@ -27,16 +27,9 @@
#ifndef __ooo_vba_excel_XDataLabel_idl__
#define __ooo_vba_excel_XDataLabel_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XDataLabels.idl b/oovbaapi/ooo/vba/excel/XDataLabels.idl
index 0b7cd8b4ee97..02681d2eb57f 100644
--- a/oovbaapi/ooo/vba/excel/XDataLabels.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabels.idl
@@ -27,16 +27,9 @@
#ifndef __ooo_vba_excel_XDataLabels_idl__
#define __ooo_vba_excel_XDataLabels_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XDialog.idl b/oovbaapi/ooo/vba/excel/XDialog.idl
index 5d652605c60e..e8149a36814b 100644
--- a/oovbaapi/ooo/vba/excel/XDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XDialog.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XDialog_idl__
#define __ooo_vba_excel_XDialog_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XDialogs.idl b/oovbaapi/ooo/vba/excel/XDialogs.idl
index ef6f4b7d75a1..4efe93593b47 100644
--- a/oovbaapi/ooo/vba/excel/XDialogs.idl
+++ b/oovbaapi/ooo/vba/excel/XDialogs.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XDialogs_idl__
#define __ooo_vba_excel_XDialogs_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XFont.idl b/oovbaapi/ooo/vba/excel/XFont.idl
index 82ad577186e4..0f67d5f53ef3 100644
--- a/oovbaapi/ooo/vba/excel/XFont.idl
+++ b/oovbaapi/ooo/vba/excel/XFont.idl
@@ -27,16 +27,9 @@
#ifndef __ooo_vba_excel_XFont_idl__
#define __ooo_vba_excel_XFont_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XFormat.idl b/oovbaapi/ooo/vba/excel/XFormat.idl
index 65837ce2ffd9..14bac900d6e3 100644
--- a/oovbaapi/ooo/vba/excel/XFormat.idl
+++ b/oovbaapi/ooo/vba/excel/XFormat.idl
@@ -28,12 +28,8 @@
#ifndef __ooo_vba_excel_XFormat_idl__
#define __ooo_vba_excel_XFormat_idl__
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XFormatCondition.idl b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
index a2c18defdeff..269fb54c8dab 100644
--- a/oovbaapi/ooo/vba/excel/XFormatCondition.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
@@ -28,13 +28,8 @@
#ifndef __ooo_vba_excel_XFormatCondition_idl__
#define __ooo_vba_excel_XFormatCondition_idl__
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XFormatConditions.idl b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
index 7983637faf78..cef9b38633ed 100644
--- a/oovbaapi/ooo/vba/excel/XFormatConditions.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XFormatConditions_idl__
#define __ooo_vba_excel_XFormatConditions_idl__
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
module ooo { module vba { module excel
{
diff --git a/oovbaapi/ooo/vba/excel/XGlobals.idl b/oovbaapi/ooo/vba/excel/XGlobals.idl
index 4c40f8fe087a..6113801be140 100644
--- a/oovbaapi/ooo/vba/excel/XGlobals.idl
+++ b/oovbaapi/ooo/vba/excel/XGlobals.idl
@@ -27,24 +27,12 @@
#ifndef __ooo_vba_excel_XGlobals_idl__
#define __ooo_vba_excel_XGlobals_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-#ifndef __ooo_vba_excel_XWorkbook_idl__
#include <ooo/vba/excel/XWorkbook.idl>
-#endif
-#ifndef __ooo_vba_excel_XWorksheet_idl__
#include <ooo/vba/excel/XWorksheet.idl>
-#endif
-#ifndef __ooo_vba_XAssistant_idl__
#include <ooo/vba/XAssistant.idl>
-#endif
-#ifndef __ooo_vba_excel_XApplication_idl__
#include <ooo/vba/excel/XApplication.idl>
-#endif
module ooo { module vba { module excel {
@@ -80,6 +68,7 @@ XRange Intersect([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3,
any Names( [in] any Index );
XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
raises(com::sun::star::script::BasicErrorException);
+ any MenuBars( [in] any aIndex );
};
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreak.idl b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
index dbe9852bd845..76ac8326c135 100644
--- a/oovbaapi/ooo/vba/excel/XHPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_excel_XHPageBreak_idl__
#define __ooo_vba_excel_XHPageBreak_idl__
-#ifndef __ooo_vba_excel_XPageBreak_idl__
#include <ooo/vba/excel/XPageBreak.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
index 9d1e91514d84..b5cd8bb3752a 100644
--- a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
@@ -27,20 +27,10 @@
#ifndef __ooo_vba_excel_XHPageBreaks_idl__
#define __ooo_vba_excel_XHPageBreaks_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl
index bd3758ae18f0..b7aeb43b3f9d 100644
--- a/oovbaapi/ooo/vba/excel/XInterior.idl
+++ b/oovbaapi/ooo/vba/excel/XInterior.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XInterior_idl__
#define __ooo_vba_excel_XInterior_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XMenu.idl b/oovbaapi/ooo/vba/excel/XMenu.idl
new file mode 100644
index 000000000000..ffa808c5e625
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XMenu.idl
@@ -0,0 +1,49 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Novell Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Pei Feng Lin <pflin@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef __ooo_vba_excel_XMenu_idl__
+#define __ooo_vba_excel_XMenu_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+//=============================================================================
+
+module ooo { module vba { module excel {
+//=============================================================================
+
+interface XMenu
+{
+ interface XHelperInterface;
+
+ [attribute] string Caption;
+
+ void Delete() raises ( com::sun::star::script::BasicErrorException );
+ any MenuItems( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/XMenuBar.idl b/oovbaapi/ooo/vba/excel/XMenuBar.idl
new file mode 100644
index 000000000000..0e22d1c6d19f
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XMenuBar.idl
@@ -0,0 +1,46 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Novell Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Pei Feng Lin <pflin@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef __ooo_vba_excel_XMenuBar_idl__
+#define __ooo_vba_excel_XMenuBar_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+//=============================================================================
+
+module ooo { module vba { module excel {
+//=============================================================================
+
+interface XMenuBar
+{
+ interface XHelperInterface;
+
+ any Menus( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/XMenuBars.idl b/oovbaapi/ooo/vba/excel/XMenuBars.idl
new file mode 100644
index 000000000000..40e7966015c0
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XMenuBars.idl
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * 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_XMenuBars_idl__
+#define __ooo_vba_excel_XMenuBars_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+#include <com/sun/star/script/BasicErrorException.idl>
+#include <ooo/vba/XCollection.idl>
+
+//=============================================================================
+
+module ooo { module vba { module excel {
+
+//=============================================================================
+
+interface XMenuBars
+{
+ interface ooo::vba::XCollection;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/XMenuItem.idl b/oovbaapi/ooo/vba/excel/XMenuItem.idl
new file mode 100644
index 000000000000..0c82b25f880a
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XMenuItem.idl
@@ -0,0 +1,49 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Novell Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Pei Feng Lin <pflin@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef __ooo_vba_excel_XMenuItem_idl__
+#define __ooo_vba_excel_XMenuItem_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+//=============================================================================
+
+module ooo { module vba { module excel {
+//=============================================================================
+
+interface XMenuItem
+{
+ interface XHelperInterface;
+
+ [attribute] string Caption;
+ [attribute] string OnAction;
+
+ void Delete() raises ( com::sun::star::script::BasicErrorException );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/XMenuItems.idl b/oovbaapi/ooo/vba/excel/XMenuItems.idl
new file mode 100644
index 000000000000..c70bdb4511f8
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XMenuItems.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
+ *
+ * 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_XMenuItems_idl__
+#define __ooo_vba_excel_XMenuItems_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+#include <com/sun/star/script/BasicErrorException.idl>
+#include <ooo/vba/XCollection.idl>
+
+//=============================================================================
+
+module ooo { module vba { module excel {
+
+//=============================================================================
+
+interface XMenuItem;
+
+interface XMenuItems
+{
+ interface ooo::vba::XCollection;
+
+ XMenuItem Add( [in] string Caption, [in] any OnAction, [in] any ShortcutKey, [in] any Before, [in] any Restore, [in] any StatusBar, [in] any HelpFile, [in] any HelpContextID ) raises ( com::sun::star::script::BasicErrorException );
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/XMenus.idl b/oovbaapi/ooo/vba/excel/XMenus.idl
new file mode 100644
index 000000000000..9f58de5cd5dd
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XMenus.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
+ *
+ * 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_XMenus_idl__
+#define __ooo_vba_excel_XMenus_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+#include <com/sun/star/script/BasicErrorException.idl>
+#include <ooo/vba/XCollection.idl>
+
+//=============================================================================
+
+module ooo { module vba { module excel {
+
+//=============================================================================
+
+interface XMenu;
+
+interface XMenus
+{
+ interface ooo::vba::XCollection;
+
+ XMenu Add( [in] string Caption, [in] any Before, [in] any Restore ) raises ( com::sun::star::script::BasicErrorException );
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index 554848803d92..09a69ab045b6 100644
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XName_idl__
#define __ooo_vba_excel_XName_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
@@ -50,12 +45,12 @@ interface XName
[attribute] string Name;
[attribute] string NameLocal;
[attribute] boolean Visible;
- [attribute, readonly] string Value;
- [attribute, readonly] string RefersTo;
- [attribute, readonly] string RefersToLocal;
- [attribute, readonly] string RefersToR1C1;
- [attribute, readonly] string RefersToR1C1Local;
- [attribute, readonly] XRange RefersToRange;
+ [attribute] string Value;
+ [attribute, readonly] string RefersTo;
+ [attribute, readonly] string RefersToLocal;
+ [attribute, readonly] string RefersToR1C1;
+ [attribute, readonly] string RefersToR1C1Local;
+ [attribute, readonly] XRange RefersToRange;
void Delete( );
};
diff --git a/oovbaapi/ooo/vba/excel/XNames.idl b/oovbaapi/ooo/vba/excel/XNames.idl
index c34d7a7a2d36..e8fedc4df688 100644
--- a/oovbaapi/ooo/vba/excel/XNames.idl
+++ b/oovbaapi/ooo/vba/excel/XNames.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XNames_idl__
#define __ooo_vba_excel_XNames_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XOLEObject.idl b/oovbaapi/ooo/vba/excel/XOLEObject.idl
index a379039c32e8..922de379ffa1 100644
--- a/oovbaapi/ooo/vba/excel/XOLEObject.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObject.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XOLEObject_idl__
#define __ooo_vba_excel_XOLEObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XOLEObjects.idl b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
index 72c778cd38ac..f380984bdda3 100644
--- a/oovbaapi/ooo/vba/excel/XOLEObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_excel_XOLEObjects_idl__
#define __ooo_vba_excel_XOLEObjects_idl__
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XOutline.idl b/oovbaapi/ooo/vba/excel/XOutline.idl
index 1ca0deb1c164..285a1d927ae4 100644
--- a/oovbaapi/ooo/vba/excel/XOutline.idl
+++ b/oovbaapi/ooo/vba/excel/XOutline.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XOutline_idl__
#define __ooo_vba_excel_XOutline_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XPageBreak.idl b/oovbaapi/ooo/vba/excel/XPageBreak.idl
index 904e7e930bf1..972e125a12a1 100644
--- a/oovbaapi/ooo/vba/excel/XPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XPageBreak.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_excel_XPageBreak_idl__
#define __ooo_vba_excel_XPageBreak_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
index 3308e4b29b2b..8b12f550e08a 100644
--- a/oovbaapi/ooo/vba/excel/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XPageSetup_idl__
#define __ooo_vba_excel_XPageSetup_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
@@ -65,6 +60,7 @@ 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 52dd679e4d05..00a4e280524f 100644
--- a/oovbaapi/ooo/vba/excel/XPivotCache.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotCache.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XPivotCache_idl__
#define __ooo_vba_excel_XPivotCache_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
@@ -45,6 +40,7 @@ interface XPivotCache
{
interface ::ooo::vba::XHelperInterface;
+ [attribute] long MissingItemsLimit;
void Refresh();
};
diff --git a/oovbaapi/ooo/vba/excel/XPivotTable.idl b/oovbaapi/ooo/vba/excel/XPivotTable.idl
index b4ebb5eb2453..f50d9fd7e7bb 100644
--- a/oovbaapi/ooo/vba/excel/XPivotTable.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTable.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_excel_XPivotTable_idl__
#define __ooo_vba_excel_XPivotTable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XPivotCache_idl__
#include <ooo/vba/excel/XPivotCache.idl>
-#endif
-
-#ifndef __ooo_vba__XHelperInterface_idl__
-#define __ooo_vba__XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XPivotTables.idl b/oovbaapi/ooo/vba/excel/XPivotTables.idl
index 07c4c08c7b80..c2915448cd6d 100644
--- a/oovbaapi/ooo/vba/excel/XPivotTables.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTables.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XPivotTables_idl__
#define __ooo_vba_excel_XPivotTables_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XQueryTable.idl b/oovbaapi/ooo/vba/excel/XQueryTable.idl
new file mode 100644
index 000000000000..ca284c418365
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XQueryTable.idl
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * 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 7e6aba65d34e..62a0994beb68 100644
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -27,33 +27,17 @@
#ifndef __ooo_vba_excel_XRange_idl__
#define __ooo_vba_excel_XRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_script_XDefaultProperty_idl__
#include <com/sun/star/script/XDefaultProperty.idl>
-#endif
-#ifndef __com_sun_star_script_XDefaultMethod_idl__
#include <com/sun/star/script/XDefaultMethod.idl>
-#endif
-#ifndef __ooo_vba_XCollection_idl__
+#include <com/sun/star/script/XErrorQuery.idl>
#include <ooo/vba/XCollection.idl>
-#endif
-#ifndef __ooo_vba_excel_XFormat_idl__
#include <ooo/vba/excel/XFormat.idl>
-#endif
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
+
//=============================================================================
module ooo { module vba { module excel {
@@ -69,14 +53,18 @@ interface XBorders;
interface XValidation;
interface XWorksheet;
+interface XPivotTable;
+interface XQueryTable;
interface XRange
{
interface com::sun::star::container::XEnumerationAccess;
interface com::sun::star::script::XDefaultMethod;
interface com::sun::star::script::XDefaultProperty;
+ interface com::sun::star::script::XErrorQuery;
interface ::ooo::vba::excel::XFormat;
//interface ::ooo::vba::XHelperInterface;
+ [attribute, readonly] any Name;
[attribute] any Value;
[attribute] any Formula;
[attribute] any FormulaArray;
@@ -102,6 +90,7 @@ interface XRange
[attribute] any Style;
[attribute] any AddIndent;
[attribute] any ShowDetail;
+ [attribute, readonly] XQueryTable QueryTable;
XComment AddComment( [in] any Text );
void Clear();
@@ -166,6 +155,11 @@ 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/XSeries.idl b/oovbaapi/ooo/vba/excel/XSeries.idl
index c8317d12fb68..64b754a67b01 100644
--- a/oovbaapi/ooo/vba/excel/XSeries.idl
+++ b/oovbaapi/ooo/vba/excel/XSeries.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XSeries_idl__
#define __ooo_vba_excel_XSeries_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
index 09d4ea26b221..cdbf9cbc97ed 100644
--- a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
+++ b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
@@ -27,12 +27,8 @@
#ifndef __ooo_vba_excel_XSeriesCollection_idl__
#define __ooo_vba_excel_XSeriesCollection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XStyle.idl b/oovbaapi/ooo/vba/excel/XStyle.idl
index c07b601bfb0c..5f94f812d85d 100644
--- a/oovbaapi/ooo/vba/excel/XStyle.idl
+++ b/oovbaapi/ooo/vba/excel/XStyle.idl
@@ -28,16 +28,9 @@
#ifndef __ooo_vba_excel_XStyle_idl__
#define __ooo_vba_excel_XStyle_idl__
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XFormat_idl__
#include <ooo/vba/excel/XFormat.idl>
-#endif
module ooo { module vba { module excel {
interface XStyle
diff --git a/oovbaapi/ooo/vba/excel/XStyles.idl b/oovbaapi/ooo/vba/excel/XStyles.idl
index 3fc0db4e16ad..6ad792e9062a 100644
--- a/oovbaapi/ooo/vba/excel/XStyles.idl
+++ b/oovbaapi/ooo/vba/excel/XStyles.idl
@@ -28,17 +28,9 @@
#ifndef __ooo_vba_excel_XStyles_idl__
#define __ooo_vba_excel_XStyles_idl__
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
module ooo { module vba { module excel {
interface XStyle;
diff --git a/oovbaapi/ooo/vba/excel/XTextFrame.idl b/oovbaapi/ooo/vba/excel/XTextFrame.idl
index 603145d01037..161e1a29cc04 100644
--- a/oovbaapi/ooo/vba/excel/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/XTextFrame.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_excel_XTextFrame_idl__
#define __ooo_vba_excel_XTextFrame_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module excel {
interface XTextFrame : com::sun::star::uno::XInterface
diff --git a/oovbaapi/ooo/vba/excel/XTitle.idl b/oovbaapi/ooo/vba/excel/XTitle.idl
index 3294de51740a..92d5b7fd8ca9 100644
--- a/oovbaapi/ooo/vba/excel/XTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XTitle.idl
@@ -28,13 +28,8 @@
#ifndef __ooo_vba_excel_XTitle_idl__
#define __ooo_vba_excel_XTitle_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XVPageBreak.idl b/oovbaapi/ooo/vba/excel/XVPageBreak.idl
index 65ef2b537394..779968d06c98 100644
--- a/oovbaapi/ooo/vba/excel/XVPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XVPageBreak.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_excel_XVPageBreak_idl__
#define __ooo_vba_excel_XVPageBreak_idl__
-#ifndef __ooo_vba_excel_XPageBreak_idl__
#include <ooo/vba/excel/XPageBreak.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XVPageBreaks.idl b/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
index 6ad087f009cb..be9be1fc6453 100644
--- a/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
@@ -27,21 +27,10 @@
#ifndef __ooo_vba_excel_XVPageBreaks_idl__
#define __ooo_vba_excel_XVPageBreaks_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XValidation.idl b/oovbaapi/ooo/vba/excel/XValidation.idl
index e1eb83473efe..3d30482aac9b 100644
--- a/oovbaapi/ooo/vba/excel/XValidation.idl
+++ b/oovbaapi/ooo/vba/excel/XValidation.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XValidation_idl__
#define __ooo_vba_excel_XValidation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XWindows.idl b/oovbaapi/ooo/vba/excel/XWindows.idl
index 499f27a26bf9..60585f1848af 100644
--- a/oovbaapi/ooo/vba/excel/XWindows.idl
+++ b/oovbaapi/ooo/vba/excel/XWindows.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XWindows_idl__
#define __ooo_vba_excel_XWindows_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 5407dc6d23bd..7d4a70fbb1be 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XWorkbook_idl__
#define __ooo_vba_excel_XWorkbook_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
+#include <com/sun/star/lang/XUnoTunnel.idl>
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
@@ -45,11 +40,15 @@ interface XWorksheet;
interface XWorksheets;
interface XStyles;
-interface XWorkbook : com::sun::star::uno::XInterface
+interface XWorkbook
{
+
+ interface ::com::sun::star::lang::XUnoTunnel;
+
[attribute, readonly] boolean ProtectStructure;
[attribute, readonly] XWorksheet ActiveSheet;
[attribute, readonly] string CodeName;
+ [attribute, readonly] long FileFormat;
[attribute] boolean PrecisionAsDisplayed;
any Worksheets( [in] any Index );
@@ -60,8 +59,9 @@ interface XWorkbook : com::sun::star::uno::XInterface
void Activate();
any Names( [in] any Index );
any Colors( [in] any Index ) raises (com::sun::star::script::BasicErrorException);
- long FileFormat() 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/XWorkbooks.idl b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
index de7b031e3c0a..41722ea33eaa 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbooks.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XWorkbooks_idl__
#define __ooo_vba_excel_XWorkbooks_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index 6492a1a573df..e3128181ee61 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -27,21 +27,11 @@
#ifndef __ooo_vba_excel_XWorksheet_idl__
#define __ooo_vba_excel_XWorksheet_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
+#include <com/sun/star/lang/XUnoTunnel.idl>
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
+
//=============================================================================
module ooo { module vba { module excel {
@@ -59,6 +49,7 @@ interface XWorksheet
interface ::ooo::vba::XHelperInterface;
interface ::com::sun::star::script::XInvocation;
interface ::com::sun::star::container::XNamed;
+ interface ::com::sun::star::lang::XUnoTunnel;
[attribute] long Visible;
[attribute, readonly] long StandardHeight;
@@ -77,7 +68,7 @@ interface XWorksheet
void Activate();
void Calculate( );
- void Select();
+ void Select([in] any Replace);
void Move([in] any Before,[in] any After );
void Copy([in] any Before,[in] any After );
void Paste([in] any Destination,[in] any Link);
diff --git a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
index bc39848d46ef..6f1bce57bb7f 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
@@ -27,21 +27,11 @@
#ifndef __ooo_vba_excel_XWSFunction_idl__
#define __ooo_vba_excel_XWSFunction_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XExactName_idl__
#include <com/sun/star/beans/XExactName.idl>
-#endif
-
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
+
//=============================================================================
module ooo { module vba { module excel {
diff --git a/oovbaapi/ooo/vba/excel/XWorksheets.idl b/oovbaapi/ooo/vba/excel/XWorksheets.idl
index 36d22ed657bd..17c80ce4547a 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheets.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheets.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_excel_XWorksheets_idl__
#define __ooo_vba_excel_XWorksheets_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
//=============================================================================
@@ -49,6 +44,7 @@ interface XWorksheets
void Delete();
void PrintOut( [in] any From, [in] any To, [in] any Copies, [in] any Preview, [in] any ActivePrinter, [in] any PrintToFile, [in] any Collate, [in] any PrToFileName );
void Select( [in] any Replace );
+ void Copy( [in] any Before, [in] any After);
};
}; }; };
diff --git a/oovbaapi/ooo/vba/excel/makefile.mk b/oovbaapi/ooo/vba/excel/makefile.mk
index 251588086701..428062f5c95a 100644..100755
--- a/oovbaapi/ooo/vba/excel/makefile.mk
+++ b/oovbaapi/ooo/vba/excel/makefile.mk
@@ -102,7 +102,13 @@ IDLFILES= XGlobals.idl\
XVPageBreak.idl \
XVPageBreaks.idl \
TextFrame.idl \
-
+ XMenuBar.idl \
+ XMenuBars.idl \
+ XMenu.idl \
+ XMenus.idl \
+ XMenuItem.idl \
+ XMenuItems.idl \
+ XQueryTable.idl
# ------------------------------------------------------------------