diff options
| author | Steve Yin <steve_y@apache.org> | 2014-01-16 08:29:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-16 12:03:36 +0000 |
| commit | 5b8a16209f1e1d8fc43157463384f6ab407ac514 (patch) | |
| tree | 9d8fc07382515e8c4d703648849fc1a79050fd28 /oox/source | |
| parent | 34a94e6855782667f54110b0ff68bf3bf8f058a2 (diff) | |
Resolves: #i119578# Lighten special effect in .PPTX won't display
(cherry picked from commit 641aa4b583e27369b404584d094e0758a93ce5b5)
Change-Id: I27a0503036087febc7f838dab4c2201eb0593d5c
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 14bd0e284061..7a9c3c7b7468 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -70,27 +70,32 @@ namespace oox { namespace ppt { { } - sal_Int32 get() + Any get() { sal_Int32 nColor; + Sequence< double > aHSL( 3 ); + Any aColor; switch( colorSpace ) { case AnimationColorSpace::HSL: - nColor = ( ( ( one * 128 ) / 360 ) & 0xff ) << 16 - | ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8 - | ( ( ( three * 128 ) / 1000 ) & 0xff ); + aHSL[ 0 ] = double(one) / 100000; + aHSL[ 1 ] = double(two) / 100000; + aHSL[ 2 ] = double(three) / 100000; + aColor = Any(aHSL); break; case AnimationColorSpace::RGB: nColor = ( ( ( one * 128 ) / 1000 ) & 0xff ) << 16 | ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8 | ( ( ( three * 128 ) / 1000 ) & 0xff ); + aColor = Any(nColor); break; default: nColor = 0; + aColor = Any( nColor ); break; } - return nColor; + return aColor; } sal_Int16 colorSpace; @@ -444,7 +449,7 @@ namespace oox { namespace ppt { if( maFromClr.isUsed() ) mpNode->setFrom( Any( maFromClr.getColor( rGraphicHelper ) ) ); if( mbHasByColor ) - mpNode->setBy( Any ( m_byColor.get() ) ); + mpNode->setBy( m_byColor.get() ); } } |