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

[Libreoffice Gerrit user]

 sd/inc/CustomAnimationPreset.hxx         |    2 +-
 sd/source/core/CustomAnimationPreset.cxx |   19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit da70e562087b6016aeaffadedc4ce66eaf370919
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Jan 28 20:48:01 2019 -0500
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 4 15:22:24 2019 +0100

    sd: LOK: avoid caching pointers and leaking
    
    Change-Id: I68163bc30b0655b11dec34bdcc750b495b93365a
    Reviewed-on: https://gerrit.libreoffice.org/68265
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 790569613d82..5209e8c35d1c 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -128,7 +128,7 @@ private:
     PresetCategoryList maMiscPresets;
 
     //! Maps per-language the animation presets.
-    SAL_DLLPRIVATE static std::map<OUString, CustomAnimationPresets*>  mpCustomAnimationPresetsMap;
+    SAL_DLLPRIVATE static std::map<OUString, CustomAnimationPresets>  mPresetsMap;
 };
 
 
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 6d2f44ccba4c..c4be1dd032f6 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -529,7 +529,7 @@ void CustomAnimationPresets::changePresetSubType( const CustomAnimationEffectPtr
     }
 }
 
-std::map<OUString, CustomAnimationPresets*>  CustomAnimationPresets::mpCustomAnimationPresetsMap;
+std::map<OUString, CustomAnimationPresets>  CustomAnimationPresets::mPresetsMap;
 
 const CustomAnimationPresets& CustomAnimationPresets::getCustomAnimationPresets()
 {
@@ -540,16 +540,13 @@ const CustomAnimationPresets& CustomAnimationPresets::getCustomAnimationPresets(
                                : SvtSysLocaleOptions().GetLanguageTag().getLanguage();
 
     SolarMutexGuard aGuard;
-    const auto it = mpCustomAnimationPresetsMap.find(aLang);
-    if (it != mpCustomAnimationPresetsMap.end())
-        return *it->second;
-
-    // Note: we are invoked recursively(!), so we must set the instance pointer
-    // in the cache map before we importResources, lest we get in infinite loop.
-    sd::CustomAnimationPresets* pCustomAnimationPresets = new sd::CustomAnimationPresets();
-    mpCustomAnimationPresetsMap[aLang] = pCustomAnimationPresets;
-    pCustomAnimationPresets->importResources();
-    return *pCustomAnimationPresets;
+    const auto it = mPresetsMap.find(aLang);
+    if (it != mPresetsMap.end())
+        return it->second;
+
+    CustomAnimationPresets& rPresets = mPresetsMap[aLang];
+    rPresets.importResources();
+    return rPresets;
 }
 
 Reference< XAnimationNode > CustomAnimationPresets::getRandomPreset( sal_Int16 nPresetClass ) const