[Libreoffice-commits] core.git: sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 18 20:01:11 UTC 2018


 sw/source/core/edit/editsh.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e0432408840196e3f0af3c91ba4a42c70262b1e0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 18 13:00:34 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 18 22:00:45 2018 +0200

    tdf#119770 nullptr GetGraphic return
    
    Change-Id: I9e76b6704e7f82cd9d200ed6c5802101de264242
    Reviewed-on: https://gerrit.libreoffice.org/60683
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 04bd08bb8f6f..f5867ee7fb8a 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -603,7 +603,8 @@ Graphic SwEditShell::GetIMapGraphic() const
         }
         else if ( rNd.IsOLENode() )
         {
-            aRet = *static_cast<SwOLENode&>(rNd).GetGraphic();
+            if (const Graphic* pGraphic = static_cast<SwOLENode&>(rNd).GetGraphic())
+                aRet = *pGraphic;
         }
         else
         {


More information about the Libreoffice-commits mailing list