applied_patches/0862-xlsx-export-cell-style-max-builtin.diff

   1 From 0d05955d4ef899fd310d41ae4134803abaa83d6b Mon Sep 17 00:00:00 2001
   2 From: Jan Nieuwenhuizen <janneke@gnu.org>
   3 Date: Wed, 10 Jun 2009 14:59:58 +0200
   4 Subject: [PATCH] [OOXML]: calc export: respect CELL_STYLE_MAX_BUILTIN_ID=55.  Fixes n#497563.
   5
   6    * Modified     sc/source/filter/xlsx/xlsx-xestyle.cxx
   7 ---
   8  sc/source/filter/xlsx/xlsx-xestyle.cxx |    5 ++++-
   9  1 files changed, 4 insertions(+), 1 deletions(-)
  10
  11 diff --git sc/source/filter/xlsx/xlsx-xestyle.cxx sc/source/filter/xlsx/xlsx-xestyle.cxx
  12 index d5c5499..bf49bef 100644
  13 --- sc/source/filter/xlsx/xlsx-xestyle.cxx
  14 +++ sc/source/filter/xlsx/xlsx-xestyle.cxx
  15 @@ -2213,7 +2213,10 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm )
  16      rStrm.GetCurrentStream()->singleElement( XML_cellStyle,
  17              XML_name,           sName.getStr(),
  18              XML_xfId,           OString::valueOf( nXFId ).getStr(),
  19 -            XML_builtinId,      OString::valueOf( (sal_Int32) mnStyleId ).getStr(),
  20 +/* mso-excel 2007 complains when it finds builtinId >= 55, it is not
  21 + * bothered by multiple 54 values. */
  22 +#define CELL_STYLE_MAX_BUILTIN_ID 55
  23 +                                             XML_builtinId, OString::valueOf( std::min( static_cast<sal_Int32>( CELL_STYLE_MAX_BUILTIN_ID - 1 ), static_cast <sal_Int32>( mnStyleId ) ) ).getStr(),
  24              // OOXTODO: XML_iLevel,
  25              // OOXTODO: XML_hidden,
  26              XML_customBuiltin,  XclXmlUtils::ToPsz( ! IsBuiltIn() ),
  27 --
  28 1.6.0.rc1.49.g98a8
  29