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

[Miklos Vajna]

 oox/source/drawingml/shape.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 53e5b6be99bf2f9d7f390716b7480468a37e4b20
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Dec 2 13:49:51 2013 +0100

    DOCX drawingML shape import: fix sw text frame transparence
    
    Mirror what the VML import's ShapeBase::convertShapeProperties() already
    does, fixes CppunitTest_sw_ooxmlexport's testFdo66688 when wps import is
    enabled by default.
    
    Change-Id: Iabed3a5fa1353aefe3055232ad0b7770067a7a58

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1f7d559..78a7581 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -611,6 +611,16 @@ Reference< XShape > Shape::createAndInsert(
         // assertions from svx) ...
         if( aServiceName != "com.sun.star.drawing.GroupShape" )
         {
+            if (aServiceName == "com.sun.star.text.TextFrame")
+            {
+                // TextFrames have BackColorTransparency, not FillTransparence
+                if (aShapeProps.hasProperty(PROP_FillTransparence))
+                {
+                    aShapeProps.setProperty(PROP_BackColorTransparency, aShapeProps[PROP_FillTransparence]);
+                    aShapeProps.erase(PROP_FillTransparence);
+                }
+            }
+
             PropertySet( xSet ).setProperties( aShapeProps );
             if (mbLockedCanvas && aServiceName == "com.sun.star.drawing.LineShape")
             {