diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-11-02 19:14:05 +0000 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-11-08 07:11:20 +0100 |
| commit | f10b7e820844d94b4dbec3dcaf24392275940914 (patch) | |
| tree | 2b64d34359581d0460cf9dc98903134d3bcb5b87 | |
| parent | Fix some layout values (diff) | |
| download | core-f10b7e820844d94b4dbec3dcaf24392275940914.tar.gz core-f10b7e820844d94b4dbec3dcaf24392275940914.zip | |
tdf#119648 - even if we fail to import a fontwork, we shouldn't crash.
Change-Id: Id2dcfb69ad8440ea63564334a5a26a5f9b9bde14
Reviewed-on: https://gerrit.libreoffice.org/62789
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 90b05316fdc0..290c1f746fe4 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -340,7 +340,10 @@ static void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem if ( GalleryExplorer::GetSdrObj( GALLERY_THEME_POWERPOINT, i, &aFormModel ) ) { - const SdrObject* pSourceObj = aFormModel.GetPage( 0 )->GetObj( 0 ); + const SdrObject* pSourceObj = nullptr; + if (aFormModel.GetPageCount() > 0) + pSourceObj = aFormModel.GetPage( 0 )->GetObj( 0 ); + SAL_WARN_IF(!pSourceObj, "svx.form", "No content in gallery custom shape '" << rCustomShape << "'" ); if( pSourceObj ) { PropertyValue aPropVal_; |