[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - icon-themes/tango sd/inc sd/source

[Ashod Nakashian (via logerrit)]

 icon-themes/tango/cmd/lc_redactdoc.png           |binary
 icon-themes/tango/cmd/lc_redactedexportblack.png |binary
 icon-themes/tango/cmd/lc_redactedexportwhite.png |binary
 icon-themes/tango/cmd/sc_redactdoc.png           |binary
 icon-themes/tango/cmd/sc_redactedexportblack.png |binary
 icon-themes/tango/cmd/sc_redactedexportwhite.png |binary
 sd/inc/CustomAnimationPreset.hxx                 |    2 +-
 sd/source/core/CustomAnimationPreset.cxx         |   19 ++++++++-----------
 8 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 7fb2687470ea706dbebf270cb62261df6bc22c01
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Jan 28 20:48:01 2019 -0500
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 15 13:43:59 2019 +0200

    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>
    (cherry picked from commit da70e562087b6016aeaffadedc4ce66eaf370919)
    Reviewed-on: https://gerrit.libreoffice.org/76284
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 593bf02c8b65cdea1d77c6800a9af57e1c6cb08b)
    Reviewed-on: https://gerrit.libreoffice.org/77491
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 57669734014b..ad21b7a00d4a 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -129,7 +129,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 5b4bb999d613..401cff4b8c8b 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -532,7 +532,7 @@ void CustomAnimationPresets::changePresetSubType( const CustomAnimationEffectPtr
     }
 }
 
-std::map<OUString, CustomAnimationPresets*>  CustomAnimationPresets::mpCustomAnimationPresetsMap;
+std::map<OUString, CustomAnimationPresets>  CustomAnimationPresets::mPresetsMap;
 
 const CustomAnimationPresets& CustomAnimationPresets::getCustomAnimationPresets()
 {
@@ -543,16 +543,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
commit 7ee5c01574f221a0749f4f79889629484788af30
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Mar 27 22:54:38 2019 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 15 13:43:48 2019 +0200

    Add Redaction toolbar icons from colibre to tango
    
    Tango is the default theme of Collabora Office 6.0
    
    Change-Id: I95722b0794aec9fc9eac707e4020460ddfb1371f
    (cherry picked from commit 9c644c8bf3d7096efeb52beccaef02f6455f83eb)
    Reviewed-on: https://gerrit.libreoffice.org/76285
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 3b1c1b0d2f5348d2eea761b452c9f7ce940dc737)
    Reviewed-on: https://gerrit.libreoffice.org/77490
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/icon-themes/tango/cmd/lc_redactdoc.png b/icon-themes/tango/cmd/lc_redactdoc.png
new file mode 100644
index 000000000000..3cdc2ffc2918
Binary files /dev/null and b/icon-themes/tango/cmd/lc_redactdoc.png differ
diff --git a/icon-themes/tango/cmd/lc_redactedexportblack.png b/icon-themes/tango/cmd/lc_redactedexportblack.png
new file mode 100644
index 000000000000..c1f9ec36f122
Binary files /dev/null and b/icon-themes/tango/cmd/lc_redactedexportblack.png differ
diff --git a/icon-themes/tango/cmd/lc_redactedexportwhite.png b/icon-themes/tango/cmd/lc_redactedexportwhite.png
new file mode 100644
index 000000000000..a07f9c82d288
Binary files /dev/null and b/icon-themes/tango/cmd/lc_redactedexportwhite.png differ
diff --git a/icon-themes/tango/cmd/sc_redactdoc.png b/icon-themes/tango/cmd/sc_redactdoc.png
new file mode 100644
index 000000000000..013684ba7470
Binary files /dev/null and b/icon-themes/tango/cmd/sc_redactdoc.png differ
diff --git a/icon-themes/tango/cmd/sc_redactedexportblack.png b/icon-themes/tango/cmd/sc_redactedexportblack.png
new file mode 100644
index 000000000000..1163e7d2856e
Binary files /dev/null and b/icon-themes/tango/cmd/sc_redactedexportblack.png differ
diff --git a/icon-themes/tango/cmd/sc_redactedexportwhite.png b/icon-themes/tango/cmd/sc_redactedexportwhite.png
new file mode 100644
index 000000000000..ff872a4ccd51
Binary files /dev/null and b/icon-themes/tango/cmd/sc_redactedexportwhite.png differ