[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                         |    1 
 patches/vba/vba-fix-listboxhang-n560355.diff |   45 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

New commits:
commit 27f7a82ac947c44e129be8e4ed40c13f923e11e7
Author: Noel Power <noel.power at novell.com>
Date:   Mon Dec 14 15:17:56 2009 +0000

    fix issue n560355
    
    * patches/dev300/apply:
    * patches/vba/vba-fix-listboxhang-n560355.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b89687a..aa0dba0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1898,6 +1898,7 @@ vba-fix-wsfunction-booleanparam.diff, bnc#541735
 vba-fix-selection-dot-inproject.diff
 vba-fix-override-exportproblem.diff
 vba-fix-find-wraparound-onfail.diff. n#554261
+vba-fix-listboxhang-n560355.diff, n#560355
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/vba-fix-listboxhang-n560355.diff b/patches/vba/vba-fix-listboxhang-n560355.diff
new file mode 100644
index 0000000..3540ee1
--- /dev/null
+++ b/patches/vba/vba-fix-listboxhang-n560355.diff
@@ -0,0 +1,45 @@
+diff --git toolkit/source/awt/vclxwindows.cxx toolkit/source/awt/vclxwindows.cxx
+index dc32c06..7b2f801 100644
+--- toolkit/source/awt/vclxwindows.cxx
++++ toolkit/source/awt/vclxwindows.cxx
+@@ -1181,16 +1181,6 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::
+                         pButton->Check( b );
+                     else
+                         pButton->SetState( b );
+-					// If VBA - need to be able to test
+-					// simulate click event
+-					if ( maActionListeners.getLength() )
+-					{
+-						::com::sun::star::awt::ActionEvent aEvent;
+-						aEvent.Source = (::cppu::OWeakObject*)this;
+-						aEvent.ActionCommand = maActionCommand;
+-						maActionListeners.actionPerformed( aEvent );
+-					}
+-					
+                 }
+             }
+             break;
+@@ -1953,11 +1943,8 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
+                 ::com::sun::star::uno::Sequence< ::rtl::OUString> aItems;
+                 if ( Value >>= aItems )
+                 {
+-					sal_Int16 nElem  = pListBox->GetEntryCount();
+                     pListBox->Clear();
+                     addItems( aItems, 0 );
+-					if ( aItems.getLength() == 0 && nElem && maItemListeners.getLength() )
+-						ImplCallItemListeners();
+                 }
+             }
+             break;
+@@ -1970,11 +1957,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
+                         pListBox->SelectEntryPos( --n, sal_False );
+ 
+                     if ( aItems.getLength() )
+-                    {			
+                         selectItemsPos( aItems, sal_True );
+-                       if ( maItemListeners.getLength() )
+-                           ImplCallItemListeners();
+-                    }
+                     else
+                         pListBox->SetNoSelection();
+