diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 13:25:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 13:25:34 +0000 |
| commit | 58d92ac8261f7ef0c56319fa708de86f2799618d (patch) | |
| tree | f4c330774ffeea42bf5c36555678e3f81a665e33 /oox/source | |
| parent | 361dbe64f93d4f57c6d7ff1305d0268af6c6ad38 (diff) | |
INTEGRATION: CWS xmlfilter04 (1.2.12); FILE MERGED
2008/02/27 13:15:46 dr 1.2.12.2: improved XLS color handling
2008/02/21 12:42:03 hbrinkm 1.2.12.1: joined changes from xmlfilter03
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/dump/biffdumper.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx index f017e7dfebeb..1b5491e9d82b 100644 --- a/oox/source/dump/biffdumper.cxx +++ b/oox/source/dump/biffdumper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: biffdumper.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -555,10 +555,11 @@ sal_uInt8 BiffObjectBase::dumpErrorCode( const sal_Char* pcName ) sal_Int32 BiffObjectBase::dumpRgbColor( const sal_Char* pcName ) { - OoxColor aColor; - aColor.importColorRgb( *mxStrm ); - writeColorItem( pcName ? pcName : "color-rgb", aColor.mnValue ); - return aColor.mnValue; + sal_uInt8 nR, nG, nB, nA; + *mxStrm >> nR >> nG >> nB >> nA; + sal_Int32 nValue = (nA << 24) | (nR << 16) | (nG << 8) | nB; + writeColorItem( pcName ? pcName : "color-rgb", nValue ); + return nValue; } rtl_TextEncoding BiffObjectBase::dumpCodePage( const sal_Char* pcName ) |