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 <riz_17_oke@yahoo.co.id>
(cherry picked from commit 789f67940af461c18b0a2ffbc6313b91fb08f26a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100224

2 files changed, 54 insertions, 11 deletions

diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst
index 842ec418ca0b..875564800757 100644
--- a/svtools/inc/bitmaps.hlst
+++ b/svtools/inc/bitmaps.hlst
@@ -100,6 +100,15 @@
 #define BMP_OO_CALC_TEMPLATE_LC     "res/lx03254.png"
 #define BMP_OO_WRITER_TEMPLATE_LC   "res/lx03255.png"
 #define BMP_EXTENSION_LC            "res/lx03256.png"
+#define BMP_HTML_32                 "res/lx03139_32.png"
+#define BMP_OO_DATABASE_DOC_32      "res/lx03245_32.png"
+#define BMP_OO_DRAW_DOC_32          "res/lx03246_32.png"
+#define BMP_OO_MATH_DOC_32          "res/lx03247_32.png"
+#define BMP_OO_GLOBAL_DOC_32        "res/lx03248_32.png"
+#define BMP_OO_IMPRESS_DOC_32       "res/lx03249_32.png"
+#define BMP_OO_CALC_DOC_32          "res/lx03250_32.png"
+#define BMP_OO_WRITER_DOC_32        "res/lx03251_32.png"
+#define BMP_OO_WRITER_TEMPLATE_32   "res/lx03255_32.png"
 #define BMP_PLUGIN                  "res/plugin.png"
 #define RID_BMP_FOLDER              "svtools/res/folder.png"
 #define BMP_CURRENT                 "svtools/res/ed01.png"
@@ -114,5 +123,15 @@
 
 #define BMP_TAB_LOCK "cmd/sc_lock.png"
 
+// Workaround for tdf#135369, not directly used from the code:
+
+#define BMP_OO_DATABASE_DOC_24      "res/odb_24_8.png"
+#define BMP_OO_DRAW_DOC_24          "res/odg_24_8.png"
+#define BMP_OO_MATH_DOC_24          "res/odf_24_8.png"
+#define BMP_OO_GLOBAL_DOC_24        "res/odm_24_8.png"
+#define BMP_OO_IMPRESS_DOC_24       "res/odp_24_8.png"
+#define BMP_OO_CALC_DOC_24          "res/ods_24_8.png"
+#define BMP_OO_WRITER_DOC_24        "res/odt_24_8.png"
+#define BMP_OO_WRITER_TEMPLATE_24   "res/ott_24_8.png"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 3f458647564c..2964dec1cb8e 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -482,9 +482,34 @@ static const char* GetFolderDescriptionId_Impl( const OUString& rURL )
     return pRet;
 }
 
