diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-10-08 21:48:43 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-08 15:15:10 +0000 |
| commit | 413771fa32815672afc6b7799c1433f523088811 (patch) | |
| tree | 756c76e26b875da0f30a6df0a68e2c9e15ef4c2a /oox | |
| parent | e1b15a2eec0f28ae8e45354687f86aaf87976fab (diff) | |
fdo#75757: remove inheritance to std::map
from ItemFormatMap.
Change-Id: I956b5797e677d22eb71fe801b650db7c982d6d51
Reviewed-on: https://gerrit.libreoffice.org/11854
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/dump/dffdumper.cxx | 4 | ||||
| -rw-r--r-- | oox/source/dump/dumperbase.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx index c4c73ac70e2e..318a129541ea 100644 --- a/oox/source/dump/dffdumper.cxx +++ b/oox/source/dump/dffdumper.cxx @@ -193,7 +193,7 @@ void DffStreamObject::dumpDffOpt() writeHexItem( "complex-size", nValue, "CONV-DEC" ); String aName; PropType eType = PROPTYPE_BINARY; - ItemFormatMap::const_iterator aIt = maComplexProps.find( nBaseId ); + ::std::map< sal_Int64, ItemFormat >::const_iterator aIt = maComplexProps.find( nBaseId ); if( aIt != maComplexProps.end() ) { const ItemFormat& rItemFmt = aIt->second; @@ -211,7 +211,7 @@ void DffStreamObject::dumpDffOpt() } else { - ItemFormatMap::const_iterator aIt = maSimpleProps.find( nBaseId ); + ::std::map< sal_Int64, ItemFormat >::const_iterator aIt = maSimpleProps.find( nBaseId ); if( aIt != maSimpleProps.end() ) { const ItemFormat& rItemFmt = aIt->second; diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 1143e6a284b6..aa0000c3bd3a 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -936,7 +936,7 @@ void ItemFormatMap::insertFormats( const NameListRef& rxNameList ) { if( Base::isValid( rxNameList ) ) for( NameListBase::const_iterator aIt = rxNameList->begin(), aEnd = rxNameList->end(); aIt != aEnd; ++aIt ) - (*this)[ aIt->first ].parse( aIt->second ); + maMap[ aIt->first ].parse( aIt->second ); } ConstList::ConstList( const SharedConfigData& rCfgData ) : @@ -2488,7 +2488,7 @@ void RecordObjectBase::implDump() // record body if( !mbBinaryOnly && cfg().hasName( xRecNames, mnRecId ) ) { - ItemFormatMap::const_iterator aIt = aSimpleRecs.find( mnRecId ); + ::std::map< sal_Int64, ItemFormat >::const_iterator aIt = aSimpleRecs.find( mnRecId ); if( aIt != aSimpleRecs.end() ) dumpItem( aIt->second ); else |