ooo-build r15362 - in trunk: . patches/dev300 patches/vba

[pflin svn gnome org]

Author: pflin
Date: Wed Feb 18 09:37:41 2009
New Revision: 15362
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15362&view=rev

Log:
2009-02-18  Fong Lin <pflin novell com>
	* patches/vba/vba-combobox-listindex-fix.diff: fixed for n#476891.
	* patches/dev300/apply.



Added:
   trunk/patches/vba/vba-combobox-listindex-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Feb 18 09:37:41 2009
@@ -1752,6 +1752,7 @@
 vba-interior-object-fix.diff, n#459479, Fong
 range-defaultmethod-i98476.diff, i#98476 
 vba-excel-iserror-fix.diff, n#469762
+vba-combobox-listindex-fix.diff, n#476891, Fong
 
 # filter to read custom toolbars ( and other customization data ) from writer
 word-read-custom-toolbar-filter.diff, noelpwer

Added: trunk/patches/vba/vba-combobox-listindex-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-combobox-listindex-fix.diff	Wed Feb 18 09:37:41 2009
@@ -0,0 +1,25 @@
+diff --git vbahelper/source/msforms/vbacombobox.cxx vbahelper/source/msforms/vbacombobox.cxx
+index f1ea440..7c27734 100644
+--- vbahelper/source/msforms/vbacombobox.cxx
++++ vbahelper/source/msforms/vbacombobox.cxx
+@@ -63,9 +63,17 @@ ScVbaComboBox::getValue() throw (uno::RuntimeException)
+ void SAL_CALL 
+ ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
+ {
+-    uno::Sequence< sal_Int16 > sSelection(1);
+-    _value >>= sSelection[ 0 ];
+-    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( sSelection ) );
++    sal_Int16 nIndex = 0;
++    if( _value >>= nIndex )
++    {
++	    uno::Sequence< rtl::OUString > sItems;
++    	m_xProps->getPropertyValue( ITEMS ) >>= sItems;
++        if( ( nIndex >= 0 ) && ( sItems.getLength() > nIndex ) )
++        {
++            rtl::OUString sText = sItems[ nIndex ];
++            m_xProps->setPropertyValue( TEXT, uno::makeAny( sText ) );
++        }
++    }
+ }
+ 
+ uno::Any SAL_CALL