[Libreoffice-commits] core.git: vcl/source

[Jan Holesovsky (via logerrit)]

 vcl/source/window/toolbox2.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 425e29eb8c71c047507d8fdc3a294f2f03829f6f
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Jul 23 14:06:57 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Aug 2 11:30:15 2020 +0200

    Revert "android: avoid expensive load of un-used sidebar icons on mobile."
    
    Unfortunately we need this on Android for the tablets, otherwise the
    sidebar lacks the icons.
    
    Also it is not easily possible to use the isLOKMobilePhone() check here,
    because that is per-view in general, and handled in sfx in particular,
    making it hard to use here in vcl.
    
    This reverts commit 9a38b194eec5bcf6cb8d073e5d35173c5856f28f.
    
    Change-Id: I2b599e884ad4d00b7c246743c180a5324c9a143d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99300
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index b15e97f14dcf..b7e7f8ea209f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
-#include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <boost/property_tree/ptree.hpp>
 
@@ -435,12 +434,7 @@ void ToolBox::InsertItem(const OUString& rCommand, const css::uno::Reference<css
     auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(rCommand, aModuleName);
     OUString aLabel(vcl::CommandInfoProvider::GetLabelForCommand(aProperties));
     OUString aTooltip(vcl::CommandInfoProvider::GetTooltipForCommand(rCommand, aProperties, rFrame));
-
-#ifdef ANDROID
-    Image aImage; // Loading redundant icons for sidebars shows in profiles.
-#else
     Image aImage(CommandInfoProvider::GetImageForCommand(rCommand, rFrame, GetImageSize()));
-#endif
 
     sal_uInt16 nItemId = GetItemCount() + 1;
         //TODO: ImplToolItems::size_type -> sal_uInt16!