[Libreoffice-commits] core.git: oox/source

Kohei Yoshida kohei.yoshida at collabora.com
Thu Jul 24 14:33:16 PDT 2014


 oox/source/export/drawingml.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 77ea585350f96ad912b4cdc66ba8b04a988c5fe8
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Jul 24 17:31:30 2014 -0400

    Remove compiler warning.
    
    nTransparancy will be left uninitialized if unstuffing the value from
    the Any value fails.
    
    Change-Id: I06a5853066edeb39b811bf12fd09afbc11792add

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6b25c57..0e5fb0f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2301,9 +2301,9 @@ void DrawingML::WriteShapeEffect( const OUString& sName, const Sequence< Propert
         else if(aEffectProps[i].Name == "RgbClrTransparency")
         {
             sal_Int32 nTransparency;
-            aEffectProps[i].Value >>= nTransparency;
-            // Calculate alpha value (see oox/source/drawingml/color.cxx : getTransparency())
-            nAlpha = MAX_PERCENT - ( PER_PERCENT * nTransparency );
+            if (aEffectProps[i].Value >>= nTransparency)
+                // Calculate alpha value (see oox/source/drawingml/color.cxx : getTransparency())
+                nAlpha = MAX_PERCENT - ( PER_PERCENT * nTransparency );
         }
         else if(aEffectProps[i].Name == "SchemeClr")
         {


More information about the Libreoffice-commits mailing list