diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-20 14:54:16 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-21 10:06:54 +0100 |
| commit | 60b1a93a990a9978a30dee929526faf8db629a7f (patch) | |
| tree | be9c923cada58362f647fc849fe2ed599c7a10b8 /svx | |
| parent | 64d8a71eb8ced0b701ba86e5cf066af48f98872f (diff) | |
If a SdrOle2Obj object is missing/broken show the preview set for it
if the object isn't valid, e.g. link to something that doesn't exist, set the fallback
graphic as mxGraphic so SdrOle2Obj::GetGraphic will show the fallback, otherwise
the failing mxObjRef.is test in SdrOle2Obj::GetGraphic means it doesn't get used
Change-Id: I8f1aea6b25dc216e01a0f888a44d10876bb1bebd
Reviewed-on: https://gerrit.libreoffice.org/83322
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 604d6c8eb9a5..16617ecaf94f 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1849,11 +1849,19 @@ bool SdrOle2Obj::IsChart() const void SdrOle2Obj::SetGraphicToObj( const Graphic& aGraphic ) { mpImpl->mxObjRef.SetGraphic( aGraphic, OUString() ); + // if the object isn't valid, e.g. link to something that doesn't exist, set the fallback + // graphic as mxGraphic so SdrOle2Obj::GetGraphic will show the fallback + if (const Graphic* pObjGraphic = mpImpl->mxObjRef.is() ? nullptr : mpImpl->mxObjRef.GetGraphic()) + mpImpl->mxGraphic.reset(new Graphic(*pObjGraphic)); } void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrStream, const OUString& aMediaType ) { mpImpl->mxObjRef.SetGraphicStream( xGrStream, aMediaType ); + // if the object isn't valid, e.g. link to something that doesn't exist, set the fallback + // graphic as mxGraphic so SdrOle2Obj::GetGraphic will show the fallback + if (const Graphic* pObjGraphic = mpImpl->mxObjRef.is() ? nullptr : mpImpl->mxObjRef.GetGraphic()) + mpImpl->mxGraphic.reset(new Graphic(*pObjGraphic)); } bool SdrOle2Obj::IsCalc() const |