summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2014-10-08 21:48:43 +0900
committerCaolán McNamara <caolanm@redhat.com>2014-10-08 15:15:10 +0000
commit413771fa32815672afc6b7799c1433f523088811 (patch)
tree756c76e26b875da0f30a6df0a68e2c9e15ef4c2a /include
parente1b15a2eec0f28ae8e45354687f86aaf87976fab (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 'include')
-rw-r--r--include/oox/dump/dumperbase.hxx13
1 files changed, 11 insertions, 2 deletions
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 );
};