summaryrefslogtreecommitdiff
path: root/oovbaapi/ooo
diff options
context:
space:
mode:
Diffstat (limited to 'oovbaapi/ooo')
-rw-r--r--oovbaapi/ooo/vba/XApplicationBase.idl2
-rw-r--r--oovbaapi/ooo/vba/XDialogBase.idl2
-rw-r--r--oovbaapi/ooo/vba/XDocumentBase.idl1
-rw-r--r--oovbaapi/ooo/vba/excel/XApplication.idl25
-rw-r--r--oovbaapi/ooo/vba/excel/XGlobals.idl1
-rw-r--r--oovbaapi/ooo/vba/excel/XName.idl12
-rw-r--r--oovbaapi/ooo/vba/excel/XPageSetup.idl1
-rw-r--r--oovbaapi/ooo/vba/excel/XPivotCache.idl1
-rw-r--r--oovbaapi/ooo/vba/excel/XRange.idl13
-rw-r--r--oovbaapi/ooo/vba/excel/XWorkbook.idl4
-rw-r--r--oovbaapi/ooo/vba/excel/XWorksheet.idl5
-rw-r--r--oovbaapi/ooo/vba/excel/makefile.mk8
-rw-r--r--oovbaapi/ooo/vba/makefile.mk6
-rw-r--r--oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl14
-rw-r--r--oovbaapi/ooo/vba/msforms/XComboBox.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XControl.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XLabel.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XListBox.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/XShape.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XShapeRange.idl2
-rw-r--r--oovbaapi/ooo/vba/msforms/makefile.mk3
-rw-r--r--oovbaapi/ooo/vba/word/XApplication.idl1
-rw-r--r--oovbaapi/ooo/vba/word/XDocument.idl13
-rw-r--r--oovbaapi/ooo/vba/word/XField.idl2
-rw-r--r--oovbaapi/ooo/vba/word/XGlobals.idl1
-rw-r--r--oovbaapi/ooo/vba/word/XParagraph.idl1
-rw-r--r--oovbaapi/ooo/vba/word/XRange.idl8
-rw-r--r--oovbaapi/ooo/vba/word/XReplacement.idl2
-rw-r--r--oovbaapi/ooo/vba/word/XSection.idl4
-rw-r--r--oovbaapi/ooo/vba/word/XSelection.idl16
-rw-r--r--oovbaapi/ooo/vba/word/XStyle.idl15
-rw-r--r--oovbaapi/ooo/vba/word/XTable.idl4
-rw-r--r--oovbaapi/ooo/vba/word/XTemplate.idl1
-rw-r--r--oovbaapi/ooo/vba/word/XWindow.idl1
-rw-r--r--oovbaapi/ooo/vba/word/makefile.mk25
35 files changed, 166 insertions, 34 deletions
diff --git a/oovbaapi/ooo/vba/XApplicationBase.idl b/oovbaapi/ooo/vba/XApplicationBase.idl
index 2a9830568d..c1490fc643 100644
--- a/oovbaapi/ooo/vba/XApplicationBase.idl
+++ b/oovbaapi/ooo/vba/XApplicationBase.idl
@@ -50,7 +50,7 @@ interface XApplicationBase
void Quit();
any CommandBars( [in] any aIndex );
- void 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);
+ 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 aEarliestTime, [in] string aFunction, [in] any aLatestTime, [in] any aSchedule );
float CentimetersToPoints([in] float Centimeters );
void Undo();
diff --git a/oovbaapi/ooo/vba/XDialogBase.idl b/oovbaapi/ooo/vba/XDialogBase.idl
index ee5c8330cb..48fa3d8212 100644
--- a/oovbaapi/ooo/vba/XDialogBase.idl
+++ b/oovbaapi/ooo/vba/XDialogBase.idl
@@ -46,7 +46,7 @@ interface XDialogBase
{
interface ::ooo::vba::XHelperInterface;
- void Show();
+ boolean Show();
};
}; };
diff --git a/oovbaapi/ooo/vba/XDocumentBase.idl b/oovbaapi/ooo/vba/XDocumentBase.idl
index bb45cafdac..04181bb33c 100644
--- a/oovbaapi/ooo/vba/XDocumentBase.idl
+++ b/oovbaapi/ooo/vba/XDocumentBase.idl
@@ -53,7 +53,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/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index ac1f4c4ee0..a09caea889 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -32,6 +32,14 @@
#include <ooo/vba/XHelperInterface.idl>
#include <ooo/vba/XAssistant.idl>
+#ifndef __ooo_vba_excel_XFileDialog_idl__
+#include <ooo/vba/XFileDialog.idl>
+#endif
+
+#ifndef __ooo_vba_XFileSearch_idl__
+#include <ooo/vba/XFileSearch.idl>
+#endif
+
module ooo { module vba { module excel {
interface XRange;
@@ -41,6 +49,8 @@ interface XWorksheets;
interface XWorksheetFunction;
interface XWindow;
interface XWorksheet;
+interface XFileDialog;
+interface XFileSearch;
interface XApplication
{
@@ -56,8 +66,10 @@ interface XApplication
[attribute, readonly] XWindow ActiveWindow;
[attribute, readonly] XWorksheet ActiveSheet;
[attribute, readonly] ooo::vba::XAssistant Assistant;
+ [attribute, readonly] ooo::vba::XFileSearch FileSearch; //liuchen 2009-8-18, add the support of VBA Application.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 +77,16 @@ interface XApplication
[attribute] any StatusBar;
[attribute] long Cursor;
[attribute] boolean EnableEvents;
+ [attribute] boolean Visible;
+ [attribute] boolean Iteration; //liuchen 2009-11-25
+ [attribute] long EnableCancelKey; //liuchen 2009-11-26
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);
@@ -91,8 +108,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 aIndex );
+ any MenuBars( [in] any aIndex );
+ any International([in] long Index); //liuchen 2009-11-26
+ 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/XGlobals.idl b/oovbaapi/ooo/vba/excel/XGlobals.idl
index ad9d85eb45..31ebb63411 100644
--- a/oovbaapi/ooo/vba/excel/XGlobals.idl
+++ b/oovbaapi/ooo/vba/excel/XGlobals.idl
@@ -80,6 +80,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/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index 6397e7a9c2..dd51d3319e 100644
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -50,12 +50,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/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
index 70a1ae88c7..31ad1a57b6 100644
--- a/oovbaapi/ooo/vba/excel/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
@@ -65,6 +65,7 @@ interface XPageSetup : com::sun::star::uno::XInterface
[attribute] boolean CenterVertically;
[attribute] boolean CenterHorizontally;
[attribute] boolean PrintHeadings;
+ [attribute] long PaperSize; //liuchen 2009-12-11
};
diff --git a/oovbaapi/ooo/vba/excel/XPivotCache.idl b/oovbaapi/ooo/vba/excel/XPivotCache.idl
index 65fd014e18..09bbd635e8 100644
--- a/oovbaapi/ooo/vba/excel/XPivotCache.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotCache.idl
@@ -45,6 +45,7 @@ interface XPivotCache
{
interface ::ooo::vba::XHelperInterface;
+ [attribute] long MissingItemsLimit;
void Refresh();
};
diff --git a/oovbaapi/ooo/vba/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index 5d59a3baec..165474940f 100644
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -42,6 +42,9 @@
#ifndef __com_sun_star_script_XDefaultMethod_idl__
#include <com/sun/star/script/XDefaultMethod.idl>
#endif
+#ifndef __com_sun_star_script_XErrorQuery_idl__
+#include <com/sun/star/script/XErrorQuery.idl>
+#endif
#ifndef __ooo_vba_XCollection_idl__
#include <ooo/vba/XCollection.idl>
#endif
@@ -69,14 +72,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 +109,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 +174,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 aIndex );
+ long CopyFromRecordset([in] any Data, [in] any MaxRows , [in] any MaxColumns) raises ( com::sun::star::script::BasicErrorException );
+ XPivotTable PivotTable();
+ void TextToColumns([in] any Destination, [in] any DataType, [in] any TextQualifier, [in] any ConsecutiveDelimiter, [in] any Tab, [in] any Semicolon, [in] any Comma,
+ [in] any Space, [in] any Other, [in] any OtherChar, [in] any FieldInfo, [in] any DecimalSeparator, [in] any ThousandsSeparator, [in] any TrailingMinusNumbers );
+ any AdvancedFilter([in] long Action, [in] any CriteriaRange, [in] any CopyToRange, [in] any Unique) raises ( com::sun::star::script::BasicErrorException );
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index e35b661a44..1a9807c0c4 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -50,6 +50,7 @@ interface XWorkbook : com::sun::star::uno::XInterface
[attribute, readonly] boolean ProtectStructure;
[attribute, readonly] XWorksheet ActiveSheet;
[attribute, readonly] string CodeName;
+ [attribute, readonly] long FileFormat;
[attribute] boolean PrecisionAsDisplayed;
any Worksheets([in] any sheet);
@@ -60,8 +61,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/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index a6d86957ec..b3eb6b9307 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -38,6 +38,7 @@
#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>
@@ -60,7 +61,7 @@ interface XWorksheet
interface ::com::sun::star::script::XInvocation;
interface ::com::sun::star::container::XNamed;
- [attribute] boolean Visible;
+ [attribute] long Visible;
[attribute, readonly] long StandardHeight;
[attribute, readonly] long StandardWidth;
[attribute, readonly] boolean ProtectionMode;
@@ -77,7 +78,7 @@ interface XWorksheet
void Activate();
void Calculate( );
- void Select();
+ void Select([in] any Replace); //liuchen 2009-9-2, add the input parameter to support expand selection
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/makefile.mk b/oovbaapi/ooo/vba/excel/makefile.mk
index 2515880867..1143311764 100644
--- 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 4f6d378cfe..ef77f77308 100644
--- a/oovbaapi/ooo/vba/makefile.mk
+++ b/oovbaapi/ooo/vba/makefile.mk
@@ -61,7 +61,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 e7532e3cb2..8fa44f93b3 100644
--- a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
+++ b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
@@ -25,27 +25,15 @@
*
************************************************************************/
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/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 8581392dd1..49e4320c2a 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -47,6 +47,7 @@ interface XComboBox: ::com::sun::star::uno::XInterface
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 50d15db3aa..48f178ef3a 100644
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -63,6 +63,7 @@ interface XControl
[attribute] string Name;
[attribute] string ControlTipText;
[attribute] string Tag;
+ [attribute] long ForeColor;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index 60427f6e4e..ea4d9448a8 100644
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -39,6 +39,7 @@ interface XLabel: com::sun::star::uno::XInterface
{
[attribute] string Caption;
[attribute] any Value;
+ [attribute] string Accelerator;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 627c5418bf..240060239a 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -40,7 +40,7 @@ interface XListBox: com::sun::star::uno::XInterface
{
[attribute] any Value;
[attribute] string Text;
- [attribute] boolean MultiSelect;
+ [attribute] long MultiSelect; //liuchen 2009-7-31 MultiSelect property in Excel VBA is type long
[attribute] any ListIndex;
[attribute, readonly ] long ListCount;
void AddItem( [in] any pvargItem, [in] any pvargIndex );
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index e8682a6d8e..eec1a7fb20 100644
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -75,6 +75,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 d5b0df20ea..2d936e087b 100644
--- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
@@ -47,6 +47,7 @@ interface XShapeRange
{
interface ooo::vba::XCollection;
+ [attribute] string Name;
[attribute] double Height;
[attribute] double Width;
[attribute] double Left;
@@ -65,6 +66,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/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
index 56ac4caf87..79313a95a6 100644
--- a/oovbaapi/ooo/vba/msforms/makefile.mk
+++ b/oovbaapi/ooo/vba/msforms/makefile.mk
@@ -44,6 +44,7 @@ IDLFILES=\
XLabel.idl \
XTextBox.idl \
XRadioButton.idl \
+ XCheckBox.idl \
XShape.idl \
XShapes.idl \
XLineFormat.idl \
@@ -62,6 +63,8 @@ IDLFILES=\
XSpinButton.idl \
XImage.idl \
XControls.idl \
+ XReturnBoolean.idl \
+ XReturnInteger.idl \
XTextFrame.idl \
# ------------------------------------------------------------------
diff --git a/oovbaapi/ooo/vba/word/XApplication.idl b/oovbaapi/ooo/vba/word/XApplication.idl
index e6cde02f81..311f981afe 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -57,6 +57,7 @@ interface XApplication : com::sun::star::uno::XInterface
any Documents( [in] any aIndex );
any Addins( [in] any aIndex );
any Dialogs( [in] any aIndex );
+ any ListGalleries( [in] any aIndex );
float CentimetersToPoints([in] float Centimeters );
};
diff --git a/oovbaapi/ooo/vba/word/XDocument.idl b/oovbaapi/ooo/vba/word/XDocument.idl
index 4b55552856..2fc26bf992 100644
--- a/oovbaapi/ooo/vba/word/XDocument.idl
+++ b/oovbaapi/ooo/vba/word/XDocument.idl
@@ -49,6 +49,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 +68,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/XField.idl b/oovbaapi/ooo/vba/word/XField.idl
index d610da631c..29d30aa631 100644
--- a/oovbaapi/ooo/vba/word/XField.idl
+++ b/oovbaapi/ooo/vba/word/XField.idl
@@ -36,6 +36,8 @@ module ooo { module vba { module word {
interface XField
{
interface ::ooo::vba::XHelperInterface;
+
+ boolean Update();
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XGlobals.idl b/oovbaapi/ooo/vba/word/XGlobals.idl
index 45b52fc2fb..c3cfd6de45 100644
--- a/oovbaapi/ooo/vba/word/XGlobals.idl
+++ b/oovbaapi/ooo/vba/word/XGlobals.idl
@@ -49,6 +49,7 @@ interface XGlobals : com::sun::star::uno::XInterface
any Documents( [in] any aIndex );
any Addins( [in] any aIndex );
any Dialogs( [in] any aIndex );
+ any ListGalleries( [in] any aIndex );
float CentimetersToPoints([in] float Centimeters );
};
diff --git a/oovbaapi/ooo/vba/word/XParagraph.idl b/oovbaapi/ooo/vba/word/XParagraph.idl
index 057875d7e7..a585e32cb0 100644
--- a/oovbaapi/ooo/vba/word/XParagraph.idl
+++ b/oovbaapi/ooo/vba/word/XParagraph.idl
@@ -43,6 +43,7 @@ interface XParagraph
interface ooo::vba::XHelperInterface;
[attribute, readonly] XRange Range;
+ [attribute] any Style;
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XRange.idl b/oovbaapi/ooo/vba/word/XRange.idl
index 868613c6af..4bed0c0fb9 100644
--- a/oovbaapi/ooo/vba/word/XRange.idl
+++ b/oovbaapi/ooo/vba/word/XRange.idl
@@ -45,13 +45,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 +60,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 +68,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 2d6dcd2840..778f9e1184 100644
--- a/oovbaapi/ooo/vba/word/XReplacement.idl
+++ b/oovbaapi/ooo/vba/word/XReplacement.idl
@@ -42,6 +42,8 @@ interface XReplacement
interface ooo::vba::XHelperInterface;
[attribute] string Text;
+
+ void ClearFormatting();
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XSection.idl b/oovbaapi/ooo/vba/word/XSection.idl
index 325ddf5dc8..ec4569b03e 100644
--- a/oovbaapi/ooo/vba/word/XSection.idl
+++ b/oovbaapi/ooo/vba/word/XSection.idl
@@ -43,8 +43,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/XSelection.idl b/oovbaapi/ooo/vba/word/XSelection.idl
index 053cbc67e1..3cbcfaaf08 100644
--- a/oovbaapi/ooo/vba/word/XSelection.idl
+++ b/oovbaapi/ooo/vba/word/XSelection.idl
@@ -52,7 +52,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 +68,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 +78,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 b89798d30b..1c0f30534a 100644
--- a/oovbaapi/ooo/vba/word/XStyle.idl
+++ b/oovbaapi/ooo/vba/word/XStyle.idl
@@ -35,17 +35,32 @@
#include <ooo/vba/XHelperInterface.idl>
#endif
+#ifndef __com_sun_star_script_XDefaultProperty_idl__
+#include <com/sun/star/script/XDefaultProperty.idl>
+#endif
+
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/XTable.idl b/oovbaapi/ooo/vba/word/XTable.idl
index 235067c4bf..edd5b39fdc 100644
--- a/oovbaapi/ooo/vba/word/XTable.idl
+++ b/oovbaapi/ooo/vba/word/XTable.idl
@@ -69,7 +69,9 @@ interface XTable
raises(com::sun::star::script::BasicErrorException);
*/
any Borders( [in] any aIndex );
-
+
+ any Rows([in] any aIndex );
+ any Columns([in] any aIndex );
};
}; }; };
diff --git a/oovbaapi/ooo/vba/word/XTemplate.idl b/oovbaapi/ooo/vba/word/XTemplate.idl
index 0a5f0ed38c..04e7063923 100644
--- a/oovbaapi/ooo/vba/word/XTemplate.idl
+++ b/oovbaapi/ooo/vba/word/XTemplate.idl
@@ -42,6 +42,7 @@ interface XTemplate
interface ooo::vba::XHelperInterface;
[attribute, readonly] string Name;
+ [attribute, readonly] string Path;
any AutoTextEntries( [in] any aIndex );
};
diff --git a/oovbaapi/ooo/vba/word/XWindow.idl b/oovbaapi/ooo/vba/word/XWindow.idl
index 225a92381c..4ef56da9a3 100644
--- a/oovbaapi/ooo/vba/word/XWindow.idl
+++ b/oovbaapi/ooo/vba/word/XWindow.idl
@@ -44,6 +44,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 aIndex ); // this is a fake api for it seems not support in Write
diff --git a/oovbaapi/ooo/vba/word/makefile.mk b/oovbaapi/ooo/vba/word/makefile.mk
index 543e99f7c5..04b36d1d27 100644
--- 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 \
# ------------------------------------------------------------------