[ooo-build-commit] patches/dev300

[Jan Nieuwenhuizen]

 patches/dev300/apply                                   |    2 +
 patches/dev300/xlsx-export-cell-style-max-builtin.diff |   29 +++++++++++++++++
 2 files changed, 31 insertions(+)

New commits:
commit 5a5995bb70e19d671608d1b3f727c19d1c1d3cf0
Author: Jan Nieuwenhuizen <janneke at gnu.org>
Date:   Wed Jun 10 15:29:23 2009 +0200

    [OOXML]: calc export: respect CELL_STYLE_MAX_BUILTIN_ID=55.  Fixes n#497563.
    
       * Modified     sc/source/filter/xlsx/xlsx-xestyle.cxx

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6faf47c..8957104 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3041,6 +3041,8 @@ unoxml-fast-sax-serializable.diff, thorsten
 # this here depends on oox changes in OOXMLExport
 oox-smartart-import.diff, thorsten
 
+xlsx-export-cell-style-max-builtin.diff, n#497563, janneke
+
 [ OOXML ]
 oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
 
diff --git a/patches/dev300/xlsx-export-cell-style-max-builtin.diff b/patches/dev300/xlsx-export-cell-style-max-builtin.diff
new file mode 100644
index 0000000..f2a1f38
--- /dev/null
+++ b/patches/dev300/xlsx-export-cell-style-max-builtin.diff
@@ -0,0 +1,29 @@
+From 0d05955d4ef899fd310d41ae4134803abaa83d6b Mon Sep 17 00:00:00 2001
+From: Jan Nieuwenhuizen <janneke at gnu.org>
+Date: Wed, 10 Jun 2009 14:59:58 +0200
+Subject: [PATCH] [OOXML]: calc export: respect CELL_STYLE_MAX_BUILTIN_ID=55.  Fixes n#497563.
+
+   * Modified     sc/source/filter/xlsx/xlsx-xestyle.cxx
+---
+ sc/source/filter/xlsx/xlsx-xestyle.cxx |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git sc/source/filter/xlsx/xlsx-xestyle.cxx sc/source/filter/xlsx/xlsx-xestyle.cxx
+index d5c5499..bf49bef 100644
+--- sc/source/filter/xlsx/xlsx-xestyle.cxx
++++ sc/source/filter/xlsx/xlsx-xestyle.cxx
+@@ -2213,7 +2213,10 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm )
+     rStrm.GetCurrentStream()->singleElement( XML_cellStyle,
+             XML_name,           sName.getStr(),
+             XML_xfId,           OString::valueOf( nXFId ).getStr(),
+-            XML_builtinId,      OString::valueOf( (sal_Int32) mnStyleId ).getStr(),
++/* mso-excel 2007 complains when it finds builtinId >= 55, it is not
++ * bothered by multiple 54 values. */
++#define CELL_STYLE_MAX_BUILTIN_ID 55
++                                             XML_builtinId, OString::valueOf( std::min( CELL_STYLE_MAX_BUILTIN_ID - 1, static_cast <sal_Int32>( mnStyleId ) ) ).getStr(),
+             // OOXTODO: XML_iLevel,
+             // OOXTODO: XML_hidden,
+             XML_customBuiltin,  XclXmlUtils::ToPsz( ! IsBuiltIn() ),
+-- 
+1.6.0.rc1.49.g98a8
+