Merge branch 'vba' fix conflics, trailing ws & tab issues

also removed some old headers ( which I need to add new ones for )

Conflicts:
	basic/source/classes/sbunoobj.cxx
	basic/source/classes/sbxmod.cxx
	xmloff/inc/xmlnmspe.hxx
	xmloff/inc/xmloff/xmltoken.hxx
	xmlscript/inc/xmlscript/xmldlg_imexp.hxx

11 files changed, 159 insertions, 13 deletions

diff --git a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
index 2eff91346e9d..c2ca0877ff96 100644
--- a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
+++ b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
@@ -26,26 +26,14 @@
  ************************************************************************/
 module msforms
 {
-    struct ReturnBoolean
-    {
-        boolean Value;
-    };
-
     struct ReturnEffect
     {
         //fmDropEffect Value;
         short Value;
     };
 
-    struct ReturnInteger
-    {
-        long Value;
-    };
-
     struct ReturnSingle
     {
         float Value;
     };
-
-
 };
diff --git a/oovbaapi/ooo/vba/msforms/XCheckBox.idl b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
new file mode 100644
index 000000000000..f7001fa2623a
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XCheckBox.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: XCheckBox.idl,v $
+ * $Revision: 1.3 $
+ *
+ * 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_XCheckBox_idl__
+#define __ooo_vba_msforms_XCheckBox_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+//=============================================================================
+
+module ooo {  module vba {  module msforms {
+
+//=============================================================================
+interface XCheckBox: com::sun::star::uno::XInterface
+{
+    [attribute] string Caption;
+    [attribute] any Value;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 5f2b66431eb8..d3285c7d78b0 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -47,6 +47,7 @@ interface XComboBox: ::com::sun::star::uno::XInterface
     void AddItem( [in] any pvargItem, [in] any pvargIndex );
     void removeItem( [in] any index );
     void Clear();
+    any List( [in] any pvargIndex, [in] any pvarColumn );
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 97ca9d152716..3de8db1eb06c 100644
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -63,6 +63,7 @@ interface XControl
     [attribute] string Name;
     [attribute] string ControlTipText;
     [attribute] string Tag;
+    [attribute] long ForeColor;
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index d757af5074d8..476ac859b7aa 100644
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -39,6 +39,7 @@ interface XLabel: com::sun::star::uno::XInterface
 {
     [attribute] string Caption;
     [attribute] any Value;
+    [attribute] string Accelerator;
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index bdc0c6bfc660..48465f279a59 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -40,7 +40,7 @@ interface XListBox: com::sun::star::uno::XInterface
 {
     [attribute] any Value;
     [attribute] string Text;
-    [attribute] boolean MultiSelect;
+    [attribute] long MultiSelect; //liuchen 2009-7-31 MultiSelect property in Excel VBA is type long
     [attribute] any ListIndex;
         [attribute, readonly ] long ListCount;
     void AddItem( [in] any pvargItem, [in] any pvargIndex );
diff --git a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
new file mode 100644
index 000000000000..6ffc4d1be98b
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright IBM Corporation 2009, 2010.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __ooo_vba_msforms_XReturnInteger_idl__
+#define __ooo_vba_msforms_XReturnInteger_idl__
+
+#ifndef __com_sun_star_script_XDefaultProperty_idl__
+#include <com/sun/star/script/XDefaultProperty.idl>
+#endif
+//=============================================================================
+
+module msforms
+{
+
+//=============================================================================
+interface XReturnBoolean: com::sun::star::script::XDefaultProperty
+{
+    [attribute] boolean Value;
+};
+//=============================================================================
+
+};
+
+#endif
diff --git a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
new file mode 100644
index 000000000000..3f7d7975cf8c
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright IBM Corporation 2009, 2010.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __ooo_vba_msforms_XReturnInteger_idl__
+#define __ooo_vba_msforms_XReturnInteger_idl__
+
+#ifndef __com_sun_star_script_XDefaultProperty_idl__
+#include <com/sun/star/script/XDefaultProperty.idl>
+#endif
+//=============================================================================
+
+module msforms
+{
+
+//=============================================================================
+interface XReturnInteger: com::sun::star::script::XDefaultProperty
+{
+    [attribute] long Value;
+};
+//=============================================================================
+
+};
+
+#endif
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index 3dc7c4a071af..b31dab7a1d91 100644
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -75,6 +75,7 @@ interface XShape : ooo::vba::XHelperInterface
     void ScaleHeight( [in] double Factor, [in] boolean RelativeToOriginalSize, [in] long Scale );
     void ScaleWidth( [in] double Factor, [in] boolean RelativeToOriginalSize, [in] long Scale );
     any ShapeRange( [in] any index );  // only here for convience
+    void Copy();
 };
 }; }; };
 
diff --git a/oovbaapi/ooo/vba/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
index 0cbc5f0b6d8a..0e5e2b5a039d 100644
--- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
@@ -47,6 +47,7 @@ interface XShapeRange
 {
     interface ooo::vba::XCollection;
 
+    [attribute] string Name;
     [attribute] double Height;
     [attribute] double Width;
     [attribute] double Left;
@@ -65,6 +66,7 @@ interface XShapeRange
     void IncrementRotation( [in] double Increment );
     void IncrementLeft( [in] double Increment );
     void IncrementTop( [in] double Increment );
+    void ZOrder( [in] long ZOrderCmd );
 };
 }; }; };
 
diff --git a/oovbaapi/ooo/vba/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
index 56ac4caf87cb..ebf4d2ee891a 100644
--- a/oovbaapi/ooo/vba/msforms/makefile.mk
+++ b/oovbaapi/ooo/vba/msforms/makefile.mk
@@ -44,6 +44,7 @@ IDLFILES=\
     XLabel.idl \
     XTextBox.idl \
     XRadioButton.idl \
+    XCheckBox.idl \
     XShape.idl \
     XShapes.idl \
     XLineFormat.idl \
@@ -62,6 +63,8 @@ IDLFILES=\
     XSpinButton.idl \
     XImage.idl \
     XControls.idl \
+    XReturnBoolean.idl \
+    XReturnInteger.idl \
     XTextFrame.idl \
 
 # ------------------------------------------------------------------