diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-11-19 11:08:09 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-19 11:15:51 +0100 |
| commit | 3b0e3e3797072b10738086911488cba86d840e69 (patch) | |
| tree | c45e6f9d69be560e0f8f192a3eff43de6d2c36b0 /filter | |
| parent | ca99a47bf383faf265dd65d3e70a6f43096de76d (diff) | |
fdo#66854 keep shadow distance of non-supported MSO shadow type
this is a slight improvement of d7367b709dc4e97714fb2084b872a96389e768fb
the rendering of star from #i119634# bugdoc was kept
the rendering of the yellow circle shadows from fdo#66854 bugdoc
was improved
Change-Id: Ife53328ef665131fb954eb33c2e8269ad10da0fe
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 27ca4a9813b8..c0db6dced4e1 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -2522,6 +2522,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObjData& rObjData ) const { sal_Bool bHasShadow = sal_False; + bool bNonZeroShadowOffset = false; if ( IsProperty( DFF_Prop_gtextSize ) ) rSet.Put( SvxFontHeightItem( rManager.ScalePt( GetPropertyValue( DFF_Prop_gtextSize ) ), 100, EE_CHAR_FONTHEIGHT ) ); @@ -2554,12 +2555,14 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj sal_Int32 nVal = static_cast< sal_Int32 >( GetPropertyValue( DFF_Prop_shadowOffsetX ) ); rManager.ScaleEmu( nVal ); rSet.Put( SdrShadowXDistItem( nVal ) ); + bNonZeroShadowOffset = ( nVal > 0 ); } if ( IsProperty( DFF_Prop_shadowOffsetY ) ) { sal_Int32 nVal = static_cast< sal_Int32 >( GetPropertyValue( DFF_Prop_shadowOffsetY ) ); rManager.ScaleEmu( nVal ); rSet.Put( SdrShadowYDistItem( nVal ) ); + bNonZeroShadowOffset = ( nVal > 0 ); } if ( IsProperty( DFF_Prop_fshadowObscured ) ) { @@ -2575,7 +2578,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj if ( IsProperty( DFF_Prop_shadowType ) ) { MSO_ShadowType eShadowType = static_cast< MSO_ShadowType >( GetPropertyValue( DFF_Prop_shadowType ) ); - if( eShadowType != mso_shadowOffset ) + if( eShadowType != mso_shadowOffset && !bNonZeroShadowOffset ) { //0.12" == 173 twip == 302 100mm sal_uInt32 nDist = rManager.pSdrModel->GetScaleUnit() == MAP_TWIP ? 173: 302; |