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

[Pei Feng Lin]

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

New commits:
commit 323701c375fcecff4556a1f7f6180244bd570798
Author: Fong Lin <pflin at novell.com>
Date:   Thu Jul 2 11:17:31 2009 +0800

    Fix for ComboBox binding data import in userform
    
    * patches/dev300/apply:
    * patches/vba/vba-combobox-rowsource-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0e7a664..e39d75b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1856,6 +1856,8 @@ vba-fallback-to-calling-doc-context.diff
 vba-cursor-pos-for-selected-maxrange.diff
 # fix BulletId property in NumberingRules
 writer-uno-numberingrule-bulletid.diff, i#103021, Fong
+# fix combox binding data import in userform
+vba-combobox-rowsource-fix.diff, Fong
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/vba-combobox-rowsource-fix.diff b/patches/vba/vba-combobox-rowsource-fix.diff
new file mode 100644
index 0000000..7851e40
--- /dev/null
+++ b/patches/vba/vba-combobox-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;
+ }
+