diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-01-07 22:27:41 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-07 22:27:41 +0100 |
commit | eda0cec9ac990020e9da804ec3ed38e2cbfeeb77 (patch) | |
tree | ce01afe125d3868a9677004b2aa5ef47b67aefaf /svx/source/xoutdev | |
parent | 8269d576ec5dcfd4ca76ae219e85935efcdc008b (diff) |
Revert "dummy commit (WIP)"
This reverts commit 6eb0522395c236ae6930a300992ad092449f9592.
It does not compile and the message and contents suggest it probably wasn't
meant to be pushed.
Diffstat (limited to 'svx/source/xoutdev')
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 097a34d49f9f..ce3f1de6c077 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -3443,7 +3443,6 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI { if ( aPropSeq[n].Value >>= aGradient2 ) bGradient = true; - } } @@ -3484,19 +3483,11 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI case MID_FILLGRADIENT: { ::com::sun::star::awt::Gradient aGradient2; - ::com::sun::star::awt::SvgGradient aSvgGradient2; - bool bIsSvgGradient(false); - - if( !(rVal >>= aGradient2) ) - { - if( !(rVal >>= aSvgGradient2) ) - return false; - bIsSvgGradient=true; - } + if(!(rVal >>= aGradient2)) + return false; XGradient aXGradient; - if ( !bIsSvgGradient ) { aXGradient.SetGradientStyle( (XGradientStyle) aGradient2.Style ); aXGradient.SetStartColor( aGradient2.StartColor ); aXGradient.SetEndColor( aGradient2.EndColor ); @@ -3507,11 +3498,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI aXGradient.SetStartIntens( aGradient2.StartIntensity ); aXGradient.SetEndIntens( aGradient2.EndIntensity ); aXGradient.SetSteps( aGradient2.StepCount ); - } - else { - aXGradient.SetStartColor( aSvgGradient2.StopColor[0] ); - aXGradient.SetEndColor( aSvgGradient2.StopColor[1] ); - } + SetGradientValue( aXGradient ); break; } |