diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 11:26:50 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 11:26:50 +0000 |
| commit | d09e083a08d18d466b38d80c5edd2d14811a4492 (patch) | |
| tree | f8825159e8540e8b3916bc5d951e5d23d011d4ba /oox/source/xls/stylesbuffer.cxx | |
| parent | 313d0a2cd473ef522ccff27ebb4569f8dc497d2e (diff) | |
INTEGRATION: CWS xmlfilter05 (1.3.4); FILE MERGED
2008/05/02 11:21:15 hbrinkm 1.3.4.5: RESYNC: (1.3-1.5); FILE MERGED
2008/04/21 08:26:46 dr 1.3.4.4: sign error
2008/04/16 13:10:11 dr 1.3.4.3: new optional token handling, fix default rotation in 3d charts
2008/04/02 12:42:03 hbrinkm 1.3.4.2: merged changes from xmlfilter04 to xmlfilter05
2008/04/01 15:38:45 hbrinkm 1.3.4.1: 'Merged xmlfilter04'
Diffstat (limited to 'oox/source/xls/stylesbuffer.cxx')
| -rw-r--r-- | oox/source/xls/stylesbuffer.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx index 25a0dc2e381f..58908830a40b 100644 --- a/oox/source/xls/stylesbuffer.cxx +++ b/oox/source/xls/stylesbuffer.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: stylesbuffer.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -354,7 +354,7 @@ void Color::importColor( RecordInputStream& rStrm ) // scale tint from signed 16-bit to double range -1.0 ... 1.0 double fTint = nTint; if( nTint < 0 ) - fTint /= SAL_MIN_INT16; + fTint /= -SAL_MIN_INT16; else if( nTint > 0 ) fTint /= SAL_MAX_INT16; @@ -707,7 +707,7 @@ void Font::importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) case XLS_TOKEN( rFont ): if( rAttribs.hasAttribute( XML_val ) ) { - maOoxData.maName = rAttribs.getString( XML_val ); + maOoxData.maName = rAttribs.getString( XML_val, OUString() ); maUsedFlags.mbNameUsed = true; } break; @@ -2676,7 +2676,7 @@ CellStyle::CellStyle( const WorkbookHelper& rHelper ) : void CellStyle::importCellStyle( const AttributeList& rAttribs ) { - maOoxData.maName = rAttribs.getString( XML_name ); + maOoxData.maName = rAttribs.getString( XML_name, OUString() ); maOoxData.mnXfId = rAttribs.getInteger( XML_xfId, -1 ); maOoxData.mnBuiltinId = rAttribs.getInteger( XML_builtinId, -1 ); maOoxData.mnLevel = rAttribs.getInteger( XML_iLevel, 0 ); |