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

[Tor Lillqvist (via logerrit)]

 icon-themes/colibre/sfx2/res/symphony/morebutton-large.png                      |binary
 sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx |    8 ++------
 sfx2/inc/bitmaps.hlst                                                           |    1 +
 sfx2/source/sidebar/Theme.cxx                                                   |    6 ++++++
 4 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 7f65f83a46873523aba1e5e36f9500c43c13c7a5
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 23 14:44:40 2019 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:11:29 2020 +0100

    tdf#127878: Use a larger "morebutton" image on iOS
    
    Change-Id: Ifbd1b92a6921f7a283c3a7e288fbf05fbc2453eb
    Reviewed-on: https://gerrit.libreoffice.org/81379
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 89a620a7dfdd3b881a620568b82ef68e96b51c92)
    Reviewed-on: https://gerrit.libreoffice.org/83659
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/icon-themes/colibre/sfx2/res/symphony/morebutton-large.png b/icon-themes/colibre/sfx2/res/symphony/morebutton-large.png
new file mode 100644
index 000000000000..550d511c96f4
Binary files /dev/null and b/icon-themes/colibre/sfx2/res/symphony/morebutton-large.png differ
diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst
index 9dbdfb4da5d4..b97a6c813aeb 100644
--- a/sfx2/inc/bitmaps.hlst
+++ b/sfx2/inc/bitmaps.hlst
@@ -37,6 +37,7 @@
 #define GRIP                                "sfx2/res/grip.png"
 #define OPEN_MORE                           "sfx2/res/symphony/open_more.png"
 #define MOREBUTTON                          "sfx2/res/symphony/morebutton.png"
+#define MOREBUTTON_LARGE                    "sfx2/res/symphony/morebutton-large.png"
 #define SIDEBAR_3D_LARGE                    "sfx2/res/symphony/sidebar-3d-large.png"
 #define SIDEBAR_3D_SMALL                    "sfx2/res/symphony/sidebar-3d-small.png"
 #define SIDEBAR_ANIMATION_LARGE             "sfx2/res/symphony/sidebar-animation-large.png"
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 90ab20e46f15..666ce34280a3 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -294,9 +294,15 @@ void Theme::UpdateTheme()
         setPropertyValue(
             maPropertyIdToNameMap[Image_TabBarMenu],
             Any(OUString("private:graphicrepository/sfx2/res/symphony/open_more.png")));
+#ifdef IOS
+        setPropertyValue(
+            maPropertyIdToNameMap[Image_PanelMenu],
+            Any(OUString("private:graphicrepository/sfx2/res/symphony/morebutton-large.png")));
+#else
         setPropertyValue(
             maPropertyIdToNameMap[Image_PanelMenu],
             Any(OUString("private:graphicrepository/sfx2/res/symphony/morebutton.png")));
+#endif
         setPropertyValue(
             maPropertyIdToNameMap[Image_Closer],
             Any(OUString("private:graphicrepository/sfx2/res/closedoc.png")));
commit 3ea975c5e54c65c6639109f924dc61378d5b05c5
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Nov 11 23:35:03 2018 -0500
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:08:51 2020 +0100

    sd: for_each -> range-for
    
    Simpler, more readable, and sensible stacktraces.
    
    Change-Id: I8e8a9903e3bf2ce5f31b841db9cb68fe4edc3fb6
    (cherry picked from commit a00490bf0d2ee2c94f494978ebfeb8012a02e678)
    Reviewed-on: https://gerrit.libreoffice.org/82403
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index 9657957d9ed2..15460fe15f7c 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -69,12 +69,8 @@ void ConfigurationControllerResourceManager::ActivateResources (
     // Iterate in normal order over the resources that are to be
     // activated so that resources on which others depend are activated
     // before the depending resources are activated.
-    ::std::for_each(
-        rResources.begin(),
-        rResources.end(),
-        [&] (Reference<XResourceId> const& xResource) {
-            return ActivateResource(xResource, rxConfiguration);
-        } );
+    for (const Reference<XResourceId>& xResource : rResources)
+        ActivateResource(xResource, rxConfiguration);
 }
 
 void ConfigurationControllerResourceManager::DeactivateResources (