summaryrefslogtreecommitdiff
path: root/oovbaapi/ooo/vba
diff options
context:
space:
mode:
Diffstat (limited to 'oovbaapi/ooo/vba')
-rw-r--r--oovbaapi/ooo/vba/XApplicationBase.idl1
-rwxr-xr-xoovbaapi/ooo/vba/XCollectionBase.idl56
-rw-r--r--oovbaapi/ooo/vba/XControlProvider.idl2
-rwxr-xr-xoovbaapi/ooo/vba/XExecutableDialog.idl58
-rw-r--r--oovbaapi/ooo/vba/excel/SheetObjects.idl26
-rw-r--r--oovbaapi/ooo/vba/excel/XApplication.idl4
-rwxr-xr-xoovbaapi/ooo/vba/makefile.mk2
-rw-r--r--oovbaapi/ooo/vba/msforms/XCheckBox.idl3
-rw-r--r--oovbaapi/ooo/vba/msforms/XComboBox.idl18
-rw-r--r--oovbaapi/ooo/vba/msforms/XCommandButton.idl56
-rw-r--r--oovbaapi/ooo/vba/msforms/XControl.idl2
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XFrame.idl (renamed from oovbaapi/ooo/vba/msforms/XButton.idl)20
-rw-r--r--oovbaapi/ooo/vba/msforms/XGroupBox.idl6
-rw-r--r--oovbaapi/ooo/vba/msforms/XLabel.idl7
-rw-r--r--oovbaapi/ooo/vba/msforms/XListBox.idl11
-rwxr-xr-xoovbaapi/ooo/vba/msforms/XNewFont.idl57
-rw-r--r--oovbaapi/ooo/vba/msforms/XRadioButton.idl7
-rw-r--r--oovbaapi/ooo/vba/msforms/XTextBox.idl10
-rw-r--r--oovbaapi/ooo/vba/msforms/XToggleButton.idl7
-rw-r--r--oovbaapi/ooo/vba/msforms/XUserForm.idl2
-rwxr-xr-xoovbaapi/ooo/vba/msforms/makefile.mk5
21 files changed, 322 insertions, 38 deletions
diff --git a/oovbaapi/ooo/vba/XApplicationBase.idl b/oovbaapi/ooo/vba/XApplicationBase.idl
index 44ec45625bc0..d46eb2446e31 100644
--- a/oovbaapi/ooo/vba/XApplicationBase.idl
+++ b/oovbaapi/ooo/vba/XApplicationBase.idl
@@ -45,7 +45,6 @@ interface XApplicationBase
[attribute, readonly] string Version;
[attribute, readonly] any VBE;
- [attribute, readonly] any VBProjects;
void Quit();
diff --git a/oovbaapi/ooo/vba/XCollectionBase.idl b/oovbaapi/ooo/vba/XCollectionBase.idl
new file mode 100755
index 000000000000..245b252f7856
--- /dev/null
+++ b/oovbaapi/ooo/vba/XCollectionBase.idl
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * Copyright 2010, Oracle and/or its affiliates. All rights reserved.
+ *
+ ************************************************************************/
+
+#ifndef OOO_VBA_XOLLECTIONBASE_IDL
+#define OOO_VBA_XOLLECTIONBASE_IDL
+
+#include <com/sun/star/container/XEnumerationAccess.idl>
+#include <com/sun/star/script/XDefaultMethod.idl>
+
+//=============================================================================
+
+module ooo { module vba {
+
+//=============================================================================
+
+/** Base interface for VBA collections.
+
+ Every VBA collection provides the number of items, an enumeration access of
+ all collection items (e.g. for the "For Each" loop), and a way to access
+ single items, usually via the method "Item".
+
+ The various VBA collection objects expect a specific number of arguments in
+ the "Item" method, therefore this method is not part of this base interface
+ but has to be specified seperately in every derived interface.
+ */
+interface XCollectionBase
+{
+ //-------------------------------------------------------------------------
+ /** Provides an enumeration of all items in this collection.
+ */
+ interface ::com::sun::star::container::XEnumerationAccess;
+
+ //-------------------------------------------------------------------------
+ /** Provides the name of the default item access method.
+
+ Usually this method is called "Item". The access method has to be
+ specified and implemented separately by every derived class.
+ */
+ interface ::com::sun::star::script::XDefaultMethod;
+
+ //-------------------------------------------------------------------------
+ /** Returns the number of items contained in this collection.
+ */
+ [attribute, readonly] long Count;
+
+ //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/XControlProvider.idl b/oovbaapi/ooo/vba/XControlProvider.idl
index ecd73d496770..9918b4235dc7 100644
--- a/oovbaapi/ooo/vba/XControlProvider.idl
+++ b/oovbaapi/ooo/vba/XControlProvider.idl
@@ -38,8 +38,6 @@ module ooo { module vba {
interface XControlProvider
{
::ooo::vba::msforms::XControl createControl( [in] ::com::sun::star::drawing::XControlShape xControl, [in] ::com::sun::star::frame::XModel xDocOwner );
- ::ooo::vba::msforms::XControl createUserformControl( [in] ::com::sun::star::awt::XControl xControl, [in] ::com::sun::star::awt::XControl xDialog, [in] ::com::sun::star::frame::XModel xDocOwner );
-
};
}; };
diff --git a/oovbaapi/ooo/vba/XExecutableDialog.idl b/oovbaapi/ooo/vba/XExecutableDialog.idl
new file mode 100755
index 000000000000..8754c8071348
--- /dev/null
+++ b/oovbaapi/ooo/vba/XExecutableDialog.idl
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __ooo_vba_XExecutableDialog_idl__
+#define __ooo_vba_XExecutableDialog_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+//=============================================================================
+
+module ooo { module vba {
+
+/** The VBA equivalent to the UNO interface
+ <type scope="com::sun::star::ui::dialogs">XExecutableDialog</type>.
+ */
+interface XExecutableDialog
+{
+ /** Executes the dialog.
+
+ @return
+ The return value is dependent on the calling context. Usually, on
+ cancelling the dialog the implementation will return <FALSE/>,
+ otherwise the return value will contain the expected result.
+ */
+ any execute();
+};
+
+//=============================================================================
+
+}; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/excel/SheetObjects.idl b/oovbaapi/ooo/vba/excel/SheetObjects.idl
index 5947c52ff4a0..0a2a3fd9ffe9 100644
--- a/oovbaapi/ooo/vba/excel/SheetObjects.idl
+++ b/oovbaapi/ooo/vba/excel/SheetObjects.idl
@@ -74,10 +74,10 @@ interface XGraphicObjects : com::sun::star::uno::XInterface
/** Adds a new graphic object to the sheet this collection belongs to. The
type of the object is determined by the type of the collection.
- @param fLeft Position of the left border in points (1/72 inch).
- @param fTop Position of the top border in points (1/72 inch).
- @param fWidth Width of the object in points (1/72 inch).
- @param fHeight Height of the object in points (1/72 inch).
+ @param Left Position of the left border in points (1/72 inch).
+ @param Top Position of the top border in points (1/72 inch).
+ @param Width Width of the object in points (1/72 inch).
+ @param Height Height of the object in points (1/72 inch).
@return The created graphic object.
*/
@@ -102,10 +102,10 @@ interface XLineObjects : com::sun::star::uno::XInterface
/** Adds a new line object to the sheet this collection belongs to. The
type of the object is determined by the type of the collection.
- @param fX1 Position of the first X coordinate in points (1/72 inch).
- @param fY1 Position of the first Y coordinate in points (1/72 inch).
- @param fX2 Position of the last X coordinate in points (1/72 inch).
- @param fY2 Position of the last Y coordinate in points (1/72 inch).
+ @param X1 Position of the first X coordinate in points (1/72 inch).
+ @param Y1 Position of the first Y coordinate in points (1/72 inch).
+ @param X2 Position of the last X coordinate in points (1/72 inch).
+ @param Y2 Position of the last Y coordinate in points (1/72 inch).
@return The created line object.
*/
@@ -123,11 +123,11 @@ interface XDrawings : com::sun::star::uno::XInterface
{
/** Adds a new polygon object to the sheet this collection belongs to.
- @param fX1 Position of the first X coordinate in points (1/72 inch).
- @param fY1 Position of the first Y coordinate in points (1/72 inch).
- @param fX2 Position of the last X coordinate in points (1/72 inch).
- @param fY2 Position of the last Y coordinate in points (1/72 inch).
- @param bClosed True = outline closed (last and first point connected).
+ @param X1 Position of the first X coordinate in points (1/72 inch).
+ @param Y1 Position of the first Y coordinate in points (1/72 inch).
+ @param X2 Position of the last X coordinate in points (1/72 inch).
+ @param Y2 Position of the last Y coordinate in points (1/72 inch).
+ @param Closed True = outline closed (last and first point connected).
@return The created polygon object.
*/
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index 640f18529895..e9bee9bae44d 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -70,7 +70,7 @@ interface XApplication
[attribute] any CutCopyMode;
[attribute] any StatusBar;
[attribute] long Cursor;
- [attribute] boolean EnableEvents;
+ [attribute] boolean EnableEvents;
[attribute] boolean Visible;
[attribute] boolean Iteration;
[attribute] long EnableCancelKey;
@@ -115,5 +115,3 @@ interface XApplication
}; }; };
#endif
-
-
diff --git a/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk
index bacb05fb6ffa..10281a645196 100755
--- a/oovbaapi/ooo/vba/makefile.mk
+++ b/oovbaapi/ooo/vba/makefile.mk
@@ -39,6 +39,7 @@ PACKAGE=ooo$/vba
IDLFILES=\
XErrObject.idl \
XCollection.idl\
+ XCollectionBase.idl\
XVBAToOOEventDescGen.idl\
XPropValue.idl\
XHelperInterface.idl\
@@ -58,6 +59,7 @@ IDLFILES=\
XGlobalsBase.idl\
XDocumentProperty.idl\
XDocumentProperties.idl\
+ XExecutableDialog.idl\
XFontBase.idl\
XDialogsBase.idl\
XDialogBase.idl\
diff --git a/oovbaapi/ooo/vba/msforms/XCheckBox.idl b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
index 301d23a7b396..ec2c7136383e 100644
--- a/oovbaapi/ooo/vba/msforms/XCheckBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
@@ -28,6 +28,8 @@
#define __ooo_vba_msforms_XCheckBox_idl__
#include <com/sun/star/uno/XInterface.idl>
+#include <ooo/vba/msforms/XNewFont.idl>
+
//=============================================================================
module ooo { module vba { module msforms {
@@ -37,6 +39,7 @@ interface XCheckBox: com::sun::star::uno::XInterface
{
[attribute] string Caption;
[attribute] any Value;
+ [attribute, readonly] XNewFont Font;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 286383a5d89b..77b5e950d938 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -24,24 +24,34 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#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>
//=============================================================================
module ooo { module vba { module msforms {
-
//=============================================================================
-interface XComboBox: ::com::sun::star::uno::XInterface
+
+interface XComboBox
{
[attribute] any Value;
[attribute] any ListIndex;
- [attribute, readonly ] long ListCount;
+ [attribute, readonly] long ListCount;
[attribute] string Text;
+ [attribute] long Style;
+ [attribute] long DropButtonStyle;
+ [attribute] long DragBehavior;
+ [attribute] long EnterFieldBehavior;
+ [attribute] long ListStyle;
+ [attribute] long TextAlign;
+ [attribute, readonly] long TextLength;
+ [attribute, readonly] XNewFont Font;
+
void AddItem( [in] any pvargItem, [in] any pvargIndex );
void removeItem( [in] any index );
void Clear();
diff --git a/oovbaapi/ooo/vba/msforms/XCommandButton.idl b/oovbaapi/ooo/vba/msforms/XCommandButton.idl
new file mode 100644
index 000000000000..0e7697cbd162
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XCommandButton.idl
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __ooo_vba_msforms_XCommandButton_idl__
+#define __ooo_vba_msforms_XCommandButton_idl__
+
+#include <ooo/vba/msforms/XNewFont.idl>
+
+//=============================================================================
+
+module ooo { module vba { module msforms {
+
+//=============================================================================
+
+interface XCommandButton
+{
+ [attribute] string Caption;
+ [attribute] boolean AutoSize;
+ [attribute] boolean Cancel;
+ [attribute] boolean Default;
+ [attribute] long BackColor;
+ [attribute] long ForeColor;
+ [attribute, readonly] XNewFont Font;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 5b59999f2fc1..5ece205ee465 100644
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -55,7 +55,7 @@ interface XControl
[attribute] string Name;
[attribute] string ControlTipText;
[attribute] string Tag;
- [attribute] long ForeColor;
+ [attribute] long TabIndex;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XButton.idl b/oovbaapi/ooo/vba/msforms/XFrame.idl
index c88018a0ad18..6038b61dd3bd 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XFrame.idl
@@ -24,24 +24,32 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __ooo_vba_msforms_XButton_idl__
-#define __ooo_vba_msforms_XButton_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __ooo_vba_msforms_XFrame_idl__
+#define __ooo_vba_msforms_XFrame_idl__
+
+#include <ooo/vba/msforms/XNewFont.idl>
+
//=============================================================================
module ooo { module vba { module msforms {
//=============================================================================
-interface XButton: com::sun::star::uno::XInterface
+
+interface XFrame
{
[attribute] string Caption;
+ [attribute] long SpecialEffect;
+ [attribute] long BorderStyle;
+ [attribute, readonly] XNewFont Font;
+
+ any Controls( [in] any Index );
};
//=============================================================================
}; }; };
-#endif
-
+//=============================================================================
+#endif
diff --git a/oovbaapi/ooo/vba/msforms/XGroupBox.idl b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
index 4680da630818..ad62a6a171d4 100644
--- a/oovbaapi/ooo/vba/msforms/XGroupBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
@@ -24,17 +24,23 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#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>
+
//=============================================================================
module ooo { module vba { module msforms {
+
//=============================================================================
+
interface XGroupBox
{
[attribute] string Caption;
+ [attribute, readonly] XNewFont Font;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index cead2221575c..10a92dc20184 100644
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -24,20 +24,25 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#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>
+
//=============================================================================
module ooo { module vba { module msforms {
//=============================================================================
-interface XLabel: com::sun::star::uno::XInterface
+
+interface XLabel
{
[attribute] string Caption;
[attribute] any Value;
[attribute] string Accelerator;
+ [attribute, readonly] XNewFont Font;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 27b6f86bbfbf..98ce26e68a3e 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -24,23 +24,28 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#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>
+
//=============================================================================
module ooo { module vba { module msforms {
-
//=============================================================================
-interface XListBox: com::sun::star::uno::XInterface
+
+interface XListBox
{
[attribute] any Value;
[attribute] string Text;
[attribute] long MultiSelect;
[attribute] any ListIndex;
- [attribute, readonly ] long ListCount;
+ [attribute, readonly] long ListCount;
+ [attribute, readonly] XNewFont Font;
+
void AddItem( [in] any pvargItem, [in] any pvargIndex );
void removeItem( [in] any index );
void Clear();
diff --git a/oovbaapi/ooo/vba/msforms/XNewFont.idl b/oovbaapi/ooo/vba/msforms/XNewFont.idl
new file mode 100755
index 000000000000..755dd510b63a
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XNewFont.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __ooo_vba_msforms_XNewFont_idl__
+#define __ooo_vba_msforms_XNewFont_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+//=============================================================================
+
+module ooo { module vba { module msforms {
+
+//=============================================================================
+
+interface XNewFont
+{
+ [attribute] string Name;
+ [attribute] double Size;
+ [attribute] short Charset;
+ [attribute] short Weight;
+ [attribute] boolean Bold;
+ [attribute] boolean Italic;
+ [attribute] boolean Underline;
+ [attribute] boolean Strikethrough;
+};
+
+//=============================================================================
+
+}; }; };
+
+//=============================================================================
+
+#endif
diff --git a/oovbaapi/ooo/vba/msforms/XRadioButton.idl b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
index 1c54d6d570c2..162aa1fdf28b 100644
--- a/oovbaapi/ooo/vba/msforms/XRadioButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
@@ -24,19 +24,24 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#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>
+
//=============================================================================
module ooo { module vba { module msforms {
//=============================================================================
-interface XRadioButton: com::sun::star::uno::XInterface
+
+interface XRadioButton
{
[attribute] string Caption;
[attribute] any Value;
+ [attribute, readonly] XNewFont Font;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index e10ad3fb1bae..75aaf836817f 100644
--- a/oovbaapi/ooo/vba/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
@@ -24,21 +24,29 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#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>
+
//=============================================================================
module ooo { module vba { module msforms {
//=============================================================================
-interface XTextBox: com::sun::star::uno::XInterface
+
+interface XTextBox
{
[attribute] string Text;
[attribute] any Value;
[attribute] long MaxLength;
[attribute] boolean Multiline;
+ [attribute] long SpecialEffect;
+ [attribute] long BorderStyle;
+ [attribute, readonly] long TextLength;
+ [attribute, readonly] XNewFont Font;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XToggleButton.idl b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
index e47e106423e8..a441740cb5f1 100644
--- a/oovbaapi/ooo/vba/msforms/XToggleButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
@@ -24,18 +24,23 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#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>
+
//=============================================================================
module ooo { module vba { module msforms {
+
//=============================================================================
+
interface XToggleButton
{
- interface XButton;
+ interface XCommandButton;
[attribute] any Value;
};
diff --git a/oovbaapi/ooo/vba/msforms/XUserForm.idl b/oovbaapi/ooo/vba/msforms/XUserForm.idl
index 4d413777e30a..28bb8ed988ab 100644
--- a/oovbaapi/ooo/vba/msforms/XUserForm.idl
+++ b/oovbaapi/ooo/vba/msforms/XUserForm.idl
@@ -35,6 +35,8 @@ interface XUserForm
//interface ::ooo::vba::XHelperInterface;
interface ::com::sun::star::script::XInvocation;
[attribute] string Caption;
+ [attribute] double InnerWidth;
+ [attribute] double InnerHeight;
void Show();
void Hide();
void RePaint();
diff --git a/oovbaapi/ooo/vba/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
index ebf4d2ee891a..2717d0409da6 100755
--- a/oovbaapi/ooo/vba/msforms/makefile.mk
+++ b/oovbaapi/ooo/vba/msforms/makefile.mk
@@ -38,10 +38,13 @@ PACKAGE=ooo$/vba$/msforms
IDLFILES=\
MSFormReturnTypes.idl \
+ XCheckBox.idl \
XComboBox.idl \
- XButton.idl \
+ XCommandButton.idl \
XControl.idl \
+ XFrame.idl \
XLabel.idl \
+ XNewFont.idl \
XTextBox.idl \
XRadioButton.idl \
XCheckBox.idl \