[ooo-build-commit] patches/dev300 patches/vba

[Pei Feng Lin]

 patches/dev300/apply                             |    1 +
 patches/vba/vba-combobox-data-rowsource-fix.diff |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 448f115e40c2cae19e42e9e0c8a24260e31a1ac0
Author: Fong Lin <pflin at novell.com>
Date:   Wed Nov 4 16:47:08 2009 +0800

    Trigger comboBox Change even when the value of ComboBox.ListIndex is set
    
    * patches/dev300/apply:
    * patches/vba/vba-combobox-data-rowsource-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a4ed988..ee5ca84 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1652,6 +1652,7 @@ vba-thiscomponent-fix.diff
 SectionOwner => noelpwer
 vba-basic-not-fix.diff, i#105321, Fong
 vba-autofiltermode.diff, n#549383
+vba-combobox-data-rowsource-fix.diff, n#539220
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/vba-combobox-data-rowsource-fix.diff b/patches/vba/vba-combobox-data-rowsource-fix.diff
new file mode 100644
index 0000000..7851e40
--- /dev/null
+++ b/patches/vba/vba-combobox-data-rowsource-fix.diff
@@ -0,0 +1,13 @@
+diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
+index f1e9ff3..c7b1082 100644
+--- svx/source/msfilter/msocximex.cxx
++++ svx/source/msfilter/msocximex.cxx
+@@ -2677,6 +2677,8 @@ sal_Bool OCX_ComboBox::Import(com::sun::star::uno::Reference<
+ 	rPropSet->setPropertyValue( WW8_ASCII2STR("MaxTextLen"), aTmp);
+ 
+ 	aFontData.Import(rPropSet);
++	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
++	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
+ 	return sal_True;
+ }
+