[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                    |    1 +
 patches/dev300/calc-perf-xls-import-cellstyles-fix.diff |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit d3d55ced1be3eb750fbb7e2d7953cb7ad5dd2093
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Apr 14 17:13:31 2010 -0400

    Fix a regression on conditional formatting import from xls documents.
    
    * patches/dev300/apply:
    * patches/dev300/calc-perf-xls-import-cellstyles-fix.diff: apply conditional
      formatting attributes *after* the styles attributes, in order to prevent
      conditional formatting attributes from getting overwritten. (n#594266)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5dbbcf7..76a1452 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3751,6 +3751,7 @@ calc-perf-import-dbf-sc.diff,           n#558505, kohei
 calc-perf-ods-import-row-height.diff, n#582693, kohei
 calc-perf-ods-import-cellstyles.diff, n#582693, kohei
 calc-perf-xls-import-cellstyles.diff, n#582693, kohei
+calc-perf-xls-import-cellstyles-fix.diff, n#594266, kohei
 
 # Adjust the size of the broadcast slot machine to match the new row limit.
 calc-perf-adjust-slot-machine.diff, n#588554, kohei
diff --git a/patches/dev300/calc-perf-xls-import-cellstyles-fix.diff b/patches/dev300/calc-perf-xls-import-cellstyles-fix.diff
new file mode 100644
index 0000000..4b3f37d
--- /dev/null
+++ b/patches/dev300/calc-perf-xls-import-cellstyles-fix.diff
@@ -0,0 +1,14 @@
+diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
+index 0d5bea0..400ccff 100644
+--- sc/source/filter/excel/excimp8.cxx
++++ sc/source/filter/excel/excimp8.cxx
+@@ -322,8 +322,8 @@ void ImportExcel8::ReadBasic( void )
+ 
+ void ImportExcel8::EndSheet( void )
+ {
+-    GetCondFormatManager().Apply();
+     ImportExcel::EndSheet();
++    GetCondFormatManager().Apply();
+ }
+ 
+