From 8f61c0e58dfbda8d797faaa400389857db69e34f Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Fri, 7 Aug 2020 17:18:18 +0300 Subject: tdf#134887 NewToolbarController: Use different icons for extra large Changes from master: - Resolved merge conflicts caused by the fact we're not backporting the other commit of tdf#134887. - Added a simple workaround for tdf#135369. Conflicts: framework/source/uielement/popuptoolbarcontroller.cxx Change-Id: I30621ab2e98c2387f3de67b2871516e5e25da761 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99565 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit 789f67940af461c18b0a2ffbc6313b91fb08f26a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100224 --- include/svtools/imagemgr.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index 26930b4080fd..d66fade753d4 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -23,6 +23,7 @@ #include #include #include +#include enum class SvImageId { NONE = 0, @@ -122,7 +123,7 @@ public: SVT_DLLPUBLIC static OUString GetImageId( const INetURLObject& rURL, bool bBig = false ); SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, bool bBig = false, Size const & rPreferredSize = Size()); SVT_DLLPUBLIC static OUString GetFileImageId( const INetURLObject& rURL ); - SVT_DLLPUBLIC static Image GetImageNoDefault(const INetURLObject& rURL, bool bBig = false, Size const & rPreferredSize = Size()); + SVT_DLLPUBLIC static Image GetImageNoDefault(const INetURLObject& rURL, vcl::ImageType eImageType = vcl::ImageType::Small); SVT_DLLPUBLIC static OUString GetFolderImageId( const svtools::VolumeInfo& rInfo ); SVT_DLLPUBLIC static OUString GetDescription( const INetURLObject& rObject ); -- cgit