summaryrefslogtreecommitdiff
path: root/oovbaapi/ooo/vba
diff options
context:
space:
mode:
Diffstat (limited to 'oovbaapi/ooo/vba')
-rw-r--r--oovbaapi/ooo/vba/ControlProvider.idl5
-rw-r--r--oovbaapi/ooo/vba/XApplicationBase.idl2
-rw-r--r--oovbaapi/ooo/vba/XAssistant.idl5
-rw-r--r--oovbaapi/ooo/vba/XCollection.idl9
-rw-r--r--oovbaapi/ooo/vba/XCommandBar.idl6
-rw-r--r--oovbaapi/ooo/vba/XCommandBarButton.idl2
-rw-r--r--oovbaapi/ooo/vba/XCommandBarControl.idl5
-rw-r--r--oovbaapi/ooo/vba/XCommandBarControls.idl5
-rw-r--r--oovbaapi/ooo/vba/XCommandBarPopup.idl2
-rw-r--r--oovbaapi/ooo/vba/XCommandBars.idl5
-rw-r--r--oovbaapi/ooo/vba/XControlProvider.idl13
-rw-r--r--oovbaapi/ooo/vba/XDialogBase.idl7
-rw-r--r--oovbaapi/ooo/vba/XDialogsBase.idl6
-rw-r--r--oovbaapi/ooo/vba/XDocumentBase.idl6
-rw-r--r--oovbaapi/ooo/vba/XDocumentProperties.idl6
-rw-r--r--oovbaapi/ooo/vba/XDocumentsBase.idl6
-rw-r--r--oovbaapi/ooo/vba/XErrObject.idl2
-rw-r--r--oovbaapi/ooo/vba/XFileDialog.idl51
-rw-r--r--oovbaapi/ooo/vba/XFileDialogSelectedItems.idl47
-rw-r--r--oovbaapi/ooo/vba/XFileSearch.idl56
-rw-r--r--oovbaapi/ooo/vba/XFontBase.idl7
-rw-r--r--oovbaapi/ooo/vba/XFoundFiles.idl47
-rw-r--r--oovbaapi/ooo/vba/XGlobalsBase.idl7
-rw-r--r--oovbaapi/ooo/vba/XHelperInterface.idl11
-rw-r--r--oovbaapi/ooo/vba/XPageSetupBase.idl5
-rw-r--r--oovbaapi/ooo/vba/XPropValue.idl3
-rw-r--r--oovbaapi/ooo/vba/XVBAAppService.idl58
-rw-r--r--oovbaapi/ooo/vba/XVBADocService.idl58
-rw-r--r--oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl5
-rw-r--r--oovbaapi/ooo/vba/XWindowBase.idl5
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/constants/makefile.mk2
-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
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/makefile.mk6
-rw-r--r--oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl12
-rw-r--r--[-rwxr-xr-x]oovbaapi/ooo/vba/msforms/XCheckBox.idl9
-rw-r--r--oovbaapi/ooo/vba/msforms/XColorFormat.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XComboBox.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XControl.idl8
-rw-r--r--oovbaapi/ooo/vba/msforms/XControls.idl4
-rw-r--r--oovbaapi/ooo/vba/msforms/XFillFormat.idl5
-rw-r--r--oovbaapi/ooo/vba/msforms/XGroupBox.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XImage.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XLabel.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XLineFormat.idl5
-rw-r--r--oovbaapi/ooo/vba/msforms/XListBox.idl3
-rw-r--r--oovbaapi/ooo/vba/msforms/XMultiPage.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XPages.idl4
-rw-r--r--oovbaapi/ooo/vba/msforms/XPictureFormat.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XProgressBar.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XRadioButton.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XReturnBoolean.idl47
-rw-r--r--oovbaapi/ooo/vba/msforms/XReturnInteger.idl47
-rw-r--r--oovbaapi/ooo/vba/msforms/XScrollBar.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XShape.idl12
-rw-r--r--oovbaapi/ooo/vba/msforms/XShapeRange.idl10
-rw-r--r--oovbaapi/ooo/vba/msforms/XShapes.idl4
-rw-r--r--oovbaapi/ooo/vba/msforms/XSpinButton.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XTextBox.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XTextBoxShape.idl4
-rw-r--r--oovbaapi/ooo/vba/msforms/XTextFrame.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XToggleButton.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XUserForm.idl4
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/makefile.mk3
-rw-r--r--oovbaapi/ooo/vba/word/XAddin.idl8
-rw-r--r--oovbaapi/ooo/vba/word/XAddins.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XApplication.idl6
-rw-r--r--oovbaapi/ooo/vba/word/XAutoTextEntries.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XAutoTextEntry.idl8
-rw-r--r--oovbaapi/ooo/vba/word/XBookmark.idl8
-rw-r--r--oovbaapi/ooo/vba/word/XBookmarks.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XBorder.idl6
-rw-r--r--oovbaapi/ooo/vba/word/XBorders.idl4
-rw-r--r--oovbaapi/ooo/vba/word/XCell.idl49
-rw-r--r--oovbaapi/ooo/vba/word/XCells.idl54
-rw-r--r--oovbaapi/ooo/vba/word/XCheckBox.idl44
-rw-r--r--oovbaapi/ooo/vba/word/XColumn.idl46
-rw-r--r--oovbaapi/ooo/vba/word/XColumns.idl51
-rw-r--r--oovbaapi/ooo/vba/word/XDialog.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XDialogs.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XDocument.idl24
-rw-r--r--oovbaapi/ooo/vba/word/XDocuments.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XField.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XFields.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XFind.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XFont.idl7
-rw-r--r--oovbaapi/ooo/vba/word/XFormField.idl48
-rw-r--r--oovbaapi/ooo/vba/word/XFormFields.idl47
-rw-r--r--oovbaapi/ooo/vba/word/XFrame.idl45
-rw-r--r--oovbaapi/ooo/vba/word/XFrames.idl47
-rw-r--r--oovbaapi/ooo/vba/word/XGlobals.idl3
-rw-r--r--oovbaapi/ooo/vba/word/XHeaderFooter.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XHeadersFooters.idl47
-rw-r--r--oovbaapi/ooo/vba/word/XListFormat.idl50
-rw-r--r--oovbaapi/ooo/vba/word/XListGalleries.idl47
-rw-r--r--oovbaapi/ooo/vba/word/XListGallery.idl44
-rw-r--r--oovbaapi/ooo/vba/word/XListLevel.idl56
-rw-r--r--oovbaapi/ooo/vba/word/XListLevels.idl47
-rw-r--r--oovbaapi/ooo/vba/word/XListTemplate.idl44
-rw-r--r--oovbaapi/ooo/vba/word/XListTemplates.idl47
-rw-r--r--oovbaapi/ooo/vba/word/XOptions.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XPageSetup.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XPane.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XPanes.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XParagraph.idl6
-rw-r--r--oovbaapi/ooo/vba/word/XParagraphFormat.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XParagraphs.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XRange.idl16
-rw-r--r--oovbaapi/ooo/vba/word/XReplacement.idl7
-rw-r--r--oovbaapi/ooo/vba/word/XRevision.idl46
-rw-r--r--oovbaapi/ooo/vba/word/XRevisions.idl50
-rw-r--r--oovbaapi/ooo/vba/word/XRow.idl48
-rw-r--r--oovbaapi/ooo/vba/word/XRows.idl55
-rw-r--r--oovbaapi/ooo/vba/word/XSection.idl9
-rw-r--r--oovbaapi/ooo/vba/word/XSections.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XSelection.idl21
-rw-r--r--oovbaapi/ooo/vba/word/XStyle.idl17
-rw-r--r--oovbaapi/ooo/vba/word/XStyles.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XSystem.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XTabStop.idl42
-rw-r--r--oovbaapi/ooo/vba/word/XTabStops.idl51
-rw-r--r--oovbaapi/ooo/vba/word/XTable.idl8
-rw-r--r--oovbaapi/ooo/vba/word/XTableOfContents.idl50
-rw-r--r--oovbaapi/ooo/vba/word/XTables.idl11
-rw-r--r--oovbaapi/ooo/vba/word/XTablesOfContents.idl51
-rw-r--r--oovbaapi/ooo/vba/word/XTemplate.idl6
-rw-r--r--oovbaapi/ooo/vba/word/XVariable.idl8
-rw-r--r--oovbaapi/ooo/vba/word/XVariables.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XView.idl5
-rw-r--r--oovbaapi/ooo/vba/word/XWindow.idl6
-rw-r--r--oovbaapi/ooo/vba/word/XWrapFormat.idl2
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/makefile.mk25
196 files changed, 2155 insertions, 816 deletions
diff --git a/oovbaapi/ooo/vba/ControlProvider.idl b/oovbaapi/ooo/vba/ControlProvider.idl
index fc45173763d7..aa43e1e4e41e 100644
--- a/oovbaapi/ooo/vba/ControlProvider.idl
+++ b/oovbaapi/ooo/vba/ControlProvider.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_ControlProvider_idl__
#define __ooo_vba_ControlProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
module ooo { module vba {
diff --git a/oovbaapi/ooo/vba/XApplicationBase.idl b/oovbaapi/ooo/vba/XApplicationBase.idl
index 3d0e6c9ce0f5..d46eb2446e31 100644
--- a/oovbaapi/ooo/vba/XApplicationBase.idl
+++ b/oovbaapi/ooo/vba/XApplicationBase.idl
@@ -49,7 +49,7 @@ interface XApplicationBase
void Quit();
any CommandBars( [in] any Index );
- void Run( [in] string Macro, [in] /*Optional*/ any Arg1, [in] /*Optional*/ any 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);
+ any Run([in] string MacroName, [in] /*Optional*/ any varg1, [in] /*Optional*/ any varg2, [in] /*Optional*/ any varg3, [in] /*Optional*/ any varg4, [in] /*Optional*/ any varg5, [in] /*Optional*/ any varg6, [in] /*Optional*/ any varg7, [in] /*Optional*/ any varg8, [in] /*Optional*/ any varg9, [in] /*Optional*/ any varg10, [in] /*Optional*/ any varg11, [in] /*Optional*/ any varg12, [in] /*Optional*/ any varg13, [in] /*Optional*/ any varg14, [in] /*Optional*/ any varg15, [in] /*Optional*/ any varg16, [in] /*Optional*/ any varg17, [in] /*Optional*/ any varg18, [in] /*Optional*/ any varg19, [in] /*Optional*/ any varg20, [in] /*Optional*/ any varg21, [in] /*Optional*/ any varg22, [in] /*Optional*/ any varg23, [in] /*Optional*/ any varg24, [in] /*Optional*/ any varg25, [in] /*Optional*/ any varg26, [in] /*Optional*/ any varg27, [in] /*Optional*/ any varg28, [in] /*Optional*/ any varg29, [in] /*Optional*/ any varg30);
void OnTime( [in] any EarliestTime, [in] string Procedure, [in] any LatestTime, [in] any Schedule );
float CentimetersToPoints([in] float Centimeters );
void Undo();
diff --git a/oovbaapi/ooo/vba/XAssistant.idl b/oovbaapi/ooo/vba/XAssistant.idl
index a9077aa4cf3b..37eb51ee2a84 100644
--- a/oovbaapi/ooo/vba/XAssistant.idl
+++ b/oovbaapi/ooo/vba/XAssistant.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XAssistant_idl__
#define __ooo_vba_XAssistant_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 {
diff --git a/oovbaapi/ooo/vba/XCollection.idl b/oovbaapi/ooo/vba/XCollection.idl
index 63982aab36d6..3bdfede3dd31 100644
--- a/oovbaapi/ooo/vba/XCollection.idl
+++ b/oovbaapi/ooo/vba/XCollection.idl
@@ -27,19 +27,10 @@
#ifndef __ooo_vba_XCollection_idl__
#define __ooo_vba_XCollection_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_XDefaultMethod_idl__
#include <com/sun/star/script/XDefaultMethod.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
module ooo { module vba {
diff --git a/oovbaapi/ooo/vba/XCommandBar.idl b/oovbaapi/ooo/vba/XCommandBar.idl
index 3b3a2349a83e..803008ee6042 100644
--- a/oovbaapi/ooo/vba/XCommandBar.idl
+++ b/oovbaapi/ooo/vba/XCommandBar.idl
@@ -27,13 +27,9 @@
#ifndef __ooo_vba_XCommandBar_idl__
#define __ooo_vba_XCommandBar_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 {
diff --git a/oovbaapi/ooo/vba/XCommandBarButton.idl b/oovbaapi/ooo/vba/XCommandBarButton.idl
index 4914bbc569cb..87efce44079f 100644
--- a/oovbaapi/ooo/vba/XCommandBarButton.idl
+++ b/oovbaapi/ooo/vba/XCommandBarButton.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_XCommandBarButton_idl__
#define __ooo_vba_XCommandBarButton_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module ooo { module vba {
diff --git a/oovbaapi/ooo/vba/XCommandBarControl.idl b/oovbaapi/ooo/vba/XCommandBarControl.idl
index 7f20a6bf2c3f..d27922dd7fd4 100644
--- a/oovbaapi/ooo/vba/XCommandBarControl.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControl.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XCommandBarControl_idl__
#define __ooo_vba_XCommandBarControl_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 {
diff --git a/oovbaapi/ooo/vba/XCommandBarControls.idl b/oovbaapi/ooo/vba/XCommandBarControls.idl
index f2e0824cf5b5..f43d74d2b2fc 100644
--- a/oovbaapi/ooo/vba/XCommandBarControls.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControls.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XCommandBarControls_idl__
#define __ooo_vba_XCommandBarControls_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/XCommandBarPopup.idl b/oovbaapi/ooo/vba/XCommandBarPopup.idl
index 8511ae4412ad..2893d1193a8e 100644
--- a/oovbaapi/ooo/vba/XCommandBarPopup.idl
+++ b/oovbaapi/ooo/vba/XCommandBarPopup.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_XCommandBarPopup_idl__
#define __ooo_vba_XCommandBarPopup_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module ooo { module vba {
diff --git a/oovbaapi/ooo/vba/XCommandBars.idl b/oovbaapi/ooo/vba/XCommandBars.idl
index 484b7bc76629..88ffdf370aed 100644
--- a/oovbaapi/ooo/vba/XCommandBars.idl
+++ b/oovbaapi/ooo/vba/XCommandBars.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XCommandBars_idl__
#define __ooo_vba_XCommandBars_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/XControlProvider.idl b/oovbaapi/ooo/vba/XControlProvider.idl
index df8b53bdfc72..9918b4235dc7 100644
--- a/oovbaapi/ooo/vba/XControlProvider.idl
+++ b/oovbaapi/ooo/vba/XControlProvider.idl
@@ -27,24 +27,11 @@
#ifndef __ooo_vba_XControlProvider_idl__
#define __ooo_vba_XControlProvider_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XControlShape_idl__
#include <com/sun/star/drawing/XControlShape.idl>
-#endif
-#ifndef __ooo_vba_msforms_XControl_idl__
#include <ooo/vba/msforms/XControl.idl>
-#endif
module ooo { module vba {
diff --git a/oovbaapi/ooo/vba/XDialogBase.idl b/oovbaapi/ooo/vba/XDialogBase.idl
index fd89edb16237..1aa7db0e7f8e 100644
--- a/oovbaapi/ooo/vba/XDialogBase.idl
+++ b/oovbaapi/ooo/vba/XDialogBase.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XDialog_idl__
#define __ooo_vba_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
//=============================================================================
@@ -46,7 +41,7 @@ interface XDialogBase
{
interface ::ooo::vba::XHelperInterface;
- void Show();
+ boolean Show();
};
}; };
diff --git a/oovbaapi/ooo/vba/XDialogsBase.idl b/oovbaapi/ooo/vba/XDialogsBase.idl
index 74c36d4f1738..fede0e45bc84 100644
--- a/oovbaapi/ooo/vba/XDialogsBase.idl
+++ b/oovbaapi/ooo/vba/XDialogsBase.idl
@@ -27,16 +27,10 @@
#ifndef __ooo_vba_XDialogs_idl__
#define __ooo_vba_XDialogs_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 __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
//=============================================================================
diff --git a/oovbaapi/ooo/vba/XDocumentBase.idl b/oovbaapi/ooo/vba/XDocumentBase.idl
index a4ee8b4366c6..e3166f20df58 100644
--- a/oovbaapi/ooo/vba/XDocumentBase.idl
+++ b/oovbaapi/ooo/vba/XDocumentBase.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XDocumentBase_idl__
#define __ooo_vba_XDocumentBase_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 {
//=============================================================================
@@ -53,7 +48,6 @@ interface XDocumentBase
void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
void Save();
void Activate();
- void Protect( [in] any Password );
void Unprotect( [in] any Password );
};
diff --git a/oovbaapi/ooo/vba/XDocumentProperties.idl b/oovbaapi/ooo/vba/XDocumentProperties.idl
index 7c56d33924ab..e742ed7113de 100644
--- a/oovbaapi/ooo/vba/XDocumentProperties.idl
+++ b/oovbaapi/ooo/vba/XDocumentProperties.idl
@@ -28,15 +28,9 @@
#ifndef __ooo_vba_XDocumentProperties_idl__
#define __ooo_vba_XDocumentProperties_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 {
interface XDocumentProperty;
diff --git a/oovbaapi/ooo/vba/XDocumentsBase.idl b/oovbaapi/ooo/vba/XDocumentsBase.idl
index 6c4048f68b81..908040359fb3 100644
--- a/oovbaapi/ooo/vba/XDocumentsBase.idl
+++ b/oovbaapi/ooo/vba/XDocumentsBase.idl
@@ -27,14 +27,8 @@
#ifndef __ooo_vba_XDocumentsBase_idl__
#define __ooo_vba_XDocumentsBase_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/XErrObject.idl b/oovbaapi/ooo/vba/XErrObject.idl
index 84ef9c2c412c..4b7b5f68f91a 100644
--- a/oovbaapi/ooo/vba/XErrObject.idl
+++ b/oovbaapi/ooo/vba/XErrObject.idl
@@ -28,9 +28,7 @@
#ifndef __ooo_vba__XErrObject_idl__
#define __ooo_vba__XErrObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module ooo { module vba {
//==============================================================================
diff --git a/oovbaapi/ooo/vba/XFileDialog.idl b/oovbaapi/ooo/vba/XFileDialog.idl
new file mode 100644
index 000000000000..1f1012af8d32
--- /dev/null
+++ b/oovbaapi/ooo/vba/XFileDialog.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * 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
new file mode 100644
index 000000000000..787e4f4f8bb0
--- /dev/null
+++ b/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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
new file mode 100644
index 000000000000..c60284a21d18
--- /dev/null
+++ b/oovbaapi/ooo/vba/XFileSearch.idl
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * 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/XFontBase.idl b/oovbaapi/ooo/vba/XFontBase.idl
index 93d3749e85bd..7731531aef48 100644
--- a/oovbaapi/ooo/vba/XFontBase.idl
+++ b/oovbaapi/ooo/vba/XFontBase.idl
@@ -27,16 +27,9 @@
#ifndef __ooo_vba_XFont_idl__
#define __ooo_vba_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/XFoundFiles.idl b/oovbaapi/ooo/vba/XFoundFiles.idl
new file mode 100644
index 000000000000..245d8dbdbcc1
--- /dev/null
+++ b/oovbaapi/ooo/vba/XFoundFiles.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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_XFoundFiles_idl__
+#define __ooo_vba_XFoundFiles_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+//=============================================================================
+
+module ooo { module vba {
+//=============================================================================
+
+interface XFoundFiles
+{
+ interface ooo::vba::XCollection;
+};
+
+}; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/XGlobalsBase.idl b/oovbaapi/ooo/vba/XGlobalsBase.idl
index 1d41463b53c9..dd2d7b8e4c53 100644
--- a/oovbaapi/ooo/vba/XGlobalsBase.idl
+++ b/oovbaapi/ooo/vba/XGlobalsBase.idl
@@ -27,15 +27,10 @@
#ifndef __ooo_vba_XGlobalsBase_idl__
#define __ooo_vba_XGlobalsBase_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_lang_XMultiServiceFactory
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
+
module ooo { module vba {
interface XGlobalsBase
{
diff --git a/oovbaapi/ooo/vba/XHelperInterface.idl b/oovbaapi/ooo/vba/XHelperInterface.idl
index 80d1fbddcfa1..4ad2eccf2c5e 100644
--- a/oovbaapi/ooo/vba/XHelperInterface.idl
+++ b/oovbaapi/ooo/vba/XHelperInterface.idl
@@ -27,20 +27,11 @@
#ifndef __ooo_vba_XHelperInterface_idl__
#define __ooo_vba_XHelperInterface_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
+#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
module ooo { module vba {
diff --git a/oovbaapi/ooo/vba/XPageSetupBase.idl b/oovbaapi/ooo/vba/XPageSetupBase.idl
index 2c496cb48f06..1159646b5d42 100644
--- a/oovbaapi/ooo/vba/XPageSetupBase.idl
+++ b/oovbaapi/ooo/vba/XPageSetupBase.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XPageSetupBase_idl__
#define __ooo_vba_XPageSetupBase_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/XPropValue.idl b/oovbaapi/ooo/vba/XPropValue.idl
index 17059ede9dcb..c5e46bb71f0c 100644
--- a/oovbaapi/ooo/vba/XPropValue.idl
+++ b/oovbaapi/ooo/vba/XPropValue.idl
@@ -27,10 +27,7 @@
#ifndef __ooo_vba_XPropValue_idl__
#define __ooo_vba_XPropValue_idl__
-#ifndef __com_sun_star_script_XDefaultProperty_idl__
#include <com/sun/star/script/XDefaultProperty.idl>
-#endif
-
//=============================================================================
diff --git a/oovbaapi/ooo/vba/XVBAAppService.idl b/oovbaapi/ooo/vba/XVBAAppService.idl
new file mode 100644
index 000000000000..2a38a531b47f
--- /dev/null
+++ b/oovbaapi/ooo/vba/XVBAAppService.idl
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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_appservice_idl__
+#define __ooo_vba_appservice_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/uno/XComponentContext.idl>
+#include <com/sun/star/frame/XModel.idl>
+#include <com/sun/star/script/XLibraryContainer.idl>
+
+//=============================================================================
+
+module ooo { module vba {
+
+//=============================================================================
+
+
+interface XHelperInterface;
+interface XComponentContext;
+interface XModel;
+
+interface XVBAAppService
+{
+ interface ::com::sun::star::uno::XInterface;
+
+ any getVBE([in] XHelperInterface xParent, [in] ::com::sun::star::uno::XComponentContext xContext, [in] ::com::sun::star::frame::XModel xModel);
+ any getVBProjects([in] XHelperInterface xParent, [in] ::com::sun::star::uno::XComponentContext xContext, [in] ::com::sun::star::frame::XModel xModel, [in] ::com::sun::star::script::XLibraryContainer xMacroLibraryContainer, [in] com::sun::star::script::XLibraryContainer xDialogLibraryContainer);
+
+
+};
+
+ }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/XVBADocService.idl b/oovbaapi/ooo/vba/XVBADocService.idl
new file mode 100644
index 000000000000..7c19e38e2a0e
--- /dev/null
+++ b/oovbaapi/ooo/vba/XVBADocService.idl
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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_socservice_idl__
+#define __ooo_vba_appservice_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/uno/XComponentContext.idl>
+#include <com/sun/star/frame/XModel.idl>
+#include <com/sun/star/script/XLibraryContainer.idl>
+
+//=============================================================================
+
+module ooo { module vba {
+
+//=============================================================================
+
+
+interface XHelperInterface;
+interface XComponentContext;
+interface XModel;
+
+interface XVBADocService
+{
+ interface ::com::sun::star::uno::XInterface;
+
+
+ any getVBProject([in] XHelperInterface xParent, [in] ::com::sun::star::uno::XComponentContext xContext, [in] ::com::sun::star::frame::XModel xModel, [in] ::com::sun::star::script::XLibraryContainer xMacroLibraryContainer, [in] com::sun::star::script::XLibraryContainer xDialogLibraryContainer);
+
+
+};
+
+ }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
index 1304ce474369..29894494fd96 100644
--- a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
+++ b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XVBAToOOEventDescGen_idl__
#define __ooo_vba_XVBAToOOEventDescGen_idl__
-#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__
#include <com/sun/star/script/ScriptEventDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_script_XScriptEventsSupplier_idl__
#include <com/sun/star/script/XScriptEventsSupplier.idl>
-#endif
module ooo { module vba {
interface XVBAToOOEventDescGen : com::sun::star::uno::XInterface
diff --git a/oovbaapi/ooo/vba/XWindowBase.idl b/oovbaapi/ooo/vba/XWindowBase.idl
index 3872a9af5dd3..ceedde24bd37 100644
--- a/oovbaapi/ooo/vba/XWindowBase.idl
+++ b/oovbaapi/ooo/vba/XWindowBase.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_XHelperWindow_idl__
#define __ooo_vba_XHelperWindow_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 {
//=============================================================================
diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk
index a731574363be..dbe221391335 100644..100755
--- a/oovbaapi/ooo/vba/constants/makefile.mk
+++ b/oovbaapi/ooo/vba/constants/makefile.mk
@@ -37,11 +37,9 @@ PACKAGE=org$/vba$/constants
.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------------
-# I tried to use the IDLFILES target but it failed dismally
MY_GEN_IDL_PATH=$(MISC)$/idl
MY_GEN_UCR_PATH=$(OUT)$/ucr$/$(PACKAGE)
MYTMPIDLFILES=$(shell @ls $(MY_GEN_IDL_PATH))
-#IDLFILES=$(foreach,i,$(MYTMPIDLFILES) $(MY_GEN_IDL_PATH)$/$(i))
MYIDLFILES=$(foreach,i,$(MYTMPIDLFILES) $(MY_GEN_IDL_PATH)$/$(i))
MYURDFILES=$(foreach,i,$(MYIDLFILES) $(MY_GEN_UCR_PATH)$/$(i:b).urd)
MYDBTARGET=$(OUT)$/ucr/constants.db
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
# ------------------------------------------------------------------
diff --git a/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk
index d1adc1c4252e..10281a645196 100644..100755
--- a/oovbaapi/ooo/vba/makefile.mk
+++ b/oovbaapi/ooo/vba/makefile.mk
@@ -63,7 +63,11 @@ IDLFILES=\
XFontBase.idl\
XDialogsBase.idl\
XDialogBase.idl\
- XPageSetupBase.idl
+ XPageSetupBase.idl \
+ XFileSearch.idl\
+ XFoundFiles.idl\
+ XFileDialog.idl \
+ XFileDialogSelectedItems.idl
# ------------------------------------------------------------------
.ENDIF
diff --git a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
index 2eff91346e9d..c2ca0877ff96 100644
--- a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
+++ b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
@@ -26,26 +26,14 @@
************************************************************************/
module msforms
{
- struct ReturnBoolean
- {
- boolean Value;
- };
-
struct ReturnEffect
{
//fmDropEffect Value;
short Value;
};
- struct ReturnInteger
- {
- long Value;
- };
-
struct ReturnSingle
{
float Value;
};
-
-
};
diff --git a/oovbaapi/ooo/vba/msforms/XCheckBox.idl b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
index 7520a559b0d5..ec2c7136383e 100755..100644
--- a/oovbaapi/ooo/vba/msforms/XCheckBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
@@ -2,7 +2,7 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
@@ -24,10 +24,10 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-
#ifndef __ooo_vba_msforms_XCheckBox_idl__
#define __ooo_vba_msforms_XCheckBox_idl__
+#include <com/sun/star/uno/XInterface.idl>
#include <ooo/vba/msforms/XNewFont.idl>
//=============================================================================
@@ -35,8 +35,7 @@
module ooo { module vba { module msforms {
//=============================================================================
-
-interface XCheckBox
+interface XCheckBox: com::sun::star::uno::XInterface
{
[attribute] string Caption;
[attribute] any Value;
@@ -48,5 +47,3 @@ interface XCheckBox
}; }; };
#endif
-
-
diff --git a/oovbaapi/ooo/vba/msforms/XColorFormat.idl b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
index 0c9e1ee83a1d..ef3a0f8a732f 100644
--- a/oovbaapi/ooo/vba/msforms/XColorFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_msforms_XColorFormat_idl__
#define __ooo_vba_msforms_XColorFormat_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 51ca4a4135d1..77b5e950d938 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -28,6 +28,7 @@
#ifndef __ooo_vba_msforms_XComboBox_idl__
#define __ooo_vba_msforms_XComboBox_idl__
+#include <com/sun/star/uno/XInterface.idl>
#include <ooo/vba/msforms/XNewFont.idl>
//=============================================================================
@@ -54,6 +55,7 @@ interface XComboBox
void AddItem( [in] any pvargItem, [in] any pvargIndex );
void removeItem( [in] any index );
void Clear();
+ any List( [in] any pvargIndex, [in] any pvarColumn );
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 3cd1f2c3e75c..5ece205ee465 100644
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -27,16 +27,8 @@
#ifndef __ooo_vba_msforms_XControl_idl__
#define __ooo_vba_msforms_XControl_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 msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XControls.idl b/oovbaapi/ooo/vba/msforms/XControls.idl
index 11325303d56c..674ea6e8c608 100644
--- a/oovbaapi/ooo/vba/msforms/XControls.idl
+++ b/oovbaapi/ooo/vba/msforms/XControls.idl
@@ -27,12 +27,8 @@
#ifndef __ooo_vba_msforms_XControls_idl__
#define __ooo_vba_msforms_XControls_idl__
-#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 msforms {
interface XControl;
diff --git a/oovbaapi/ooo/vba/msforms/XFillFormat.idl b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
index 02cdc39ad21b..b007245f94ef 100644
--- a/oovbaapi/ooo/vba/msforms/XFillFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_msforms_XFillFormat_idl__
#define __ooo_vba_msforms_XFillFormat_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XColorFormat_idl__
#include <ooo/vba/msforms/XColorFormat.idl>
-#endif
module ooo { module vba { module msforms {
interface XFillFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XGroupBox.idl b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
index 9718f23e1c66..ad62a6a171d4 100644
--- a/oovbaapi/ooo/vba/msforms/XGroupBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
@@ -28,6 +28,7 @@
#ifndef __ooo_vba_msforms_XGroupBox_idl__
#define __ooo_vba_msforms_XGroupBox_idl__
+#include <com/sun/star/uno/XInterface.idl>
#include <ooo/vba/msforms/XNewFont.idl>
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XImage.idl b/oovbaapi/ooo/vba/msforms/XImage.idl
index f37b62ce146e..2c77aace76e5 100644
--- a/oovbaapi/ooo/vba/msforms/XImage.idl
+++ b/oovbaapi/ooo/vba/msforms/XImage.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_msforms_XImage_idl__
#define __ooo_vba_msforms_XImage_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module ooo { module vba { module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index 399127a091c8..10a92dc20184 100644
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -28,6 +28,7 @@
#ifndef __ooo_vba_msforms_XLabel_idl__
#define __ooo_vba_msforms_XLabel_idl__
+#include <com/sun/star/uno/XInterface.idl>
#include <ooo/vba/msforms/XNewFont.idl>
//=============================================================================
@@ -40,6 +41,7 @@ interface XLabel
{
[attribute] string Caption;
[attribute] any Value;
+ [attribute] string Accelerator;
[attribute, readonly] XNewFont Font;
};
diff --git a/oovbaapi/ooo/vba/msforms/XLineFormat.idl b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
index 72df94ee5cd7..ee7eba2e96b0 100644
--- a/oovbaapi/ooo/vba/msforms/XLineFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_msforms_XLineFormat_idl__
#define __ooo_vba_msforms_XLineFormat_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XColorFormat_idl__
#include <ooo/vba/msforms/XColorFormat.idl>
-#endif
module ooo { module vba { module msforms {
interface XLineFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 63f9cce0bdf8..98ce26e68a3e 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -28,6 +28,7 @@
#ifndef __ooo_vba_msforms_XListBox_idl__
#define __ooo_vba_msforms_XListBox_idl__
+#include <com/sun/star/uno/XInterface.idl>
#include <ooo/vba/msforms/XNewFont.idl>
//=============================================================================
@@ -40,7 +41,7 @@ interface XListBox
{
[attribute] any Value;
[attribute] string Text;
- [attribute] boolean MultiSelect;
+ [attribute] long MultiSelect;
[attribute] any ListIndex;
[attribute, readonly] long ListCount;
[attribute, readonly] XNewFont Font;
diff --git a/oovbaapi/ooo/vba/msforms/XMultiPage.idl b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
index 7d0c8ee76421..d30026e78ffc 100644
--- a/oovbaapi/ooo/vba/msforms/XMultiPage.idl
+++ b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_msforms_XMultiPage_idl__
#define __ooo_vba_msforms_XMultiPage_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module ooo { module vba { module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XPages.idl b/oovbaapi/ooo/vba/msforms/XPages.idl
index fb290be32cda..283efca02610 100644
--- a/oovbaapi/ooo/vba/msforms/XPages.idl
+++ b/oovbaapi/ooo/vba/msforms/XPages.idl
@@ -27,12 +27,8 @@
#ifndef __ooo_vba_msforms_XPage_idl__
#define __ooo_vba_msforms_XPage_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/msforms/XPictureFormat.idl b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
index 4eb6a2bcf78f..fabc48dd9058 100644
--- a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
@@ -28,9 +28,7 @@
#define __ooo_vba_msforms_XPictureFormat_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module msforms {
interface XPictureFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XProgressBar.idl b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
index c40b3f6c1f01..4364f083d320 100644
--- a/oovbaapi/ooo/vba/msforms/XProgressBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_msforms_XProgressBar_idl__
#define __ooo_vba_msforms_XProgressBar_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module ooo { module vba { module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XRadioButton.idl b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
index 2aced0e92e30..162aa1fdf28b 100644
--- a/oovbaapi/ooo/vba/msforms/XRadioButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
@@ -28,6 +28,7 @@
#ifndef __ooo_vba_msforms_XRadioButton_idl__
#define __ooo_vba_msforms_XRadioButton_idl__
+#include <com/sun/star/uno/XInterface.idl>
#include <ooo/vba/msforms/XNewFont.idl>
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
new file mode 100644
index 000000000000..edca3789f534
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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 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
new file mode 100644
index 000000000000..cd214b71b799
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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 msforms
+{
+
+//=============================================================================
+interface XReturnInteger: com::sun::star::script::XDefaultProperty
+{
+ [attribute] long Value;
+};
+//=============================================================================
+
+};
+
+#endif
diff --git a/oovbaapi/ooo/vba/msforms/XScrollBar.idl b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
index 37f4a8c32868..7d6c5aea3c4b 100644
--- a/oovbaapi/ooo/vba/msforms/XScrollBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_msforms_XScrollBar_idl__
#define __ooo_vba_msforms_XScrollBar_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module ooo { module vba { module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index 3dc7c4a071af..602b3fdf35bb 100644
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -27,21 +27,10 @@
#ifndef __ooo_vba_msforms_XShape_idl__
#define __ooo_vba_msforms_XShape_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XLineFormat_idl__
#include <ooo/vba/msforms/XLineFormat.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XFillFormat_idl__
#include <ooo/vba/msforms/XFillFormat.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XPictureFormat_idl__
#include <ooo/vba/msforms/XPictureFormat.idl>
-#endif
module ooo { module vba { module msforms {
interface XShapeRange;
@@ -75,6 +64,7 @@ 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();
};
}; }; };
diff --git a/oovbaapi/ooo/vba/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
index 0cbc5f0b6d8a..6aa5778f40fe 100644
--- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_msforms_XShapeRange_idl__
#define __ooo_vba_msforms_XShapeRange_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XShape_idl__
#include <ooo/vba/msforms/XShape.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
module ooo { module vba { module msforms {
@@ -47,6 +39,7 @@ interface XShapeRange
{
interface ooo::vba::XCollection;
+ [attribute] string Name;
[attribute] double Height;
[attribute] double Width;
[attribute] double Left;
@@ -65,6 +58,7 @@ interface XShapeRange
void IncrementRotation( [in] double Increment );
void IncrementLeft( [in] double Increment );
void IncrementTop( [in] double Increment );
+ void ZOrder( [in] long ZOrderCmd );
};
}; }; };
diff --git a/oovbaapi/ooo/vba/msforms/XShapes.idl b/oovbaapi/ooo/vba/msforms/XShapes.idl
index d6ecfec13525..63aaa60e73a3 100644
--- a/oovbaapi/ooo/vba/msforms/XShapes.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapes.idl
@@ -27,12 +27,8 @@
#ifndef __ooo_vba_msforms_XShapes_idl__
#define __ooo_vba_msforms_XShapes_idl__
-#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 msforms {
interface XShapeRange;
diff --git a/oovbaapi/ooo/vba/msforms/XSpinButton.idl b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
index 3732b638f1ab..07e0bac846eb 100644
--- a/oovbaapi/ooo/vba/msforms/XSpinButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_msforms_XSpinButton_idl__
#define __ooo_vba_msforms_XSpinButton_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module ooo { module vba { module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index 267fbf7f01cb..75aaf836817f 100644
--- a/oovbaapi/ooo/vba/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
@@ -28,6 +28,7 @@
#ifndef __ooo_vba_msforms_XTextBox_idl__
#define __ooo_vba_msforms_XTextBox_idl__
+#include <com/sun/star/uno/XInterface.idl>
#include <ooo/vba/msforms/XNewFont.idl>
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
index 30a9adbed7f5..04c504ecd788 100644
--- a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
@@ -27,12 +27,8 @@
#ifndef __ooo_vba_msforms_XTextBoxShape_idl__
#define __ooo_vba_msforms_XTextBoxShape_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XCharacters_idl
#include <ooo/vba/excel/XCharacters.idl>
-#endif
//=============================================================================
module ooo { module vba { module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XTextFrame.idl b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
index fe29f35275b2..7042570e1dc5 100644
--- a/oovbaapi/ooo/vba/msforms/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_msforms_XTextFrame_idl__
#define __ooo_vba_msforms_XTextFrame_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module msforms {
interface XTextFrame : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XToggleButton.idl b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
index 923f7e1e2203..a441740cb5f1 100644
--- a/oovbaapi/ooo/vba/msforms/XToggleButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
@@ -28,6 +28,8 @@
#ifndef __ooo_vba_msforms_XToggleButton_idl__
#define __ooo_vba_msforms_XToggleButton_idl__
+#include <ooo/vba/msforms/XButton.idl>
+#include <com/sun/star/uno/XInterface.idl>
#include <ooo/vba/msforms/XCommandButton.idl>
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XUserForm.idl b/oovbaapi/ooo/vba/msforms/XUserForm.idl
index 1e54dd1b8f41..28bb8ed988ab 100644
--- a/oovbaapi/ooo/vba/msforms/XUserForm.idl
+++ b/oovbaapi/ooo/vba/msforms/XUserForm.idl
@@ -27,12 +27,8 @@
#ifndef __ooo_vba_msforms_XUserForm_idl__
#define __ooo_vba_msforms_XUserForm_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
module ooo { module vba { module msforms {
interface XUserForm
{
diff --git a/oovbaapi/ooo/vba/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
index 1d7d9ee166e5..2717d0409da6 100644..100755
--- a/oovbaapi/ooo/vba/msforms/makefile.mk
+++ b/oovbaapi/ooo/vba/msforms/makefile.mk
@@ -47,6 +47,7 @@ IDLFILES=\
XNewFont.idl \
XTextBox.idl \
XRadioButton.idl \
+ XCheckBox.idl \
XShape.idl \
XShapes.idl \
XLineFormat.idl \
@@ -65,6 +66,8 @@ IDLFILES=\
XSpinButton.idl \
XImage.idl \
XControls.idl \
+ XReturnBoolean.idl \
+ XReturnInteger.idl \
XTextFrame.idl \
# ------------------------------------------------------------------
diff --git a/oovbaapi/ooo/vba/word/XAddin.idl b/oovbaapi/ooo/vba/word/XAddin.idl
index 116707efb93a..96e715f19da9 100644
--- a/oovbaapi/ooo/vba/word/XAddin.idl
+++ b/oovbaapi/ooo/vba/word/XAddin.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_word_XAddin_idl__
#define __ooo_vba_word_XAddin_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_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
module ooo { module vba { module word {
diff --git a/oovbaapi/ooo/vba/word/XAddins.idl b/oovbaapi/ooo/vba/word/XAddins.idl
index a7c5a1b4a09e..b7b8c2fbfd75 100644
--- a/oovbaapi/ooo/vba/word/XAddins.idl
+++ b/oovbaapi/ooo/vba/word/XAddins.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XAddins_idl__
#define __ooo_vba_word_XAddins_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/word/XApplication.idl b/oovbaapi/ooo/vba/word/XApplication.idl
index 542f2efc2a56..8a1db18a3f1c 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XApplication_idl__
#define __ooo_vba_word_XApplication_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 word {
@@ -57,6 +52,7 @@ interface XApplication : com::sun::star::uno::XInterface
any Documents( [in] any Index );
any Addins( [in] any Index );
any Dialogs( [in] any Index );
+ any ListGalleries( [in] any aIndex );
float CentimetersToPoints([in] float Centimeters );
};
diff --git a/oovbaapi/ooo/vba/word/XAutoTextEntries.idl b/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
index 62f58db374bb..a591d77f0360 100644
--- a/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
+++ b/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XAutoTextEntries_idl__
#define __ooo_vba_word_XAutoTextEntries_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/word/XAutoTextEntry.idl b/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
index d2068b9650f6..16ada1b3f748 100644
--- a/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
+++ b/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_word_XAutoTextEntry_idl__
#define __ooo_vba_word_XAutoTextEntry_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_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
module ooo { module vba { module word {
diff --git a/oovbaapi/ooo/vba/word/XBookmark.idl b/oovbaapi/ooo/vba/word/XBookmark.idl
index d3f02de3a31b..afd33b080f54 100644
--- a/oovbaapi/ooo/vba/word/XBookmark.idl
+++ b/oovbaapi/ooo/vba/word/XBookmark.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_word_XBookmark_idl__
#define __ooo_vba_word_XBookmark_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_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
module ooo { module vba { module word {
diff --git a/oovbaapi/ooo/vba/word/XBookmarks.idl b/oovbaapi/ooo/vba/word/XBookmarks.idl
index b412d1c40538..997ed08a3c08 100644
--- a/oovbaapi/ooo/vba/word/XBookmarks.idl
+++ b/oovbaapi/ooo/vba/word/XBookmarks.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XBookmarks_idl__
#define __ooo_vba_word_XBookmarks_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/word/XBorder.idl b/oovbaapi/ooo/vba/word/XBorder.idl
index 34c5a90fa620..7945a7c3b043 100644
--- a/oovbaapi/ooo/vba/word/XBorder.idl
+++ b/oovbaapi/ooo/vba/word/XBorder.idl
@@ -27,13 +27,9 @@
#ifndef __ooo_vba_word_XBorder_idl__
#define __ooo_vba_word_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 word {
diff --git a/oovbaapi/ooo/vba/word/XBorders.idl b/oovbaapi/ooo/vba/word/XBorders.idl
index f333c06a6a38..c5c0e4e279aa 100644
--- a/oovbaapi/ooo/vba/word/XBorders.idl
+++ b/oovbaapi/ooo/vba/word/XBorders.idl
@@ -27,12 +27,8 @@
#ifndef __ooo_vba_word_XBorders_idl__
#define __ooo_vba_word_XBorders_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/word/XCell.idl b/oovbaapi/ooo/vba/word/XCell.idl
new file mode 100644
index 000000000000..ebee1c348d55
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XCell.idl
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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_word_XCell_idl__
+#define __ooo_vba_word_XCell_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XCell
+{
+ interface ooo::vba::XHelperInterface;
+
+ [attribute] long Width;
+ [attribute] any Height;
+ [attribute] long HeightRule;
+
+ void SetWidth( [in] float ColumnWidth, [in] long RulerStyle );
+ void SetHeight( [in] float RowHeight, [in] long HeightRule );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XCells.idl b/oovbaapi/ooo/vba/word/XCells.idl
new file mode 100644
index 000000000000..e0c65ea72fac
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XCells.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_word_XCells_idl__
+#define __ooo_vba_word_XCells_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XCells
+{
+ interface ::ooo::vba::XCollection;
+
+ [attribute] long Width;
+ [attribute] any Height;
+ [attribute] long HeightRule;
+
+ void SetWidth( [in] float ColumnWidth, [in] long RulerStyle );
+ void SetHeight( [in] float RowHeight, [in] long HeightRule );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XCheckBox.idl b/oovbaapi/ooo/vba/word/XCheckBox.idl
new file mode 100644
index 000000000000..e5e34e9799c6
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XCheckBox.idl
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * 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_word_XCheckBox_idl__
+#define __ooo_vba_word_XCheckBox_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XCheckBox
+{
+ interface ooo::vba::XHelperInterface;
+
+ [attribute] boolean Value;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XColumn.idl b/oovbaapi/ooo/vba/word/XColumn.idl
new file mode 100644
index 000000000000..457b37f58e5d
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XColumn.idl
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * 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_word_XColumn_idl__
+#define __ooo_vba_word_XColumn_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XColumn
+{
+ interface ooo::vba::XHelperInterface;
+
+ [attribute] long Width;
+
+ void Select();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XColumns.idl b/oovbaapi/ooo/vba/word/XColumns.idl
new file mode 100644
index 000000000000..6427a2019266
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XColumns.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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_word_XColumns_idl__
+#define __ooo_vba_word_XColumns_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XColumns
+{
+ interface ::ooo::vba::XCollection;
+
+ [attribute] long Width;
+
+ void Select();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XDialog.idl b/oovbaapi/ooo/vba/word/XDialog.idl
index 05041877f163..d2083d5f2e63 100644
--- a/oovbaapi/ooo/vba/word/XDialog.idl
+++ b/oovbaapi/ooo/vba/word/XDialog.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XDialog_idl__
#define __ooo_vba_word_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/word/XDialogs.idl b/oovbaapi/ooo/vba/word/XDialogs.idl
index 867c43d3facf..0e18e3af3cd0 100644
--- a/oovbaapi/ooo/vba/word/XDialogs.idl
+++ b/oovbaapi/ooo/vba/word/XDialogs.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XDialogs_idl__
#define __ooo_vba_word_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/word/XDocument.idl b/oovbaapi/ooo/vba/word/XDocument.idl
index b11e627871a8..9b060bc77fa1 100644
--- a/oovbaapi/ooo/vba/word/XDocument.idl
+++ b/oovbaapi/ooo/vba/word/XDocument.idl
@@ -27,21 +27,10 @@
#ifndef __ooo_vba_word_XDocument_idl__
#define __ooo_vba_word_XDocument_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 __ooo_vba_word_XRange_idl__
#include <ooo/vba/word/XRange.idl>
-#endif
-
-#ifndef __com_sun_star_script_XInvocation_idl__
#include <com/sun/star/script/XInvocation.idl>
-#endif
module ooo { module vba { module word {
@@ -49,6 +38,11 @@ interface XDocument : com::sun::star::script::XInvocation
{
[attribute, readonly] XRange Content;
[attribute] any AttachedTemplate;
+ [attribute] long ProtectionType;
+ [attribute] boolean UpdateStylesOnOpen;
+ [attribute] boolean AutoHyphenation;
+ [attribute] long HyphenationZone;
+ [attribute] long ConsecutiveHyphensLimit;
XRange Range( [in] any Start, [in] any End );
any BuiltInDocumentProperties( [in] any Index );
@@ -63,6 +57,14 @@ interface XDocument : com::sun::star::script::XInvocation
any Sections( [in] any Index );
void Activate();
any PageSetup();
+ any TablesOfContents([in] any Index);
+ any FormFields([in] any Index);
+ void Protect( [in] long Type, [in] any NOReset, [in] any Password, [in] any UseIRM, [in] any EnforceStyleLock );
+ void PrintOut([in] any Background, [in] any Append, [in] any Range, [in] any OutputFileName, [in] any From, [in] any To, [in] any Item, [in] any Copies, [in] any Pages, [in] any PageType, [in] any PrintToFile, [in] any Collate, [in] any FileName, [in] any ActivePrinterMacGX, [in] any ManualDuplexPrint, [in] any PrintZoomColumn, [in] any PrintZoomRow, [in] any PrintZoomPaperWidth, [in] any PrintZoomPaperHeight);
+ void PrintPreview();
+ void ClosePrintPreview();
+ any Revisions( [in] any index );
+ any Frames( [in] any index );
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XDocuments.idl b/oovbaapi/ooo/vba/word/XDocuments.idl
index 21d2487fdcd6..b328d18d229d 100644
--- a/oovbaapi/ooo/vba/word/XDocuments.idl
+++ b/oovbaapi/ooo/vba/word/XDocuments.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XDocuments_idl__
#define __ooo_vba_word_XDocuments_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/word/XField.idl b/oovbaapi/ooo/vba/word/XField.idl
index 9109079e59cd..4a9ab6b14474 100644
--- a/oovbaapi/ooo/vba/word/XField.idl
+++ b/oovbaapi/ooo/vba/word/XField.idl
@@ -28,14 +28,15 @@
#ifndef __ooo_vba_word_XField_idl__
#define __ooo_vba_word_XField_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
+
module ooo { module vba { module word {
interface XField
{
interface ::ooo::vba::XHelperInterface;
+
+ boolean Update();
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XFields.idl b/oovbaapi/ooo/vba/word/XFields.idl
index e1fdc9997271..cc61c665bd54 100644
--- a/oovbaapi/ooo/vba/word/XFields.idl
+++ b/oovbaapi/ooo/vba/word/XFields.idl
@@ -28,13 +28,8 @@
#ifndef __ooo_vba_word__XFields_idl__
#define __ooo_vba_word__XFields_idl__
-#ifndef __ooo_vba_HelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
module ooo { module vba { module word {
diff --git a/oovbaapi/ooo/vba/word/XFind.idl b/oovbaapi/ooo/vba/word/XFind.idl
index 99aff1e9c5ad..3351a0682e56 100644
--- a/oovbaapi/ooo/vba/word/XFind.idl
+++ b/oovbaapi/ooo/vba/word/XFind.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XFind_idl__
#define __ooo_vba_word_XFind_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 word {
diff --git a/oovbaapi/ooo/vba/word/XFont.idl b/oovbaapi/ooo/vba/word/XFont.idl
index a6c71ea90af9..eb4347726019 100644
--- a/oovbaapi/ooo/vba/word/XFont.idl
+++ b/oovbaapi/ooo/vba/word/XFont.idl
@@ -27,16 +27,9 @@
#ifndef __ooo_vba_word_XFont_idl__
#define __ooo_vba_word_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/word/XFormField.idl b/oovbaapi/ooo/vba/word/XFormField.idl
new file mode 100644
index 000000000000..3e32504a4d94
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XFormField.idl
@@ -0,0 +1,48 @@
+/*************************************************************************
+ *
+ * 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_word_XFormField_idl__
+#define __ooo_vba_word_XFormField_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XFormField
+{
+ interface ooo::vba::XHelperInterface;
+
+ [attribute] string Result;
+ [attribute] boolean Enabled;
+
+ any CheckBox();
+
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XFormFields.idl b/oovbaapi/ooo/vba/word/XFormFields.idl
new file mode 100644
index 000000000000..07338aea0dea
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XFormFields.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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_word_XFormFields_idl__
+#define __ooo_vba_word_XFormFields_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XFormFields
+{
+ interface ::ooo::vba::XCollection;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XFrame.idl b/oovbaapi/ooo/vba/word/XFrame.idl
new file mode 100644
index 000000000000..f7a9e34eeef7
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XFrame.idl
@@ -0,0 +1,45 @@
+/*************************************************************************
+ *
+ * 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_word_XFrame_idl__
+#define __ooo_vba_word_XFrame_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+#include <com/sun/star/container/XNamed.idl>
+
+module ooo { module vba { module word {
+
+interface XFrame
+{
+ interface ooo::vba::XHelperInterface;
+
+ void Select();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XFrames.idl b/oovbaapi/ooo/vba/word/XFrames.idl
new file mode 100644
index 000000000000..9f366d9073f2
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XFrames.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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_word_XFrames_idl__
+#define __ooo_vba_word_XFrames_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XFrames
+{
+ interface ::ooo::vba::XCollection;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XGlobals.idl b/oovbaapi/ooo/vba/word/XGlobals.idl
index b139819db40e..830cc0699b6b 100644
--- a/oovbaapi/ooo/vba/word/XGlobals.idl
+++ b/oovbaapi/ooo/vba/word/XGlobals.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_word_XGlobals_idl__
#define __ooo_vba_word_XGlobals_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module ooo { module vba { module word {
interface XDocument;
@@ -49,6 +47,7 @@ interface XGlobals : com::sun::star::uno::XInterface
any Documents( [in] any Index );
any Addins( [in] any Index );
any Dialogs( [in] any Index );
+ any ListGalleries( [in] any aIndex );
float CentimetersToPoints([in] float Centimeters );
};
diff --git a/oovbaapi/ooo/vba/word/XHeaderFooter.idl b/oovbaapi/ooo/vba/word/XHeaderFooter.idl
index c598e4f1f3d9..1d4b1b55776e 100644
--- a/oovbaapi/ooo/vba/word/XHeaderFooter.idl
+++ b/oovbaapi/ooo/vba/word/XHeaderFooter.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XHeaderFooter_idl__
#define __ooo_vba_word_XHeaderFooter_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 word {
diff --git a/oovbaapi/ooo/vba/word/XHeadersFooters.idl b/oovbaapi/ooo/vba/word/XHeadersFooters.idl
new file mode 100644
index 000000000000..eb234a3139b5
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XHeadersFooters.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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_word_XHeadersFooters_idl__
+#define __ooo_vba_word_XHeadersFooters_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XHeadersFooters
+{
+ interface ::ooo::vba::XCollection;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XListFormat.idl b/oovbaapi/ooo/vba/word/XListFormat.idl
new file mode 100644
index 000000000000..5b27e6cba1ef
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XListFormat.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_word_XListFormat_idl__
+#define __ooo_vba_word_XListFormat_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XListTemplate;
+interface XListFormat
+{
+ interface ooo::vba::XHelperInterface;
+
+ void ApplyListTemplate([in] XListTemplate ListTemplate,
+ [in] any /* optional */ ContinuePreviousList,
+ [in] any /* optional */ ApplyTo,
+ [in] any /* optional */ DefaultListBehavior);
+
+ void ConvertNumbersToText();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XListGalleries.idl b/oovbaapi/ooo/vba/word/XListGalleries.idl
new file mode 100644
index 000000000000..c682c301c926
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XListGalleries.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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_word_XListGalleries_idl__
+#define __ooo_vba_word_XListGalleries_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XListGalleries
+{
+ interface ::ooo::vba::XCollection;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XListGallery.idl b/oovbaapi/ooo/vba/word/XListGallery.idl
new file mode 100644
index 000000000000..1ff5e70007e6
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XListGallery.idl
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * 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_word_XListGallery_idl__
+#define __ooo_vba_word_XListGallery_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XListGallery
+{
+ interface ooo::vba::XHelperInterface;
+
+ any ListTemplates( [in] any aIndex );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XListLevel.idl b/oovbaapi/ooo/vba/word/XListLevel.idl
new file mode 100644
index 000000000000..66b6a6260efd
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XListLevel.idl
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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_word_XListLevel_idl__
+#define __ooo_vba_word_XListLevel_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XFont;
+interface XListLevel
+{
+ interface ooo::vba::XHelperInterface;
+
+ [attribute] long Alignment;
+ [attribute] XFont Font;
+ [attribute, readonly] long Index;
+ [attribute] string LinkedStyle;
+ [attribute] string NumberFormat;
+ [attribute] float NumberPosition;
+ [attribute] long NumberStyle;
+ [attribute] long ResetOnHigher;
+ [attribute] long StartAt;
+ [attribute] float TabPosition;
+ [attribute] float TextPosition;
+ [attribute] long TrailingCharacter;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XListLevels.idl b/oovbaapi/ooo/vba/word/XListLevels.idl
new file mode 100644
index 000000000000..56a695de0d71
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XListLevels.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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_word_XListLevels_idl__
+#define __ooo_vba_word_XListLevels_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XListLevels
+{
+ interface ::ooo::vba::XCollection;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XListTemplate.idl b/oovbaapi/ooo/vba/word/XListTemplate.idl
new file mode 100644
index 000000000000..6f8f9695a2bc
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XListTemplate.idl
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * 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_word_XListTemplate_idl__
+#define __ooo_vba_word_XListTemplate_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XListTemplate
+{
+ interface ooo::vba::XHelperInterface;
+
+ any ListLevels( [in] any aIndex );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XListTemplates.idl b/oovbaapi/ooo/vba/word/XListTemplates.idl
new file mode 100644
index 000000000000..7a9d37ecf560
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XListTemplates.idl
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * 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_word_XListTemplates_idl__
+#define __ooo_vba_word_XListTemplates_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XListTemplates
+{
+ interface ::ooo::vba::XCollection;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XOptions.idl b/oovbaapi/ooo/vba/word/XOptions.idl
index d90665448439..a92d019d1a6e 100644
--- a/oovbaapi/ooo/vba/word/XOptions.idl
+++ b/oovbaapi/ooo/vba/word/XOptions.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XOptions_idl__
#define __ooo_vba_word_XOptions_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 word {
diff --git a/oovbaapi/ooo/vba/word/XPageSetup.idl b/oovbaapi/ooo/vba/word/XPageSetup.idl
index a133541383d6..a4cf887f1ef1 100644
--- a/oovbaapi/ooo/vba/word/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/word/XPageSetup.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XPageSetup_idl__
#define __ooo_vba_word_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
//=============================================================================
diff --git a/oovbaapi/ooo/vba/word/XPane.idl b/oovbaapi/ooo/vba/word/XPane.idl
index b405dff5575d..826b08dd327c 100644
--- a/oovbaapi/ooo/vba/word/XPane.idl
+++ b/oovbaapi/ooo/vba/word/XPane.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XPane_idl__
#define __ooo_vba_word_XPane_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 word {
diff --git a/oovbaapi/ooo/vba/word/XPanes.idl b/oovbaapi/ooo/vba/word/XPanes.idl
index ac2a2b270551..2eed59918c65 100644
--- a/oovbaapi/ooo/vba/word/XPanes.idl
+++ b/oovbaapi/ooo/vba/word/XPanes.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XPanes_idl__
#define __ooo_vba_word_XPanes_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/word/XParagraph.idl b/oovbaapi/ooo/vba/word/XParagraph.idl
index 6c59b9d39530..61a57238947a 100644
--- a/oovbaapi/ooo/vba/word/XParagraph.idl
+++ b/oovbaapi/ooo/vba/word/XParagraph.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XParagraph_idl__
#define __ooo_vba_word_XParagraph_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 word {
@@ -43,6 +38,7 @@ interface XParagraph
interface ooo::vba::XHelperInterface;
[attribute, readonly] XRange Range;
+ [attribute] any Style;
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XParagraphFormat.idl b/oovbaapi/ooo/vba/word/XParagraphFormat.idl
index 809b131e4752..71b49071c2eb 100644
--- a/oovbaapi/ooo/vba/word/XParagraphFormat.idl
+++ b/oovbaapi/ooo/vba/word/XParagraphFormat.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XParagraphFormat_idl__
#define __ooo_vba_word_XParagraphFormat_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 word {
diff --git a/oovbaapi/ooo/vba/word/XParagraphs.idl b/oovbaapi/ooo/vba/word/XParagraphs.idl
index 8ec47a4a2eda..f0f98ede53b7 100644
--- a/oovbaapi/ooo/vba/word/XParagraphs.idl
+++ b/oovbaapi/ooo/vba/word/XParagraphs.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XParagraphs_idl__
#define __ooo_vba_word_XParagraphs_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/word/XRange.idl b/oovbaapi/ooo/vba/word/XRange.idl
index b7d53e7c8174..40de1433430d 100644
--- a/oovbaapi/ooo/vba/word/XRange.idl
+++ b/oovbaapi/ooo/vba/word/XRange.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_word_XRange_idl__
#define __ooo_vba_word_XRange_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module word {
@@ -45,13 +37,14 @@ module ooo { module vba { module word {
interface XParagraphFormat;
interface XStyle;
interface XFont;
+interface XListFormat;
interface XRange
{
interface ooo::vba::XHelperInterface;
[attribute] string Text;
[attribute] XParagraphFormat ParagraphFormat;
- [attribute] XStyle Style;
+ [attribute] any Style;
[attribute,readonly] ::com::sun::star::text::XTextRange XTextRange;
// Of course Font is NOT readonly, #FIXME #TODO
// readonly though will force an error attempting to write
@@ -59,6 +52,7 @@ interface XRange
[attribute] long LanguageID;
[attribute] long Start;
[attribute] long End;
+ [attribute, readonly] XListFormat ListFormat;
void InsertBreak( [in] any Type );
void Select();
@@ -66,6 +60,10 @@ interface XRange
void InsertParagraphBefore();
void InsertParagraphAfter();
any PageSetup();
+ boolean InRange( [in] XRange Range );
+ any Revisions( [in] any index );
+ any Sections( [in] any index );
+ any Fields( [in] any index );
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XReplacement.idl b/oovbaapi/ooo/vba/word/XReplacement.idl
index 6fff3b049f23..adbdf56b3549 100644
--- a/oovbaapi/ooo/vba/word/XReplacement.idl
+++ b/oovbaapi/ooo/vba/word/XReplacement.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XReplacement_idl__
#define __ooo_vba_word_XReplacement_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 word {
@@ -42,6 +37,8 @@ interface XReplacement
interface ooo::vba::XHelperInterface;
[attribute] string Text;
+
+ void ClearFormatting();
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XRevision.idl b/oovbaapi/ooo/vba/word/XRevision.idl
new file mode 100644
index 000000000000..5a20c1ecefa7
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XRevision.idl
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * 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_word_XRevision_idl__
+#define __ooo_vba_word_XRevision_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XRange;
+interface XRevision
+{
+ interface ooo::vba::XHelperInterface;
+
+ void Accept();
+ void Reject();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XRevisions.idl b/oovbaapi/ooo/vba/word/XRevisions.idl
new file mode 100644
index 000000000000..9940052fbd83
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XRevisions.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_word_XRevisions_idl__
+#define __ooo_vba_word_XRevisions_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XRevisions
+{
+ interface ::ooo::vba::XCollection;
+
+ void AcceptAll();
+ void RejectAll();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XRow.idl b/oovbaapi/ooo/vba/word/XRow.idl
new file mode 100644
index 000000000000..ebe0d7a0290c
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XRow.idl
@@ -0,0 +1,48 @@
+/*************************************************************************
+ *
+ * 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_word_XRow_idl__
+#define __ooo_vba_word_XRow_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XRow
+{
+ interface ooo::vba::XHelperInterface;
+
+ [attribute] any Height;
+ [attribute] long HeightRule;
+
+ void Select();
+ void SetHeight( [in] float RowHeight, [in] long HeightRule );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XRows.idl b/oovbaapi/ooo/vba/word/XRows.idl
new file mode 100644
index 000000000000..9e34dc8ad82a
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XRows.idl
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * 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_word_XRows_idl__
+#define __ooo_vba_word_XRows_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XRows
+{
+ interface ::ooo::vba::XCollection;
+
+ [attribute] long Alignment;
+ [attribute] any AllowBreakAcrossPages;
+ [attribute] float SpaceBetweenColumns;
+
+ void Delete();
+ void SetLeftIndent( [in] float LeftIndent, [in] long RulerStyle );
+ void Select();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XSection.idl b/oovbaapi/ooo/vba/word/XSection.idl
index c84f70f830bf..90aac99bbf9a 100644
--- a/oovbaapi/ooo/vba/word/XSection.idl
+++ b/oovbaapi/ooo/vba/word/XSection.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XSection_idl__
#define __ooo_vba_word_XSection_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 word {
@@ -43,8 +38,8 @@ interface XSection
[attribute] boolean ProtectedForForms;
- any Headers();
- any Footers();
+ any Headers( [in] any aIndex );
+ any Footers( [in] any aIndex );
any PageSetup();
};
diff --git a/oovbaapi/ooo/vba/word/XSections.idl b/oovbaapi/ooo/vba/word/XSections.idl
index d0b50881f8cf..38645309ede2 100644
--- a/oovbaapi/ooo/vba/word/XSections.idl
+++ b/oovbaapi/ooo/vba/word/XSections.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XSections_idl__
#define __ooo_vba_word_XSections_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/word/XSelection.idl b/oovbaapi/ooo/vba/word/XSelection.idl
index 71fe8f8a5121..46a2bb7ef2d1 100644
--- a/oovbaapi/ooo/vba/word/XSelection.idl
+++ b/oovbaapi/ooo/vba/word/XSelection.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XSelection_idl__
#define __ooo_vba_word_XSelection_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 word {
@@ -52,7 +47,7 @@ interface XSelection
[attribute, readonly] XRange Range;
[attribute] XParagraphFormat ParagraphFormat;
[attribute, readonly] XFind Find;
- [attribute] XStyle Style;
+ [attribute] any Style;
[attribute, readonly] XFont Font;
[attribute, readonly] XHeaderFooter HeaderFooter;
[attribute] long LanguageID;
@@ -68,6 +63,7 @@ interface XSelection
void MoveRight( [in] any Unit, [in] any Count, [in] any Extend );
void MoveLeft( [in] any Unit, [in] any Count, [in] any Extend );
void MoveDown( [in] any Unit, [in] any Count, [in] any Extend );
+ void MoveUp( [in] any Unit, [in] any Count, [in] any Extend );
void TypeParagraph();
void InsertParagraph();
void InsertParagraphBefore();
@@ -77,6 +73,19 @@ interface XSelection
any Information( [in] long Type );
void InsertBreak( [in] any Type );
any ShapeRange();
+ void SelectColumn();
+ void SelectRow();
+ any Rows( [in] any aIndex );
+ any Columns( [in] any aIndex );
+ any Cells( [in] any aIndex );
+ void Copy();
+ void CopyAsPicture();
+ void Paste();
+ void Collapse([in] any Direction);
+ void WholeStory();
+ boolean InRange( [in] XRange Range );
+ void SplitTable();
+ any Paragraphs( [in] any aIndex );
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XStyle.idl b/oovbaapi/ooo/vba/word/XStyle.idl
index 5d341e366dd1..c5b0ab5bb6ca 100644
--- a/oovbaapi/ooo/vba/word/XStyle.idl
+++ b/oovbaapi/ooo/vba/word/XStyle.idl
@@ -27,25 +27,32 @@
#ifndef __ooo_vba_word_XStyle_idl__
#define __ooo_vba_word_XStyle_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
+#include <com/sun/star/script/XDefaultProperty.idl>
module ooo { module vba { module word {
interface XFont;
+interface XListTemplate;
+interface XParagraphFormat;
interface XStyle
{
interface ooo::vba::XHelperInterface;
+ interface com::sun::star::script::XDefaultProperty;
[attribute] string Name;
[attribute] long LanguageID;
[attribute, readonly] long Type;
[attribute, readonly] XFont Font;
+ [attribute] string NameLocal;
+ [attribute, readonly] XParagraphFormat ParagraphFormat;
+ [attribute] boolean AutomaticallyUpdate;
+ [attribute] any BaseStyle;
+ [attribute] any NextParagraphStyle;
+ [attribute, readonly] long ListLevelNumber;
+
+ void LinkToListTemplate( [in] XListTemplate ListTemplate, [in] any ListLevelNumber );
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XStyles.idl b/oovbaapi/ooo/vba/word/XStyles.idl
index d79bae37936a..3e7f0c1ca34d 100644
--- a/oovbaapi/ooo/vba/word/XStyles.idl
+++ b/oovbaapi/ooo/vba/word/XStyles.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XStyles_idl__
#define __ooo_vba_word_XStyles_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/word/XSystem.idl b/oovbaapi/ooo/vba/word/XSystem.idl
index 35dec51f9c78..f0dc82952de1 100644
--- a/oovbaapi/ooo/vba/word/XSystem.idl
+++ b/oovbaapi/ooo/vba/word/XSystem.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XSystem_idl__
#define __ooo_vba_word_XSystem_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 word {
diff --git a/oovbaapi/ooo/vba/word/XTabStop.idl b/oovbaapi/ooo/vba/word/XTabStop.idl
new file mode 100644
index 000000000000..541bd288e630
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XTabStop.idl
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * 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_word_XTabStop_idl__
+#define __ooo_vba_word_XTabStop_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XTabStop
+{
+ interface ooo::vba::XHelperInterface;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XTabStops.idl b/oovbaapi/ooo/vba/word/XTabStops.idl
new file mode 100644
index 000000000000..931c8798db4b
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XTabStops.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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_word_XTabStops_idl__
+#define __ooo_vba_word_XTabStops_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XTabStop;
+interface XTabStops
+{
+ interface ::ooo::vba::XCollection;
+
+ XTabStop Add([in] float Position, [in] any Alignment, [in] any Leader );
+ void ClearAll();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XTable.idl b/oovbaapi/ooo/vba/word/XTable.idl
index 26b125a2c88c..e29cdd3a1faa 100644
--- a/oovbaapi/ooo/vba/word/XTable.idl
+++ b/oovbaapi/ooo/vba/word/XTable.idl
@@ -28,13 +28,9 @@
#ifndef __ooo_vba_word_XTable_idl__
#define __ooo_vba_word_XTable_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 word {
interface XRange;
@@ -70,6 +66,8 @@ interface XTable
*/
any Borders( [in] any Index );
+ any Rows([in] any aIndex );
+ any Columns([in] any aIndex );
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XTableOfContents.idl b/oovbaapi/ooo/vba/word/XTableOfContents.idl
new file mode 100644
index 000000000000..d281e65adb8b
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XTableOfContents.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_word_XTableOfContents_idl__
+#define __ooo_vba_word_XTableOfContents_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XHelperInterface.idl>
+
+module ooo { module vba { module word {
+
+interface XTableOfContents
+{
+ interface ooo::vba::XHelperInterface;
+
+ [attribute] long LowerHeadingLevel;
+ [attribute] long TabLeader;
+ [attribute] boolean UseFields;
+ [attribute] boolean UseOutlineLevels;
+
+ void Delete();
+ void Update();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XTables.idl b/oovbaapi/ooo/vba/word/XTables.idl
index 4854cfded09b..9c6c7e157e41 100644
--- a/oovbaapi/ooo/vba/word/XTables.idl
+++ b/oovbaapi/ooo/vba/word/XTables.idl
@@ -28,21 +28,10 @@
#ifndef __ooo_vba_word__XTables_idl__
#define __ooo_vba_word__XTables_idl__
-#ifndef __ooo_vba_HelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
-#endif
-
-#ifndef __ooo_vba_word_XTable_idl__
#include <ooo/vba/word/XTable.idl>
-#endif
-
-#ifndef __com_sun_star_script_BasicErrorException_idl__
#include <com/sun/star/script/BasicErrorException.idl>
-#endif
module ooo { module vba { module word {
diff --git a/oovbaapi/ooo/vba/word/XTablesOfContents.idl b/oovbaapi/ooo/vba/word/XTablesOfContents.idl
new file mode 100644
index 000000000000..92a65d2748ef
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XTablesOfContents.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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_word_XTablesOfContents_idl__
+#define __ooo_vba_word_XTablesOfContents_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/XCollection.idl>
+
+
+//=============================================================================
+
+module ooo { module vba { module word {
+
+//=============================================================================
+
+interface XTableOfContents;
+interface XRange;
+interface XTablesOfContents
+{
+ interface ::ooo::vba::XCollection;
+
+ XTableOfContents Add([in] XRange Range, [in] any UseHeadingStyles, [in] any UpperHeadingLevel, [in] any LowerHeadingLevel, [in] any UseFields, [in] any TableID, [in] any RightAlignPageNumbers, [in] any IncludePageNumbers, [in] any AddedStyles, [in] any UseHyperlinks, [in] any HidePageNumbersInWeb, [in] any UseOutlineLevels );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/word/XTemplate.idl b/oovbaapi/ooo/vba/word/XTemplate.idl
index 390037719f1e..5a53f7539e50 100644
--- a/oovbaapi/ooo/vba/word/XTemplate.idl
+++ b/oovbaapi/ooo/vba/word/XTemplate.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XTemplate_idl__
#define __ooo_vba_word_XTemplate_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 word {
@@ -42,6 +37,7 @@ interface XTemplate
interface ooo::vba::XHelperInterface;
[attribute, readonly] string Name;
+ [attribute, readonly] string Path;
any AutoTextEntries( [in] any Index );
};
diff --git a/oovbaapi/ooo/vba/word/XVariable.idl b/oovbaapi/ooo/vba/word/XVariable.idl
index 4a60922ffe66..b36a900288bc 100644
--- a/oovbaapi/ooo/vba/word/XVariable.idl
+++ b/oovbaapi/ooo/vba/word/XVariable.idl
@@ -27,17 +27,9 @@
#ifndef __ooo_vba_word_XVariable_idl__
#define __ooo_vba_word_XVariable_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_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
module ooo { module vba { module word {
diff --git a/oovbaapi/ooo/vba/word/XVariables.idl b/oovbaapi/ooo/vba/word/XVariables.idl
index a7744253955d..d8fca7480b2a 100644
--- a/oovbaapi/ooo/vba/word/XVariables.idl
+++ b/oovbaapi/ooo/vba/word/XVariables.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XVariables_idl__
#define __ooo_vba_word_XVariables_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/word/XView.idl b/oovbaapi/ooo/vba/word/XView.idl
index ade551ad7ca9..985859d9372d 100644
--- a/oovbaapi/ooo/vba/word/XView.idl
+++ b/oovbaapi/ooo/vba/word/XView.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XView_idl__
#define __ooo_vba_word_XView_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 word {
diff --git a/oovbaapi/ooo/vba/word/XWindow.idl b/oovbaapi/ooo/vba/word/XWindow.idl
index 10d650d6dd6a..e1c61ea0aa04 100644
--- a/oovbaapi/ooo/vba/word/XWindow.idl
+++ b/oovbaapi/ooo/vba/word/XWindow.idl
@@ -27,13 +27,8 @@
#ifndef __ooo_vba_word_XWindow_idl__
#define __ooo_vba_word_XWindow_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
//=============================================================================
@@ -44,6 +39,7 @@ module ooo { module vba { module word {
interface XWindow : com::sun::star::uno::XInterface
{
[attribute] any View;
+ [attribute] any WindowState;
void Activate();
void Close([in] any SaveChanges, [in] any RouteDocument);
any Panes( [in] any Index ); // this is a fake api for it seems not support in Write
diff --git a/oovbaapi/ooo/vba/word/XWrapFormat.idl b/oovbaapi/ooo/vba/word/XWrapFormat.idl
index 155ba2c4e5f5..69f9c069f9e2 100644
--- a/oovbaapi/ooo/vba/word/XWrapFormat.idl
+++ b/oovbaapi/ooo/vba/word/XWrapFormat.idl
@@ -27,9 +27,7 @@
#ifndef __ooo_vba_word_XWrapFormat_idl__
#define __ooo_vba_word_XWrapFormat_idl__
-#ifndef __ooo_vba_XHelperInterface_idl__
#include <ooo/vba/XHelperInterface.idl>
-#endif
module ooo { module vba { module word {
interface XWrapFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/word/makefile.mk b/oovbaapi/ooo/vba/word/makefile.mk
index 543e99f7c538..4ed210befad2 100644..100755
--- a/oovbaapi/ooo/vba/word/makefile.mk
+++ b/oovbaapi/ooo/vba/word/makefile.mk
@@ -79,6 +79,31 @@ IDLFILES= XGlobals.idl\
XPageSetup.idl \
XSection.idl \
XSections.idl \
+ XRow.idl \
+ XRows.idl \
+ XColumn.idl \
+ XColumns.idl \
+ XCell.idl \
+ XCells.idl \
+ XTabStop.idl \
+ XTabStops.idl \
+ XTableOfContents.idl \
+ XTablesOfContents.idl \
+ XListFormat.idl \
+ XListGalleries.idl \
+ XListGallery.idl \
+ XListTemplate.idl \
+ XListTemplates.idl \
+ XListLevel.idl \
+ XListLevels.idl \
+ XFormField.idl \
+ XFormFields.idl \
+ XRevision.idl \
+ XRevisions.idl \
+ XFrame.idl \
+ XFrames.idl \
+ XCheckBox.idl \
+ XHeadersFooters.idl \
# ------------------------------------------------------------------