summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2020-07-23 14:06:57 +0200
committerAndras Timar <andras.timar@collabora.com>2020-07-28 09:35:43 +0200
commit8cf49d72e4688c0c83d6c073384f1345e45a777f (patch)
tree45b170158945eb5f5c7e5228fa75d292ba7cd097
parent407ad48dc464495031e45e4b3019fb1f068d301c (diff)
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/+/99328 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--vcl/source/window/toolbox2.cxx6
1 files changed, 0 insertions, 6 deletions
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index ade4c3360df8..48accb906242 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 <vcl/svapp.hxx>
@@ -425,12 +424,7 @@ void ToolBox::InsertItem(const OUString& rCommand, const css::uno::Reference<css
OUString aModuleName(vcl::CommandInfoProvider::GetModuleIdentifier(rFrame));
OUString aLabel(vcl::CommandInfoProvider::GetLabelForCommand(rCommand, aModuleName));
OUString aTooltip(vcl::CommandInfoProvider::GetTooltipForCommand(rCommand, 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!