[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/inc vcl/source

[Libreoffice Gerrit user]

 vcl/inc/svdata.hxx        |    5 +++--
 vcl/source/app/svdata.cxx |    7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit abbb137daa15704baa1f9a5c1b0cdedb702e77fa
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue Mar 12 14:54:52 2019 +0100
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue Mar 12 14:54:52 2019 +0100

    initialize caches in the constructor
    
    Change-Id: I1aa89afcb5d399b653e270ae18342afa7103a680

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 9a17b6f176ef..f0473f2dd2c4 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -172,6 +172,7 @@ struct ImplSVAppData
 
 struct ImplSVGDIData
 {
+    ImplSVGDIData();
     ~ImplSVGDIData();
 
     VclPtr<OutputDevice>    mpFirstWinGraphics;             // First OutputDevice with a Frame Graphics
@@ -194,8 +195,8 @@ struct ImplSVGDIData
     long                    mnAppFontY = 0;                 // AppFont Y-Numenator for 80/tel Height
     bool                    mbFontSubChanged = false;       // true: FontSubstitution was changed between Begin/End
 
-    o3tl::lru_map<OUString, BitmapEx> maThemeImageCache = o3tl::lru_map<OUString, BitmapEx>(10);
-    o3tl::lru_map<OUString, gfx::DrawRoot> maThemeDrawCommandsCache = o3tl::lru_map<OUString, gfx::DrawRoot>(50);
+    o3tl::lru_map<OUString, BitmapEx> maThemeImageCache;
+    o3tl::lru_map<OUString, gfx::DrawRoot> maThemeDrawCommandsCache;
 };
 
 struct ImplSVWinData
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 8d5d329a7478..03124862d235 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -279,7 +279,14 @@ void LocaleConfigurationListener::ConfigurationChanged( utl::ConfigurationBroadc
 
 ImplSVData::~ImplSVData() {}
 ImplSVAppData::~ImplSVAppData() {}
+
+ImplSVGDIData::ImplSVGDIData()
+    : maThemeImageCache(10)
+    , maThemeDrawCommandsCache(50)
+{}
+
 ImplSVGDIData::~ImplSVGDIData() {}
+
 ImplSVWinData::~ImplSVWinData() {}
 ImplSVHelpData::~ImplSVHelpData() {}