ooo-build r13901 - in trunk/patches: dev300 vba

From: noelpwer svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13901 - in trunk/patches: dev300 vba
Date: Tue, 16 Sep 2008 17:36:25 +0000 (UTC)
Author: noelpwer
Date: Tue Sep 16 17:36:25 2008
New Revision: 13901
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13901&view=rev

Log:
2008-09-15  Noel Power  <noel power novell com>

        * patches/dev300/apply: added n#426415 & n#426416 patches
        * patches/vba/enhanced-form-userform-controls.diff: n#426415
        * patches/vba/vba-allow-forms-resetvalue-binding.diff: n#426415
        * patches/vba/fix-vba-NOT-trigger-update.diff: n#426416
        * patches/vba/cws-npower11.diff: ListBox.ListCount/ListBox.List
        and api support for  n#426415. Additionally userform geometery
        in Points support


Added:
   trunk/patches/vba/fix-vba-NOT-trigger-update.diff
   trunk/patches/vba/vba-allow-forms-resetvalue-binding.diff
Modified:
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-npower11.diff
   trunk/patches/vba/enhanced-form-userform-controls.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Sep 16 17:36:25 2008
@@ -1617,6 +1617,12 @@
 # fix bad intersect api, need to be folded into npower11
 # also needs some testing
 vba-intersect-multi-area.diff
+# fix import sizes and geometry of userforms
+vba-userform-geometry-tweak.diff
+# n#426415
+vba-allow-forms-resetvalue-binding.diff
+# n#426415
+fix-vba-NOT-trigger-update.diff
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff	(original)
+++ trunk/patches/dev300/cws-npower11.diff	Tue Sep 16 17:36:25 2008
@@ -3,7 +3,7 @@
 RCS file: /cvs/sc/sc/inc/compiler.hxx,v
 retrieving revision 1.39
 retrieving revision 1.39.24.1
-diff -u -p -b -w -B -r1.39 -r1.39.24.1
+diff -u -p -u -p -b -w -B -r1.39 -r1.39.24.1
 --- sc/inc/compiler.hxx	8 Jul 2008 07:19:00 -0000	1.39
 +++ sc/inc/compiler.hxx	11 Sep 2008 06:11:48 -0000	1.39.24.1
 @@ -513,6 +513,9 @@ public:
@@ -21,7 +21,7 @@
 RCS file: /cvs/sc/sc/inc/document.hxx,v
 retrieving revision 1.115
 retrieving revision 1.115.22.3
-diff -u -p -b -w -B -r1.115 -r1.115.22.3
+diff -u -p -u -p -b -w -B -r1.115 -r1.115.22.3
 --- sc/inc/document.hxx	8 Jul 2008 07:19:13 -0000	1.115
 +++ sc/inc/document.hxx	7 Aug 2008 07:40:08 -0000	1.115.22.3
 @@ -703,7 +703,7 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
@@ -38,7 +38,7 @@
 RCS file: /cvs/sc/sc/inc/olinetab.hxx,v
 retrieving revision 1.6
 retrieving revision 1.6.96.1
-diff -u -p -b -w -B -r1.6 -r1.6.96.1
+diff -u -p -u -p -b -w -B -r1.6 -r1.6.96.1
 --- sc/inc/olinetab.hxx	10 Apr 2008 18:41:55 -0000	1.6
 +++ sc/inc/olinetab.hxx	29 Jul 2008 06:35:39 -0000	1.6.96.1
 @@ -114,7 +114,7 @@ public:
@@ -55,7 +55,7 @@
 RCS file: /cvs/sc/sc/source/core/tool/compiler.cxx,v
 retrieving revision 1.81
 retrieving revision 1.81.22.1
