[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0db098ec9d5a7743f8595114f6a72c92121acc22
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 5 16:54:21 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Dec 6 09:52:40 2019 +0100

    handle unsetting Image
    
    Change-Id: If4a3ab94c268caeebdc42c664c568aa9004c50ad
    Reviewed-on: https://gerrit.libreoffice.org/84580
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index d340fad0f6c1..e1baf6c61d90 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3033,7 +3033,10 @@ public:
 
     virtual void set_image(VirtualDevice* pDevice) override
     {
-        m_xImage->SetImage(createImage(*pDevice));
+        if (pDevice)
+            m_xImage->SetImage(createImage(*pDevice));
+        else
+            m_xImage->SetImage(::Image());
     }
 
     virtual void set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) override