commit 640ae4bf97530882614796aed669be8c4fd91fe4
author Michael Meeks <michael.meeks@collabora.com> Fri Nov 02 19:14:05 2018 +0000
committer Caolán McNamara <caolanm@redhat.com> Thu Nov 08 14:20:17 2018 +0100
tree 4144f170a0874715f3733fdeec1b7d8858567900
parent 1b5e1ca38c1ebc374f25d50a7c551cbb4b8fa398

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>
(cherry picked from commit f10b7e820844d94b4dbec3dcaf24392275940914)
Reviewed-on: https://gerrit.libreoffice.org/63061
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

svx/source/toolbars/fontworkbar.cxx

diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 338907d..e374b0d 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -358,7 +358,10 @@
                    rPool.FreezeIdRanges();
                    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_;