-diff -u -p -b -w -B -r1.81 -r1.81.22.1
+diff -u -p -u -p -b -w -B -r1.81 -r1.81.22.1
 --- sc/source/core/tool/compiler.cxx	8 Jul 2008 07:20:31 -0000	1.81
 +++ sc/source/core/tool/compiler.cxx	11 Sep 2008 06:11:48 -0000	1.81.22.1
 @@ -581,6 +581,33 @@ OpCode ScCompiler::GetEnglishOpCode( con
@@ -97,7 +97,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/makefile.mk,v
 retrieving revision 1.6
 retrieving revision 1.5.42.8
-diff -u -p -b -w -B -r1.6 -r1.5.42.8
+diff -u -p -u -p -b -w -B -r1.6 -r1.5.42.8
 --- sc/source/ui/vba/makefile.mk	11 Apr 2008 00:46:57 -0000	1.6
 +++ sc/source/ui/vba/makefile.mk	5 Sep 2008 14:04:18 -0000	1.5.42.8
 @@ -88,6 +88,7 @@ SLOFILES= \
@@ -142,7 +142,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/service.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.5
-diff -u -p -b -w -B -r1.4 -r1.3.42.5
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.5
 --- sc/source/ui/vba/service.cxx	11 Apr 2008 00:47:11 -0000	1.4
 +++ sc/source/ui/vba/service.cxx	7 Aug 2008 07:40:10 -0000	1.3.42.5
 @@ -53,12 +53,22 @@ namespace  worksheet
@@ -193,7 +193,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.cxx,v
 retrieving revision 1.7
 retrieving revision 1.5.42.4
-diff -u -p -b -w -B -r1.7 -r1.5.42.4
+diff -u -p -u -p -b -w -B -r1.7 -r1.5.42.4
 --- sc/source/ui/vba/vbaapplication.cxx	11 Apr 2008 00:47:25 -0000	1.7
 +++ sc/source/ui/vba/vbaapplication.cxx	29 Jul 2008 06:35:39 -0000	1.5.42.4
 @@ -42,6 +42,7 @@
@@ -393,7 +393,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.3
-diff -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
 --- sc/source/ui/vba/vbaapplication.hxx	11 Apr 2008 00:47:42 -0000	1.4
 +++ sc/source/ui/vba/vbaapplication.hxx	29 Jul 2008 06:35:39 -0000	1.3.42.3
 @@ -75,6 +75,8 @@ public:
@@ -655,7 +655,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
 --- sc/source/ui/vba/vbaaxis.cxx	11 Apr 2008 00:48:27 -0000	1.3
 +++ sc/source/ui/vba/vbaaxis.cxx	6 Jul 2008 15:31:03 -0000	1.2.42.2
 @@ -42,8 +42,8 @@ using namespace ::org::openoffice::excel
@@ -698,7 +698,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbabutton.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbabutton.cxx	11 Apr 2008 00:50:02 -0000	1.3
 +++ sc/source/ui/vba/vbabutton.cxx	5 Sep 2008 14:04:19 -0000	1.2.42.3
 @@ -35,7 +35,7 @@ using namespace org::openoffice;
@@ -738,7 +738,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbabutton.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbabutton.hxx	11 Apr 2008 00:50:19 -0000	1.3
 +++ sc/source/ui/vba/vbabutton.hxx	5 Sep 2008 14:04:19 -0000	1.2.42.3
 @@ -40,10 +40,12 @@ typedef cppu::ImplInheritanceHelper1< Sc
@@ -761,7 +761,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbacharacters.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
 --- sc/source/ui/vba/vbacharacters.cxx	11 Apr 2008 00:50:34 -0000	1.4
 +++ sc/source/ui/vba/vbacharacters.cxx	6 Jul 2008 15:30:46 -0000	1.3.42.2
 @@ -46,7 +46,11 @@ ScVbaCharacters::ScVbaCharacters( const 
@@ -898,8 +898,8 @@
 RCS file: sc/source/ui/vba/vbacheckbox.hxx
 diff -N sc/source/ui/vba/vbacheckbox.hxx
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sc/source/ui/vba/vbacheckbox.hxx	5 Sep 2008 14:04:19 -0000	1.1.2.2
-@@ -0,0 +1,58 @@
++++ sc/source/ui/vba/vbacheckbox.hxx	15 Sep 2008 19:20:01 -0000	1.1.2.3
+@@ -0,0 +1,60 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -936,13 +936,13 @@
 + ************************************************************************/
 +#ifndef SC_VBA_CHECKBOX_HXX
 +#define SC_VBA_CHECKBOX_HXX
-+#include <cppuhelper/implbase1.hxx>
++#include <cppuhelper/implbase2.hxx>
 +#include <org/openoffice/msforms/XRadioButton.hpp>
 +
 +#include "vbacontrol.hxx"
 +#include "vbahelper.hxx"
 +
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, oo::msforms::XRadioButton > CheckBoxImpl_BASE;
++typedef cppu::ImplInheritanceHelper2< ScVbaControl, oo::msforms::XRadioButton, css::script::XDefaultProperty > CheckBoxImpl_BASE;
 +
 +class ScVbaCheckbox : public CheckBoxImpl_BASE
 +{
@@ -953,6 +953,8 @@
 +    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
 +    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
 +    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++    // XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
 +    //XHelperInterface
 +    virtual rtl::OUString& getServiceImplName();
 +    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
@@ -962,10 +964,10 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbacombobox.cxx,v
 retrieving revision 1.4
-retrieving revision 1.3.42.3
-diff -u -p -b -w -B -r1.4 -r1.3.42.3
+retrieving revision 1.3.42.4
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.4
 --- sc/source/ui/vba/vbacombobox.cxx	11 Apr 2008 00:55:28 -0000	1.4
-+++ sc/source/ui/vba/vbacombobox.cxx	5 Sep 2008 14:04:19 -0000	1.3.42.3
++++ sc/source/ui/vba/vbacombobox.cxx	15 Sep 2008 19:20:01 -0000	1.3.42.4
 @@ -34,34 +34,93 @@ using namespace com::sun::star;
  using namespace org::openoffice;
  
@@ -1067,11 +1069,33 @@
  ::rtl::OUString SAL_CALL 
  ScVbaComboBox::getText() throw (uno::RuntimeException)
  {
-@@ -140,3 +199,22 @@ ScVbaComboBox::Clear(  ) throw (uno::Run
+@@ -140,3 +199,44 @@ ScVbaComboBox::Clear(  ) throw (uno::Run
  	setValue( uno::makeAny( rtl::OUString() ) );
  	m_xProps->setPropertyValue( ITEMS, uno::makeAny( uno::Sequence< rtl::OUString >() ) );
  }
 +
++void SAL_CALL
++ScVbaComboBox::setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException)
++{
++	ScVbaControl::setRowSource( _rowsource );
++	if ( _rowsource.getLength() == 0 )
++		Clear();
++}
++
++sal_Int32 SAL_CALL
++ScVbaComboBox::getListCount() throw (uno::RuntimeException)
++{
++    uno::Sequence< rtl::OUString > sList;
++    m_xProps->getPropertyValue( ITEMS ) >>= sList;
++    return sList.getLength();
++}
++
++uno::Any SAL_CALL 
++ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
++{
++	return uno::Any();
++}
++
 +rtl::OUString& 
 +ScVbaComboBox::getServiceImplName()
 +{
@@ -1094,11 +1118,11 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbacombobox.hxx,v
 retrieving revision 1.4
-retrieving revision 1.3.42.3
-diff -u -p -b -w -B -r1.4 -r1.3.42.3
+retrieving revision 1.3.42.4
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.4
 --- sc/source/ui/vba/vbacombobox.hxx	11 Apr 2008 00:55:42 -0000	1.4
-+++ sc/source/ui/vba/vbacombobox.hxx	5 Sep 2008 14:04:19 -0000	1.3.42.3
-@@ -44,22 +44,16 @@
++++ sc/source/ui/vba/vbacombobox.hxx	15 Sep 2008 19:20:01 -0000	1.3.42.4
+@@ -44,22 +44,17 @@
  typedef cppu::ImplInheritanceHelper2<ScVbaControl, oo::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE;
  class ScVbaComboBox : public ComboBoxImpl_BASE
  {		
@@ -1121,11 +1145,18 @@
  
  	// Attributes
 +	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
++	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
 +	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
  	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
  	virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-@@ -71,6 +65,9 @@ public:
+@@ -68,9 +63,15 @@ public:
+ 	// Methods
+ 	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
+ 	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
++	// XControl
++    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
  
  	// XDefaultProperty
          ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
@@ -2786,7 +2817,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.7
-diff -u -p -b -w -B -r1.3 -r1.2.42.7
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.7
 --- sc/source/ui/vba/vbacontrol.cxx	11 Apr 2008 00:57:50 -0000	1.3
 +++ sc/source/ui/vba/vbacontrol.cxx	9 Sep 2008 18:43:44 -0000	1.2.42.7
 @@ -36,7 +36,13 @@
@@ -3304,7 +3335,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.4
-diff -u -p -b -w -B -r1.3 -r1.2.42.4
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.4
 --- sc/source/ui/vba/vbacontrol.hxx	11 Apr 2008 00:58:09 -0000	1.3
 +++ sc/source/ui/vba/vbacontrol.hxx	9 Sep 2008 10:22:25 -0000	1.2.42.4
 @@ -35,40 +35,34 @@
@@ -3576,7 +3607,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaglobals.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
 --- sc/source/ui/vba/vbaglobals.cxx	11 Apr 2008 01:02:04 -0000	1.4
 +++ sc/source/ui/vba/vbaglobals.cxx	6 Jul 2008 15:29:30 -0000	1.3.42.2
 @@ -153,9 +153,9 @@ ScVbaGlobals::Range( const uno::Any& Cel
@@ -3596,7 +3627,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaglobals.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
 --- sc/source/ui/vba/vbaglobals.hxx	11 Apr 2008 01:02:19 -0000	1.4
 +++ sc/source/ui/vba/vbaglobals.hxx	6 Jul 2008 15:30:20 -0000	1.3.42.2
 @@ -70,6 +70,6 @@
@@ -3611,10 +3642,10 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.cxx,v
 retrieving revision 1.5
-retrieving revision 1.3.42.5
-diff -u -p -b -w -B -r1.5 -r1.3.42.5
+retrieving revision 1.3.42.6
+diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.6
 --- sc/source/ui/vba/vbahelper.cxx	11 Apr 2008 01:02:33 -0000	1.5
-+++ sc/source/ui/vba/vbahelper.cxx	5 Sep 2008 14:04:20 -0000	1.3.42.5
++++ sc/source/ui/vba/vbahelper.cxx	15 Sep 2008 19:20:01 -0000	1.3.42.6
 @@ -37,6 +37,7 @@
  #include <com/sun/star/uno/XComponentContext.hpp>
  #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -3712,41 +3743,41 @@
 +    {
 +	sal_Int32 nLeft = 0;
 +	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;	
-+	return nLeft;
++	return Millimeter::getInPoints( nLeft );
 +    }
 +    void UserFormGeometryHelper::setLeft( double nLeft )
 +    {
-+        mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( static_cast< sal_Int32 >( nLeft ) ) );
++        mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
 +    }
 +    double UserFormGeometryHelper::getTop()
 +    {
 +	sal_Int32 nTop = 0;
 +	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ) ) >>= nTop;	
-+	return nTop;
++	return Millimeter::getInPoints( nTop );
 +    }
 +    void UserFormGeometryHelper::setTop( double nTop )
 +    {
-+	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ), uno::makeAny( static_cast< sal_Int32 >( nTop ) ) );
++	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
 +    }
 +    double UserFormGeometryHelper::getHeight()
 +    {
 +	sal_Int32 nHeight = 0;
 +	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLHGT ) ) ) >>= nHeight;	
