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

Miklos Vajna vmiklos at collabora.co.uk
Fri Dec 20 02:22:21 PST 2013


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

New commits:
commit 2b6c7519f69b43636028de8c15b1981e0328361f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Dec 20 11:14:29 2013 +0100

    oox: import textframe border line width from drawingml
    
    With this, CppunitTest_sw_ooxmlexport's testTextFrameBorders finally
    pases, even in experimental mode.
    
    Change-Id: I393bf1089702004956124c6aaad594ed32804b71

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1406567..a6e61a7 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -639,6 +639,8 @@ Reference< XShape > Shape::createAndInsert(
                     {
                         css::table::BorderLine2 aBorderLine = xPropertySet->getPropertyValue(PropertyMap::getPropertyName(aBorders[i])).get<css::table::BorderLine2>();
                         aBorderLine.Color = aShapeProps[PROP_LineColor].get<sal_Int32>();
+                        if (aLineProperties.moLineWidth.has())
+                            aBorderLine.LineWidth = convertEmuToHmm(aLineProperties.moLineWidth.get());
                         aShapeProps.setProperty(aBorders[i], uno::makeAny(aBorderLine));
                     }
                     aShapeProps.erase(PROP_LineColor);


More information about the Libreoffice-commits mailing list