include/vcl/bitmaps.hlst | 8 ++++++++ sfx2/inc/bitmaps.hlst | 8 -------- sfx2/source/control/recentdocsviewitem.cxx | 15 ++++++++------- 3 files changed, 16 insertions(+), 15 deletions(-)
New commits: commit fc511f9ed4303397a15f9f3fe718a52db04d33fa Author: Michael Weghorn <[email protected]> AuthorDate: Thu Mar 12 09:27:32 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Mar 13 07:37:57 2026 +0100 Move constants for app icons from sfx2-internal to global vcl header Also replace the "SFX_" with a "RID_" prefix. This prepares for reuse inside vcl in an upcoming commit. Change-Id: Idf0fc77fcce2182c94be872fb01fe0da0b16c790 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201521 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/bitmaps.hlst b/include/vcl/bitmaps.hlst index 9703db86d4cc..71eea1b21ef5 100644 --- a/include/vcl/bitmaps.hlst +++ b/include/vcl/bitmaps.hlst @@ -14,4 +14,12 @@ inline constexpr OUString RID_BITMAP_HLDOC = u"res/hldoctp.png"_ustr; inline constexpr OUString RID_BITMAP_HLDOCN = u"res/hldocntp.png"_ustr; inline constexpr OUString RID_BITMAP_HLMAIL = u"res/hlmailtp.png"_ustr; +inline constexpr OUString RID_FILE_THUMBNAIL_TEXT = u"res/writer128.png"_ustr; +inline constexpr OUString RID_FILE_THUMBNAIL_SHEET = u"res/calc128.png"_ustr; +inline constexpr OUString RID_FILE_THUMBNAIL_PRESENTATION = u"res/impress128.png"_ustr; +inline constexpr OUString RID_FILE_THUMBNAIL_DRAWING = u"res/draw128.png"_ustr; +inline constexpr OUString RID_FILE_THUMBNAIL_DATABASE = u"res/base128.png"_ustr; +inline constexpr OUString RID_FILE_THUMBNAIL_MATH = u"res/math128.png"_ustr; +inline constexpr OUString RID_FILE_THUMBNAIL_DEFAULT = u"res/main128.png"_ustr; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst index 8d085bdb855b..1a0e61f5c8e0 100644 --- a/sfx2/inc/bitmaps.hlst +++ b/sfx2/inc/bitmaps.hlst @@ -46,14 +46,6 @@ inline constexpr OUString SFX_THUMBNAIL_SHEET = u"res/ots_96_8.png"_ustr; inline constexpr OUString SFX_THUMBNAIL_PRESENTATION = u"res/otp_96_8.png"_ustr; inline constexpr OUString SFX_THUMBNAIL_DRAWING = u"res/otg_96_8.png"_ustr; -inline constexpr OUString SFX_FILE_THUMBNAIL_TEXT = u"res/writer128.png"_ustr; -inline constexpr OUString SFX_FILE_THUMBNAIL_SHEET = u"res/calc128.png"_ustr; -inline constexpr OUString SFX_FILE_THUMBNAIL_PRESENTATION = u"res/impress128.png"_ustr; -inline constexpr OUString SFX_FILE_THUMBNAIL_DRAWING = u"res/draw128.png"_ustr; -inline constexpr OUString SFX_FILE_THUMBNAIL_DATABASE = u"res/base128.png"_ustr; -inline constexpr OUString SFX_FILE_THUMBNAIL_MATH = u"res/math128.png"_ustr; -inline constexpr OUString SFX_FILE_THUMBNAIL_DEFAULT = u"res/main128.png"_ustr; - inline constexpr OUString SFX_FILE_OVERLAY_TEXT = u"res/odt_48_8.png"_ustr; inline constexpr OUString SFX_FILE_OVERLAY_SHEET = u"res/ods_48_8.png"_ustr; inline constexpr OUString SFX_FILE_OVERLAY_PRESENTATION = u"res/odp_48_8.png"_ustr; diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index ec913958622d..444309af2e32 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -25,6 +25,7 @@ #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <unotools/historyoptions.hxx> +#include <vcl/bitmaps.hlst> #include <vcl/event.hxx> #include <vcl/filter/PngImageReader.hxx> #include <vcl/ptrstyle.hxx> @@ -85,12 +86,12 @@ Bitmap Url2Icon(std::u16string_view rURL, const Ext2IconMap& rExtToIcon, const O Bitmap getDefaultThumbnail(const OUString& rURL) { static const Ext2IconMap BitmapForExtension - = { { sfx2::ApplicationType::TYPE_WRITER, SFX_FILE_THUMBNAIL_TEXT }, - { sfx2::ApplicationType::TYPE_CALC, SFX_FILE_THUMBNAIL_SHEET }, - { sfx2::ApplicationType::TYPE_IMPRESS, SFX_FILE_THUMBNAIL_PRESENTATION }, - { sfx2::ApplicationType::TYPE_DRAW, SFX_FILE_THUMBNAIL_DRAWING }, - { sfx2::ApplicationType::TYPE_DATABASE, SFX_FILE_THUMBNAIL_DATABASE }, - { sfx2::ApplicationType::TYPE_MATH, SFX_FILE_THUMBNAIL_MATH } }; + = { { sfx2::ApplicationType::TYPE_WRITER, RID_FILE_THUMBNAIL_TEXT }, + { sfx2::ApplicationType::TYPE_CALC, RID_FILE_THUMBNAIL_SHEET }, + { sfx2::ApplicationType::TYPE_IMPRESS, RID_FILE_THUMBNAIL_PRESENTATION }, + { sfx2::ApplicationType::TYPE_DRAW, RID_FILE_THUMBNAIL_DRAWING }, + { sfx2::ApplicationType::TYPE_DATABASE, RID_FILE_THUMBNAIL_DATABASE }, + { sfx2::ApplicationType::TYPE_MATH, RID_FILE_THUMBNAIL_MATH } }; static const Ext2IconMap EncryptedBitmapForExtension = { { sfx2::ApplicationType::TYPE_WRITER, BMP_128X128_WRITER_DOC }, @@ -103,7 +104,7 @@ Bitmap getDefaultThumbnail(const OUString& rURL) const std::map<sfx2::ApplicationType, OUString>& rWhichMap = IsDocEncrypted(rURL) ? EncryptedBitmapForExtension : BitmapForExtension; - return Url2Icon(rURL, rWhichMap, SFX_FILE_THUMBNAIL_DEFAULT); + return Url2Icon(rURL, rWhichMap, RID_FILE_THUMBNAIL_DEFAULT); } Bitmap getModuleOverlay(std::u16string_view rURL)
