[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                              |    4 ++++
 patches/dev300/calc-combo-listbox-export-fix.diff |   13 +++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit 2bf35bce6c10ac7783bc8c8d9881bbb135e92b40
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Sep 25 13:51:05 2009 -0400

    Fix erroneous export of OCX combo box controls.
    
    * patches/dev300/apply: apply this new patch.
    
    * patches/dev300/calc-combo-listbox-export-fix.diff: add two empty
      bytes to keep Excel 2003 and 2007 happy.  Interestingly, Excel XP
      was just fine with or without this fix. (n#540566)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b4d2e46..3ed5664 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -837,6 +837,10 @@ calc-find-replace-skip-filtered.diff, n#539282, kohei
 # force-interpret formula cell results.
 calc-getpivotdata-force-interpret-formula.diff, n#540563, kohei
 
+# fix incorrect export of combo boxes, by adding two empty bytes to make Excel
+# 2003 and 2007 happy.
+calc-combo-listbox-export-fix.diff, n#540566, noelp
+
 # Support PHONETIC function to display asian phonetic guide.
 # LATER: I'll take care of this later.  --kohei
 # calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
diff --git a/patches/dev300/calc-combo-listbox-export-fix.diff b/patches/dev300/calc-combo-listbox-export-fix.diff
new file mode 100644
index 0000000..11b1e5d
--- /dev/null
+++ b/patches/dev300/calc-combo-listbox-export-fix.diff
@@ -0,0 +1,13 @@
+diff --git sc/source/filter/excel/xeescher.cxx sc/source/filter/excel/xeescher.cxx
+index 98eb5b7..78a0d2a 100644
+--- sc/source/filter/excel/xeescher.cxx
++++ sc/source/filter/excel/xeescher.cxx
+@@ -696,6 +696,8 @@ void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
+             else if( mnObjType == EXC_OBJTYPE_DROPDOWN )
+             {
+                 rStrm << sal_uInt16( 0 ) << mnLineCount;
++                // dxMin & zero length str
++                rStrm << sal_uInt16( 0 ) << sal_uInt16( 0 );
+             }
+ 
+             rStrm.EndRecord();