oox/source/vml/vmlshapecontext.cxx | 2 ++
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 2 ++
2 files changed, 4 insertions(+)
New commits:
commit 9644f506ae31f1cacd6ab4c24b2591179791eebd
Author: Justin Luth <justin_l...@sil.org>
Date: Mon Sep 18 15:57:51 2017 -0400
tdf#97648 ooxmlimport: horizontal lines have no margins
Change-Id: I170ab7a742f8e9d8029512592abda9fc54edda18
Reviewed-on: https://gerrit.libreoffice.org/42437
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/oox/source/vml/vmlshapecontext.cxx
b/oox/source/vml/vmlshapecontext.cxx
index 423ba1458053..8181c982780d 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -308,6 +308,8 @@ ShapeTypeContext::ShapeTypeContext(ContextHandler2Helper
const & rParent,
OUString hrpct = rAttribs.getString( O_TOKEN( hrpct ), "1000" );
if( hrpct != "0" )
mrTypeModel.maWidthPercent = OUString::number( hrpct.toInt32() );
+ mrTypeModel.maWrapDistanceLeft = "0";
+ mrTypeModel.maWrapDistanceRight = "0";
}
// stroke settings (may be overridden by v:stroke element later)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 66eda44719f8..bbcaf277cb79 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -232,6 +232,8 @@
DECLARE_OOXMLEXPORT_TEST(testTdf97648_relativeWidth,"tdf97648_relativeWidth.docx
CPPUNIT_ASSERT_DOUBLES_EQUAL( sal_Int32(8001),
getShape(2)->getSize().Width, 10);
CPPUNIT_ASSERT_DOUBLES_EQUAL( sal_Int32(4001),
getShape(3)->getSize().Width, 10);
CPPUNIT_ASSERT_DOUBLES_EQUAL( sal_Int32(1600),
getShape(4)->getSize().Width, 10);
+
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(0), getProperty<sal_Int32>(getShape(1),
"LeftMargin") );
}
DECLARE_OOXMLEXPORT_TEST(testTdf104061_tableSectionColumns,"tdf104061_tableSectionColumns.docx")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
