diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-07-16 20:31:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-27 06:49:16 +0000 |
| commit | e73c4d5013d7a0bf7d72db1773d7125ab91cf269 (patch) | |
| tree | 2cb3ce794495c24e427cb7525d8785071b42a65e /sc/source/filter/oox/pivotcachebuffer.cxx | |
| parent | 508c95f1b655d9cfa6be37a5a9de9aff6fd383bf (diff) | |
sc: meBiff is always set to BiffType::BIFF_UNKNOWN
remove meBeff and GetBiff().
adapt uses.
remove enum BiffType, because only use is gone.
keep BiffType symbols as comment for documetation.
Change-Id: I7019a21b80fd5b5f0b92458f83dd9e34bc704731
Reviewed-on: https://gerrit.libreoffice.org/27253
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/filter/oox/pivotcachebuffer.cxx')
| -rw-r--r-- | sc/source/filter/oox/pivotcachebuffer.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 019b02986e9c..7de3dbb6d7d2 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -235,7 +235,7 @@ void PivotCacheItem::readIndex( SequenceInputStream& rStrm ) void PivotCacheItem::readString( BiffInputStream& rStrm, const WorkbookHelper& rHelper ) { - maValue <<= (rHelper.getBiff() == BIFF8) ? rStrm.readUniString() : rStrm.readByteStringUC( true, rHelper.getTextEncoding() ); + maValue <<= rStrm.readByteStringUC( true, rHelper.getTextEncoding() ); mnType = XML_s; } @@ -634,7 +634,7 @@ void PivotCacheField::importPCDField( BiffInputStream& rStrm ) maFieldGroupModel.mnBaseField = rStrm.readuInt16(); rStrm.skip( 2 ); // number of unique items (either shared or group) rStrm >> nGroupItems >> nBaseItems >> nSharedItems; - maFieldModel.maName = (getBiff() == BIFF8) ? rStrm.readUniString() : rStrm.readByteStringUC( true, getTextEncoding() ); + maFieldModel.maName = rStrm.readByteStringUC( true, getTextEncoding() ); maFieldModel.mbServerField = getFlag( nFlags, BIFF_PCDFIELD_SERVERFIELD ); maFieldModel.mbUniqueList = !getFlag( nFlags, BIFF_PCDFIELD_NOUNIQUEITEMS ); @@ -1176,9 +1176,7 @@ void PivotCache::importPCDefinition( BiffInputStream& rStrm ) rStrm.skip( 6 ); // total field count, report record count, (repeated) cache type rStrm >> nUserNameLen; if( nUserNameLen != BIFF_PC_NOSTRING ) - maDefModel.maRefreshedBy = (getBiff() == BIFF8) ? - rStrm.readUniString( nUserNameLen ) : - rStrm.readCharArrayUC( nUserNameLen, getTextEncoding() ); + maDefModel.maRefreshedBy = rStrm.readCharArrayUC( nUserNameLen, getTextEncoding() ); maDefModel.mbInvalid = getFlag( nFlags, BIFF_PCDEFINITION_INVALID ); maDefModel.mbSaveData = getFlag( nFlags, BIFF_PCDEFINITION_SAVEDATA ); |