[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Michael Meeks (via logerrit)]

 vcl/source/helper/commandinfoprovider.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6eb45e25ef821fff45e1074d73384bbf10ccb058
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Fri Oct 4 14:08:19 2019 +0100
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Fri Oct 4 14:09:40 2019 +0100

    Fix merge issue in ad747625c821; try harder to find icons.
    
    Change-Id: I3eaf187d770413bfafde84245a3e7ed186e2cdc4

diff --git a/vcl/source/helper/commandinfoprovider.cxx 
b/vcl/source/helper/commandinfoprovider.cxx
index 80bc04f876a5..e4b4b3d2cc75 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -324,7 +324,8 @@ static Reference<graphic::XGraphic> 
GetXGraphicForCommand(const OUString& rsComm
 
             aGraphicSeq = xDocImgMgr->getImages( nImageType, aImageCmdSeq );
             Reference<graphic::XGraphic> xGraphic = aGraphicSeq[0];
-            return xGraphic;
+            if (xGraphic)
+                return xGraphic;
         }
     }
     catch (Exception&)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits