View | Details | Raw Unified | Return to issue 119634
Collapse All | Expand All

(-)filter/source/msfilter/msdffimp.cxx (-9 / +16 lines)
Lines 2660-2676 Link Here
2660
        rSet.Put( SvxCrossedOutItem( nFontAttributes & 0x01 ? STRIKEOUT_SINGLE : STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
2660
        rSet.Put( SvxCrossedOutItem( nFontAttributes & 0x01 ? STRIKEOUT_SINGLE : STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
2661
	if ( IsProperty( DFF_Prop_fillColor ) )
2661
	if ( IsProperty( DFF_Prop_fillColor ) )
2662
		rSet.Put( XFillColorItem( String(), rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_fillColor ), DFF_Prop_fillColor ) ) );
2662
		rSet.Put( XFillColorItem( String(), rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_fillColor ), DFF_Prop_fillColor ) ) );
2663
	if ( IsProperty( DFF_Prop_shadowType ) )
2663
	if ( IsProperty( DFF_Prop_shadowColor ) )
2664
		rSet.Put( SdrShadowColorItem( String(), rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
2665
	else
2664
	{
2666
	{
2665
		MSO_ShadowType eShadowType = static_cast< MSO_ShadowType >( GetPropertyValue( DFF_Prop_shadowType ) );
2667
		//The default value for this property is 0x00808080
2666
		if( eShadowType != mso_shadowOffset )
2668
		rSet.Put( SdrShadowColorItem( String(),  rManager.MSO_CLR_ToColor( 0x00808080, DFF_Prop_shadowColor ) ) );
2667
		{
2668
			rSet.Put( SdrShadowXDistItem( 35 ) ); // 0,35 mm Schattendistanz
2669
			rSet.Put( SdrShadowYDistItem( 35 ) );
2670
		}
2671
	}
2669
	}
2672
	if ( IsProperty( DFF_Prop_shadowColor ) )
2673
		rSet.Put( SdrShadowColorItem( String(), rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
2674
	if ( IsProperty( DFF_Prop_shadowOpacity ) )
2670
	if ( IsProperty( DFF_Prop_shadowOpacity ) )
2675
        rSet.Put( SdrShadowTransparenceItem( (sal_uInt16)( ( 0x10000 - GetPropertyValue( DFF_Prop_shadowOpacity ) ) / 655 ) ) );
2671
        rSet.Put( SdrShadowTransparenceItem( (sal_uInt16)( ( 0x10000 - GetPropertyValue( DFF_Prop_shadowOpacity ) ) / 655 ) ) );
2676
	if ( IsProperty( DFF_Prop_shadowOffsetX ) )
2672
	if ( IsProperty( DFF_Prop_shadowOffsetX ) )
Lines 2696-2701 Link Here
2696
				rSet.Put( SdrShadowYDistItem( 35 ) );
2692
				rSet.Put( SdrShadowYDistItem( 35 ) );
2697
		}
2693
		}
2698
	}
2694
	}
2695
	if ( IsProperty( DFF_Prop_shadowType ) )
2696
	{
2697
		MSO_ShadowType eShadowType = static_cast< MSO_ShadowType >( GetPropertyValue( DFF_Prop_shadowType ) );
2698
		if( eShadowType != mso_shadowOffset )
2699
		{
2700
			//0.12'' == 173 twip == 302 100mm
2701
			sal_uInt32 nDist = rManager.pSdrModel->GetScaleUnit() == MAP_TWIP ? 173: 302;
2702
			rSet.Put( SdrShadowXDistItem( nDist ) );
2703
			rSet.Put( SdrShadowYDistItem( nDist ) );
2704
		}
2705
	}
2699
	if ( bHasShadow )
2706
	if ( bHasShadow )
2700
	{
2707
	{
2701
		// #160376# sj: activating shadow only if fill and or linestyle is used
2708
		// #160376# sj: activating shadow only if fill and or linestyle is used

Return to issue 119634