diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-08-12 17:10:40 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-08-12 22:05:36 -0400 |
commit | 1e68aabdeaacd8d4cac94d46925a55e2a93880d7 (patch) | |
tree | 0ed5e1bd1fff8d80a79ae45537e7e0bb72ab0db6 /sc | |
parent | 3c99db4ca0405ab74f0e327ef9444c6cfdb7fc5b (diff) |
Don't export builtinId of 54 or above.
Change-Id: I5ab651e0c92ab032d892080f979aa4f53295a8b6
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index f4c76407844e..7d21206fbc16 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2213,9 +2213,8 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->singleElement( XML_cellStyle, XML_name, sName.getStr(), XML_xfId, OString::number( nXFId ).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 +// builtinId of 54 or above is invalid according to OpenXML SDK validator. +#define CELL_STYLE_MAX_BUILTIN_ID 54 XML_builtinId, OString::number( std::min( static_cast<sal_Int32>( CELL_STYLE_MAX_BUILTIN_ID - 1 ), static_cast <sal_Int32>( mnStyleId ) ) ).getStr(), // OOXTODO: XML_iLevel, // OOXTODO: XML_hidden, |