-static OUString GetImageNameFromList_Impl( SvImageId nImageId, bool bBig )
+static OUString GetImageNameFromList_Impl( SvImageId nImageId, vcl::ImageType eImageType )
 {
-    if (bBig)
+    if (eImageType == vcl::ImageType::Size32)
+    {
+        switch (nImageId)
+        {
+            case SvImageId::HTML:
+                return BMP_HTML_32;
+            case SvImageId::OO_DatabaseDoc:
+                return BMP_OO_DATABASE_DOC_32;
+            case SvImageId::OO_DrawDoc:
+                return BMP_OO_DRAW_DOC_32;
+            case SvImageId::OO_MathDoc:
+                return BMP_OO_MATH_DOC_32;
+            case SvImageId::OO_GlobalDoc:
+                return BMP_OO_GLOBAL_DOC_32;
+            case SvImageId::OO_ImpressDoc:
+                return BMP_OO_IMPRESS_DOC_32;
+            case SvImageId::OO_CalcDoc:
+                return BMP_OO_CALC_DOC_32;
+            case SvImageId::OO_WriterDoc:
+                return BMP_OO_WRITER_DOC_32;
+            case SvImageId::OO_WriterTemplate:
+                return BMP_OO_WRITER_TEMPLATE_32;
+            default: break;
+        }
+    }
+    else if (eImageType == vcl::ImageType::Size26)
     {
         switch (nImageId)
         {
@@ -640,7 +665,6 @@ static OUString GetImageNameFromList_Impl( SvImageId nImageId, bool bBig )
             case SvImageId::Table:
                 return BMP_TABLE_SC;
             case SvImageId::Folder:
-                // if not bBig, then return our new small folder image (256 colors)
                 return RID_BMP_FOLDER;
             case SvImageId::DXF:
                 return BMP_DXF_SC;
@@ -687,9 +711,9 @@ static OUString GetImageNameFromList_Impl( SvImageId nImageId, bool bBig )
     return OUString();
 }
 
-static Image GetImageFromList_Impl( SvImageId nImageId, bool bBig, Size aSize = Size())
+static Image GetImageFromList_Impl( SvImageId nImageId, vcl::ImageType eImageType, Size aSize = Size())
 {
-    OUString sImageName(GetImageNameFromList_Impl(nImageId, bBig));
+    OUString sImageName(GetImageNameFromList_Impl(nImageId, eImageType));
     if (!sImageName.isEmpty())
         return Image(StockImage::Yes, sImageName, aSize);
     return Image();
@@ -761,24 +785,24 @@ OUString SvFileInformationManager::GetImageId(const INetURLObject& rObject, bool
 {
     SvImageId nImage = GetImageId_Impl( rObject, true );
     DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" );
-    return GetImageNameFromList_Impl(nImage, bBig);
+    return GetImageNameFromList_Impl(nImage, bBig ? vcl::ImageType::Size26 : vcl::ImageType::Size16);
 }
 
 Image SvFileInformationManager::GetImage(const INetURLObject& rObject, bool bBig, Size const & rPreferredSize)
 {
     SvImageId nImage = GetImageId_Impl( rObject, true );
     DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" );
-    return GetImageFromList_Impl(nImage, bBig, rPreferredSize);
+    return GetImageFromList_Impl(nImage, bBig ? vcl::ImageType::Size26 : vcl::ImageType::Size16, rPreferredSize);
 }
 
 OUString SvFileInformationManager::GetFileImageId(const INetURLObject& rObject)
 {
     SvImageId nImage = GetImageId_Impl( rObject, false );
     DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" );
-    return GetImageNameFromList_Impl(nImage, /*bBig*/false);
+    return GetImageNameFromList_Impl(nImage, vcl::ImageType::Size16);
 }
 
-Image SvFileInformationManager::GetImageNoDefault(const INetURLObject& rObject, bool bBig, Size const & rPreferredSize)
+Image SvFileInformationManager::GetImageNoDefault(const INetURLObject& rObject, vcl::ImageType eImageType)
 {
     SvImageId nImage = GetImageId_Impl(rObject, true);
     DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" );
@@ -786,7 +810,7 @@ Image SvFileInformationManager::GetImageNoDefault(const INetURLObject& rObject,
     if ( nImage == SvImageId::File )
         return Image();
 
-    return GetImageFromList_Impl(nImage, bBig, rPreferredSize);
+    return GetImageFromList_Impl(nImage, eImageType);
 }
 
 OUString SvFileInformationManager::GetFolderImageId( const svtools::VolumeInfo& rInfo )
@@ -803,7 +827,7 @@ OUString SvFileInformationManager::GetFolderImageId( const svtools::VolumeInfo&
     else if ( rInfo.m_bIsVolume )
         nImage = SvImageId::FixedDevice;
 
-    return GetImageNameFromList_Impl(nImage, false/*bBig*/);
+    return GetImageNameFromList_Impl(nImage, vcl::ImageType::Size16);
 }
 
 OUString SvFileInformationManager::GetDescription( const INetURLObject& rObject )