diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-12-16 19:00:18 +0100 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-12-16 19:00:18 +0100 |
| commit | 2b7da24f60f3cf7feafa17562c47760b8f1f44d0 (patch) | |
| tree | db4233d7448a2a4635285b38a16d1fe8fdbf2d86 /oox/source/dump | |
| parent | b60db466ef41f4414ef80563dc3b97428336acf5 (diff) | |
dr78: #i109800# SHEET record may not point to BOF but to any record in the sheet substream
Diffstat (limited to 'oox/source/dump')
| -rw-r--r-- | oox/source/dump/biffdumper.cxx | 16 | ||||
| -rw-r--r-- | oox/source/dump/dumperbase.ini | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx index 3d6f20ed62ba..709fa22b41e0 100644 --- a/oox/source/dump/biffdumper.cxx +++ b/oox/source/dump/biffdumper.cxx @@ -2461,6 +2461,12 @@ void WorkbookStreamObject::implDumpRecordBody() dumpDec< sal_Int32 >( "sst-idx" ); break; + case BIFF_ID_MERGEDCELLS: + mxOut->resetItemIndex(); + for( sal_uInt16 nIdx = 0, nCount = dumpDec< sal_uInt16 >( "count" ); !rStrm.isEof() && (nIdx < nCount); ++nIdx ) + dumpRange( "#range" ); + break; + case BIFF_ID_MSODRAWING: case BIFF_ID_MSODRAWINGGROUP: case BIFF_ID_MSODRAWINGSEL: @@ -2560,6 +2566,16 @@ void WorkbookStreamObject::implDumpRecordBody() } break; + case BIFF_ID_PALETTE: + mxOut->resetItemIndex(); + for( sal_uInt16 nIdx = 0, nCount = dumpDec< sal_uInt16 >( "count" ); !rStrm.isEof() && (nIdx < nCount); ++nIdx ) + { + OUStringBuffer aColorName; + StringHelper::appendHex( aColorName, dumpColorABGR( "#color" ) ); + mxColors->setName( nIdx, aColorName.makeStringAndClear() ); + } + break; + case BIFF_ID_PANE: dumpDec< sal_uInt16 >( "x-pos", "CONV-TWIP-TO-CM" ); dumpDec< sal_uInt16 >( "y-pos", "CONV-TWIP-TO-CM" ); diff --git a/oox/source/dump/dumperbase.ini b/oox/source/dump/dumperbase.ini index 34ef302c784c..f9b776c9d99a 100644 --- a/oox/source/dump/dumperbase.ini +++ b/oox/source/dump/dumperbase.ini @@ -35,7 +35,7 @@ show-trailing-unknown=1 # Shows the absolute stream position of records in the record header field # (default=on). # 0=off, 1=on -show-record-position=0 +show-record-position=1 # name lists ================================================================= # |