[Libreoffice-commits] core.git: solenv/bin svtools/inc

[Caolán McNamara (via logerrit)]

 solenv/bin/pack_images.py |    6 ++++++
 svtools/inc/bitmaps.hlst  |    1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit f716fd1580bcc6042afaab9beba24ca6cbcb1c73
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 2 18:01:28 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 2 22:07:00 2020 +0200

    tdf#135369 on removing an image link, ensure the linked to image is in the list
    
    If we removed something that is a link to a real file from our list of images
    to pack, but that real image is not in the list of images to pack, add it in
    instead so the real image does get packed
    
    Change-Id: I71bcbdf872a59194a1d94f287dda8fc27e4a6464
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99961
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/bin/pack_images.py b/solenv/bin/pack_images.py
index 5d368658961f..5ccc194e6307 100644
--- a/solenv/bin/pack_images.py
+++ b/solenv/bin/pack_images.py
@@ -342,7 +342,13 @@ def remove_links_from_zip_list(zip_list, links):
 
     for link in links.keys():
         if link in zip_list:
+            module = zip_list[link]
             del zip_list[link]
+            # tdf#135369 if we removed something that is a link to a real file
+            # from our list of images to pack, but that real image is not in
+            # the list of images to pack, add it in instead now
+            if links[link] not in zip_list:
+                zip_list[links[link]] = module
 
     LOGGER.debug("Cleaned zip list:\n%s", "\n".join(zip_list))
 
diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst
index cb6a813eac61..35332e05ede0 100644
--- a/svtools/inc/bitmaps.hlst
+++ b/svtools/inc/bitmaps.hlst
@@ -123,5 +123,4 @@
 
 #define BMP_TAB_LOCK "cmd/sc_lock.png"
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */