move pseudo bitmap resources to an ilst

Change-Id: Ib649db6620c83a42e96ca45e4a5018fdff74286b

4 files changed, 31 insertions, 68 deletions

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 818c86fb5207..ecfbe963a5da 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -28,6 +28,7 @@ $(packimages_DIR)/%.zip : \
 		$(packimages_DIR)/sorted.lst \
 		$(packimages_DIR)/commandimagelist.ilst \
 		$(SRCDIR)/sfx2/source/sidebar/sidebar.ilst \
+		$(SRCDIR)/vcl/source/control/throbber.ilst \
 		$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
 		$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \
 		$(call gb_Helper_get_imagelists)
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 822b3a24b679..c76fcd00d3e9 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
 
 $(eval $(call gb_SrsTarget_add_nonlocalizable_files,vcl/source/src,\
     vcl/source/src/images.src \
-    vcl/source/src/throbber.src \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/source/control/throbber.ilst b/vcl/source/control/throbber.ilst
new file mode 100644
index 000000000000..17f9e3eedf11
--- /dev/null
+++ b/vcl/source/control/throbber.ilst
@@ -0,0 +1,30 @@
+%MODULE%/vcl/res/spinner-16-01.png
+%MODULE%/vcl/res/spinner-16-02.png
+%MODULE%/vcl/res/spinner-16-03.png
+%MODULE%/vcl/res/spinner-16-04.png
+%MODULE%/vcl/res/spinner-16-05.png
+%MODULE%/vcl/res/spinner-16-06.png
+%MODULE%/vcl/res/spinner-32-01.png
+%MODULE%/vcl/res/spinner-32-02.png
+%MODULE%/vcl/res/spinner-32-03.png
+%MODULE%/vcl/res/spinner-32-04.png
+%MODULE%/vcl/res/spinner-32-05.png
+%MODULE%/vcl/res/spinner-32-06.png
+%MODULE%/vcl/res/spinner-32-07.png
+%MODULE%/vcl/res/spinner-32-08.png
+%MODULE%/vcl/res/spinner-32-09.png
+%MODULE%/vcl/res/spinner-32-10.png
+%MODULE%/vcl/res/spinner-32-11.png
+%MODULE%/vcl/res/spinner-32-12.png
+%MODULE%/vcl/res/spinner-64-01.png
+%MODULE%/vcl/res/spinner-64-02.png
+%MODULE%/vcl/res/spinner-64-03.png
+%MODULE%/vcl/res/spinner-64-04.png
+%MODULE%/vcl/res/spinner-64-05.png
+%MODULE%/vcl/res/spinner-64-06.png
+%MODULE%/vcl/res/spinner-64-07.png
+%MODULE%/vcl/res/spinner-64-08.png
+%MODULE%/vcl/res/spinner-64-09.png
+%MODULE%/vcl/res/spinner-64-10.png
+%MODULE%/vcl/res/spinner-64-11.png
+%MODULE%/vcl/res/spinner-64-12.png
diff --git a/vcl/source/src/throbber.src b/vcl/source/src/throbber.src
deleted file mode 100644
index 41a5f508b1c4..000000000000
--- a/vcl/source/src/throbber.src
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// TODO: we need a mechanism to add images to images.zip, *without*
-// referring them in resource files. The below resources are never loaded
-// at runtime, instead, the images in images.zip are accessed via
-// private:graphicrepository/* URLs.
-
-Resource 3000
-{
-    Image 1 { ImageBitmap = Bitmap{ file = "spinner-16-01.png"; }; };
-    Image 2 { ImageBitmap = Bitmap{ file = "spinner-16-02.png"; }; };
-    Image 3 { ImageBitmap = Bitmap{ file = "spinner-16-03.png"; }; };
-    Image 4 { ImageBitmap = Bitmap{ file = "spinner-16-04.png"; }; };
-    Image 5 { ImageBitmap = Bitmap{ file = "spinner-16-05.png"; }; };
-    Image 6 { ImageBitmap = Bitmap{ file = "spinner-16-06.png"; }; };
-};
-
-Resource 3001
-{
-    Image  1 { ImageBitmap = Bitmap{ file = "spinner-32-01.png"; }; };
-    Image  2 { ImageBitmap = Bitmap{ file = "spinner-32-02.png"; }; };
-    Image  3 { ImageBitmap = Bitmap{ file = "spinner-32-03.png"; }; };
-    Image  4 { ImageBitmap = Bitmap{ file = "spinner-32-04.png"; }; };
-    Image  5 { ImageBitmap = Bitmap{ file = "spinner-32-05.png"; }; };
-    Image  6 { ImageBitmap = Bitmap{ file = "spinner-32-06.png"; }; };
-    Image  7 { ImageBitmap = Bitmap{ file = "spinner-32-07.png"; }; };
-    Image  8 { ImageBitmap = Bitmap{ file = "spinner-32-08.png"; }; };
-    Image  9 { ImageBitmap = Bitmap{ file = "spinner-32-09.png"; }; };
-    Image 10 { ImageBitmap = Bitmap{ file = "spinner-32-10.png"; }; };
-    Image 11 { ImageBitmap = Bitmap{ file = "spinner-32-11.png"; }; };
-    Image 12 { ImageBitmap = Bitmap{ file = "spinner-32-12.png"; }; };
-};
-
-Resource 3002
-{
-    Image  1 { ImageBitmap = Bitmap{ file = "spinner-64-01.png"; }; };
-    Image  2 { ImageBitmap = Bitmap{ file = "spinner-64-02.png"; }; };
-    Image  3 { ImageBitmap = Bitmap{ file = "spinner-64-03.png"; }; };
-    Image  4 { ImageBitmap = Bitmap{ file = "spinner-64-04.png"; }; };
-    Image  5 { ImageBitmap = Bitmap{ file = "spinner-64-05.png"; }; };
-    Image  6 { ImageBitmap = Bitmap{ file = "spinner-64-06.png"; }; };
-    Image  7 { ImageBitmap = Bitmap{ file = "spinner-64-07.png"; }; };
-    Image  8 { ImageBitmap = Bitmap{ file = "spinner-64-08.png"; }; };
-    Image  9 { ImageBitmap = Bitmap{ file = "spinner-64-09.png"; }; };
-    Image 10 { ImageBitmap = Bitmap{ file = "spinner-64-10.png"; }; };
-    Image 11 { ImageBitmap = Bitmap{ file = "spinner-64-11.png"; }; };
-    Image 12 { ImageBitmap = Bitmap{ file = "spinner-64-12.png"; }; };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */