diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-11-17 22:33:28 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-11-17 23:49:04 +0100 |
commit | 05896a16412dd48d19ffd2e360ae7da5e41c2725 (patch) | |
tree | eb9ff3428b6175c0c9f5cacfeb762fdcd00b87d9 /sc/inc/colorscale.hxx | |
parent | 510f463099272cec7f2193f3ffa1dbbd20d9f718 (diff) |
sc: loplugin:badstatics
Not sure if there would be a performance penalty to re-loading these
icons every time, so move the static map from
ScIconSetFormat::getBitmap() to a member of ScDocument.
Change-Id: If560d70cea27e25396dd821d9e77a785e3b79820
Diffstat (limited to 'sc/inc/colorscale.hxx')
-rw-r--r-- | sc/inc/colorscale.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index a593e4ddaf78..427bf53413b0 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -30,6 +30,10 @@ struct ScDataBarInfo; class BitmapEx; class ScFormulaListener; +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 +379,7 @@ public: virtual condformat::ScFormatEntryType GetType() const override; static ScIconSetMap* getIconSetMap(); - static BitmapEx& getBitmap( ScIconSetType eType, sal_Int32 nIndex ); + static BitmapEx& getBitmap(sc::IconSetBitmapMap &, ScIconSetType eType, sal_Int32 nIndex); typedef ScIconSetFormatData::Entries_t::iterator iterator; typedef ScIconSetFormatData::Entries_t::const_iterator const_iterator; |