diff options
Diffstat (limited to 'oovbaapi')
22 files changed, 73 insertions, 102 deletions
diff --git a/oovbaapi/genconstidl/makefile.mk b/oovbaapi/genconstidl/makefile.mk index 42219545c672..95397442c208 100644 --- a/oovbaapi/genconstidl/makefile.mk +++ b/oovbaapi/genconstidl/makefile.mk @@ -54,18 +54,16 @@ MYDONEFILES += $(foreach,i,$(MYSYMFILES) $(MISC)$/$(i:b).done) ALLTAR: GENIDL -GENIDL : $(MY_GEN_IDL_PATH) $(MYDONEFILES) +GENIDL : $(MYDONEFILES) GENRDB : GENIDL $(MYURDFILES) $(MISC)$/%.done : %.api + @@-$(MKDIR) $(MY_GEN_IDL_PATH) @echo Processing $? $(PERL) api-to-idl.pl $? $(MY_GEN_IDL_PATH) @$(TOUCH) $@ -$(MY_GEN_IDL_PATH) : - @@-$(MKDIR) $@ - CLEAN : @$(RM) $(MY_GEN_IDL_PATH)$/*.idl @$(RM) $(foreach,i,$(MYSYMFILES) $(MISC)$/$(i:b).done) diff --git a/oovbaapi/ooo/vba/XCommandBar.idl b/oovbaapi/ooo/vba/XCommandBar.idl index 7bf5c9dcf675..395dafcd5567 100644 --- a/oovbaapi/ooo/vba/XCommandBar.idl +++ b/oovbaapi/ooo/vba/XCommandBar.idl @@ -54,9 +54,12 @@ interface XCommandBar [attribute] string Name; [attribute] boolean Visible; + [attribute] boolean Enabled; void Delete() raises ( com::sun::star::script::BasicErrorException ); any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException ); + long Type() raises ( com::sun::star::script::BasicErrorException ); + any FindControl( [in] any Type, [in] any Id, [in] any Tag, [in] any Visible, [in] any Recursive ) raises ( com::sun::star::script::BasicErrorException ); }; }; }; diff --git a/oovbaapi/ooo/vba/XCommandBarControl.idl b/oovbaapi/ooo/vba/XCommandBarControl.idl index 44ec75e01729..b6da3a319d7f 100644 --- a/oovbaapi/ooo/vba/XCommandBarControl.idl +++ b/oovbaapi/ooo/vba/XCommandBarControl.idl @@ -54,6 +54,8 @@ interface XCommandBarControl [attribute] string Caption; [attribute] string OnAction; [attribute] boolean Visible; + [attribute, readonly] long Type; + [attribute] boolean Enabled; void Delete() raises ( com::sun::star::script::BasicErrorException ); any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException ); diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl index 47628b18a7f1..de6763ab242d 100644 --- a/oovbaapi/ooo/vba/excel/XApplication.idl +++ b/oovbaapi/ooo/vba/excel/XApplication.idl @@ -42,10 +42,6 @@ #include <ooo/vba/XAssistant.idl> #endif -#ifndef __ooo_vba_XCommandBars_idl__ -#include <ooo/vba/XCommandBars.idl> -#endif - module ooo { module vba { module excel { interface XRange; @@ -56,10 +52,10 @@ interface XWorksheetFunction; interface XWindow; interface XWorksheet; -interface XApplication +interface XApplication : com::sun::star::uno::XInterface { - interface ::ooo::vba::XHelperInterface; +// interface ::ooo::vba::XHelperInterface; [attribute, readonly] any Selection; [attribute, readonly] XWorkbook ActiveWorkbook; @@ -74,14 +70,11 @@ interface XApplication // to determine this [attribute, readonly] XWorkbook ThisWorkbook; [attribute, readonly] string Name; - [attribute] boolean ScreenUpdating; - [attribute] boolean DisplayStatusBar; [attribute] boolean DisplayAlerts; [attribute] boolean DisplayFormulaBar; [attribute] any CutCopyMode; [attribute] any StatusBar; [attribute] long Cursor; - [attribute, readonly] string Version; void setDefaultFilePath([in] string DefaultFilePath) raises(com::sun::star::script::BasicErrorException); @@ -90,7 +83,7 @@ interface XApplication 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 aIndex ); + //any CommandBars( [in] any aIndex ); any Workbooks( [in] any aIndex ); any Worksheets( [in] any aIndex ); any Windows( [in] any aIndex ); @@ -110,6 +103,7 @@ interface XApplication raises(com::sun::star::script::BasicErrorException); void Volatile([in] any Volatile); void DoEvents(); + any Caller( [in] any aIndex ); }; }; }; }; diff --git a/oovbaapi/ooo/vba/excel/XDialog.idl b/oovbaapi/ooo/vba/excel/XDialog.idl index 5bfb18f69baf..8c24fe038c25 100644 --- a/oovbaapi/ooo/vba/excel/XDialog.idl +++ b/oovbaapi/ooo/vba/excel/XDialog.idl @@ -45,13 +45,8 @@ module ooo { module vba { module excel { //============================================================================= -interface XApplication; - -interface XDialog +interface XDialog : com::sun::star::uno::XInterface { - interface ::ooo::vba::XHelperInterface; - - void Show(); }; }; }; }; diff --git a/oovbaapi/ooo/vba/excel/XDialogs.idl b/oovbaapi/ooo/vba/excel/XDialogs.idl index 4b4493e9d2ff..346be87b91b4 100644 --- a/oovbaapi/ooo/vba/excel/XDialogs.idl +++ b/oovbaapi/ooo/vba/excel/XDialogs.idl @@ -33,9 +33,6 @@ #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> @@ -44,15 +41,9 @@ //============================================================================= module ooo { module vba { module excel { -interface XApplication; -//============================================================================= -//interface XDialogs : ::ooo::vba::XCollection -interface XDialogs +interface XDialogs : com::sun::star::uno::XInterface { - interface ::ooo::vba::XHelperInterface; - - [attribute, readonly] long Count; any Item( [in] any Index ); }; diff --git a/oovbaapi/ooo/vba/excel/XFont.idl b/oovbaapi/ooo/vba/excel/XFont.idl index 038e6b43a85c..f6da47052195 100644 --- a/oovbaapi/ooo/vba/excel/XFont.idl +++ b/oovbaapi/ooo/vba/excel/XFont.idl @@ -47,22 +47,9 @@ module ooo { module vba { module excel { interface XFont { - interface ::ooo::vba::XHelperInterface; - - [attribute] any Size; [attribute] any StandardFontSize; [attribute] any StandardFont; [attribute] any FontStyle; - [attribute] any ColorIndex; - [attribute] any Color; - [attribute] any Bold; - [attribute] any Underline; - [attribute] any Strikethrough; - [attribute] any Shadow; - [attribute] any Italic; - [attribute] any Subscript; - [attribute] any Superscript; - [attribute] any Name; [attribute] any OutlineFont; }; diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl index b847e656dadb..335040dee224 100644 --- a/oovbaapi/ooo/vba/excel/XPageSetup.idl +++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl @@ -45,20 +45,15 @@ module ooo { module vba { module excel { //============================================================================= -interface XPageSetup +interface XPageSetup : com::sun::star::uno::XInterface { - interface ::ooo::vba::XHelperInterface; +// interface ::ooo::vba::XHelperInterface; //Attributes [attribute] string PrintArea; - [attribute] double TopMargin; - [attribute] double BottomMargin; - [attribute] double RightMargin; - [attribute] double LeftMargin; [attribute] double HeaderMargin; [attribute] double FooterMargin; - [attribute] long Orientation; [attribute] any FitToPagesTall; [attribute] any FitToPagesWide; [attribute] any Zoom; diff --git a/oovbaapi/ooo/vba/excel/XTextFrame.idl b/oovbaapi/ooo/vba/excel/XTextFrame.idl index e0380217e609..201bc1860660 100644 --- a/oovbaapi/ooo/vba/excel/XTextFrame.idl +++ b/oovbaapi/ooo/vba/excel/XTextFrame.idl @@ -34,21 +34,9 @@ #include <ooo/vba/XHelperInterface.idl> #endif -#ifndef __ooo_vba_excel_XCharacters_idl__ -#include <ooo/vba/excel/XCharacters.idl> -#endif - module ooo { module vba { module excel { -interface XTextFrame : ooo::vba::XHelperInterface +interface XTextFrame : com::sun::star::uno::XInterface { - [attribute] boolean AutoSize; - [attribute] float MarginBottom; - [attribute] float MarginTop; - [attribute] float MarginLeft; - [attribute] float MarginRight; - XCharacters Characters(); - /*I don't find it in msdn - Range TextRange();*/ }; }; }; }; #endif diff --git a/oovbaapi/ooo/vba/excel/XWindow.idl b/oovbaapi/ooo/vba/excel/XWindow.idl index b67810a764b3..63a8428c3491 100644 --- a/oovbaapi/ooo/vba/excel/XWindow.idl +++ b/oovbaapi/ooo/vba/excel/XWindow.idl @@ -46,10 +46,8 @@ module ooo { module vba { module excel { interface XRange; interface XWorksheet; interface XPane; -interface XWindow +interface XWindow : com::sun::star::uno::XInterface { - interface ::ooo::vba::XHelperInterface; - [attribute] any Caption; [attribute] boolean DisplayGridlines; [attribute] boolean DisplayHeadings; @@ -58,8 +56,6 @@ interface XWindow [attribute] boolean DisplayVerticalScrollBar; [attribute] boolean DisplayWorkbookTabs; [attribute] boolean FreezePanes; - [attribute] long Height; - [attribute] long Left; [attribute] boolean Split; [attribute] long SplitColumn; [attribute] double SplitHorizontal; @@ -67,10 +63,7 @@ interface XWindow [attribute] double SplitVertical; [attribute] any ScrollColumn; [attribute] any ScrollRow; - [attribute] long Top; [attribute] any View; - [attribute] boolean Visible; - [attribute] long Width; [attribute] any WindowState; [attribute] any Zoom; any SelectedSheets( [in] any aIndex ); diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl index e05a6ccca493..bb043bfa6b29 100644 --- a/oovbaapi/ooo/vba/excel/XWorkbook.idl +++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl @@ -48,31 +48,20 @@ interface XWorksheet; interface XWorksheets; interface XStyles; -interface XWorkbook +interface XWorkbook : com::sun::star::uno::XInterface { - interface ::ooo::vba::XHelperInterface; - - [attribute, readonly] string Name; - [attribute, readonly] string Path; - [attribute, readonly] string FullName; [attribute, readonly] boolean ProtectStructure; [attribute, readonly] XWorksheet ActiveSheet; - [attribute] boolean Saved; [attribute, readonly] string CodeName; + [attribute] boolean PrecisionAsDisplayed; any Worksheets([in] any sheet); any Styles([in] any Index ); any Sheets([in] any sheet); any Windows([in] any index ); - void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook); - void Protect( [in] any Password ); - void Unprotect( [in] any Password ); - void Save(); - void Activate(); void ResetColors() raises (com::sun::star::script::BasicErrorException); - + 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 ); diff --git a/oovbaapi/ooo/vba/excel/XWorkbooks.idl b/oovbaapi/ooo/vba/excel/XWorkbooks.idl index a94747282200..685124922707 100644 --- a/oovbaapi/ooo/vba/excel/XWorkbooks.idl +++ b/oovbaapi/ooo/vba/excel/XWorkbooks.idl @@ -45,9 +45,8 @@ module ooo { module vba { module excel { //============================================================================= -interface XWorkbooks +interface XWorkbooks : com::sun::star::uno::XInterface { - interface ::ooo::vba::XCollection; any Add(); any Open([in] string Filename, [in] any UpdateLinks, [in] any ReadOnly, [in] any Format, [in] any Password, [in] any WriteResPassword, [in] any IgnoreReadOnlyRecommended, [in] any Origin, [in] any Delimiter, [in] any Editable, [in] any Notify, [in] any Converter, [in] any AddToMru); diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl index 743e6b8fe6a2..00cd109a8b70 100644 --- a/oovbaapi/ooo/vba/excel/XWorksheet.idl +++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl @@ -53,6 +53,7 @@ interface XRange; interface XOutline; interface XPageSetup; interface XHPageBreaks; +interface XVPageBreaks; interface XWorksheet { interface ::ooo::vba::XHelperInterface; @@ -70,6 +71,7 @@ interface XWorksheet [attribute, readonly] XWorksheet Previous; [attribute, readonly] string CodeName; [attribute, readonly] short Index; + [attribute] long EnableSelection; void Activate(); void Calculate( ); @@ -88,6 +90,7 @@ interface XWorksheet XOutline Outline(); XPageSetup PageSetup(); any HPageBreaks([in] any Index); + any VPageBreaks([in] any Index); any OLEObjects([in] any Index); void ShowDataForm(); any Shapes([in] any Index); diff --git a/oovbaapi/ooo/vba/excel/makefile.mk b/oovbaapi/ooo/vba/excel/makefile.mk index 764c073e6846..4ffa89f94ce1 100644 --- a/oovbaapi/ooo/vba/excel/makefile.mk +++ b/oovbaapi/ooo/vba/excel/makefile.mk @@ -46,7 +46,9 @@ dummy: # ------------------------------------------------------------------------ -IDLFILES= XApplication.idl\ +IDLFILES= XGlobals.idl\ + Globals.idl\ + XApplication.idl\ XComment.idl\ XComments.idl\ XRange.idl\ @@ -103,6 +105,9 @@ IDLFILES= XApplication.idl\ XPageBreak.idl \ XHPageBreak.idl \ XHPageBreaks.idl \ + XVPageBreak.idl \ + XVPageBreaks.idl \ + TextFrame.idl \ # ------------------------------------------------------------------ diff --git a/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk index ee63d6373feb..093ea81d8d55 100644 --- a/oovbaapi/ooo/vba/makefile.mk +++ b/oovbaapi/ooo/vba/makefile.mk @@ -47,7 +47,6 @@ dummy: IDLFILES=\ XErrObject.idl \ - XGlobals.idl \ XCollection.idl\ XVBAToOOEventDescGen.idl\ XPropValue.idl\ @@ -57,7 +56,21 @@ IDLFILES=\ XCommandBarControls.idl\ XCommandBar.idl\ XCommandBars.idl\ - Globals.idl\ + XCommandBarPopup.idl\ + XCommandBarButton.idl\ + XControlProvider.idl\ + ControlProvider.idl\ + XApplicationBase.idl\ + XWindowBase.idl\ + XDocumentBase.idl\ + XDocumentsBase.idl\ + XGlobalsBase.idl\ + XDocumentProperty.idl\ + XDocumentProperties.idl\ + XFontBase.idl\ + XDialogsBase.idl\ + XDialogBase.idl\ + XPageSetupBase.idl \ # ------------------------------------------------------------------ diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl index 75f9becd253c..8db43ffdccf2 100644 --- a/oovbaapi/ooo/vba/msforms/XControl.idl +++ b/oovbaapi/ooo/vba/msforms/XControl.idl @@ -61,6 +61,7 @@ interface XControl [attribute] double Left; [attribute] double Top; [attribute] string Name; + [attribute] string ControlTipText; }; //============================================================================= diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl index e43726134680..45a37f23f47a 100644 --- a/oovbaapi/ooo/vba/msforms/XShape.idl +++ b/oovbaapi/ooo/vba/msforms/XShape.idl @@ -34,10 +34,6 @@ #include <ooo/vba/XHelperInterface.idl> #endif -#ifndef __ooo_vba_excel_XTextFrame_idl__ -#include <ooo/vba/excel/XTextFrame.idl> -#endif - #ifndef __ooo_vba_msforms_XLineFormat_idl__ #include <ooo/vba/msforms/XLineFormat.idl> #endif @@ -66,14 +62,13 @@ interface XShape : ooo::vba::XHelperInterface [attribute, readonly] XLineFormat Line; [attribute, readonly] XFillFormat Fill; [attribute, readonly] XPictureFormat PictureFormat; + [attribute] boolean LockAspectRatio; + [attribute] boolean LockAnchor; + [attribute] long RelativeHorizontalPosition; + [attribute] long RelativeVerticalPosition; - /* - using in word - [attribute] RelativeHorizontalPosition - [attribute] RelativeVerticalPosition - [attribute] XWrapFormat WrapFormat; - */ - ooo::vba::excel::XTextFrame TextFrame(); + any TextFrame(); + any WrapFormat(); void Delete(); void ZOrder( [in] long ZOrderCmd ); void IncrementRotation( [in] double Increment ); diff --git a/oovbaapi/ooo/vba/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl index e0ceb79f94bd..079406ac1e5f 100644 --- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl +++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl @@ -44,9 +44,25 @@ module ooo { module vba { module msforms { +interface XLineFormat; +interface XFillFormat; interface XShapeRange { interface ooo::vba::XCollection; + + [attribute] double Height; + [attribute] double Width; + [attribute] double Left; + [attribute] double Top; + [attribute, readonly] XLineFormat Line; + [attribute, readonly] XFillFormat Fill; + [attribute] boolean LockAspectRatio; + [attribute] boolean LockAnchor; + [attribute] long RelativeHorizontalPosition; + [attribute] long RelativeVerticalPosition; + + any TextFrame(); + any WrapFormat(); void Select(); XShape Group(); void IncrementRotation( [in] double Increment ); diff --git a/oovbaapi/ooo/vba/msforms/XShapes.idl b/oovbaapi/ooo/vba/msforms/XShapes.idl index 3d49fbc0701b..1bb5dc2a0429 100644 --- a/oovbaapi/ooo/vba/msforms/XShapes.idl +++ b/oovbaapi/ooo/vba/msforms/XShapes.idl @@ -51,6 +51,7 @@ interface XShapes */ any AddLine( [in] long StartX, [in] long StartY, [in] long endX, [in] long endY ); any AddShape([in] long ShapeType, [in] long StartX, [in] long StartY, [in] long endX, [in] long endY ); + any AddTextbox([in] long Orientation, [in] long Left, [in] long Top, [in] long Width, [in] long Height ); }; }; }; }; diff --git a/oovbaapi/ooo/vba/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk index f6549931444b..012cc7b91a59 100644 --- a/oovbaapi/ooo/vba/msforms/makefile.mk +++ b/oovbaapi/ooo/vba/msforms/makefile.mk @@ -71,6 +71,7 @@ IDLFILES=\ XSpinButton.idl \ XImage.idl \ XControls.idl \ + XTextFrame.idl \ # ------------------------------------------------------------------ diff --git a/oovbaapi/prj/build.lst b/oovbaapi/prj/build.lst index bc34a4f376ff..e6d23a3bed91 100644 --- a/oovbaapi/prj/build.lst +++ b/oovbaapi/prj/build.lst @@ -4,5 +4,6 @@ ovba oovbaapi\genconstidl nmake - all ovba_genconstidl NULL ovba oovbaapi\ooo\vba\constants nmake - all ovba_constants ovba_genconstidl NULL ovba oovbaapi\ooo\vba nmake - all ovba_vba NULL ovba oovbaapi\ooo\vba\excel nmake - all ovba_excel NULL +ovba oovbaapi\ooo\vba\word nmake - all ovba_word NULL ovba oovbaapi\ooo\vba\msforms nmake - all ovba_msforms NULL -ovba oovbaapi\util nmake - all ovba_util ovba_vba ovba_excel ovba_msforms ovba_constants ovba_genconstidl NULL +ovba oovbaapi\util nmake - all ovba_util ovba_vba ovba_excel ovba_word ovba_msforms ovba_constants ovba_genconstidl NULL diff --git a/oovbaapi/util/makefile.mk b/oovbaapi/util/makefile.mk index 97e592a7c053..df7a331540c1 100644 --- a/oovbaapi/util/makefile.mk +++ b/oovbaapi/util/makefile.mk @@ -49,6 +49,7 @@ dummy: UNOIDLDBFILES= \ $(UCR)$/vba.db \ $(UCR)$/excel.db \ + $(UCR)$/word.db \ $(UCR)$/msforms.db \ $(UCR)$/constants.db |