sc/source/filter/excel/xestream.cxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 5aa9cfedc3e1e2f191a3fc86342dd851e5ef3d3f
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon May 6 02:56:40 2013 +0200
make Excel happy
Why the f*cking hell do we need file format specs if they are ignored
and we just write into an implementers note what we want to see in the
spec. And at least if there is an implementers note file make sure to
mention all the cases and save me the reverse engineering time.
Change-Id: I08c2c9963fc6f2780e49a89f988a758665e007fa
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index 29d5bd7..64e0ee7 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -950,16 +950,16 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData(
sax_fastparser::FSHelper
const char* pUnderline = lcl_GetUnderlineStyle(
rFontData.GetScUnderline(), bHaveUnderline );
const char* pVertAlign = lcl_ToVerticalAlignmentRun(
rFontData.GetScEscapement(), bHaveVertAlign );
- lcl_WriteValue( pStream, nFontId, XclXmlUtils::ToOString(
rFontData.maName ).getStr() );
- lcl_WriteValue( pStream, XML_charset, rFontData.mnCharSet != 0 ?
OString::valueOf( (sal_Int32) rFontData.mnCharSet ).getStr() : NULL );
- lcl_WriteValue( pStream, XML_family, OString::valueOf( (sal_Int32)
rFontData.mnFamily ).getStr() );
lcl_WriteValue( pStream, XML_b, rFontData.mnWeight > 400 ?
XclXmlUtils::ToPsz( rFontData.mnWeight > 400 ) : NULL );
lcl_WriteValue( pStream, XML_i, rFontData.mbItalic ?
XclXmlUtils::ToPsz( rFontData.mbItalic ) : NULL );
lcl_WriteValue( pStream, XML_strike, rFontData.mbStrikeout ?
XclXmlUtils::ToPsz( rFontData.mbStrikeout ) : NULL );
- lcl_WriteValue( pStream, XML_outline, rFontData.mbOutline ?
XclXmlUtils::ToPsz( rFontData.mbOutline ) : NULL );
- lcl_WriteValue( pStream, XML_shadow, rFontData.mbShadow ?
XclXmlUtils::ToPsz( rFontData.mbShadow ) : NULL );
// OOXTODO: lcl_WriteValue( rStream, XML_condense, ); // mac
compatibility setting
// OOXTODO: lcl_WriteValue( rStream, XML_extend, ); // compatibility
setting
+ lcl_WriteValue( pStream, XML_outline, rFontData.mbOutline ?
XclXmlUtils::ToPsz( rFontData.mbOutline ) : NULL );
+ lcl_WriteValue( pStream, XML_shadow, rFontData.mbShadow ?
XclXmlUtils::ToPsz( rFontData.mbShadow ) : NULL );
+ lcl_WriteValue( pStream, XML_u, bHaveUnderline ? pUnderline :
NULL );
+ lcl_WriteValue( pStream, XML_vertAlign, bHaveVertAlign ? pVertAlign :
NULL );
+ lcl_WriteValue( pStream, XML_sz, OString::valueOf( (double)
(rFontData.mnHeight / 20.0) ).getStr() ); // Twips->Pt
if( rFontData.maColor != Color( 0xFF, 0xFF, 0xFF, 0xFF ) )
pStream->singleElement( XML_color,
// OOXTODO: XML_auto, bool
@@ -968,9 +968,9 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData(
sax_fastparser::FSHelper
// OOXTODO: XML_theme, index into <clrScheme/>
// OOXTODO: XML_tint, double
FSEND );
- lcl_WriteValue( pStream, XML_sz, OString::valueOf( (double)
(rFontData.mnHeight / 20.0) ).getStr() ); // Twips->Pt
- lcl_WriteValue( pStream, XML_u, bHaveUnderline ? pUnderline :
NULL );
- lcl_WriteValue( pStream, XML_vertAlign, bHaveVertAlign ? pVertAlign :
NULL );
+ lcl_WriteValue( pStream, nFontId, XclXmlUtils::ToOString(
rFontData.maName ).getStr() );
+ lcl_WriteValue( pStream, XML_family, OString::valueOf( (sal_Int32)
rFontData.mnFamily ).getStr() );
+ lcl_WriteValue( pStream, XML_charset, rFontData.mnCharSet != 0 ?
OString::valueOf( (sal_Int32) rFontData.mnCharSet ).getStr() : NULL );
return pStream;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
