diff options
| author | martinb214 <bakosmartin@gmail.com> | 2017-12-06 20:58:45 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-25 22:49:51 +0200 |
| commit | 07c2d891cb6d83e47624104107226f20b9c2b4f3 (patch) | |
| tree | d7bcec5f48d8888bfd8b8bba5beef1492b3d0190 /oox/source | |
| parent | b8adff2c5342623eafa3fa5d1e89d6e06b2aa571 (diff) | |
tdf#111790: Shadow imported from a PPTX file is not overriden
by the settings while saving back to PPTX
Reviewed-on: https://gerrit.libreoffice.org/45989
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 7f42b0f96a2798ae99aa65b84b0db3b2af2b282b)
Change-Id: I958f1987d0123bcf89ef37b13807f407781f3c15
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index b13d79ac8169..1067240fbe81 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -3220,25 +3220,25 @@ sal_Int32 lcl_CalculateDir(const double dX, const double dY) void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet ) { + if( !GetProperty( rXPropSet, "InteropGrabBag" ) ) + return; + Sequence< PropertyValue > aGrabBag, aEffects, aOuterShdwProps; - if( GetProperty( rXPropSet, "InteropGrabBag" ) ) + mAny >>= aGrabBag; + for( sal_Int32 i=0; i < aGrabBag.getLength(); ++i ) { - mAny >>= aGrabBag; - for( sal_Int32 i=0; i < aGrabBag.getLength(); ++i ) + if( aGrabBag[i].Name == "EffectProperties" ) { - if( aGrabBag[i].Name == "EffectProperties" ) + aGrabBag[i].Value >>= aEffects; + for( sal_Int32 j=0; j < aEffects.getLength(); ++j ) { - aGrabBag[i].Value >>= aEffects; - for( sal_Int32 j=0; j < aEffects.getLength(); ++j ) + if( aEffects[j].Name == "outerShdw" ) { - if( aEffects[j].Name == "outerShdw" ) - { - aEffects[j].Value >>= aOuterShdwProps; - break; - } + aEffects[j].Value >>= aOuterShdwProps; + break; } - break; } + break; } } |