summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2009-01-29 12:57:41 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2009-01-29 12:57:41 +0000
commit2004ce434723e3312263877e4a307019fde290b2 (patch)
tree269645dd1212877c4fbcda68cf7af0589adbbae4
parent960cca5f9272c4619802f0a59892094d95912564 (diff)
CWS-TOOLING: integrate CWS npower11_OOO310
2009-01-21 11:00:00 +0100 npower r266639 : replace ScAddress::CONV_XL_R1C1 with formula::FormulaGrammar::CONV_XL_R1C1 2009-01-21 10:58:33 +0100 npower r266638 : fixup access for changes to compiler.[ch]xx 2009-01-21 10:57:46 +0100 npower r266637 : replace the static with non-static member ( to align with the latest m39 ) changes 2009-01-20 11:53:52 +0100 npower r266562 : CWS-TOOLING: rebase CWS npower11 to trunk@266428 (milestone: DEV300:m39) 2009-01-09 23:31:00 +0100 cloph r266122 : fix typo (missing "="), initialize variables to avoid WaE breakage 2009-01-09 11:57:20 +0100 npower r266071 : wae Mac OSX gcc-4.0.1 (PPC) 2009-01-08 11:09:49 +0100 npower r265986 : wae - Mac OSX gcc-4.0.1 (PPC) 2009-01-07 10:33:20 +0100 npower r265952 : wae Mac OSX gcc-4.0.1 2008-12-18 19:14:10 +0100 npower r265712 : wae for wntmsci12 target 2008-12-17 16:14:54 +0100 npower r265640 : add Outline property for Font, also remove growing list of friend classes for ScCellRangeObj and replace by a single class. 2008-12-17 16:11:02 +0100 npower r265639 : fix path variable for 3.1, also tweak the unix logs 2008-12-11 02:39:58 +0100 hanbo r265233 : fix the vba/vba namespace of constants 2008-11-25 17:05:39 +0100 npower r264317 : namespace changes 2008-11-25 14:12:37 +0100 npower r264308 : revert changes made by mistake when migrating cws 2008-11-25 13:30:59 +0100 npower r264296 : i#93944# namespace changes 2008-11-25 13:29:25 +0100 npower r264293 : i#93944# namespace changes 2008-11-25 13:27:08 +0100 npower r264289 : i#93944# namespace changes 2008-11-24 18:24:17 +0100 npower r264263 : svn migration 2008-11-24 18:22:47 +0100 npower r264262 : not needed anymore 2008-11-24 18:21:23 +0100 npower r264261 : svn migration 2008-11-24 18:18:31 +0100 npower r264260 : svn migration
-rw-r--r--basic/source/classes/sbunoobj.cxx4
-rw-r--r--basic/source/runtime/step2.cxx2
-rw-r--r--oovbaapi/genconstidl/api-to-idl.pl15
-rw-r--r--oovbaapi/ooo/vba/Globals.idl (renamed from oovbaapi/org/openoffice/vba/Globals.idl)12
-rw-r--r--oovbaapi/ooo/vba/XAssistant.idl65
-rw-r--r--oovbaapi/ooo/vba/XCollection.idl (renamed from oovbaapi/org/openoffice/vba/XCollection.idl)14
-rw-r--r--oovbaapi/ooo/vba/XCommandBar.idl64
-rw-r--r--oovbaapi/ooo/vba/XCommandBarControl.idl64
-rw-r--r--oovbaapi/ooo/vba/XCommandBarControls.idl61
-rw-r--r--oovbaapi/ooo/vba/XCommandBars.idl61
-rw-r--r--oovbaapi/ooo/vba/XErrObject.idl (renamed from oovbaapi/org/openoffice/vba/XErrObject.idl)8
-rw-r--r--oovbaapi/ooo/vba/XGlobals.idl (renamed from oovbaapi/org/openoffice/vba/XGlobals.idl)28
-rw-r--r--oovbaapi/ooo/vba/XHelperInterface.idl (renamed from oovbaapi/org/openoffice/vba/XHelperInterface.idl)8
-rw-r--r--oovbaapi/ooo/vba/XPropValue.idl (renamed from oovbaapi/org/openoffice/vba/XPropValue.idl)8
-rw-r--r--oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl (renamed from oovbaapi/org/openoffice/vba/XVBAToOOEventDescGen.idl)8
-rw-r--r--oovbaapi/ooo/vba/constants/makefile.mk (renamed from oovbaapi/org/openoffice/constants/makefile.mk)2
-rw-r--r--oovbaapi/ooo/vba/excel/Hyperlink.idl54
-rw-r--r--oovbaapi/ooo/vba/excel/Range.idl (renamed from oovbaapi/org/openoffice/excel/Range.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/Window.idl54
-rw-r--r--oovbaapi/ooo/vba/excel/Workbook.idl (renamed from oovbaapi/org/openoffice/excel/Workbook.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/Worksheet.idl (renamed from oovbaapi/org/openoffice/excel/Worksheet.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XApplication.idl (renamed from oovbaapi/org/openoffice/excel/XApplication.idl)26
-rw-r--r--oovbaapi/ooo/vba/excel/XAxes.idl (renamed from oovbaapi/org/openoffice/excel/XAxes.idl)20
-rw-r--r--oovbaapi/ooo/vba/excel/XAxis.idl (renamed from oovbaapi/org/openoffice/excel/XAxis.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XAxisTitle.idl (renamed from oovbaapi/org/openoffice/excel/XAxisTitle.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XBorder.idl (renamed from oovbaapi/org/openoffice/excel/XBorder.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XBorders.idl (renamed from oovbaapi/org/openoffice/excel/XBorders.idl)18
-rw-r--r--oovbaapi/ooo/vba/excel/XCharacters.idl (renamed from oovbaapi/org/openoffice/excel/XCharacters.idl)16
-rw-r--r--oovbaapi/ooo/vba/excel/XChart.idl (renamed from oovbaapi/org/openoffice/excel/XChart.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XChartObject.idl (renamed from oovbaapi/org/openoffice/excel/XChartObject.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XChartObjects.idl (renamed from oovbaapi/org/openoffice/excel/XChartObjects.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XChartTitle.idl (renamed from oovbaapi/org/openoffice/excel/XChartTitle.idl)10
-rw-r--r--oovbaapi/ooo/vba/excel/XCharts.idl (renamed from oovbaapi/org/openoffice/excel/XCharts.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XComment.idl (renamed from oovbaapi/org/openoffice/excel/XComment.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XComments.idl (renamed from oovbaapi/org/openoffice/excel/XComments.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XDataLabel.idl (renamed from oovbaapi/org/openoffice/excel/XDataLabel.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XDataLabels.idl (renamed from oovbaapi/org/openoffice/excel/XDataLabels.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XDialog.idl (renamed from oovbaapi/org/openoffice/excel/XDialog.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XDialogs.idl (renamed from oovbaapi/org/openoffice/excel/XDialogs.idl)18
-rw-r--r--oovbaapi/ooo/vba/excel/XFont.idl (renamed from oovbaapi/org/openoffice/excel/XFont.idl)13
-rw-r--r--oovbaapi/ooo/vba/excel/XFormat.idl (renamed from oovbaapi/org/openoffice/excel/XFormat.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XFormatCondition.idl (renamed from oovbaapi/org/openoffice/excel/XFormatCondition.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XFormatConditions.idl (renamed from oovbaapi/org/openoffice/excel/XFormatConditions.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XHPageBreak.idl55
-rw-r--r--oovbaapi/ooo/vba/excel/XHPageBreaks.idl70
-rw-r--r--oovbaapi/ooo/vba/excel/XHyperlink.idl65
-rw-r--r--oovbaapi/ooo/vba/excel/XInterior.idl (renamed from oovbaapi/org/openoffice/excel/XInterior.idl)15
-rw-r--r--oovbaapi/ooo/vba/excel/XName.idl (renamed from oovbaapi/org/openoffice/excel/XName.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XNames.idl (renamed from oovbaapi/org/openoffice/excel/XNames.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XOLEObject.idl (renamed from oovbaapi/org/openoffice/excel/XOLEObject.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XOLEObjects.idl (renamed from oovbaapi/org/openoffice/excel/XOLEObjects.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XOutline.idl (renamed from oovbaapi/org/openoffice/excel/XOutline.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XPageBreak.idl73
-rw-r--r--oovbaapi/ooo/vba/excel/XPageSetup.idl85
-rw-r--r--oovbaapi/ooo/vba/excel/XPane.idl (renamed from oovbaapi/org/openoffice/excel/XPane.idl)2
-rw-r--r--oovbaapi/ooo/vba/excel/XPivotCache.idl (renamed from oovbaapi/org/openoffice/excel/XPivotCache.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XPivotTable.idl (renamed from oovbaapi/org/openoffice/excel/XPivotTable.idl)18
-rw-r--r--oovbaapi/ooo/vba/excel/XPivotTables.idl (renamed from oovbaapi/org/openoffice/excel/XPivotTables.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XRange.idl (renamed from oovbaapi/org/openoffice/excel/XRange.idl)25
-rw-r--r--oovbaapi/ooo/vba/excel/XSeries.idl (renamed from oovbaapi/org/openoffice/excel/XSeries.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XSeriesCollection.idl (renamed from oovbaapi/org/openoffice/excel/XSeriesCollection.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XStyle.idl (renamed from oovbaapi/org/openoffice/excel/XStyle.idl)14
-rw-r--r--oovbaapi/ooo/vba/excel/XStyles.idl (renamed from oovbaapi/org/openoffice/excel/XStyles.idl)16
-rw-r--r--oovbaapi/ooo/vba/excel/XTextFrame.idl (renamed from oovbaapi/org/openoffice/excel/XTextFrame.idl)16
-rw-r--r--oovbaapi/ooo/vba/excel/XTitle.idl (renamed from oovbaapi/org/openoffice/excel/XTitle.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XValidation.idl (renamed from oovbaapi/org/openoffice/excel/XValidation.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XWindow.idl (renamed from oovbaapi/org/openoffice/excel/XWindow.idl)34
-rw-r--r--oovbaapi/ooo/vba/excel/XWindows.idl (renamed from oovbaapi/org/openoffice/excel/XWindows.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XWorkbook.idl (renamed from oovbaapi/org/openoffice/excel/XWorkbook.idl)14
-rw-r--r--oovbaapi/ooo/vba/excel/XWorkbooks.idl (renamed from oovbaapi/org/openoffice/excel/XWorkbooks.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XWorksheet.idl (renamed from oovbaapi/org/openoffice/excel/XWorksheet.idl)20
-rw-r--r--oovbaapi/ooo/vba/excel/XWorksheetFunction.idl (renamed from oovbaapi/org/openoffice/excel/XWorksheetFunction.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XWorksheets.idl (renamed from oovbaapi/org/openoffice/excel/XWorksheets.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/XlBuildInDialog.idl (renamed from oovbaapi/org/openoffice/excel/XlBuildInDialog.idl)6
-rw-r--r--oovbaapi/ooo/vba/excel/makefile.mk (renamed from oovbaapi/org/openoffice/excel/makefile.mk)9
-rw-r--r--oovbaapi/ooo/vba/makefile.mk (renamed from oovbaapi/org/openoffice/vba/makefile.mk)9
-rw-r--r--oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl (renamed from oovbaapi/org/openoffice/msforms/MSFormReturnTypes.idl)0
-rw-r--r--oovbaapi/ooo/vba/msforms/XButton.idl (renamed from oovbaapi/org/openoffice/msforms/XButton.idl)6
-rw-r--r--oovbaapi/ooo/vba/msforms/XColorFormat.idl (renamed from oovbaapi/org/openoffice/msforms/XColorFormat.idl)12
-rw-r--r--oovbaapi/ooo/vba/msforms/XComboBox.idl (renamed from oovbaapi/org/openoffice/msforms/XComboBox.idl)9
-rw-r--r--oovbaapi/ooo/vba/msforms/XControl.idl (renamed from oovbaapi/org/openoffice/msforms/XControl.idl)17
-rw-r--r--oovbaapi/ooo/vba/msforms/XControls.idl51
-rw-r--r--oovbaapi/ooo/vba/msforms/XFillFormat.idl (renamed from oovbaapi/org/openoffice/msforms/XFillFormat.idl)16
-rw-r--r--oovbaapi/ooo/vba/msforms/XGroupBox.idl56
-rw-r--r--oovbaapi/ooo/vba/msforms/XImage.idl51
-rw-r--r--oovbaapi/ooo/vba/msforms/XLabel.idl (renamed from oovbaapi/org/openoffice/msforms/XLabel.idl)7
-rw-r--r--oovbaapi/ooo/vba/msforms/XLineFormat.idl (renamed from oovbaapi/org/openoffice/msforms/XLineFormat.idl)16
-rw-r--r--oovbaapi/ooo/vba/msforms/XListBox.idl (renamed from oovbaapi/org/openoffice/msforms/XListBox.idl)11
-rw-r--r--oovbaapi/ooo/vba/msforms/XMultiPage.idl58
-rw-r--r--oovbaapi/ooo/vba/msforms/XPages.idl61
-rw-r--r--oovbaapi/ooo/vba/msforms/XPictureFormat.idl (renamed from oovbaapi/org/openoffice/msforms/XPictureFormat.idl)12
-rw-r--r--oovbaapi/ooo/vba/msforms/XProgressBar.idl57
-rw-r--r--oovbaapi/ooo/vba/msforms/XRadioButton.idl (renamed from oovbaapi/org/openoffice/msforms/XRadioButton.idl)8
-rw-r--r--oovbaapi/ooo/vba/msforms/XScrollBar.idl61
-rw-r--r--oovbaapi/ooo/vba/msforms/XShape.idl (renamed from oovbaapi/org/openoffice/msforms/XShape.idl)30
-rw-r--r--oovbaapi/ooo/vba/msforms/XShapeRange.idl (renamed from oovbaapi/org/openoffice/msforms/XShapeRange.idl)20
-rw-r--r--oovbaapi/ooo/vba/msforms/XShapes.idl (renamed from oovbaapi/org/openoffice/msforms/XShapes.idl)16
-rw-r--r--oovbaapi/ooo/vba/msforms/XSpinButton.idl59
-rw-r--r--oovbaapi/ooo/vba/msforms/XTextBox.idl (renamed from oovbaapi/org/openoffice/msforms/XTextBox.idl)8
-rw-r--r--oovbaapi/ooo/vba/msforms/XTextBoxShape.idl61
-rw-r--r--oovbaapi/ooo/vba/msforms/XToggleButton.idl60
-rw-r--r--oovbaapi/ooo/vba/msforms/XUserForm.idl58
-rw-r--r--oovbaapi/ooo/vba/msforms/makefile.mk (renamed from oovbaapi/org/openoffice/msforms/makefile.mk)14
-rw-r--r--oovbaapi/prj/build.lst14
-rw-r--r--scripting/source/dlgprov/dlgevtatt.cxx6
105 files changed, 1975 insertions, 475 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 7f7c63bb34..dcd51ceb28 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -117,7 +117,7 @@ static String ID_DBG_PROPERTIES( RTL_CONSTASCII_USTRINGPARAM("Dbg_Properties") )
static String ID_DBG_METHODS( RTL_CONSTASCII_USTRINGPARAM("Dbg_Methods") );
static ::rtl::OUString aSeqLevelStr( RTL_CONSTASCII_USTRINGPARAM("[]") );
-static ::rtl::OUString defaultNameSpace( RTL_CONSTASCII_USTRINGPARAM("org.openoffice") );
+static ::rtl::OUString defaultNameSpace( RTL_CONSTASCII_USTRINGPARAM("ooo.vba") );
// Gets the default property for an uno object. Note: There is some
// redirection built in. The property name specifies the name
@@ -1600,7 +1600,7 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj,
OSL_TRACE("Checking if object implements %s",
OUStringToOString( defaultNameSpace + aClass,
RTL_TEXTENCODING_UTF8 ).getStr() );
- // although interfaces in the org.openoffice.vba namespace
+ // although interfaces in the ooo.vba.vba namespace
// obey the idl rules and have a leading X, in basic we
// want to be able to do something like
// 'dim wrkbooks as WorkBooks'
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index acec14f133..097712a576 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -71,7 +71,7 @@ SbxArray* getVBAGlobals( )
xCtx.set( xProps->getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
UNO_QUERY_THROW );
- SbUnoObject dGlobs( String( RTL_CONSTASCII_USTRINGPARAM("ExcelGlobals") ), xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/org.openoffice.vba.theGlobals") ) );
+ SbUnoObject dGlobs( String( RTL_CONSTASCII_USTRINGPARAM("ExcelGlobals") ), xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/ooo.vba.theGlobals") ) );
SbxVariable *vba = dGlobs.Find( String( RTL_CONSTASCII_USTRINGPARAM("getGlobals") ) , SbxCLASS_DONTCARE );
diff --git a/oovbaapi/genconstidl/api-to-idl.pl b/oovbaapi/genconstidl/api-to-idl.pl
index bd161ff71a..ac7498ca7b 100644
--- a/oovbaapi/genconstidl/api-to-idl.pl
+++ b/oovbaapi/genconstidl/api-to-idl.pl
@@ -131,12 +131,23 @@ sub generate_idls($) {
my $fname = $path . "/" . $type . ".idl";
open( IDL, ">$fname" ) || die "Cannot write $fname.";
- print IDL "module org { module openoffice { module $module {\n";
+ if( $module eq "vba" ) {
+ print IDL "module ooo { module $module {\n";
+ }
+ else {
+ print IDL "module ooo { module vba { module $module {\n";
+ }
+
print IDL " constants $type {\n";
foreach $constant ( @{$result{$module}{$type}} ) {
print IDL " const long $constant->{'name'} = $constant->{'value'};\n";
}
- print IDL " };\n}; }; };\n";
+ if( $module eq "vba" ) {
+ print IDL " };\n}; };\n";
+ }
+ else {
+ print IDL " };\n}; }; };\n";
+ }
close( IDL );
}
diff --git a/oovbaapi/org/openoffice/vba/Globals.idl b/oovbaapi/ooo/vba/Globals.idl
index 7a45bc4bad..21863c3b10 100644
--- a/oovbaapi/org/openoffice/vba/Globals.idl
+++ b/oovbaapi/ooo/vba/Globals.idl
@@ -28,21 +28,21 @@
*
************************************************************************/
-#ifndef __org_openoffice_vba_Globals_idl__
-#define __org_openoffice_vba_Globals_idl__
+#ifndef __ooo_vba_Globals_idl__
+#define __ooo_vba_Globals_idl__
-#ifndef __org_openoffice_vba_XGlobals_idl__
-#include <org/openoffice/vba/XGlobals.idl>
+#ifndef __ooo_vba_XGlobals_idl__
+#include <ooo/vba/XGlobals.idl>
#endif
#include <com/sun/star/uno/XComponentContext.idl>
#include <com/sun/star/table/XCellRange.idl>
-module org { module openoffice { module vba {
+module ooo { module vba {
service Globals : XGlobals
{
};
-}; }; };
+}; };
#endif
diff --git a/oovbaapi/ooo/vba/XAssistant.idl b/oovbaapi/ooo/vba/XAssistant.idl
new file mode 100644
index 0000000000..8ca89d0c80
--- /dev/null
+++ b/oovbaapi/ooo/vba/XAssistant.idl
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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 {
+//=============================================================================
+
+interface XAssistant
+{
+ interface ::ooo::vba::XHelperInterface;
+
+ [attribute] boolean On;
+ [attribute] boolean Visible;
+ [attribute] long Top;
+ [attribute] long Left;
+ [attribute] long Animation;
+
+ string Name() raises ( com::sun::star::script::BasicErrorException );
+};
+
+}; };
+
+#endif
diff --git a/oovbaapi/org/openoffice/vba/XCollection.idl b/oovbaapi/ooo/vba/XCollection.idl
index 067730c11a..48949471b3 100644
--- a/oovbaapi/org/openoffice/vba/XCollection.idl
+++ b/oovbaapi/ooo/vba/XCollection.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_vba_XCollection_idl__
-#define __org_openoffice_vba_XCollection_idl__
+#ifndef __ooo_vba_XCollection_idl__
+#define __ooo_vba_XCollection_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
@@ -40,17 +40,17 @@
#include <com/sun/star/container/XEnumerationAccess.idl>
#endif
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module vba {
+module ooo { module vba {
//=============================================================================
interface XCollection
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
interface ::com::sun::star::script::XDefaultMethod;
interface ::com::sun::star::container::XEnumerationAccess;
@@ -58,6 +58,6 @@ interface XCollection
any Item( [in] any Index1, [in] any Index2 );
};
-}; }; };
+}; };
#endif
diff --git a/oovbaapi/ooo/vba/XCommandBar.idl b/oovbaapi/ooo/vba/XCommandBar.idl
new file mode 100644
index 0000000000..59fa285ae1
--- /dev/null
+++ b/oovbaapi/ooo/vba/XCommandBar.idl
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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 {
+//=============================================================================
+interface XCommandBarControls;
+
+interface XCommandBar
+{
+ interface XHelperInterface;
+
+ [attribute] string Name;
+ [attribute] boolean Visible;
+
+ void Delete() raises ( com::sun::star::script::BasicErrorException );
+ any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
+};
+
+}; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/XCommandBarControl.idl b/oovbaapi/ooo/vba/XCommandBarControl.idl
new file mode 100644
index 0000000000..02cf8bafc8
--- /dev/null
+++ b/oovbaapi/ooo/vba/XCommandBarControl.idl
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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 {
+//=============================================================================
+
+interface XCommandBarControl
+{
+ interface XHelperInterface;
+
+ [attribute] string Caption;
+ [attribute] string OnAction;
+ [attribute] boolean Visible;
+
+ void Delete() raises ( com::sun::star::script::BasicErrorException );
+ any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
+};
+
+}; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/XCommandBarControls.idl b/oovbaapi/ooo/vba/XCommandBarControls.idl
new file mode 100644
index 0000000000..5495432739
--- /dev/null
+++ b/oovbaapi/ooo/vba/XCommandBarControls.idl
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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
+
+//=============================================================================
+
+module ooo { module vba {
+//=============================================================================
+interface XCommandBarControl;
+
+interface XCommandBarControls
+{
+ interface XCollection;
+
+ XCommandBarControl Add( [in] any Type, [in] any Id, [in] any Parameter, [in] any Before, [in] any Temporary ) raises ( com::sun::star::script::BasicErrorException );
+};
+
+}; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/XCommandBars.idl b/oovbaapi/ooo/vba/XCommandBars.idl
new file mode 100644
index 0000000000..42e78a53ca
--- /dev/null
+++ b/oovbaapi/ooo/vba/XCommandBars.idl
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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
+
+//=============================================================================
+
+module ooo { module vba {
+//=============================================================================
+interface XCommandBar;
+
+interface XCommandBars
+{
+ interface XCollection;
+
+ XCommandBar Add( [in] any Name, [in] any Position, [in] any MenuBar, [in] any Temporary ) raises ( com::sun::star::script::BasicErrorException );
+};
+
+}; };
+
+#endif
diff --git a/oovbaapi/org/openoffice/vba/XErrObject.idl b/oovbaapi/ooo/vba/XErrObject.idl
index 129d38a3e0..dc9e3ab4c8 100644
--- a/oovbaapi/org/openoffice/vba/XErrObject.idl
+++ b/oovbaapi/ooo/vba/XErrObject.idl
@@ -28,14 +28,14 @@
*
************************************************************************/
-#ifndef __org_openoffice_vba__XErrObject_idl__
-#define __org_openoffice_vba__XErrObject_idl__
+#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 org { module openoffice { module vba {
+module ooo { module vba {
//==============================================================================
/**
*/
@@ -54,5 +54,5 @@ interface XErrObject : ::com::sun::star::uno::XInterface
};
-}; }; };
+}; };
#endif
diff --git a/oovbaapi/org/openoffice/vba/XGlobals.idl b/oovbaapi/ooo/vba/XGlobals.idl
index 7726b7db8f..6758d108cb 100644
--- a/oovbaapi/org/openoffice/vba/XGlobals.idl
+++ b/oovbaapi/ooo/vba/XGlobals.idl
@@ -27,40 +27,40 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_vba_XGlobals_idl__
-#define __org_openoffice_vba_XGlobals_idl__
+#ifndef __ooo_vba_XGlobals_idl__
+#define __ooo_vba_XGlobals_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
-#ifndef __org_openoffice_excel_XApplication_idl__
-#include <org/openoffice/excel/XApplication.idl>
+#ifndef __ooo_vba_excel_XApplication_idl__
+#include <ooo/vba/excel/XApplication.idl>
#endif
-#ifndef __org_openoffice_excel_XWorkbook_idl__
-#include <org/openoffice/excel/XWorkbook.idl>
+#ifndef __ooo_vba_excel_XWorkbook_idl__
+#include <ooo/vba/excel/XWorkbook.idl>
#endif
-#ifndef __org_openoffice_excel_XWorksheet_idl__
-#include <org/openoffice/excel/XWorksheet.idl>
+#ifndef __ooo_vba_excel_XWorksheet_idl__
+#include <ooo/vba/excel/XWorksheet.idl>
#endif
-module org { module openoffice { module vba {
+module ooo { module vba {
interface XGlobals: com::sun::star::uno::XInterface
{
// FIXME, need better way to expose globals
sequence< any > getGlobals();
- [attribute, readonly] org::openoffice::excel::XApplication Application;
- [attribute, readonly] org::openoffice::excel::XWorkbook ActiveWorkbook;
- [attribute, readonly] org::openoffice::excel::XWorksheet ActiveSheet;
+ [attribute, readonly] ooo::vba::excel::XApplication Application;
+ [attribute, readonly] ooo::vba::excel::XWorkbook ActiveWorkbook;
+ [attribute, readonly] ooo::vba::excel::XWorksheet ActiveSheet;
any WorkSheets( [in] any aIndex );
any WorkBooks( [in] any aIndex );
any Sheets( [in] any aIndex );
any Range( [in] any Cell1, [in] any Cell2 );
- any Names( );
+ any Names( [in] any Index );
};
-}; }; };
+}; };
#endif
diff --git a/oovbaapi/org/openoffice/vba/XHelperInterface.idl b/oovbaapi/ooo/vba/XHelperInterface.idl
index 6a04abb2c3..a669ae5529 100644
--- a/oovbaapi/org/openoffice/vba/XHelperInterface.idl
+++ b/oovbaapi/ooo/vba/XHelperInterface.idl
@@ -28,8 +28,8 @@
*
************************************************************************/
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#define __org_openoffice_vba_XHelperInterface_idl__
+#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
@@ -45,7 +45,7 @@
#include <com/sun/star/lang/XServiceInfo.idl>
#endif
-module org { module openoffice { module vba {
+module ooo { module vba {
interface XHelperInterface
{
@@ -65,7 +65,7 @@ interface XHelperInterface
};
-}; }; };
+}; };
#endif
diff --git a/oovbaapi/org/openoffice/vba/XPropValue.idl b/oovbaapi/ooo/vba/XPropValue.idl
index 1e7cf1c77a..dd57eb2a26 100644
--- a/oovbaapi/org/openoffice/vba/XPropValue.idl
+++ b/oovbaapi/ooo/vba/XPropValue.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_vba_XPropValue_idl__
-#define __org_openoffice_vba_XPropValue_idl__
+#ifndef __ooo_vba_XPropValue_idl__
+#define __ooo_vba_XPropValue_idl__
#ifndef __com_sun_star_script_XDefaultProperty_idl__
#include <com/sun/star/script/XDefaultProperty.idl>
@@ -37,7 +37,7 @@
//=============================================================================
-module org { module openoffice { module vba {
+module ooo { module vba {
//=============================================================================
@@ -48,7 +48,7 @@ interface XPropValue: com::sun::star::script::XDefaultProperty
//=============================================================================
-}; }; };
+}; };
#endif
diff --git a/oovbaapi/org/openoffice/vba/XVBAToOOEventDescGen.idl b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
index c14ca57e34..4a1bca88a3 100644
--- a/oovbaapi/org/openoffice/vba/XVBAToOOEventDescGen.idl
+++ b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_vba_XVBAToOOEventDescGen_idl__
-#define __org_openoffice_vba_XVBAToOOEventDescGen_idl__
+#ifndef __ooo_vba_XVBAToOOEventDescGen_idl__
+#define __ooo_vba_XVBAToOOEventDescGen_idl__
#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__
#include <com/sun/star/script/ScriptEventDescriptor.idl>
@@ -38,12 +38,12 @@
#include <com/sun/star/script/XScriptEventsSupplier.idl>
#endif
-module org { module openoffice { module vba {
+module ooo { module vba {
interface XVBAToOOEventDescGen : com::sun::star::uno::XInterface
{
sequence< com::sun::star::script::ScriptEventDescriptor > getEventDescriptions( [in] com::sun::star::uno::XInterface xControl, [in] string sLibModName, [in] sequence< string > handlerExts );
com::sun::star::script::XScriptEventsSupplier getEventSupplier( [in] com::sun::star::uno::XInterface xControl );
};
-}; }; };
+}; };
#endif
diff --git a/oovbaapi/org/openoffice/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk
index b086c0385c..9fb0e9144d 100644
--- a/oovbaapi/org/openoffice/constants/makefile.mk
+++ b/oovbaapi/ooo/vba/constants/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..$/..
PRJNAME=oovbapi
TARGET=constants
-PACKAGE=org$/openoffice$/constants
+PACKAGE=org$/vba$/constants
# --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/util$/makefile.pmk
diff --git a/oovbaapi/ooo/vba/excel/Hyperlink.idl b/oovbaapi/ooo/vba/excel/Hyperlink.idl
new file mode 100644
index 0000000000..7f2058a6c3
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/Hyperlink.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+#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>
+
+module ooo { module vba { module excel {
+service Hyperlink : XHyperlink
+{
+ createHyperlink( [in] ::ooo::vba::XHelperInterface Parent, [in] ::com::sun::star::frame::XModel xModel );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/org/openoffice/excel/Range.idl b/oovbaapi/ooo/vba/excel/Range.idl
index f21cceac8b..89891d6ee3 100644
--- a/oovbaapi/org/openoffice/excel/Range.idl
+++ b/oovbaapi/ooo/vba/excel/Range.idl
@@ -28,20 +28,20 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_Range_idl__
-#define __org_openoffice_excel_Range_idl__
+#ifndef __ooo_vba_excel_Range_idl__
+#define __ooo_vba_excel_Range_idl__
-#ifndef __org_openoffice_excel_XRange_idl__
-#include <org/openoffice/excel/XRange.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>
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
service Range : XRange
{
- createRangeFromXCellRange( [in] ::org::openoffice::vba::XHelperInterface Parent, [in] ::com::sun::star::table::XCellRange Range );
+ createRangeFromXCellRange( [in] ::ooo::vba::XHelperInterface Parent, [in] ::com::sun::star::table::XCellRange Range );
};
}; }; };
diff --git a/oovbaapi/ooo/vba/excel/Window.idl b/oovbaapi/ooo/vba/excel/Window.idl
new file mode 100644
index 0000000000..ac907156fa
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/Window.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+#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>
+
+module ooo { module vba { module excel {
+service Window : XWindow
+{
+ createWindow( [in] ::ooo::vba::XHelperInterface Parent, [in] ::com::sun::star::frame::XModel xModel );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/org/openoffice/excel/Workbook.idl b/oovbaapi/ooo/vba/excel/Workbook.idl
index cc3bac238b..6aa4fb353c 100644
--- a/oovbaapi/org/openoffice/excel/Workbook.idl
+++ b/oovbaapi/ooo/vba/excel/Workbook.idl
@@ -28,20 +28,20 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_Workbook_idl__
-#define __org_openoffice_excel_Workbook_idl__
+#ifndef __ooo_vba_excel_Workbook_idl__
+#define __ooo_vba_excel_Workbook_idl__
-#ifndef __org_openoffice_excel_XWorkbook_idl__
-#include <org/openoffice/excel/XWorkbook.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>
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
service Workbook : XWorkbook
{
- createWorkbook( [in] ::org::openoffice::vba::XHelperInterface Parent, [in] ::com::sun::star::frame::XModel xModel );
+ createWorkbook( [in] ::ooo::vba::XHelperInterface Parent, [in] ::com::sun::star::frame::XModel xModel );
};
}; }; };
diff --git a/oovbaapi/org/openoffice/excel/Worksheet.idl b/oovbaapi/ooo/vba/excel/Worksheet.idl
index e9a9f26353..303d302ead 100644
--- a/oovbaapi/org/openoffice/excel/Worksheet.idl
+++ b/oovbaapi/ooo/vba/excel/Worksheet.idl
@@ -28,11 +28,11 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_Worksheet_idl__
-#define __org_openoffice_excel_Worksheet_idl__
+#ifndef __ooo_vba_excel_Worksheet_idl__
+#define __ooo_vba_excel_Worksheet_idl__
-#ifndef __org_openoffice_excel_XWorksheet_idl__
-#include <org/openoffice/excel/XWorksheet.idl>
+#ifndef __ooo_vba_excel_XWorksheet_idl__
+#include <ooo/vba/excel/XWorksheet.idl>
#endif
#ifndef __com_sun_star_sheet_XComponentContext_idl__
@@ -42,10 +42,10 @@
#include <com/sun/star/frame/XModel.idl>
#endif
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
service Worksheet : XWorksheet
{
- createWorksheet( [in] ::org::openoffice::vba::XHelperInterface Parent, [in] ::com::sun::star::frame::XModel xModel, [in] string SheetName );
+ createWorksheet( [in] ::ooo::vba::XHelperInterface Parent, [in] ::com::sun::star::frame::XModel xModel, [in] string SheetName );
};
}; }; };
diff --git a/oovbaapi/org/openoffice/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index 62309de4f2..be0cf98087 100644
--- a/oovbaapi/org/openoffice/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -27,18 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XApplication_idl__
-#define __org_openoffice_excel_XApplication_idl__
+#ifndef __ooo_vba_excel_XApplication_idl__
+#define __ooo_vba_excel_XApplication_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-module org { module openoffice { module excel {
+#ifndef __ooo_vba_XAssistant_idl__
+#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;
interface XWorkbook;
@@ -51,13 +59,14 @@ interface XWorksheet;
interface XApplication
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute, readonly] any Selection;
[attribute, readonly] XWorkbook ActiveWorkbook;
[attribute, readonly] XRange ActiveCell;
[attribute, readonly] XWindow ActiveWindow;
[attribute, readonly] XWorksheet ActiveSheet;
+ [attribute, readonly] ooo::vba::XAssistant Assistant;
[attribute] long Calculation;
//#TODO #FIXME this is more of a placeholder, will return
// the value of activeworkbook, in xl 'ThisWorkbook' should return the
@@ -81,6 +90,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 Workbooks( [in] any aIndex );
any Worksheets( [in] any aIndex );
any Windows( [in] any aIndex );
@@ -88,7 +98,7 @@ interface XApplication
any Evaluate( [in] string Name );
any Dialogs( [in] any DialogIndex );
any Range( [in] any Cell1, [in] any Cell2 );
- any Names();
+ any Names( [in] any Index );
void GoTo( [in] any Reference, [in] any Scroll );
// #FIXME #TODO up to 30 args needed
double CountA( [in] any arg1 );
@@ -96,6 +106,8 @@ interface XApplication
void Calculate() raises(com::sun::star::script::BasicErrorException);
XRange Intersect([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);
+ 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();
};
diff --git a/oovbaapi/org/openoffice/excel/XAxes.idl b/oovbaapi/ooo/vba/excel/XAxes.idl
index 1318315be7..220f5f050f 100644
--- a/oovbaapi/org/openoffice/excel/XAxes.idl
+++ b/oovbaapi/ooo/vba/excel/XAxes.idl
@@ -28,29 +28,29 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XAxes_idl__
-#define __org_openoffice_excel_XAxes_idl__
+#ifndef __ooo_vba_excel_XAxes_idl__
+#define __ooo_vba_excel_XAxes_idl__
-#ifndef __org_openoffice_excel_XAxis_idl__
-#include <org/openoffice/excel/XAxis.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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XAxes
{
- interface ::org::openoffice::vba::XCollection;
+ interface ::ooo::vba::XCollection;
};
}; }; };
diff --git a/oovbaapi/org/openoffice/excel/XAxis.idl b/oovbaapi/ooo/vba/excel/XAxis.idl
index b707eae5c2..1b79ff4ba3 100644
--- a/oovbaapi/org/openoffice/excel/XAxis.idl
+++ b/oovbaapi/ooo/vba/excel/XAxis.idl
@@ -28,22 +28,22 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XAxis_idl__
-#define __org_openoffice_excel_XAxis_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XAxisTitle;
interface XAxis
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
void Delete()
raises(com::sun::star::script::BasicErrorException);
diff --git a/oovbaapi/org/openoffice/excel/XAxisTitle.idl b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
index e0ffcb28e6..48fd559b47 100644
--- a/oovbaapi/org/openoffice/excel/XAxisTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
@@ -28,22 +28,22 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XAxisTitle_idl__
-#define __org_openoffice_excel_XAxisTitle_idl__
+#ifndef __ooo_vba_excel_XAxisTitle_idl__
+#define __ooo_vba_excel_XAxisTitle_idl__
-#ifndef __org_openoffice_excel_XTitle_idl__
-#include <org/openoffice/excel/XTitle.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 org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XAxisTitle
{
- interface ::org::openoffice::excel::XTitle;
+ interface ::ooo::vba::excel::XTitle;
};
}; }; };
diff --git a/oovbaapi/org/openoffice/excel/XBorder.idl b/oovbaapi/ooo/vba/excel/XBorder.idl
index db2769541f..86e7e98978 100644
--- a/oovbaapi/org/openoffice/excel/XBorder.idl
+++ b/oovbaapi/ooo/vba/excel/XBorder.idl
@@ -27,25 +27,25 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XBorder_idl__
-#define __org_openoffice_excel_XBorder_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XBorder
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute] any Color;
[attribute] any ColorIndex;
diff --git a/oovbaapi/org/openoffice/excel/XBorders.idl b/oovbaapi/ooo/vba/excel/XBorders.idl
index 7112e387c7..f90e11bd05 100644
--- a/oovbaapi/org/openoffice/excel/XBorders.idl
+++ b/oovbaapi/ooo/vba/excel/XBorders.idl
@@ -27,30 +27,30 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XBorders_idl__
-#define __org_openoffice_excel_XBorders_idl__
+#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 __org_openoffice_excel_XBorder_idl__
-#include <org/openoffice/excel/XBorder.idl>
+#ifndef __ooo_vba_excel_XBorder_idl__
+#include <ooo/vba/excel/XBorder.idl>
#endif
-#ifndef __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XBorders
{
- interface org::openoffice::excel::XBorder;
- interface org::openoffice::vba::XCollection;
+ interface ooo::vba::excel::XBorder;
+ interface ooo::vba::XCollection;
};
//=============================================================================
diff --git a/oovbaapi/org/openoffice/excel/XCharacters.idl b/oovbaapi/ooo/vba/excel/XCharacters.idl
index 406df9b294..29ce05a01b 100644
--- a/oovbaapi/org/openoffice/excel/XCharacters.idl
+++ b/oovbaapi/ooo/vba/excel/XCharacters.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XCharacters_idl__
-#define __org_openoffice_excel_XCharacters_idl__
+#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 __org_openoffice_excel_XFont_idl__
-#include <org/openoffice/excel/XFont.idl>
+#ifndef __ooo_vba_excel_XFont_idl__
+#include <ooo/vba/excel/XFont.idl>
#endif
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XCharacters
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute] string Caption;
[attribute, readonly ] long Count;
diff --git a/oovbaapi/org/openoffice/excel/XChart.idl b/oovbaapi/ooo/vba/excel/XChart.idl
index 8805d976ed..055e939239 100644
--- a/oovbaapi/org/openoffice/excel/XChart.idl
+++ b/oovbaapi/ooo/vba/excel/XChart.idl
@@ -27,14 +27,14 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XChart_idl__
-#define __org_openoffice_excel_XChart_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
#ifndef __com_sun_star_script_BasicErrorException_idl__
@@ -42,14 +42,14 @@
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XRange;
interface XChartTitle;
interface XChart
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute, readonly] string Name;
any SeriesCollection( [in] any Item );
diff --git a/oovbaapi/org/openoffice/excel/XChartObject.idl b/oovbaapi/ooo/vba/excel/XChartObject.idl
index d789c977ec..335d41198c 100644
--- a/oovbaapi/org/openoffice/excel/XChartObject.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObject.idl
@@ -27,27 +27,27 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XChartObject_idl__
-#define __org_openoffice_excel_XChartObject_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.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 org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XChart;
interface XChartObject
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute, readonly] XChart Chart;
[attribute] string Name;
diff --git a/oovbaapi/org/openoffice/excel/XChartObjects.idl b/oovbaapi/ooo/vba/excel/XChartObjects.idl
index ea4e246fee..e5cb4e3252 100644
--- a/oovbaapi/org/openoffice/excel/XChartObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObjects.idl
@@ -27,15 +27,15 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XChartObjects_idl__
-#define __org_openoffice_excel_XChartObjects_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
#ifndef __com_sun_star_script_BasicErrorException_idl__
@@ -44,12 +44,12 @@
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XChartObjects
{
- interface org::openoffice::vba::XCollection;
+ interface ooo::vba::XCollection;
any Add( [in] double Left, [in] double Top, [in] double Width, [in] double Height ) raises(com::sun::star::script::BasicErrorException);
void Delete() raises (com::sun::star::script::BasicErrorException);
};
diff --git a/oovbaapi/org/openoffice/excel/XChartTitle.idl b/oovbaapi/ooo/vba/excel/XChartTitle.idl
index e953246e95..69b03b3125 100644
--- a/oovbaapi/org/openoffice/excel/XChartTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XChartTitle.idl
@@ -28,18 +28,18 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XChartTitle_idl__
-#define __org_openoffice_excel_XChartTitle_idl__
+#ifndef __ooo_vba_excel_XChartTitle_idl__
+#define __ooo_vba_excel_XChartTitle_idl__
-#ifndef ___org_openoffice_excel_XTitle_idl__
-#include <org/openoffice/excel/XTitle.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 org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XTitle;
interface XChartTitle
diff --git a/oovbaapi/org/openoffice/excel/XCharts.idl b/oovbaapi/ooo/vba/excel/XCharts.idl
index 7939b15148..129adad6b4 100644
--- a/oovbaapi/org/openoffice/excel/XCharts.idl
+++ b/oovbaapi/ooo/vba/excel/XCharts.idl
@@ -27,15 +27,15 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XChart_idl__
-#define __org_openoffice_excel_XChart_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
#ifndef __com_sun_star_script_BasicErrorException_idl__
@@ -44,12 +44,12 @@
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XChart;
//=============================================================================
interface XCharts
{
- interface org::openoffice::vba::XCollection;
+ interface ooo::vba::XCollection;
any Add() raises(com::sun::star::script::BasicErrorException);
XChart getActiveChart() raises (com::sun::star::script::BasicErrorException);
};
diff --git a/oovbaapi/org/openoffice/excel/XComment.idl b/oovbaapi/ooo/vba/excel/XComment.idl
index 3bb818d9e0..0a9e926a09 100644
--- a/oovbaapi/org/openoffice/excel/XComment.idl
+++ b/oovbaapi/ooo/vba/excel/XComment.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XComment_idl__
-#define __org_openoffice_excel_XComment_idl__
+#ifndef __ooo_vba_excel_XComment_idl__
+#define __ooo_vba_excel_XComment_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
@@ -36,19 +36,19 @@
#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
#endif
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XApplication;
interface XRange;
interface XComment
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute] string Author;
// [attribute, readonly] Shape Shape;
diff --git a/oovbaapi/org/openoffice/excel/XComments.idl b/oovbaapi/ooo/vba/excel/XComments.idl
index 2e8fdba2ce..641b63d97e 100644
--- a/oovbaapi/org/openoffice/excel/XComments.idl
+++ b/oovbaapi/ooo/vba/excel/XComments.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XComments_idl__
-#define __org_openoffice_excel_XComments_idl__
+#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>
@@ -36,17 +36,17 @@
#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
#endif
-#ifndef __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XComments
{
- interface org::openoffice::vba::XCollection;
+ interface ooo::vba::XCollection;
};
//=============================================================================
diff --git a/oovbaapi/org/openoffice/excel/XDataLabel.idl b/oovbaapi/ooo/vba/excel/XDataLabel.idl
index 13ebc1def3..5d1a0cd020 100644
--- a/oovbaapi/org/openoffice/excel/XDataLabel.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabel.idl
@@ -27,14 +27,14 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XDataLabel_idl__
-#define __org_openoffice_excel_XDataLabel_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
#ifndef __com_sun_star_script_BasicErrorException_idl__
@@ -42,12 +42,12 @@
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XDataLabel
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
string Text() raises(com::sun::star::script::BasicErrorException);
string Name() raises (com::sun::star::script::BasicErrorException);
diff --git a/oovbaapi/org/openoffice/excel/XDataLabels.idl b/oovbaapi/ooo/vba/excel/XDataLabels.idl
index 945280452b..91dfcefea0 100644
--- a/oovbaapi/org/openoffice/excel/XDataLabels.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabels.idl
@@ -27,14 +27,14 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XDataLabels_idl__
-#define __org_openoffice_excel_XDataLabels_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
#ifndef __com_sun_star_script_BasicErrorException_idl__
@@ -42,12 +42,12 @@
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XDataLabels
{
- interface ::org::openoffice::vba::XCollection;
+ interface ::ooo::vba::XCollection;
};
//=============================================================================
diff --git a/oovbaapi/org/openoffice/excel/XDialog.idl b/oovbaapi/ooo/vba/excel/XDialog.idl
index ed711dc7b2..1aec6eaab5 100644
--- a/oovbaapi/org/openoffice/excel/XDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XDialog.idl
@@ -27,21 +27,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XDialog_idl__
-#define __org_openoffice_excel_XDialog_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
@@ -49,7 +49,7 @@ interface XApplication;
interface XDialog
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
void Show();
};
diff --git a/oovbaapi/org/openoffice/excel/XDialogs.idl b/oovbaapi/ooo/vba/excel/XDialogs.idl
index 41cba63838..f6ce44ed35 100644
--- a/oovbaapi/org/openoffice/excel/XDialogs.idl
+++ b/oovbaapi/ooo/vba/excel/XDialogs.idl
@@ -27,30 +27,30 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XDialogs_idl__
-#define __org_openoffice_excel_XDialogs_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XApplication;
//=============================================================================
-//interface XDialogs : ::org::openoffice::vba::XCollection
+//interface XDialogs : ::ooo::vba::XCollection
interface XDialogs
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute, readonly] long Count;
diff --git a/oovbaapi/org/openoffice/excel/XFont.idl b/oovbaapi/ooo/vba/excel/XFont.idl
index f3bb918bfa..3a96e58033 100644
--- a/oovbaapi/org/openoffice/excel/XFont.idl
+++ b/oovbaapi/ooo/vba/excel/XFont.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XFont_idl__
-#define __org_openoffice_excel_XFont_idl__
+#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>
@@ -37,17 +37,17 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
#endif
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XFont
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute] any Size;
[attribute] any StandardFontSize;
@@ -63,6 +63,7 @@ interface XFont
[attribute] any Subscript;
[attribute] any Superscript;
[attribute] any Name;
+ [attribute] any OutlineFont;
};
//=============================================================================
diff --git a/oovbaapi/org/openoffice/excel/XFormat.idl b/oovbaapi/ooo/vba/excel/XFormat.idl
index 3192665ca1..4dd52ca158 100644
--- a/oovbaapi/org/openoffice/excel/XFormat.idl
+++ b/oovbaapi/ooo/vba/excel/XFormat.idl
@@ -28,17 +28,17 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XFormat_idl__
-#define __org_openoffice_excel_XFormat_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XBorders;
interface XFont;
@@ -46,7 +46,7 @@ interface XInterior;
interface XFormat
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
// void Clear( ) raises ( com::sun::star::script::BasicErrorException );
any Borders( [in] any item )
diff --git a/oovbaapi/org/openoffice/excel/XFormatCondition.idl b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
index a1dbab2163..ff68906f32 100644
--- a/oovbaapi/org/openoffice/excel/XFormatCondition.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
@@ -28,18 +28,18 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XFormatCondition_idl__
-#define __org_openoffice_excel_XFormatCondition_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XFont;
interface XInterior;
@@ -47,7 +47,7 @@ interface XBorders;
interface XFormatCondition
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
void Delete( ) raises ( com::sun::star::script::BasicErrorException );
diff --git a/oovbaapi/org/openoffice/excel/XFormatConditions.idl b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
index 52ca0c64e9..8bf32f2e1f 100644
--- a/oovbaapi/org/openoffice/excel/XFormatConditions.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
@@ -27,25 +27,25 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XFormatConditions_idl__
-#define __org_openoffice_excel_XFormatConditions_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
-module org { module openoffice { module excel
+module ooo { module vba { module excel
{
interface XFormatCondition;
interface XFormatConditions
{
- interface org::openoffice::vba::XCollection;
+ interface ooo::vba::XCollection;
void Delete( ) raises ( com::sun::star::script::BasicErrorException );
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreak.idl b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
new file mode 100644
index 0000000000..62c8cda9af
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XHPageBreak.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
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * 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_XHPageBreak_idl__
+#define __ooo_vba_excel_XHPageBreak_idl__
+
+#ifndef __ooo_vba_excel_XPageBreak_idl__
+#include <ooo/vba/excel/XPageBreak.idl>
+#endif
+
+
+//=============================================================================
+
+module ooo { module vba { module excel {
+
+//=============================================================================
+
+interface XHPageBreak
+{
+ interface ::ooo::vba::excel::XPageBreak;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
new file mode 100644
index 0000000000..01f023ba41
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
@@ -0,0 +1,70 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * 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_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
+
+//=============================================================================
+
+module ooo { module vba { module excel {
+
+//=============================================================================
+
+interface XHPageBreak;
+
+interface XHPageBreaks
+{
+
+ interface ooo::vba::XCollection;
+ //Methods
+ any Add([in] any Before) raises(com::sun::star::script::BasicErrorException);
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/excel/XHyperlink.idl b/oovbaapi/ooo/vba/excel/XHyperlink.idl
new file mode 100644
index 0000000000..b72bb0ab71
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XHyperlink.idl
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#ifndef __ooo_vba_excel_XHyperlink_idl__
+#define __ooo_vba_excel_XHyperlink_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 {
+
+//=============================================================================
+interface XRange;
+interface XHyperlink
+{
+ interface ::ooo::vba::XHelperInterface;
+
+ [attribute] string Address;
+ [attribute] string Name;
+ [attribute] string TextToDisplay;
+
+ XRange Range();
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/org/openoffice/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl
index ba41efd09d..9386a13c41 100644
--- a/oovbaapi/org/openoffice/excel/XInterior.idl
+++ b/oovbaapi/ooo/vba/excel/XInterior.idl
@@ -27,30 +27,33 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XInterior_idl__
-#define __org_openoffice_excel_XInterior_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XInterior
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute] any Color;
[attribute] any ColorIndex;
+ [attribute] any Pattern;
+ [attribute] any PatternColor;
+ [attribute] any PatternColorIndex;
};
//=============================================================================
diff --git a/oovbaapi/org/openoffice/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index 1e2a2bcf9a..ea281aa029 100644
--- a/oovbaapi/org/openoffice/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -27,20 +27,20 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XName_idl__
-#define __org_openoffice_excel_XName_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
@@ -48,7 +48,7 @@ interface XRange;
interface XName
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute] string Name;
[attribute] string NameLocal;
diff --git a/oovbaapi/org/openoffice/excel/XNames.idl b/oovbaapi/ooo/vba/excel/XNames.idl
index 5cc470a976..353fd817eb 100644
--- a/oovbaapi/org/openoffice/excel/XNames.idl
+++ b/oovbaapi/ooo/vba/excel/XNames.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XNames_idl__
-#define __org_openoffice_excel_XNames_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XNames
{
- interface ::org::openoffice::vba::XCollection;
+ interface ::ooo::vba::XCollection;
any Add( [in] any Name , [in] any RefersTo , [in] any Visible , [in] any MacroType , [in] any ShortcutKey , [in] any Category , [in] any NameLocal , [in] any RefersToLocal , [in] any CategoryLocal , [in] any RefersToR1C1 , [in] any RefersToR1C1Local );
};
diff --git a/oovbaapi/org/openoffice/excel/XOLEObject.idl b/oovbaapi/ooo/vba/excel/XOLEObject.idl
index 168472a44a..c12248eb9f 100644
--- a/oovbaapi/org/openoffice/excel/XOLEObject.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObject.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XOLEObject_idl__
-#define __org_openoffice_excel_XOLEObject_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XOLEObject
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute, readonly] com::sun::star::uno::XInterface Object;
[attribute] boolean Enabled;
diff --git a/oovbaapi/org/openoffice/excel/XOLEObjects.idl b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
index 6e08cd0442..7266ba31cc 100644
--- a/oovbaapi/org/openoffice/excel/XOLEObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
@@ -27,21 +27,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XOLEObjects_idl__
-#define __org_openoffice_excel_XOLEObjects_idl__
+#ifndef __ooo_vba_excel_XOLEObjects_idl__
+#define __ooo_vba_excel_XOLEObjects_idl__
-#ifndef __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XOLEObjects
{
- interface ::org::openoffice::vba::XCollection;
+ interface ::ooo::vba::XCollection;
//[attribute, readonly] boolean Focused;
};
diff --git a/oovbaapi/org/openoffice/excel/XOutline.idl b/oovbaapi/ooo/vba/excel/XOutline.idl
index 5cafb1ce24..ed412e8933 100644
--- a/oovbaapi/org/openoffice/excel/XOutline.idl
+++ b/oovbaapi/ooo/vba/excel/XOutline.idl
@@ -27,20 +27,20 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XOutline_idl__
-#define __org_openoffice_excel_XOutline_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
@@ -48,7 +48,7 @@ module org { module openoffice { module excel {
interface XOutline
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
//Methods
void ShowLevels([in] any RowLevels,[in] any ColumnLevels);
diff --git a/oovbaapi/ooo/vba/excel/XPageBreak.idl b/oovbaapi/ooo/vba/excel/XPageBreak.idl
new file mode 100644
index 0000000000..f8e12a734a
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XPageBreak.idl
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * 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_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
+
+//=============================================================================
+
+module ooo { module vba { module excel {
+
+//=============================================================================
+
+interface XRange;
+
+interface XPageBreak
+{
+
+ interface ::ooo::vba::XHelperInterface;
+
+ // Attributes
+ [attribute] long Type;
+
+ //Methods
+ void Delete() raises(com::sun::star::script::BasicErrorException);
+ XRange Location()raises(com::sun::star::script::BasicErrorException);
+
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
new file mode 100644
index 0000000000..03ed927338
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * 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_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
+
+//=============================================================================
+
+module ooo { module vba { module excel {
+
+//=============================================================================
+
+
+interface XPageSetup
+{
+
+ 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;
+ [attribute] string LeftHeader;
+ [attribute] string CenterHeader;
+ [attribute] string RightHeader;
+ [attribute] string LeftFooter;
+ [attribute] string CenterFooter;
+ [attribute] string RightFooter;
+ [attribute] long Order;
+ [attribute] long FirstPageNumber;
+ [attribute] boolean CenterVertically;
+ [attribute] boolean CenterHorizontally;
+ [attribute] boolean PrintHeadings;
+
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/org/openoffice/excel/XPane.idl b/oovbaapi/ooo/vba/excel/XPane.idl
index bfae193ce8..74635c6867 100644
--- a/oovbaapi/org/openoffice/excel/XPane.idl
+++ b/oovbaapi/ooo/vba/excel/XPane.idl
@@ -36,7 +36,7 @@
//============================================================================
-module org{ module openoffice { module excel {
+module ooo { module vba { module excel {
//============================================================================
diff --git a/oovbaapi/org/openoffice/excel/XPivotCache.idl b/oovbaapi/ooo/vba/excel/XPivotCache.idl
index 190235f1b2..9d5d8d29d4 100644
--- a/oovbaapi/org/openoffice/excel/XPivotCache.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotCache.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XPivotCache_idl__
-#define __org_openoffice_excel_XPivotCache_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XPivotCache
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
void Refresh();
};
diff --git a/oovbaapi/org/openoffice/excel/XPivotTable.idl b/oovbaapi/ooo/vba/excel/XPivotTable.idl
index 6871af11b3..e77cc3beb7 100644
--- a/oovbaapi/org/openoffice/excel/XPivotTable.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTable.idl
@@ -27,31 +27,31 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XPivotTable_idl__
-#define __org_openoffice_excel_XPivotTable_idl__
+#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 __org_openoffice_excel_XPivotCache_idl__
-#include <org/openoffice/excel/XPivotCache.idl>
+#ifndef __ooo_vba_excel_XPivotCache_idl__
+#include <ooo/vba/excel/XPivotCache.idl>
#endif
-#ifndef __org_openoffice_vba__XHelperInterface_idl__
-#define __org_openoffice_vba__XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba__XHelperInterface_idl__
+#define __ooo_vba__XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
//interface XPivotTable: com::sun::star::uno::XInterface
interface XPivotTable
{
- interface org::openoffice::vba::XHelperInterface;
+ interface ooo::vba::XHelperInterface;
XPivotCache PivotCache();
};
diff --git a/oovbaapi/org/openoffice/excel/XPivotTables.idl b/oovbaapi/ooo/vba/excel/XPivotTables.idl
index bdaed1418d..28849ef756 100644
--- a/oovbaapi/org/openoffice/excel/XPivotTables.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTables.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XPivotTables_idl__
-#define __org_openoffice_excel_XPivotTables_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XPivotTables
{
- interface org::openoffice::vba::XCollection;
+ interface ooo::vba::XCollection;
// PivotCache should be a PivotCache object ( but thats not defined
// yet )
//XPivotTable Add( [in] any PivotCache, [in] any TableDestination, [in] any TableName, [in] any ReadData );
diff --git a/oovbaapi/org/openoffice/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index a7836d93d4..5e59bf498b 100644
--- a/oovbaapi/org/openoffice/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XRange_idl__
-#define __org_openoffice_excel_XRange_idl__
+#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>
@@ -45,21 +45,21 @@
#ifndef __com_sun_star_script_XDefaultMethod_idl__
#include <com/sun/star/script/XDefaultMethod.idl>
#endif
-#ifndef __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
-#ifndef __org_openoffice_excel_XFormat_idl__
-#include <org/openoffice/excel/XFormat.idl>
+#ifndef __ooo_vba_excel_XFormat_idl__
+#include <ooo/vba/excel/XFormat.idl>
#endif
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#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 org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XFont;
interface XRows;
@@ -77,8 +77,8 @@ interface XRange
interface com::sun::star::container::XEnumerationAccess;
interface com::sun::star::script::XDefaultMethod;
interface com::sun::star::script::XDefaultProperty;
- interface ::org::openoffice::excel::XFormat;
- //interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::excel::XFormat;
+ //interface ::ooo::vba::XHelperInterface;
[attribute] any Value;
[attribute] any Formula;
@@ -103,6 +103,7 @@ interface XRange
[attribute, readonly] XValidation Validation;
[attribute] any Style;
[attribute] any AddIndent;
+ [attribute] any ShowDetail;
XComment AddComment( [in] any Text );
void Clear();
@@ -134,6 +135,7 @@ interface XRange
any getCellRange();
void PasteSpecial([in] any Paste, [in] any Operation,[in] any SkipBlanks, [in] any Transpose);
boolean Replace( [in] string What, [in] string Replacement, [in] any LookAt, [in] any SearchOrder, [in] any MatchCase, [in] any MatchByte, [in] any SearchFormat, [in] any ReplaceFormat );
+ XRange Find( [in] any What, [in] any After, [in] any LookIn, [in] any LookAt, [in] any SearchOrder, [in] any SearchDirection, [in] any MatchCase, [in] any MatchByte, [in] any SearchFormat );
void Sort( [in] any Key1, [in] any Order1, [in] any Key2, [in] any Type,
[in] any Order2, [in] any Key3, [in] any Order3,
@@ -164,6 +166,7 @@ interface XRange
XRange SpecialCells( [in] any Type, [in] /*Optional*/ any Value ) raises ( com::sun::star::script::BasicErrorException );
void RemoveSubtotal() raises ( com::sun::star::script::BasicErrorException );
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 );
};
diff --git a/oovbaapi/org/openoffice/excel/XSeries.idl b/oovbaapi/ooo/vba/excel/XSeries.idl
index d14a3d2c84..fc95826428 100644
--- a/oovbaapi/org/openoffice/excel/XSeries.idl
+++ b/oovbaapi/ooo/vba/excel/XSeries.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XSeries_idl__
-#define __org_openoffice_excel_XSeries_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XSeries
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute, readonly] string Name;
any Series( [in] any Item );
diff --git a/oovbaapi/org/openoffice/excel/XSeriesCollection.idl b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
index 999829c3d8..429c7f3bec 100644
--- a/oovbaapi/org/openoffice/excel/XSeriesCollection.idl
+++ b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
@@ -27,24 +27,24 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XSeriesCollection_idl__
-#define __org_openoffice_excel_XSeriesCollection_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XSeries;
//=============================================================================
interface XSeriesCollection
{
- interface ::org::openoffice::vba::XCollection;
+ interface ::ooo::vba::XCollection;
//XSeries Add( [in] any Source, [in] any RowCol, [in] any SeriesLabels,
// [in] any CategoryLabels, [in] any Replace );
XSeries NewSeries();
diff --git a/oovbaapi/org/openoffice/excel/XStyle.idl b/oovbaapi/ooo/vba/excel/XStyle.idl
index 65654aaf10..542e73c3fe 100644
--- a/oovbaapi/org/openoffice/excel/XStyle.idl
+++ b/oovbaapi/ooo/vba/excel/XStyle.idl
@@ -28,21 +28,21 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XStyle_idl__
-#define __org_openoffice_excel_XStyle_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_excel_XFormat_idl__
-#include <org/openoffice/excel/XFormat.idl>
+#ifndef __ooo_vba_excel_XFormat_idl__
+#include <ooo/vba/excel/XFormat.idl>
#endif
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XStyle
{
interface XFormat;
diff --git a/oovbaapi/org/openoffice/excel/XStyles.idl b/oovbaapi/ooo/vba/excel/XStyles.idl
index 4fbf9f1f89..69fd3bbf0a 100644
--- a/oovbaapi/org/openoffice/excel/XStyles.idl
+++ b/oovbaapi/ooo/vba/excel/XStyles.idl
@@ -28,26 +28,26 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XStyles_idl__
-#define __org_openoffice_excel_XStyles_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XStyle;
interface XStyles
{
- interface ::org::openoffice::vba::XCollection;
+ interface ::ooo::vba::XCollection;
/**
@param Workbook
Optional.
diff --git a/oovbaapi/org/openoffice/excel/XTextFrame.idl b/oovbaapi/ooo/vba/excel/XTextFrame.idl
index d99dcb006e..534b2561ea 100644
--- a/oovbaapi/org/openoffice/excel/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/XTextFrame.idl
@@ -27,19 +27,19 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XTextFrame_idl__
-#define __org_openoffice_excel_XTextFrame_idl__
+#ifndef __ooo_vba_excel_XTextFrame_idl__
+#define __ooo_vba_excel_XTextFrame_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_excel_XCharacters_idl__
-#include <org/openoffice/excel/XCharacters.idl>
+#ifndef __ooo_vba_excel_XCharacters_idl__
+#include <ooo/vba/excel/XCharacters.idl>
#endif
-module org { module openoffice { module excel {
-interface XTextFrame : org::openoffice::vba::XHelperInterface
+module ooo { module vba { module excel {
+interface XTextFrame : ooo::vba::XHelperInterface
{
[attribute] boolean AutoSize;
[attribute] float MarginBottom;
diff --git a/oovbaapi/org/openoffice/excel/XTitle.idl b/oovbaapi/ooo/vba/excel/XTitle.idl
index 0e23d2e137..11013f298e 100644
--- a/oovbaapi/org/openoffice/excel/XTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XTitle.idl
@@ -28,18 +28,18 @@
*
************************************************************************/
-#ifndef __org_openoffice_excel_XTitle_idl__
-#define __org_openoffice_excel_XTitle_idl__
+#ifndef __ooo_vba_excel_XTitle_idl__
+#define __ooo_vba_excel_XTitle_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.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 org { module openoffice { module excel {
+module ooo { module vba { module excel {
interface XCharacters;
interface XFont;
@@ -48,7 +48,7 @@ interface XInterior;
interface XTitle
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
// XBorder Border( ) raises ( com::sun::star::script::BasicErrorException );
XInterior Interior() raises(com::sun::star::script::BasicErrorException);
diff --git a/oovbaapi/org/openoffice/excel/XValidation.idl b/oovbaapi/ooo/vba/excel/XValidation.idl
index 6e6865dc24..dd1ef46202 100644
--- a/oovbaapi/org/openoffice/excel/XValidation.idl
+++ b/oovbaapi/ooo/vba/excel/XValidation.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XValidation_idl__
-#define __org_openoffice_excel_XValidation_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XValidation
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute] boolean IgnoreBlank;
[attribute] boolean InCellDropdown;
diff --git a/oovbaapi/org/openoffice/excel/XWindow.idl b/oovbaapi/ooo/vba/excel/XWindow.idl
index fdcfaf92ca..2baf8995ab 100644
--- a/oovbaapi/org/openoffice/excel/XWindow.idl
+++ b/oovbaapi/ooo/vba/excel/XWindow.idl
@@ -27,26 +27,28 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XWindow_idl__
-#define __org_openoffice_excel_XWindow_idl__
+#ifndef __ooo_vba_excel_XWindow_idl__
+#define __ooo_vba_excel_XWindow_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XRange;
+interface XWorksheet;
+interface XPane;
interface XWindow
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute] any Caption;
[attribute] boolean DisplayGridlines;
@@ -56,6 +58,8 @@ 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;
@@ -63,6 +67,10 @@ 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 );
@@ -73,7 +81,21 @@ interface XWindow
void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
XRange ActiveCell() raises(com::sun::star::script::BasicErrorException);
any Selection() raises(com::sun::star::script::BasicErrorException);
+ long PointsToScreenPixelsX([in] long Points) raises(com::sun::star::script::BasicErrorException);
+ long PointsToScreenPixelsY([in] long Points) raises(com::sun::star::script::BasicErrorException);
+ void PrintOut([in] /*optional short*/ any From,
+ [in] /*optional short*/ any To,
+ [in] /*optional short*/ any Copies,
+ [in] /*optional boolean*/ any Preview,
+ [in] /*optional string*/ any ActivePrinter,
+ [in] /*optional boolean*/ any PrintToFile,
+ [in] /*optional boolean*/ any Collate,
+ [in] /*optional string*/ any PrToFileName
+ ) raises(com::sun::star::script::BasicErrorException);
+ void PrintPreview( [in] /*Optional*/ any EnableChanges ) raises ( com::sun::star::script::BasicErrorException );
+ XWorksheet ActiveSheet() raises(com::sun::star::script::BasicErrorException);
+ XPane ActivePane() raises(com::sun::star::script::BasicErrorException);
};
//=============================================================================
diff --git a/oovbaapi/org/openoffice/excel/XWindows.idl b/oovbaapi/ooo/vba/excel/XWindows.idl
index 6a08fb553a..1d1d196ecd 100644
--- a/oovbaapi/org/openoffice/excel/XWindows.idl
+++ b/oovbaapi/ooo/vba/excel/XWindows.idl
@@ -27,25 +27,25 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XWindows_idl__
-#define __org_openoffice_excel_XWindows_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XWindows
{
- interface ::org::openoffice::vba::XCollection;
+ interface ::ooo::vba::XCollection;
void Arrange( [in] long ArrangeStyle, [in] any ActiveWorkbook, [in] any SyncHorizontal, [in] any SyncVertical );
};
diff --git a/oovbaapi/org/openoffice/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 0e7ba55d10..d4d9167d78 100644
--- a/oovbaapi/org/openoffice/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -27,20 +27,20 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XWorkbook_idl__
-#define __org_openoffice_excel_XWorkbook_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
@@ -50,7 +50,7 @@ interface XStyles;
interface XWorkbook
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
[attribute, readonly] string Name;
[attribute, readonly] string Path;
@@ -71,7 +71,7 @@ interface XWorkbook
void Activate();
void ResetColors() raises (com::sun::star::script::BasicErrorException);
- any Names();
+ any Names( [in] any Index );
any Colors([in] any Index) raises (com::sun::star::script::BasicErrorException);
long FileFormat() raises (com::sun::star::script::BasicErrorException);
diff --git a/oovbaapi/org/openoffice/excel/XWorkbooks.idl b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
index 708eaf2e47..955e553f15 100644
--- a/oovbaapi/org/openoffice/excel/XWorkbooks.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
@@ -27,27 +27,27 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XWorkbooks_idl__
-#define __org_openoffice_excel_XWorkbooks_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XWorkbooks
{
- interface ::org::openoffice::vba::XCollection;
+ 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/org/openoffice/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index d297a0cf9e..7a00aeaf2b 100644
--- a/oovbaapi/org/openoffice/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -27,15 +27,15 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XWorksheet_idl__
-#define __org_openoffice_excel_XWorksheet_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
#ifndef __com_sun_star_script_XInvocation_idl__
@@ -44,19 +44,21 @@
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XComments;
interface XRange;
interface XOutline;
+interface XPageSetup;
+interface XHPageBreaks;
interface XWorksheet
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
interface ::com::sun::star::script::XInvocation;
- [attribute] string Name;
+ [attribute] string Name;
[attribute] boolean Visible;
[attribute, readonly] long StandardHeight;
[attribute, readonly] long StandardWidth;
@@ -67,6 +69,7 @@ interface XWorksheet
[attribute, readonly] XWorksheet Next;
[attribute, readonly] XWorksheet Previous;
[attribute, readonly] string CodeName;
+ [attribute, readonly] short Index;
void Activate();
void Calculate( );
@@ -83,6 +86,8 @@ interface XWorksheet
any PivotTables([in] any Index);
any Comments([in] any Index);
XOutline Outline();
+ XPageSetup PageSetup();
+ any HPageBreaks([in] any Index);
any OLEObjects([in] any Index);
void ShowDataForm();
any Shapes([in] any Index);
@@ -98,6 +103,7 @@ interface XWorksheet
void setEnableCalculation([in] boolean EnableCalculation) raises(com::sun::star::script::BasicErrorException);
boolean getEnableCalculation() raises(com::sun::star::script::BasicErrorException);
+ 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, [in] any IgnorePrintAreas );
};
diff --git a/oovbaapi/org/openoffice/excel/XWorksheetFunction.idl b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
index 1bdc9299df..dba0487952 100644
--- a/oovbaapi/org/openoffice/excel/XWorksheetFunction.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
@@ -27,15 +27,15 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XWSFunction_idl__
-#define __org_openoffice_excel_XWSFunction_idl__
+#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 __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
#ifndef __com_sun_star_beans_XExactName_idl__
@@ -47,14 +47,14 @@
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XWorksheetFunction
{
- interface ::org::openoffice::vba::XHelperInterface;
+ interface ::ooo::vba::XHelperInterface;
interface ::com::sun::star::beans::XExactName;
interface ::com::sun::star::script::XInvocation;
};
diff --git a/oovbaapi/org/openoffice/excel/XWorksheets.idl b/oovbaapi/ooo/vba/excel/XWorksheets.idl
index 94775914b7..7010ab4aa6 100644
--- a/oovbaapi/org/openoffice/excel/XWorksheets.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheets.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XWorksheets_idl__
-#define __org_openoffice_excel_XWorksheets_idl__
+#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 __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
//=============================================================================
-module org { module openoffice { module excel {
+module ooo { module vba { module excel {
//=============================================================================
interface XWorksheets
{
- interface ::org::openoffice::vba::XCollection;
+ interface ::ooo::vba::XCollection;
[attribute] any Visible;
any Add( [in] any Before, [in] any After, [in] any Count, [in] any Type );
void Delete();
diff --git a/oovbaapi/org/openoffice/excel/XlBuildInDialog.idl b/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
index 6339a86822..38eaf83d84 100644
--- a/oovbaapi/org/openoffice/excel/XlBuildInDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
@@ -27,9 +27,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_excel_XlBuildInDialog_idl__
-#define __org_openoffice_excel_XlBuildInDialog_idl__
-module org { module openoffice { module excel {
+#ifndef __ooo_vba_excel_XlBuildInDialog_idl__
+#define __ooo_vba_excel_XlBuildInDialog_idl__
+module ooo { module vba { module excel {
constants XlBuildInDialog
{
diff --git a/oovbaapi/org/openoffice/excel/makefile.mk b/oovbaapi/ooo/vba/excel/makefile.mk
index 81f7a95101..764c073e68 100644
--- a/oovbaapi/org/openoffice/excel/makefile.mk
+++ b/oovbaapi/ooo/vba/excel/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..$/..
PRJNAME=oovapi
TARGET=excel
-PACKAGE=org$/openoffice$/Excel
+PACKAGE=ooo$/vba$/Excel
# --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/util$/makefile.pmk
@@ -96,6 +96,13 @@ IDLFILES= XApplication.idl\
XNames.idl \
Workbook.idl \
Worksheet.idl \
+ Window.idl \
+ XHyperlink.idl \
+ Hyperlink.idl \
+ XPageSetup.idl \
+ XPageBreak.idl \
+ XHPageBreak.idl \
+ XHPageBreaks.idl \
# ------------------------------------------------------------------
diff --git a/oovbaapi/org/openoffice/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk
index 97f528ca28..ee63d6373f 100644
--- a/oovbaapi/org/openoffice/vba/makefile.mk
+++ b/oovbaapi/ooo/vba/makefile.mk
@@ -28,12 +28,12 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..$/..$/..
+PRJ=..$/..
PRJNAME=oovbapi
TARGET=vba
-PACKAGE=org$/openoffice$/vba
+PACKAGE=ooo$/vba
# --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/util$/makefile.pmk
@@ -52,6 +52,11 @@ IDLFILES=\
XVBAToOOEventDescGen.idl\
XPropValue.idl\
XHelperInterface.idl\
+ XAssistant.idl\
+ XCommandBarControl.idl\
+ XCommandBarControls.idl\
+ XCommandBar.idl\
+ XCommandBars.idl\
Globals.idl\
# ------------------------------------------------------------------
diff --git a/oovbaapi/org/openoffice/msforms/MSFormReturnTypes.idl b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
index b1abcc7966..b1abcc7966 100644
--- a/oovbaapi/org/openoffice/msforms/MSFormReturnTypes.idl
+++ b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
diff --git a/oovbaapi/org/openoffice/msforms/XButton.idl b/oovbaapi/ooo/vba/msforms/XButton.idl
index aea75091a2..5469863424 100644
--- a/oovbaapi/org/openoffice/msforms/XButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XButton.idl
@@ -27,15 +27,15 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XButton_idl__
-#define __org_openoffice_msforms_XButton_idl__
+#ifndef __ooo_vba_msforms_XButton_idl__
+#define __ooo_vba_msforms_XButton_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
//=============================================================================
interface XButton: com::sun::star::uno::XInterface
diff --git a/oovbaapi/org/openoffice/msforms/XColorFormat.idl b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
index 9a77848d2b..35ead4e0d4 100644
--- a/oovbaapi/org/openoffice/msforms/XColorFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
@@ -27,16 +27,16 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XColorFormat_idl__
-#define __org_openoffice_msforms_XColorFormat_idl__
+#ifndef __ooo_vba_msforms_XColorFormat_idl__
+#define __ooo_vba_msforms_XColorFormat_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
-interface XColorFormat : org::openoffice::vba::XHelperInterface
+interface XColorFormat : ooo::vba::XHelperInterface
{
[attribute] long RGB;
[attribute] long SchemeColor;
diff --git a/oovbaapi/org/openoffice/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 83f79106f0..42fb76a045 100644
--- a/oovbaapi/org/openoffice/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XComboBox_idl__
-#define __org_openoffice_msforms_XComboBox_idl__
+#ifndef __ooo_vba_msforms_XComboBox_idl__
+#define __ooo_vba_msforms_XComboBox_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
@@ -37,15 +37,18 @@
//=============================================================================
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
//=============================================================================
interface XComboBox: ::com::sun::star::uno::XInterface
{
[attribute] any Value;
+ [attribute] any ListIndex;
+ [attribute, readonly ] long ListCount;
[attribute] string Text;
void AddItem( [in] any pvargItem, [in] any pvargIndex );
+ void removeItem( [in] any index );
void Clear();
};
diff --git a/oovbaapi/org/openoffice/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 6ef9fa2a12..30901fb729 100644
--- a/oovbaapi/org/openoffice/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -27,8 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XControl_idl__
-#define __org_openoffice_msforms_XControl_idl__
+#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>
@@ -37,12 +37,20 @@
//=============================================================================
-module org { module openoffice { module msforms {
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
+#endif
+module ooo { module vba { module msforms {
//=============================================================================
-interface XControl: com::sun::star::uno::XInterface
+interface XControl
{
+ interface ::ooo::vba::XHelperInterface;
+ void SetFocus();
+ [attribute, readonly ] com::sun::star::uno::XInterface Object;
+ [attribute] string ControlSource;
+ [attribute] string RowSource;
[attribute] boolean Enabled;
[attribute] boolean Visible;
//Size. there are some defferent between Mso and OOo.
@@ -52,6 +60,7 @@ interface XControl: com::sun::star::uno::XInterface
//Postion
[attribute] double Left;
[attribute] double Top;
+ [attribute] string Name;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XControls.idl b/oovbaapi/ooo/vba/msforms/XControls.idl
new file mode 100644
index 0000000000..b6abd88384
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XControls.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
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * 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_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;
+
+interface XControls
+{
+ interface ooo::vba::XCollection;
+ void Move( [in] double cx, [in] double cy );
+};
+}; }; };
+
+
+#endif
diff --git a/oovbaapi/org/openoffice/msforms/XFillFormat.idl b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
index e4769bcb8f..8dd4afd3da 100644
--- a/oovbaapi/org/openoffice/msforms/XFillFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
@@ -27,19 +27,19 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XFillFormat_idl__
-#define __org_openoffice_msforms_XFillFormat_idl__
+#ifndef __ooo_vba_msforms_XFillFormat_idl__
+#define __ooo_vba_msforms_XFillFormat_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_msforms_XColorFormat_idl__
-#include <org/openoffice/msforms/XColorFormat.idl>
+#ifndef __ooo_vba_msforms_XColorFormat_idl__
+#include <ooo/vba/msforms/XColorFormat.idl>
#endif
-module org { module openoffice { module msforms {
-interface XFillFormat : org::openoffice::vba::XHelperInterface
+module ooo { module vba { module msforms {
+interface XFillFormat : ooo::vba::XHelperInterface
{
[attribute] boolean Visible;
[attribute] double Transparency;
diff --git a/oovbaapi/ooo/vba/msforms/XGroupBox.idl b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
new file mode 100644
index 0000000000..0280736fc2
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#ifndef __ooo_vba_msforms_XGroupBox_idl__
+#define __ooo_vba_msforms_XGroupBox_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+//=============================================================================
+
+module ooo { module vba { module msforms {
+//=============================================================================
+interface XGroupBox
+{
+ [attribute] string Caption;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/msforms/XImage.idl b/oovbaapi/ooo/vba/msforms/XImage.idl
new file mode 100644
index 0000000000..1136af6a26
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XImage.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
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * 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_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 {
+
+//=============================================================================
+interface XImage: com::sun::star::uno::XInterface
+{
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/org/openoffice/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index db7005e1bb..35e10c8258 100644
--- a/oovbaapi/org/openoffice/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -27,20 +27,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XLabel_idl__
-#define __org_openoffice_msforms_XLabel_idl__
+#ifndef __ooo_vba_msforms_XLabel_idl__
+#define __ooo_vba_msforms_XLabel_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
//=============================================================================
interface XLabel: com::sun::star::uno::XInterface
{
[attribute] string Caption;
+ [attribute] any Value;
};
//=============================================================================
diff --git a/oovbaapi/org/openoffice/msforms/XLineFormat.idl b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
index 1c1c08068e..bfa2c8fb6a 100644
--- a/oovbaapi/org/openoffice/msforms/XLineFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
@@ -27,19 +27,19 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XLineFormat_idl__
-#define __org_openoffice_msforms_XLineFormat_idl__
+#ifndef __ooo_vba_msforms_XLineFormat_idl__
+#define __ooo_vba_msforms_XLineFormat_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_msforms_XColorFormat_idl__
-#include <org/openoffice/msforms/XColorFormat.idl>
+#ifndef __ooo_vba_msforms_XColorFormat_idl__
+#include <ooo/vba/msforms/XColorFormat.idl>
#endif
-module org { module openoffice { module msforms {
-interface XLineFormat : org::openoffice::vba::XHelperInterface
+module ooo { module vba { module msforms {
+interface XLineFormat : ooo::vba::XHelperInterface
{
[attribute] long BeginArrowheadStyle;
[attribute] long BeginArrowheadLength;
diff --git a/oovbaapi/org/openoffice/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 118402e927..2ff4d6d670 100644
--- a/oovbaapi/org/openoffice/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -27,15 +27,15 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XListBox_idl__
-#define __org_openoffice_msforms_XListBox_idl__
+#ifndef __ooo_vba_msforms_XListBox_idl__
+#define __ooo_vba_msforms_XListBox_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
//=============================================================================
@@ -44,10 +44,13 @@ interface XListBox: com::sun::star::uno::XInterface
[attribute] any Value;
[attribute] string Text;
[attribute] boolean MultiSelect;
- //[attribute] sequence< boolean > Selected;
+ [attribute] any ListIndex;
+ [attribute, readonly ] long ListCount;
void AddItem( [in] any pvargItem, [in] any pvargIndex );
+ void removeItem( [in] any index );
void Clear();
any Selected( [in] long index );
+ any List( [in] any pvargIndex, [in] any pvarColumn );
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XMultiPage.idl b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
new file mode 100644
index 0000000000..98795989b1
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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 {
+
+//=============================================================================
+interface XMultiPage: com::sun::star::uno::XInterface
+{
+ [attribute] long Value;
+ any Pages( [in] any index );
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/msforms/XPages.idl b/oovbaapi/ooo/vba/msforms/XPages.idl
new file mode 100644
index 0000000000..06f237646a
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XPages.idl
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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
+
+//=============================================================================
+
+module ooo { module vba { module msforms {
+
+//=============================================================================
+interface XPages
+{
+ interface ooo::vba::XCollection;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/org/openoffice/msforms/XPictureFormat.idl b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
index 13dbc6c85d..f6baecd5de 100644
--- a/oovbaapi/org/openoffice/msforms/XPictureFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
@@ -27,16 +27,16 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XPictureFormat_idl__
-#define __org_openoffice_msforms_XPictureFormat_idl__
+#ifndef __ooo_vba_msforms_XPictureFormat_idl__
+#define __ooo_vba_msforms_XPictureFormat_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-module org { module openoffice { module msforms {
-interface XPictureFormat : org::openoffice::vba::XHelperInterface
+module ooo { module vba { module msforms {
+interface XPictureFormat : ooo::vba::XHelperInterface
{
[attribute] double Brightness;
[attribute] double Contrast;
diff --git a/oovbaapi/ooo/vba/msforms/XProgressBar.idl b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
new file mode 100644
index 0000000000..bf7e6a4347
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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 {
+
+//=============================================================================
+interface XProgressBar: com::sun::star::uno::XInterface
+{
+ [attribute] any Value;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/org/openoffice/msforms/XRadioButton.idl b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
index 3bf4e79399..3821f830ee 100644
--- a/oovbaapi/org/openoffice/msforms/XRadioButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
@@ -27,21 +27,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XRadioButton_idl__
-#define __org_openoffice_msforms_XRadioButton_idl__
+#ifndef __ooo_vba_msforms_XRadioButton_idl__
+#define __ooo_vba_msforms_XRadioButton_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
//=============================================================================
interface XRadioButton: com::sun::star::uno::XInterface
{
[attribute] string Caption;
- [attribute] boolean Value;
+ [attribute] any Value;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XScrollBar.idl b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
new file mode 100644
index 0000000000..2566a9ef1b
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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 {
+
+//=============================================================================
+interface XScrollBar: com::sun::star::uno::XInterface
+{
+ [attribute] long Max;
+ [attribute] long Min;
+ [attribute] any Value;
+ [attribute] long LargeChange;
+ [attribute] long SmallChange;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/org/openoffice/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index 0416647751..a1ac36dd27 100644
--- a/oovbaapi/org/openoffice/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -27,32 +27,32 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XShape_idl__
-#define __org_openoffice_msforms_XShape_idl__
+#ifndef __ooo_vba_msforms_XShape_idl__
+#define __ooo_vba_msforms_XShape_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_excel_XTextFrame_idl__
-#include <org/openoffice/excel/XTextFrame.idl>
+#ifndef __ooo_vba_excel_XTextFrame_idl__
+#include <ooo/vba/excel/XTextFrame.idl>
#endif
-#ifndef __org_openoffice_msforms_XLineFormat_idl__
-#include <org/openoffice/msforms/XLineFormat.idl>
+#ifndef __ooo_vba_msforms_XLineFormat_idl__
+#include <ooo/vba/msforms/XLineFormat.idl>
#endif
-#ifndef __org_openoffice_msforms_XFillFormat_idl__
-#include <org/openoffice/msforms/XFillFormat.idl>
+#ifndef __ooo_vba_msforms_XFillFormat_idl__
+#include <ooo/vba/msforms/XFillFormat.idl>
#endif
-#ifndef __org_openoffice_msforms_XPictureFormat_idl__
-#include <org/openoffice/msforms/XPictureFormat.idl>
+#ifndef __ooo_vba_msforms_XPictureFormat_idl__
+#include <ooo/vba/msforms/XPictureFormat.idl>
#endif
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
interface XShapeRange;
-interface XShape : org::openoffice::vba::XHelperInterface
+interface XShape : ooo::vba::XHelperInterface
{
[attribute] string Name;
[attribute] double Height;
@@ -73,7 +73,7 @@ interface XShape : org::openoffice::vba::XHelperInterface
[attribute] RelativeVerticalPosition
[attribute] XWrapFormat WrapFormat;
*/
- org::openoffice::excel::XTextFrame TextFrame();
+ ooo::vba::excel::XTextFrame TextFrame();
void Delete();
void ZOrder( [in] long ZOrderCmd );
void IncrementRotation( [in] double Increment );
diff --git a/oovbaapi/org/openoffice/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
index f5b43134af..1b39485dfd 100644
--- a/oovbaapi/org/openoffice/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
@@ -27,26 +27,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XShapeRange_idl__
-#define __org_openoffice_msforms_XShapeRange_idl__
+#ifndef __ooo_vba_msforms_XShapeRange_idl__
+#define __ooo_vba_msforms_XShapeRange_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_msforms_XShape_idl__
-#include <org/openoffice/msforms/XShape.idl>
+#ifndef __ooo_vba_msforms_XShape_idl__
+#include <ooo/vba/msforms/XShape.idl>
#endif
-#ifndef __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
interface XShapeRange
{
- interface org::openoffice::vba::XCollection;
+ interface ooo::vba::XCollection;
void Select();
XShape Group();
void IncrementRotation( [in] double Increment );
diff --git a/oovbaapi/org/openoffice/msforms/XShapes.idl b/oovbaapi/ooo/vba/msforms/XShapes.idl
index 3a41d1868b..3ba31ab8a6 100644
--- a/oovbaapi/org/openoffice/msforms/XShapes.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapes.idl
@@ -27,23 +27,23 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XShapes_idl__
-#define __org_openoffice_msforms_XShapes_idl__
+#ifndef __ooo_vba_msforms_XShapes_idl__
+#define __ooo_vba_msforms_XShapes_idl__
-#ifndef __org_openoffice_vba_XHelperInterface_idl__
-#include <org/openoffice/vba/XHelperInterface.idl>
+#ifndef __ooo_vba_XHelperInterface_idl__
+#include <ooo/vba/XHelperInterface.idl>
#endif
-#ifndef __org_openoffice_vba_XCollection_idl__
-#include <org/openoffice/vba/XCollection.idl>
+#ifndef __ooo_vba_XCollection_idl__
+#include <ooo/vba/XCollection.idl>
#endif
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
interface XShapeRange;
interface XShape;
interface XShapes
{
- interface org::openoffice::vba::XCollection;
+ interface ooo::vba::XCollection;
void SelectAll();
XShapeRange Range( [in] any shapes );
/*
diff --git a/oovbaapi/ooo/vba/msforms/XSpinButton.idl b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
new file mode 100644
index 0000000000..b7d154baf4
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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 {
+
+//=============================================================================
+interface XSpinButton: com::sun::star::uno::XInterface
+{
+ [attribute] long Max;
+ [attribute] long Min;
+ [attribute] any Value;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/org/openoffice/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index dc72f612e1..ab877756d7 100644
--- a/oovbaapi/org/openoffice/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
@@ -27,21 +27,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __org_openoffice_msforms_XTextBox_idl__
-#define __org_openoffice_msforms_XTextBox_idl__
+#ifndef __ooo_vba_msforms_XTextBox_idl__
+#define __ooo_vba_msforms_XTextBox_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
//=============================================================================
-module org { module openoffice { module msforms {
+module ooo { module vba { module msforms {
//=============================================================================
interface XTextBox: com::sun::star::uno::XInterface
{
[attribute] string Text;
-// [attribute] any Value;
+ [attribute] any Value;
[attribute] long MaxLength;
[attribute] boolean Multiline;
};
diff --git a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
new file mode 100644
index 0000000000..7d2b589874
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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 {
+
+//=============================================================================
+interface XTextBoxShape: com::sun::star::uno::XInterface
+{
+ [attribute] string Text;
+ ::ooo::vba::excel::XCharacters characters([in] any Start, [in] any Length);
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/msforms/XToggleButton.idl b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
new file mode 100644
index 0000000000..4ff8fb0be3
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#ifndef __ooo_vba_msforms_XToggleButton_idl__
+#define __ooo_vba_msforms_XToggleButton_idl__
+
+#ifndef __ooo_vba_msforms_XButton_idl__
+#include <ooo/vba/msforms/XButton.idl>
+#endif
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+//=============================================================================
+
+module ooo { module vba { module msforms {
+//=============================================================================
+interface XToggleButton
+{
+ interface XButton;
+ [attribute] any Value;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
+
+
diff --git a/oovbaapi/ooo/vba/msforms/XUserForm.idl b/oovbaapi/ooo/vba/msforms/XUserForm.idl
new file mode 100644
index 0000000000..076db018df
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XUserForm.idl
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#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
+{
+ //interface ::ooo::vba::XHelperInterface;
+ interface ::com::sun::star::script::XInvocation;
+ [attribute] string Caption;
+ void Show();
+ void Hide();
+ void RePaint();
+ void UnloadObject();
+ any Controls( [in] any index );
+};
+}; }; };
+
+#endif
diff --git a/oovbaapi/org/openoffice/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
index a8984dd625..f654993144 100644
--- a/oovbaapi/org/openoffice/msforms/makefile.mk
+++ b/oovbaapi/ooo/vba/msforms/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..$/..
PRJNAME=oovbapi
TARGET=msforms
-PACKAGE=org$/openoffice$/msforms
+PACKAGE=ooo$/vba$/msforms
# --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/util$/makefile.pmk
@@ -60,7 +60,17 @@ IDLFILES=\
XFillFormat.idl \
XPictureFormat.idl \
XShapeRange.idl \
- XListBox.idl
+ XTextBoxShape.idl \
+ XUserForm.idl \
+ XListBox.idl \
+ XToggleButton.idl \
+ XScrollBar.idl \
+ XProgressBar.idl \
+ XMultiPage.idl \
+ XPages.idl \
+ XSpinButton.idl \
+ XImage.idl \
+ XControls.idl \
# ------------------------------------------------------------------
diff --git a/oovbaapi/prj/build.lst b/oovbaapi/prj/build.lst
index afc8869258..bc34a4f376 100644
--- a/oovbaapi/prj/build.lst
+++ b/oovbaapi/prj/build.lst
@@ -1,8 +1,8 @@
ovba oovbaapi : offapi solenv NULL
-ovba oovbaapi usr1 - all ovba_mkout NULL
-ovba oovbaapi\genconstidl nmake - all ovba_genconstidl NULL
-ovba oovbaapi\org\openoffice\constants nmake - all ovba_constants ovba_genconstidl NULL
-ovba oovbaapi\org\openoffice\vba nmake - all ovba_vba NULL
-ovba oovbaapi\org\openoffice\excel nmake - all ovba_excel NULL
-ovba oovbaapi\org\openoffice\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 usr1 - all ovba_mkout NULL
+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\msforms nmake - all ovba_msforms NULL
+ovba oovbaapi\util nmake - all ovba_util ovba_vba ovba_excel ovba_msforms ovba_constants ovba_genconstidl NULL
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 8a6c7a7b1e..2284884e36 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -54,7 +54,7 @@
#include <com/sun/star/beans/MethodConcept.hpp>
#include <com/sun/star/beans/XMaterialHolder.hpp>
#ifdef FAKE_VBA_EVENT_SUPPORT
-#include <org/openoffice/vba/XVBAToOOEventDescGen.hpp>
+#include <ooo/vba/XVBAToOOEventDescGen.hpp>
#endif
using namespace ::com::sun::star;
@@ -125,7 +125,7 @@ namespace dlgprov
{
Sequence< Any > args(1);
args[0] <<= xModel;
- mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.vba.EventListener" ) ), args, m_xContext ), UNO_QUERY );
+ mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.EventListener" ) ), args, m_xContext ), UNO_QUERY );
}
if ( rxControl.is() )
{
@@ -199,7 +199,7 @@ namespace dlgprov
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
if ( xSMgr.is() )
{
- Reference< org::openoffice::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.vba.VBAToOOEventDesc" ) ), m_xContext ), UNO_QUERY );
+ Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAToOOEventDesc" ) ), m_xContext ), UNO_QUERY );
if ( xVBAToOOEvtDesc.is() )
xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl ), UNO_QUERY );