diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-12 14:15:29 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-20 14:13:39 +0200 |
| commit | 24921bf5470beb8247069c5117daa1b0f65bc114 (patch) | |
| tree | a6397a89fe7bce12fba2a72444775131fe05763b | |
| parent | 5563bc7d0dd893d78728dd3ba57ab1820cd194d1 (diff) | |
tdf#93382: Make HACK more targeted to avoid collateral damage
Change-Id: Ieecad5f244703c4d2436e22a3ab50f719843eef4
(cherry picked from commit 68c6408b1725a8f506a8adb8c9af67a65e667f1c)
Reviewed-on: https://gerrit.libreoffice.org/17672
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 9f07d79327cf..9b9d7500b162 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -429,13 +429,17 @@ bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) {} pOle2Obj->SetLogicRect( aRect ); } - else if (!aRect.IsEmpty()) //HACK: can aRect legally be empty? + else { awt::Size aSz; Size aSize = aRect.GetSize(); aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); - xObj->setVisualAreaSize( pOle2Obj->GetAspect(), aSz ); + if (aSz.Width != 0 || aSz.Height != 0) + { + //HACK: can aSz legally be empty? + xObj->setVisualAreaSize( pOle2Obj->GetAspect(), aSz ); + } } // connect the object after the visual area is set |