svn commit: r1558716 - /openoffice/trunk/main/oox/source/ppt/timenodelistcontext.cxx

[steve_y]

Author: steve_y
Date: Thu Jan 16 08:29:37 2014
New Revision: 1558716

URL: http://svn.apache.org/r1558716
Log:
Bug 119578 - [From Symphony]Lighten special effect in .PPTX won't display

Modified:
    openoffice/trunk/main/oox/source/ppt/timenodelistcontext.cxx

Modified: openoffice/trunk/main/oox/source/ppt/timenodelistcontext.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/ppt/timenodelistcontext.cxx?rev=1558716&r1=1558715&r2=1558716&view=diff
==============================================================================
--- openoffice/trunk/main/oox/source/ppt/timenodelistcontext.cxx (original)
+++ openoffice/trunk/main/oox/source/ppt/timenodelistcontext.cxx Thu Jan 16 
08:29:37 2014
@@ -76,27 +76,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;
@@ -504,7 +509,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() 
);
                                }
                        }