vcl/inc/bitmaps.hlst | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
New commits:
commit 2e02e73ce7c4ea6375f2f73b856c12a97488d190
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jun 13 15:39:11 2022 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Jun 15 05:34:38 2022 +0200
vcl: restore lost spinner images
This went wrong in commit 13aa5081793f133077610cd01b7f01ee765b4add
(remove unused defines, 2021-11-19), the trouble is that
postprocess/CustomTarget_images.mk needs these images to be listed in
bitmaps.hlst explictly, and the makefile won't see that the same names
are used in Throbber::getDefaultImageURLs(), constructed dynamically.
(cherry picked from commit 214438f1dcce52043c27c39e529cf60ff96c98cf)
Change-Id: Ie7ea1734ed417d17e1ce54d6a755509ef52572d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135829
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 358391950bf67b689668bc7b4018371d5a846ae3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135850
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index 40d726477e8e..00c3f82221f6 100644
--- a/vcl/inc/bitmaps.hlst
+++ b/vcl/inc/bitmaps.hlst
@@ -94,6 +94,41 @@ inline constexpr OUStringLiteral ODM_16_8 =
u"res/odm_16_8.png";
inline constexpr OUStringLiteral ODB_16_8 = u"res/odb_16_8.png";
inline constexpr OUStringLiteral ODF_16_8 = u"res/odf_16_8.png";
+//start, Throbber::getDefaultImageURLs constructs these dynamically (not
unused)
+#define SPINNER_16_01
"vcl/res/spinner-16-01.png"
+#define SPINNER_16_02
"vcl/res/spinner-16-02.png"
+#define SPINNER_16_03
"vcl/res/spinner-16-03.png"
+#define SPINNER_16_04
"vcl/res/spinner-16-04.png"
+#define SPINNER_16_05
"vcl/res/spinner-16-05.png"
+#define SPINNER_16_06
"vcl/res/spinner-16-06.png"
+
+#define SPINNER_32_01
"vcl/res/spinner-32-01.png"
+#define SPINNER_32_02
"vcl/res/spinner-32-02.png"
+#define SPINNER_32_03
"vcl/res/spinner-32-03.png"
+#define SPINNER_32_04
"vcl/res/spinner-32-04.png"
+#define SPINNER_32_05
"vcl/res/spinner-32-05.png"
+#define SPINNER_32_06
"vcl/res/spinner-32-06.png"
+#define SPINNER_32_07
"vcl/res/spinner-32-07.png"
+#define SPINNER_32_08
"vcl/res/spinner-32-08.png"
+#define SPINNER_32_09
"vcl/res/spinner-32-09.png"
+#define SPINNER_32_10
"vcl/res/spinner-32-10.png"
+#define SPINNER_32_11
"vcl/res/spinner-32-11.png"
+#define SPINNER_32_12
"vcl/res/spinner-32-12.png"
+
+#define SPINNER_64_01
"vcl/res/spinner-64-01.png"
+#define SPINNER_64_02
"vcl/res/spinner-64-02.png"
+#define SPINNER_64_03
"vcl/res/spinner-64-03.png"
+#define SPINNER_64_04
"vcl/res/spinner-64-04.png"
+#define SPINNER_64_05
"vcl/res/spinner-64-05.png"
+#define SPINNER_64_06
"vcl/res/spinner-64-06.png"
+#define SPINNER_64_07
"vcl/res/spinner-64-07.png"
+#define SPINNER_64_08
"vcl/res/spinner-64-08.png"
+#define SPINNER_64_09
"vcl/res/spinner-64-09.png"
+#define SPINNER_64_10
"vcl/res/spinner-64-10.png"
+#define SPINNER_64_11
"vcl/res/spinner-64-11.png"
+#define SPINNER_64_12
"vcl/res/spinner-64-12.png"
+//end, Throbber::getDefaultImageURLs
+
inline constexpr OUStringLiteral IMG_WARN = u"dbaccess/res/exwarning.png";
inline constexpr OUStringLiteral IMG_ERROR = u"dbaccess/res/exerror.png";
inline constexpr OUStringLiteral IMG_INFO = u"dbaccess/res/exinfo.png";