-+	return static_cast< double >( nHeight );
++	return Millimeter::getInPoints( nHeight );
 +    }
 +    void UserFormGeometryHelper::setHeight( double nHeight )
 +    {
-+	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLHGT ) ), uno::makeAny( static_cast< sal_Int32 >( nHeight ) ) );
++	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
 +    }
 +    double UserFormGeometryHelper::getWidth()
 +    {
 +	sal_Int32 nWidth = 0;
 +	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLWID ) ) ) >>= nWidth;	
-+	return static_cast< sal_Int32 >( nWidth );
++	return Millimeter::getInPoints( nWidth );
 +    }
 +    void UserFormGeometryHelper::setWidth( double nWidth)
 +    {
-+	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLWID ) ), uno::makeAny(  static_cast< sal_Int32 >( nWidth ) ) );
++	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLWID ) ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
 +    }
  } // openoffice
  } //org
@@ -3755,7 +3786,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.hxx,v
 retrieving revision 1.5
 retrieving revision 1.4.42.3
-diff -u -p -b -w -B -r1.5 -r1.4.42.3
+diff -u -p -u -p -b -w -B -r1.5 -r1.4.42.3
 --- sc/source/ui/vba/vbahelper.hxx	11 Apr 2008 01:02:47 -0000	1.5
 +++ sc/source/ui/vba/vbahelper.hxx	6 Jul 2008 15:31:23 -0000	1.4.42.3
 @@ -31,14 +31,18 @@
@@ -4230,7 +4261,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbainterior.cxx,v
 retrieving revision 1.5
 retrieving revision 1.5.96.1
-diff -u -p -b -w -B -r1.5 -r1.5.96.1
+diff -u -p -u -p -b -w -B -r1.5 -r1.5.96.1
 --- sc/source/ui/vba/vbainterior.cxx	11 Apr 2008 01:03:23 -0000	1.5
 +++ sc/source/ui/vba/vbainterior.cxx	29 Jul 2008 06:35:41 -0000	1.5.96.1
 @@ -34,8 +34,11 @@
@@ -4590,7 +4621,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbainterior.hxx,v
 retrieving revision 1.4
 retrieving revision 1.4.96.1
-diff -u -p -b -w -B -r1.4 -r1.4.96.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.96.1
 --- sc/source/ui/vba/vbainterior.hxx	11 Apr 2008 01:03:36 -0000	1.4
 +++ sc/source/ui/vba/vbainterior.hxx	29 Jul 2008 06:35:41 -0000	1.4.96.1
 @@ -46,8 +46,23 @@ class ScVbaInterior :  public ScVbaInter
@@ -4635,7 +4666,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbalabel.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbalabel.cxx	11 Apr 2008 01:03:52 -0000	1.3
 +++ sc/source/ui/vba/vbalabel.cxx	5 Sep 2008 14:04:20 -0000	1.2.42.3
 @@ -35,7 +35,7 @@ using namespace org::openoffice;
@@ -4689,7 +4720,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbalabel.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbalabel.hxx	11 Apr 2008 01:04:06 -0000	1.3
 +++ sc/source/ui/vba/vbalabel.hxx	5 Sep 2008 14:04:21 -0000	1.2.42.3
 @@ -34,16 +34,23 @@
@@ -4723,11 +4754,16 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbalistbox.cxx,v
 retrieving revision 1.4
-retrieving revision 1.3.42.4
-diff -u -p -b -w -B -r1.4 -r1.3.42.4
+retrieving revision 1.3.42.5
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.5
 --- sc/source/ui/vba/vbalistbox.cxx	11 Apr 2008 01:05:34 -0000	1.4
-+++ sc/source/ui/vba/vbalistbox.cxx	5 Sep 2008 14:04:21 -0000	1.3.42.4
-@@ -37,31 +37,49 @@
++++ sc/source/ui/vba/vbalistbox.cxx	15 Sep 2008 19:20:02 -0000	1.3.42.5
+@@ -33,35 +33,54 @@
+ #include "vbapropvalue.hxx"
+ #include <vector>
+ #include <comphelper/anytostring.hxx>
++#include <com/sun/star/script/ArrayWrapper.hpp>
+ 
  using namespace com::sun::star;
  using namespace org::openoffice;
  
@@ -4785,7 +4821,7 @@
  }
  
  void SAL_CALL 
