From 82510829d5be4321166ae80679b43b376f41ae9e Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Sun, 27 Mar 2016 03:12:02 +0200
Subject: don't inherit from std::map

Change-Id: I50e9b27c45f6f7bd52af9e0c8a188124d6413cbc
---
 sc/inc/colorscale.hxx | 7 ++-----
 sc/inc/document.hxx   | 8 +++++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 992b532a6240..96a05ee14478 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -14,6 +14,7 @@
 #include <tools/color.hxx>
 #include "rangelst.hxx"
 #include "conditio.hxx"
+#include "document.hxx"
 
 #include <memory>
 #include <vector>
@@ -26,10 +27,6 @@ class ScTokenArray;
 struct ScDataBarInfo;
 class BitmapEx;
 
-namespace sc {
-    class IconSetBitmapMap : public std::map<sal_Int32, BitmapEx> {};
-}
-
 // don't change the order
 // they are also used in the dialog to determine the position
 // in the list box
@@ -375,7 +372,7 @@ public:
     virtual condformat::ScFormatEntryType GetType() const override;
 
     static ScIconSetMap* getIconSetMap();
-    static BitmapEx& getBitmap(sc::IconSetBitmapMap &, ScIconSetType eType, sal_Int32 nIndex);
+    static BitmapEx& getBitmap(sc::IconSetBitmapMap& rBitmapMap, ScIconSetType eType, sal_Int32 nIndex);
 
     typedef ScIconSetFormatData::Entries_t::iterator iterator;
     typedef ScIconSetFormatData::Entries_t::const_iterator const_iterator;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6c313a9eb468..8caca17a3260 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -79,7 +79,6 @@ class RefMovedHint;
 struct SortUndoParam;
 struct ReorderParam;
 class FormulaGroupAreaListener;
-class IconSetBitmapMap;
 
 }
 
@@ -190,6 +189,13 @@ class ScHint;
 class SvtBroadcaster;
 enum class ScDBDataPortion;
 enum class ScSheetEventId;
+class BitmapEx;
+
+namespace sc {
+
+typedef std::map<sal_Int32, BitmapEx> IconSetBitmapMap;
+
+}
 
 namespace com { namespace sun { namespace star {
     namespace lang {
-- 
cgit