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

[Stephan Bergmann]

 oox/source/vml/vmlshape.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 10cddaaeabdc7ec3596dcc5e54c187edd520048f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 30 11:18:18 2015 +0200

    Make check of Any value more robust
    
    ...in light of the various UNO integer types
    
    Change-Id: Ie525e8cdd1d155446985ddfb2667714be2dd4904

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 3f4e3fc..988923c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -329,8 +329,12 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
                         aGrabBag[length+1].Value = uno::makeAny(sal_Int32(NormAngle360((maTypeModel.maRotation.toInt32()) * -100)));
                     }
                     propertySet->setPropertyValue( "FrameInteropGrabBag", uno::makeAny(aGrabBag) );
+                    sal_Int32 backColorTransparency = 0;
+                    propertySet->getPropertyValue("BackColorTransparency")
+                        >>= backColorTransparency;
                     if (propertySet->getPropertyValue("FillStyle") == FillStyle_NONE &&
-                        propertySet->getPropertyValue("BackColorTransparency") == makeAny(100)) {
+                        backColorTransparency == 100)
+                    {
                         // If there is no fill, the Word default is 100% transparency.
                         propertySet->setPropertyValue("FillTransparence", makeAny(sal_Int16(100)));
                     }