-@@ -91,18 +109,17 @@ ScVbaListBox::setValue( const uno::Any& 
+@@ -91,18 +110,17 @@ ScVbaListBox::setValue( const uno::Any& 
          throw uno::RuntimeException( rtl::OUString::createFromAscii(
                      "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
  
@@ -4809,7 +4845,7 @@
  	return result;
  }
  
-@@ -125,29 +142,7 @@ ScVbaListBox::setMultiSelect( sal_Bool _
+@@ -125,37 +143,15 @@ ScVbaListBox::setMultiSelect( sal_Bool _
  {
      m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) );
  }
@@ -4839,7 +4875,17 @@
  css::uno::Any SAL_CALL 
  ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
  {
-@@ -219,12 +214,45 @@ ScVbaListBox::AddItem( const uno::Any& p
+     uno::Sequence< rtl::OUString > sList;
+     m_xProps->getPropertyValue( ITEMS ) >>= sList;
+     sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
+-    sal_Int16 nIndex = m_nIndex;
+-    if( 0 > nIndex && nLength < nIndex )
++    sal_Int16 nIndex( index );
++    if( nIndex < 0 || nIndex >= nLength )
+         throw uno::RuntimeException( rtl::OUString::createFromAscii(
+                     "Error Number." ), uno::Reference< uno::XInterface >() );
+     m_nIndex = static_cast< sal_Int16 >( index );
+@@ -219,12 +215,45 @@ ScVbaListBox::AddItem( const uno::Any& p
  }
  
  void SAL_CALL 
@@ -4885,7 +4931,7 @@
  //PropListener
  void 
  ScVbaListBox::setValueEvent( const uno::Any& value )
-@@ -234,7 +262,7 @@ ScVbaListBox::setValueEvent( const uno::
+@@ -234,7 +263,7 @@ ScVbaListBox::setValueEvent( const uno::
          throw uno::RuntimeException( rtl::OUString::createFromAscii(
                      "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
      uno::Sequence< sal_Int16 > nList;
@@ -4894,7 +4940,7 @@
      sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
      sal_Int16 nIndex = m_nIndex;
      for( sal_Int16 i = 0; i < nLength; i++ )
-@@ -250,7 +278,8 @@ ScVbaListBox::setValueEvent( const uno::
+@@ -250,7 +279,8 @@ ScVbaListBox::setValueEvent( const uno::
                      nList[i] = nList[i + 1];
                  }
                  nList.realloc( nLength - 1 );
@@ -4904,7 +4950,7 @@
                  return;
              }
          }
-@@ -271,6 +300,10 @@ ScVbaListBox::setValueEvent( const uno::
+@@ -271,6 +301,10 @@ ScVbaListBox::setValueEvent( const uno::
      }
  }
  
@@ -4915,11 +4961,59 @@
  css::uno::Any 
  ScVbaListBox::getValueEvent()
  {
-@@ -287,3 +320,22 @@ ScVbaListBox::getValueEvent()
+@@ -287,3 +321,70 @@ ScVbaListBox::getValueEvent()
  
      return uno::makeAny( sal_False );
  }
 +
++void SAL_CALL
++ScVbaListBox::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
++{
++	ScVbaControl::setRowSource( _rowsource );
++	if ( _rowsource.getLength() == 0 )
++		Clear();
++}
++
++sal_Int32 SAL_CALL
++ScVbaListBox::getListCount() throw (uno::RuntimeException)
++{
++    uno::Sequence< rtl::OUString > sList;
++    m_xProps->getPropertyValue( ITEMS ) >>= sList;
++    return sList.getLength();
++}
++
++uno::Any SAL_CALL 
++ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
++{
++    uno::Sequence< rtl::OUString > sList;
++    m_xProps->getPropertyValue( ITEMS ) >>= sList;
++    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
++    uno::Any aRet;
++    if ( pvargIndex.hasValue() )
++    {
++        sal_Int16 nIndex = -1;
++        pvargIndex >>= nIndex;
++        if( nIndex < 0 || nIndex >= nLength )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Bad row Index" ), uno::Reference< uno::XInterface >() );       
++        aRet <<= sList[ nIndex ];
++    }
++    else if ( pvarColumn.hasValue() ) // pvarColumn on its own would be bad
++            throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Bad column Index" ), uno::Reference< uno::XInterface >() );       
++    else // List() ( e.g. no args )
++    {
++        uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength );
++        for ( sal_Int32 i = 0; i < nLength; ++i )
++        {
++            sReturnArray[ i ].realloc( 10 );
++            sReturnArray[ i ][ 0 ] = sList[ i ];
++        }        
++        aRet = uno::makeAny( sReturnArray );
++    }
++    return aRet;
++}
++
 +rtl::OUString& 
 +ScVbaListBox::getServiceImplName()
 +{
@@ -4942,11 +5036,11 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbalistbox.hxx,v
 retrieving revision 1.3
-retrieving revision 1.2.42.4
-diff -u -p -b -w -B -r1.3 -r1.2.42.4
+retrieving revision 1.2.42.5
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.5
 --- sc/source/ui/vba/vbalistbox.hxx	11 Apr 2008 01:05:48 -0000	1.3
-+++ sc/source/ui/vba/vbalistbox.hxx	5 Sep 2008 14:04:21 -0000	1.2.42.4
-@@ -49,14 +49,11 @@ class ScVbaListBox : public ListBoxImpl_
++++ sc/source/ui/vba/vbalistbox.hxx	15 Sep 2008 19:20:02 -0000	1.2.42.5
+@@ -49,14 +49,12 @@ class ScVbaListBox : public ListBoxImpl_
      sal_Int16 m_nIndex;
  	
  public:
@@ -4961,16 +5055,20 @@
  	// Attributes
 +	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
 +	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
  	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
  	virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-@@ -67,12 +64,17 @@ public:
+@@ -67,12 +65,19 @@ public:
  
  	// Methods
  	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
 +    virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
  	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
- 
+-
++	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
++	// XControl
++    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
  
  	// XDefaultProperty
      rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
@@ -5198,7 +5296,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaname.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
 --- sc/source/ui/vba/vbaname.cxx	11 Apr 2008 01:06:07 -0000	1.3
 +++ sc/source/ui/vba/vbaname.cxx	6 Jul 2008 15:31:26 -0000	1.2.42.2
 @@ -31,6 +31,7 @@
@@ -5311,7 +5409,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbanames.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
 --- sc/source/ui/vba/vbanames.cxx	11 Apr 2008 01:06:56 -0000	1.3
 +++ sc/source/ui/vba/vbanames.cxx	6 Jul 2008 15:29:52 -0000	1.2.42.2
 @@ -70,6 +70,7 @@ ScVbaNames::ScVbaNames(const css::uno::R
@@ -7243,7 +7341,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaradiobutton.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbaradiobutton.cxx	11 Apr 2008 01:12:55 -0000	1.3
 +++ sc/source/ui/vba/vbaradiobutton.cxx	5 Sep 2008 14:04:22 -0000	1.2.42.3
 @@ -36,7 +36,7 @@ using namespace org::openoffice;
@@ -7320,7 +7418,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaradiobutton.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbaradiobutton.hxx	11 Apr 2008 01:13:09 -0000	1.3
 +++ sc/source/ui/vba/vbaradiobutton.hxx	5 Sep 2008 14:04:22 -0000	1.2.42.3
 @@ -29,24 +29,27 @@
@@ -7363,7 +7461,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
 retrieving revision 1.9
 retrieving revision 1.5.34.14
-diff -u -p -b -w -B -r1.9 -r1.5.34.14
+diff -u -p -u -p -b -w -B -r1.9 -r1.5.34.14
 --- sc/source/ui/vba/vbarange.cxx	14 May 2008 10:03:31 -0000	1.9
 +++ sc/source/ui/vba/vbarange.cxx	5 Sep 2008 14:04:22 -0000	1.5.34.14
 @@ -115,6 +115,7 @@
@@ -7889,7 +7987,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbarange.hxx,v
 retrieving revision 1.6
 retrieving revision 1.6.70.1
-diff -u -p -b -w -B -r1.6 -r1.6.70.1
+diff -u -p -u -p -b -w -B -r1.6 -r1.6.70.1
 --- sc/source/ui/vba/vbarange.hxx	14 May 2008 10:03:47 -0000	1.6
 +++ sc/source/ui/vba/vbarange.hxx	29 Jul 2008 06:35:42 -0000	1.6.70.1
 @@ -171,6 +171,10 @@ public:
@@ -8143,7 +8241,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbashape.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.34.2
-diff -u -p -b -w -B -r1.4 -r1.3.34.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.34.2
 --- sc/source/ui/vba/vbashape.cxx	11 Apr 2008 01:16:34 -0000	1.4
 +++ sc/source/ui/vba/vbashape.cxx	6 Jul 2008 15:29:40 -0000	1.3.34.2
 @@ -50,13 +50,13 @@ using namespace ::org::openoffice;
@@ -8167,7 +8265,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbashape.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbashape.hxx	11 Apr 2008 01:16:51 -0000	1.3
 +++ sc/source/ui/vba/vbashape.hxx	6 Jul 2008 15:30:30 -0000	1.2.42.3
 @@ -47,21 +47,22 @@ typedef InheritedHelperInterfaceImpl< Li
@@ -8385,7 +8483,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbatextbox.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbatextbox.cxx	11 Apr 2008 01:19:17 -0000	1.3
 +++ sc/source/ui/vba/vbatextbox.cxx	5 Sep 2008 14:04:23 -0000	1.2.42.3
 @@ -37,11 +37,24 @@ using namespace org::openoffice;
@@ -8457,7 +8555,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbatextbox.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbatextbox.hxx	11 Apr 2008 01:19:33 -0000	1.3
 +++ sc/source/ui/vba/vbatextbox.hxx	5 Sep 2008 14:04:23 -0000	1.2.42.3
 @@ -38,16 +38,20 @@ typedef cppu::ImplInheritanceHelper1< Sc
@@ -9130,7 +9228,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.cxx,v
 retrieving revision 1.5
 retrieving revision 1.3.42.5
-diff -u -p -b -w -B -r1.5 -r1.3.42.5
+diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.5
 --- sc/source/ui/vba/vbawindow.cxx	11 Apr 2008 01:21:13 -0000	1.5
 +++ sc/source/ui/vba/vbawindow.cxx	11 Sep 2008 06:54:22 -0000	1.3.42.5
 @@ -27,6 +27,7 @@
@@ -9425,7 +9523,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.3
-diff -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
 --- sc/source/ui/vba/vbawindow.hxx	11 Apr 2008 01:21:27 -0000	1.4
 +++ sc/source/ui/vba/vbawindow.hxx	29 Jul 2008 06:35:43 -0000	1.3.42.3
 @@ -53,14 +53,19 @@ private:		
@@ -9493,7 +9591,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworkbook.cxx,v
 retrieving revision 1.5
 retrieving revision 1.4.42.2
-diff -u -p -b -w -B -r1.5 -r1.4.42.2
+diff -u -p -u -p -b -w -B -r1.5 -r1.4.42.2
 --- sc/source/ui/vba/vbaworkbook.cxx	11 Apr 2008 01:22:11 -0000	1.5
 +++ sc/source/ui/vba/vbaworkbook.cxx	6 Jul 2008 15:29:44 -0000	1.4.42.2
 @@ -428,14 +428,18 @@ ScVbaWorkbook::Styles( const::uno::Any& 
@@ -9521,7 +9619,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworkbook.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
 --- sc/source/ui/vba/vbaworkbook.hxx	11 Apr 2008 01:22:26 -0000	1.4
 +++ sc/source/ui/vba/vbaworkbook.hxx	6 Jul 2008 15:30:33 -0000	1.3.42.2
 @@ -75,7 +75,7 @@ public:
@@ -9538,7 +9636,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.cxx,v
 retrieving revision 1.5
 retrieving revision 1.3.42.6
-diff -u -p -b -w -B -r1.5 -r1.3.42.6
+diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.6
 --- sc/source/ui/vba/vbaworksheet.cxx	11 Apr 2008 01:23:10 -0000	1.5
 +++ sc/source/ui/vba/vbaworksheet.cxx	5 Sep 2008 14:04:24 -0000	1.3.42.6
 @@ -47,6 +47,7 @@
@@ -9799,7 +9897,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.4
-diff -u -p -b -w -B -r1.4 -r1.3.42.4
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.4
 --- sc/source/ui/vba/vbaworksheet.hxx	11 Apr 2008 01:23:24 -0000	1.4
 +++ sc/source/ui/vba/vbaworksheet.hxx	29 Jul 2008 06:35:43 -0000	1.3.42.4
 @@ -42,6 +42,8 @@
@@ -9845,7 +9943,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbawsfunction.cxx,v
 retrieving revision 1.4
 retrieving revision 1.4.96.1
-diff -u -p -b -w -B -r1.4 -r1.4.96.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.96.1
 --- sc/source/ui/vba/vbawsfunction.cxx	11 Apr 2008 01:24:09 -0000	1.4
 +++ sc/source/ui/vba/vbawsfunction.cxx	11 Sep 2008 06:11:49 -0000	1.4.96.1
 @@ -42,13 +42,14 @@
@@ -9907,7 +10005,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbawsfunction.hxx,v
 retrieving revision 1.4
 retrieving revision 1.4.96.1
-diff -u -p -b -w -B -r1.4 -r1.4.96.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.96.1
 --- sc/source/ui/vba/vbawsfunction.hxx	11 Apr 2008 01:24:23 -0000	1.4
 +++ sc/source/ui/vba/vbawsfunction.hxx	11 Sep 2008 06:11:49 -0000	1.4.96.1
 @@ -41,7 +41,6 @@ typedef InheritedHelperInterfaceImpl1< o
@@ -9918,13 +10016,12 @@
  public:
  	ScVbaWSFunction( const css::uno::Reference< oo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
  	virtual ~ScVbaWSFunction(){}
-cvs diff: Diffing sc/source/ui/vba/testvba
 Index: sc/source/ui/vba/testvba/README
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/testvba/README,v
 retrieving revision 1.2
 retrieving revision 1.2.42.1
-diff -u -p -b -w -B -r1.2 -r1.2.42.1
+diff -u -p -u -p -b -w -B -r1.2 -r1.2.42.1
 --- sc/source/ui/vba/testvba/README	7 Dec 2007 11:14:59 -0000	1.2
 +++ sc/source/ui/vba/testvba/README	29 Jul 2008 07:22:41 -0000	1.2.42.1
 @@ -1,35 +1,37 @@
@@ -9994,7 +10091,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/testvba/makefile.mk,v
 retrieving revision 1.3
 retrieving revision 1.3.96.2
-diff -u -p -b -w -B -r1.3 -r1.3.96.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.96.2
 --- sc/source/ui/vba/testvba/makefile.mk	11 Apr 2008 01:25:09 -0000	1.3
 +++ sc/source/ui/vba/testvba/makefile.mk	29 Jul 2008 09:36:01 -0000	1.3.96.2
 @@ -30,28 +30,44 @@
@@ -10370,7 +10467,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/testvba/testResults.pl,v
 retrieving revision 1.2
 retrieving revision 1.2.42.1
-diff -u -p -b -w -B -r1.2 -r1.2.42.1
+diff -u -p -u -p -b -w -B -r1.2 -r1.2.42.1
 --- sc/source/ui/vba/testvba/testResults.pl	7 Dec 2007 11:15:50 -0000	1.2
 +++ sc/source/ui/vba/testvba/testResults.pl	29 Jul 2008 07:22:42 -0000	1.2.42.1
 @@ -1,5 +1,5 @@
@@ -10721,124 +10818,121 @@
 +	}
 +
 +}
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments
 Index: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
-Binary files /dev/null and /tmp/cvsoMaG5U differ
+Binary files /dev/null and /tmp/cvsiSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
-Binary files /dev/null and /tmp/cvspMaG5U differ
+Binary files /dev/null and /tmp/cvsjSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
-Binary files /dev/null and /tmp/cvsqMaG5U differ
+Binary files /dev/null and /tmp/cvskSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
-Binary files /dev/null and /tmp/cvsrMaG5U differ
+Binary files /dev/null and /tmp/cvslSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
-Binary files /dev/null and /tmp/cvssMaG5U differ
+Binary files /dev/null and /tmp/cvsmSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
-Binary files /dev/null and /tmp/cvstMaG5U differ
+Binary files /dev/null and /tmp/cvsnSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
-Binary files /dev/null and /tmp/cvsuMaG5U differ
+Binary files /dev/null and /tmp/cvsoSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
-Binary files /dev/null and /tmp/cvsvMaG5U differ
+Binary files /dev/null and /tmp/cvspSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
-Binary files /dev/null and /tmp/cvswMaG5U differ
+Binary files /dev/null and /tmp/cvsqSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Template.xls
-Binary files /dev/null and /tmp/cvsxMaG5U differ
+Binary files /dev/null and /tmp/cvsrSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
-Binary files /dev/null and /tmp/cvsyMaG5U differ
+Binary files /dev/null and /tmp/cvssSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
-Binary files /dev/null and /tmp/cvszMaG5U differ
+Binary files /dev/null and /tmp/cvstSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
-Binary files /dev/null and /tmp/cvsAMaG5U differ
+Binary files /dev/null and /tmp/cvsuSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Window.xls
-Binary files /dev/null and /tmp/cvsBMaG5U differ
+Binary files /dev/null and /tmp/cvsvSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
-Binary files /dev/null and /tmp/cvsCMaG5U differ
+Binary files /dev/null and /tmp/cvswSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
-Binary files /dev/null and /tmp/cvsDMaG5U differ
+Binary files /dev/null and /tmp/cvsxSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
-Binary files /dev/null and /tmp/cvsEMaG5U differ
+Binary files /dev/null and /tmp/cvsySaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/format.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/format.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/format.xls
-Binary files /dev/null and /tmp/cvsFMaG5U differ
+Binary files /dev/null and /tmp/cvszSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/partition.xls
-Binary files /dev/null and /tmp/cvsGMaG5U differ
+Binary files /dev/null and /tmp/cvsASaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/range-4.xls
-Binary files /dev/null and /tmp/cvsHMaG5U differ
+Binary files /dev/null and /tmp/cvsBSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/replace.xls
-Binary files /dev/null and /tmp/cvsIMaG5U differ
+Binary files /dev/null and /tmp/cvsCSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
-Binary files /dev/null and /tmp/cvsJMaG5U differ
+Binary files /dev/null and /tmp/cvsDSaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/window2.xls
-Binary files /dev/null and /tmp/cvsKMaG5U differ
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/excel
+Binary files /dev/null and /tmp/cvsESaGlj differ
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
@@ -11502,7 +11596,6 @@
 + TEST Not succesfully completed : RangeTest3
 +END   TestCalc
 +Test run finished : 31/05/2007 11:02:12
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/unix
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log
@@ -12760,7 +12853,6 @@
 + TEST OK : Test Windows.Count
 +END  Window2
 +Test run finished : 05/29/2008 02:55:48 PM
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/win
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log
@@ -13751,7 +13843,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XApplication.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.3
-diff -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
 --- oovbaapi/org/openoffice/excel/XApplication.idl	11 Apr 2008 09:46:23 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XApplication.idl	29 Jul 2008 06:27:52 -0000	1.3.4.3
 @@ -38,6 +38,14 @@
@@ -14019,7 +14111,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XInterior.idl,v
 retrieving revision 1.4
 retrieving revision 1.4.6.1
-diff -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
 --- oovbaapi/org/openoffice/excel/XInterior.idl	11 Apr 2008 09:52:54 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XInterior.idl	29 Jul 2008 06:27:52 -0000	1.4.6.1
 @@ -51,6 +51,9 @@ interface XInterior
@@ -14209,7 +14301,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XRange.idl,v
 retrieving revision 1.4
 retrieving revision 1.4.6.1
-diff -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
 --- oovbaapi/org/openoffice/excel/XRange.idl	11 Apr 2008 09:55:48 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XRange.idl	29 Jul 2008 06:27:52 -0000	1.4.6.1
 @@ -103,6 +103,7 @@ interface XRange
@@ -14241,7 +14333,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWindow.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.2
-diff -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
 --- oovbaapi/org/openoffice/excel/XWindow.idl	11 Apr 2008 09:57:44 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XWindow.idl	6 Jul 2008 15:37:37 -0000	1.3.4.2
 @@ -44,6 +44,8 @@ module org {  module openoffice {  modul
@@ -14300,7 +14392,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWorkbook.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.2
-diff -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
 --- oovbaapi/org/openoffice/excel/XWorkbook.idl	11 Apr 2008 09:58:14 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XWorkbook.idl	6 Jul 2008 15:37:43 -0000	1.3.4.2
 @@ -71,7 +71,7 @@ interface XWorkbook
@@ -14317,7 +14409,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWorksheet.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.3
-diff -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
 --- oovbaapi/org/openoffice/excel/XWorksheet.idl	11 Apr 2008 09:58:44 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XWorksheet.idl	29 Jul 2008 06:27:52 -0000	1.3.4.3
 @@ -51,6 +51,8 @@ module org {  module openoffice {  modul
@@ -14359,7 +14451,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/makefile.mk,v
 retrieving revision 1.4
 retrieving revision 1.4.6.1
-diff -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
 --- oovbaapi/org/openoffice/excel/makefile.mk	11 Apr 2008 09:59:47 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/makefile.mk	29 Jul 2008 06:27:52 -0000	1.4.6.1
 @@ -96,6 +96,13 @@ IDLFILES= XApplication.idl\
@@ -14376,20 +14468,20 @@
  
  
  # ------------------------------------------------------------------
-cvs diff: Diffing oovbaapi/org/openoffice/msforms
 Index: oovbaapi/org/openoffice/msforms/XComboBox.idl
 ===================================================================
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XComboBox.idl,v
 retrieving revision 1.3
-retrieving revision 1.2.8.2
-diff -u -p -b -w -B -r1.3 -r1.2.8.2
+retrieving revision 1.2.8.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.8.3
 --- oovbaapi/org/openoffice/msforms/XComboBox.idl	11 Apr 2008 10:00:49 -0000	1.3
-+++ oovbaapi/org/openoffice/msforms/XComboBox.idl	6 Jul 2008 15:37:49 -0000	1.2.8.2
-@@ -44,6 +44,7 @@ module org {  module openoffice {  modul
++++ oovbaapi/org/openoffice/msforms/XComboBox.idl	15 Sep 2008 19:19:47 -0000	1.2.8.3
+@@ -44,6 +44,8 @@ module org {  module openoffice {  modul
  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 Clear();
@@ -14398,7 +14490,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XControl.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.4
-diff -u -p -b -w -B -r1.3 -r1.2.4.4
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.4
 --- oovbaapi/org/openoffice/msforms/XControl.idl	11 Apr 2008 10:01:02 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XControl.idl	9 Sep 2008 10:22:00 -0000	1.2.4.4
 @@ -37,12 +37,20 @@
@@ -14558,7 +14650,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XLabel.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.2
-diff -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
 --- oovbaapi/org/openoffice/msforms/XLabel.idl	11 Apr 2008 10:01:32 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XLabel.idl	6 Jul 2008 15:38:07 -0000	1.2.4.2
 @@ -41,6 +41,7 @@ module org {  module openoffice {  modul
@@ -14573,21 +14665,25 @@
 ===================================================================
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XListBox.idl,v
 retrieving revision 1.3
-retrieving revision 1.2.4.3
-diff -u -p -b -w -B -r1.3 -r1.2.4.3
+retrieving revision 1.2.4.4
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.4
 --- oovbaapi/org/openoffice/msforms/XListBox.idl	11 Apr 2008 10:02:04 -0000	1.3
-+++ oovbaapi/org/openoffice/msforms/XListBox.idl	29 Jul 2008 06:27:52 -0000	1.2.4.3
-@@ -44,8 +44,10 @@ interface XListBox: com::sun::star::uno:
++++ oovbaapi/org/openoffice/msforms/XListBox.idl	15 Sep 2008 19:19:47 -0000	1.2.4.4
+@@ -44,10 +44,13 @@ interface XListBox: com::sun::star::uno:
  	[attribute] any Value;
  	[attribute] string Text;
  	[attribute] boolean MultiSelect;
+-	//[attribute] sequence< boolean > Selected;
 +	[attribute] any ListIndex;
- 	//[attribute] sequence< boolean > Selected;
++        [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 );
  };
+ 
+ //=============================================================================
 Index: oovbaapi/org/openoffice/msforms/XMultiPage.idl
 ===================================================================
 RCS file: oovbaapi/org/openoffice/msforms/XMultiPage.idl
@@ -14790,7 +14886,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XRadioButton.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.2
-diff -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
 --- oovbaapi/org/openoffice/msforms/XRadioButton.idl	11 Apr 2008 10:02:36 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XRadioButton.idl	6 Jul 2008 15:38:04 -0000	1.2.4.2
 @@ -41,7 +41,7 @@ module org {  module openoffice {  modul
@@ -14941,7 +15037,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XTextBox.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.2
-diff -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
 --- oovbaapi/org/openoffice/msforms/XTextBox.idl	11 Apr 2008 10:03:37 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XTextBox.idl	6 Jul 2008 15:38:01 -0000	1.2.4.2
 @@ -41,7 +41,7 @@ module org {  module openoffice {  modul
@@ -15157,7 +15253,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/makefile.mk,v
 retrieving revision 1.4
 retrieving revision 1.3.4.5
-diff -u -p -b -w -B -r1.4 -r1.3.4.5
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.5
 --- oovbaapi/org/openoffice/msforms/makefile.mk	11 Apr 2008 10:03:53 -0000	1.4
 +++ oovbaapi/org/openoffice/msforms/makefile.mk	5 Sep 2008 14:06:38 -0000	1.3.4.5
 @@ -60,7 +60,16 @@ IDLFILES=\
@@ -15178,7 +15274,6 @@
  
  # ------------------------------------------------------------------
  
-cvs diff: Diffing oovbaapi/org/openoffice/vba
 Index: oovbaapi/org/openoffice/vba/XAssistant.idl
 ===================================================================
 RCS file: oovbaapi/org/openoffice/vba/XAssistant.idl
@@ -15534,7 +15629,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/vba/XGlobals.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.2
-diff -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
 --- oovbaapi/org/openoffice/vba/XGlobals.idl	11 Apr 2008 10:05:01 -0000	1.4
 +++ oovbaapi/org/openoffice/vba/XGlobals.idl	6 Jul 2008 15:37:34 -0000	1.3.4.2
 @@ -57,7 +57,7 @@ interface XGlobals: com::sun::star::uno:
@@ -15551,7 +15646,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/vba/makefile.mk,v
 retrieving revision 1.4
 retrieving revision 1.3.4.3
-diff -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
 --- oovbaapi/org/openoffice/vba/makefile.mk	11 Apr 2008 10:06:09 -0000	1.4
 +++ oovbaapi/org/openoffice/vba/makefile.mk	29 Jul 2008 06:27:53 -0000	1.3.4.3
 @@ -52,6 +52,11 @@ IDLFILES=\
@@ -15571,7 +15666,7 @@
 RCS file: /cvs/api/offapi/com/sun/star/document/makefile.mk,v
 retrieving revision 1.47
 retrieving revision 1.47.32.2
-diff -u -p -b -w -B -r1.47 -r1.47.32.2
+diff -u -p -u -p -b -w -B -r1.47 -r1.47.32.2
 --- offapi/com/sun/star/document/makefile.mk	1 Jul 2008 12:38:47 -0000	1.47
 +++ offapi/com/sun/star/document/makefile.mk	7 Aug 2008 06:23:37 -0000	1.47.32.2
 @@ -108,7 +108,7 @@ IDLFILES=\

Modified: trunk/patches/vba/enhanced-form-userform-controls.diff
==============================================================================
--- trunk/patches/vba/enhanced-form-userform-controls.diff	(original)
+++ trunk/patches/vba/enhanced-form-userform-controls.diff	Tue Sep 16 17:36:25 2008
@@ -623,7 +623,7 @@
 index 0000000..daa30a0
 --- /dev/null
 +++ svtools/source/misc/bindablecontrolhelper.cxx
-@@ -0,0 +1,158 @@
+@@ -0,0 +1,162 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -744,6 +744,8 @@
 +         uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
 +         xBindable->setValueBinding( xBinding );
 +    }
++    else if ( xBindable.is() ) // reset it
++        xBindable->setValueBinding( uno::Reference< form::binding::XValueBinding >() );
 +    uno::Reference< form::binding::XListEntrySink > xListEntrySink( rObj, uno::UNO_QUERY );
 +    if (  xFac.is() && rsRowSource.getLength() && xListEntrySink.is() )
 +    {
@@ -775,6 +777,8 @@
 +         uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
 +         xListEntrySink->setListEntrySource( xSource );
 +    }
++    else if (  xListEntrySink.is() ) // reset
++         xListEntrySink->setListEntrySource( uno::Reference< form::binding::XListEntrySource >()  );
 +
 +}
 +

Added: trunk/patches/vba/fix-vba-NOT-trigger-update.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/fix-vba-NOT-trigger-update.diff	Tue Sep 16 17:36:25 2008
@@ -0,0 +1,87 @@
+diff --git basic/source/runtime/runtime.cxx basic/source/runtime/runtime.cxx
+index 5cec3e2..69c75b3 100644
+--- basic/source/runtime/runtime.cxx
++++ basic/source/runtime/runtime.cxx
+@@ -48,6 +48,8 @@
+ #include "sbunoobj.hxx"
+ #include "errobject.hxx"
+ 
++SbxVariable* getDefaultProp( SbxVariable* pRef );
++
+ bool SbiRuntime::isVBAEnabled()
+ {
+ 	bool result = false;
+@@ -961,7 +963,25 @@ SbxVariable* SbiRuntime::GetTOS( short n
+ void SbiRuntime::TOSMakeTemp()
+ {
+ 	SbxVariable* p = refExprStk->Get( nExprLvl - 1 );
+-	if( p->GetRefCount() != 1 )
++	if ( p->GetType() == SbxEMPTY )
++		p->Broadcast( SBX_HINT_DATAWANTED );
++
++	SbxVariable* pDflt = NULL;
++	if ( bVBAEnabled &&  ( p->GetType() == SbxOBJECT || p->GetType() == SbxVARIANT  ) && ( pDflt = getDefaultProp( p ) ) )
++	{
++		pDflt->Broadcast( SBX_HINT_DATAWANTED );
++		// replacing new p on stack causes object pointed by 
++		// pDft->pParent to be deleted, when p2->Compute() is
++		// called below pParent is accessed ( but its deleted )
++		// so set it to NULL now
++		pDflt->SetParent( NULL );  
++		p = new SbxVariable( *pDflt );
++		p->SetFlag( SBX_READWRITE );
++		refExprStk->Put( p, nExprLvl - 1 );
++//		return;
++	}
++
++	else if( p->GetRefCount() != 1 )
+ 	{
+ 		SbxVariable* pNew = new SbxVariable( *p );
+ 		pNew->SetFlag( SBX_READWRITE );
+@@ -970,7 +990,6 @@ void SbiRuntime::TOSMakeTemp()
+ }
+ 
+ // Der GOSUB-Stack nimmt Returnadressen fuer GOSUBs auf
+-
+ void SbiRuntime::PushGosub( const BYTE* pc )
+ {
+ 	if( ++nGosubLvl > MAXRECURSION )
+diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
+index cbd2fad..0666725 100644
+--- basic/source/runtime/step0.cxx
++++ basic/source/runtime/step0.cxx
+@@ -59,34 +59,6 @@ void SbiRuntime::StepArith( SbxOperator 
+ 	TOSMakeTemp();
+ 	SbxVariable* p2 = GetTOS();
+ 
+-
+-	// This could & should be moved to the MakeTempTOS() method in runtime.cxx
+-	// In the code which this is cut'npaste from there is a check for a ref
+-	// count != 1 based on which the copy of the SbxVariable is done.
+-	// see orig code in MakeTempTOS ( and I'm not sure what the significance,
+-	// of that is )
+-	// here we alway seem to have a refcount of 1. Also it seems that
+-	// MakeTempTOS is called for other operation, so I hold off for now
+-	// until I have a better idea
+-	if ( bVBAEnabled
+-		&& ( p2->GetType() == SbxOBJECT || p2->GetType() == SbxVARIANT )
+-	)
+-	{
+-		SbxVariable* pDflt = getDefaultProp( p2 );
+-		if ( pDflt )
+-		{
+-			pDflt->Broadcast( SBX_HINT_DATAWANTED );
+-			// replacing new p2 on stack causes object pointed by 
+-			// pDft->pParent to be deleted, when p2->Compute() is
+-			// called below pParent is accessed ( but its deleted )
+-			// so set it to NULL now
+-			pDflt->SetParent( NULL );  
+-			p2 = new SbxVariable( *pDflt );
+-			p2->SetFlag( SBX_READWRITE );
+-			refExprStk->Put( p2, nExprLvl - 1 );
+-		}
+-	}
+-
+ 	p2->ResetFlag( SBX_FIXED );
+ 	p2->Compute( eOp, *p1 );
+ 

Added: trunk/patches/vba/vba-allow-forms-resetvalue-binding.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-allow-forms-resetvalue-binding.diff	Tue Sep 16 17:36:25 2008
@@ -0,0 +1,15 @@
+diff --git forms/source/component/FormComponent.cxx forms/source/component/FormComponent.cxx
+index 2919abd..2b73ec6 100644
+--- forms/source/component/FormComponent.cxx
++++ forms/source/component/FormComponent.cxx
+@@ -2556,8 +2556,8 @@ void SAL_CALL OBoundControlModel::setVal
+     OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::setValueBinding: How did you reach this method?" );
+         // the interface for this method should not have been exposed if we do not
+         // support binding to external data
+-
+-    if ( !impl_approveValueBinding_nolock( _rxBinding ) )
++    // allow reset
++    if ( _rxBinding.is() && !impl_approveValueBinding_nolock( _rxBinding ) )
+     {
+         throw IncompatibleTypesException(
+             FRM_RES_STRING( RID_STR_INCOMPATIBLE_TYPES ),
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]