mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around loplugin:badstatics

Browse Source 
...about

  static ImplImageTree instance;

in ImplImageTree::get (vcl/source/gdi/impimagetree.cxx) due to

  StyleIconSet ImplImageTree::maIconSet;

(of type std::unordered_map<OUString, IconSet, OUStringHash>) due to

  IconCache ImplImageTree::IconSet::maIconCache;

(of type std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash>),
reported at least when building against Mac libc++.  This is a false positive,
as ImplImageTree::shutDown cleans this up.

Change-Id: Idb1a99aa33f71286e57b31b7adb833e3ee8b5f5a
This commit is contained in:
Stephan Bergmann
2015-11-17 16:21:51 +01:00
parent 8d8e2f1d69
commit 097f8d6dbc
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/badstatics.cxx
View File

@@ -134,6 +134,7 @@ public:
|| name == "g_pHyphIter" // SwEditShell::HyphEnd() || name == "g_pHyphIter" // SwEditShell::HyphEnd()
|| name == "pFieldEditEngine" // ScGlobal::Clear() || name == "pFieldEditEngine" // ScGlobal::Clear()
|| name == "xDrawClipDocShellRef" // ScGlobal::Clear() || name == "xDrawClipDocShellRef" // ScGlobal::Clear()
|| name == "instance" // ImplImageTree::get()
) // these variables appear unproblematic ) // these variables appear unproblematic
{ {
return true; return true;