From 413771fa32815672afc6b7799c1433f523088811 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Wed, 8 Oct 2014 21:48:43 +0900 Subject: fdo#75757: remove inheritance to std::map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit from ItemFormatMap. Change-Id: I956b5797e677d22eb71fe801b650db7c982d6d51 Reviewed-on: https://gerrit.libreoffice.org/11854 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/oox/dump/dumperbase.hxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'include/oox/dump') diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 9e72588d7b79..a747de53bd6f 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -808,12 +808,21 @@ static const NameListWrapper NO_LIST; -class ItemFormatMap : public ::std::map< sal_Int64, ItemFormat > +class ItemFormatMap { +private: + ::std::map< sal_Int64, ItemFormat > maMap; + public: - ItemFormatMap() {} + ItemFormatMap() : maMap() {} explicit ItemFormatMap( const NameListRef& rxNameList ) { insertFormats( rxNameList ); } + ::std::map< sal_Int64, ItemFormat >::const_iterator end() const { return maMap.end(); } + ::std::map< sal_Int64, ItemFormat >::const_iterator find(sal_Int64 nId) const + { + return maMap.find(nId); + } + void insertFormats( const NameListRef& rxNameList ); }; -- cgit