diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-18 13:00:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-20 12:00:54 +0200 |
| commit | 2755bf801ee7105fdaee8221714909f839e2ca78 (patch) | |
| tree | 2c68df21b3995525017f5f7c61b52533f087b189 | |
| parent | bump product version to 6.1.3.0.0+ (diff) | |
| download | core-2755bf801ee7105fdaee8221714909f839e2ca78.tar.gz core-2755bf801ee7105fdaee8221714909f839e2ca78.zip | |
tdf#119770 nullptr GetGraphic return
Change-Id: I9e76b6704e7f82cd9d200ed6c5802101de264242
Reviewed-on: https://gerrit.libreoffice.org/60685
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/edit/editsh.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index e3f443b25eec..e93ef829f83d 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -605,7 +605,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 { |