diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-21 11:58:51 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-22 08:47:34 +0200 |
commit | e5ee29737edc08874ae854c459198aa4fba59dd8 (patch) | |
tree | 995b939083e527ad4c6661daef9ab8bbcb449f77 /oox/source/dump | |
parent | 0281b187752a6da62b801f4a4acf5cf74c2c31f2 (diff) |
loplugin:unusedfields in oox,reportdesign
Change-Id: I0201d76cb3d4605bdc00c81cfa9d91f98341c7f3
Reviewed-on: https://gerrit.libreoffice.org/40290
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/dump')
-rw-r--r-- | oox/source/dump/dffdumper.cxx | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx index d35cc1cf2ff6..abbd96d3b7b1 100644 --- a/oox/source/dump/dffdumper.cxx +++ b/oox/source/dump/dffdumper.cxx @@ -41,7 +41,6 @@ const sal_uInt16 DFF_ID_SPLITMENUCOLORS = 0xF11E; /// Current toolbar colo const sal_uInt16 DFF_OPT_IDMASK = 0x3FFF; const sal_uInt16 DFF_OPT_COMPLEX = 0x8000; -const sal_uInt16 DFF_OPT_FLAGSMASK = 0x003F; } // namespace @@ -186,49 +185,11 @@ void DffStreamObject::dumpDffOpt() if( getFlag( nPropId, DFF_OPT_COMPLEX ) ) { writeHexItem( "complex-size", nValue, "CONV-DEC" ); - String aName; - PropType eType = PROPTYPE_BINARY; - ::std::map< sal_Int64, ItemFormat >::const_iterator aIt = maComplexProps.find( nBaseId ); - if( aIt != maComplexProps.end() ) - { - const ItemFormat& rItemFmt = aIt->second; - aName = rItemFmt.maItemName; - if ( rItemFmt.maListName == "binary" ) - eType = PROPTYPE_BINARY; - else if ( rItemFmt.maListName == "string" ) - eType = PROPTYPE_STRING; - else if ( rItemFmt.maListName == "blip" ) - eType = PROPTYPE_BLIP; - else if ( rItemFmt.maListName == "colorarray" ) - eType = PROPTYPE_COLORARRAY; - } - aPropInfos.push_back( PropInfo( aName( "property-data" ), eType, nBaseId, nValue ) ); + aPropInfos.push_back( PropInfo( String( "property-data" ), PROPTYPE_BINARY, nBaseId, nValue ) ); } else { - ::std::map< sal_Int64, ItemFormat >::const_iterator aIt = maSimpleProps.find( nBaseId ); - if( aIt != maSimpleProps.end() ) - { - const ItemFormat& rItemFmt = aIt->second; - // flags always at end of block of 64 properties - if( (nBaseId & DFF_OPT_FLAGSMASK) == DFF_OPT_FLAGSMASK ) - { - FlagsList* pFlagsList = dynamic_cast< FlagsList* >( cfg().getNameList( rItemFmt.maListName ).get() ); - sal_Int64 nOldIgnoreFlags = 0; - if( pFlagsList ) - { - nOldIgnoreFlags = pFlagsList->getIgnoreFlags(); - pFlagsList->setIgnoreFlags( nOldIgnoreFlags | 0xFFFF0000 | ~(nValue >> 16) ); - } - writeValueItem( rItemFmt, nValue ); - if( pFlagsList ) - pFlagsList->setIgnoreFlags( nOldIgnoreFlags ); - } - else - writeValueItem( rItemFmt, nValue ); - } - else - writeHexItem( "value", nValue ); + writeHexItem( "value", nValue ); } } |