sw/qa/extras/ooxmlimport/data/tdf113182.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 ++++++++
writerfilter/source/dmapper/DomainMapper.cxx | 7 ++++++-
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit be02ce71f2ee694fa2609a7a630853c24acfbfff
Author: Serge Krot <serge.k...@cib.de>
Date: Fri Mar 16 10:42:50 2018 +0100
tdf#113182: DOCX filter: new values of wrap property in text box
Added support of "none" and "through" values of the w:wrap
poroperty in the text box.
Change-Id: I83f0c9e8162e93bf457f228d49d3b426050d4dc6
Reviewed-on: https://gerrit.libreoffice.org/51396
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/qa/extras/ooxmlimport/data/tdf113182.docx
b/sw/qa/extras/ooxmlimport/data/tdf113182.docx
new file mode 100755
index 000000000000..9f35ec3d4ebc
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf113182.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6e181a87a9b9..5563ce56dc1f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1558,6 +1558,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
}
+// DOCX: Textbox wrap differs in MSO and LO
+// Both should layout text regardless of existing text box
+// and as result only one page should be generated.
+DECLARE_OOXMLIMPORT_TEST(testTdf113182, "tdf113182.docx")
+{
+ CPPUNIT_ASSERT_EQUAL(getPages(), 1);
+}
+
DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
{
OUString aTop =
parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 310bf761f3b7..6219b7c672e1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -868,11 +868,16 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
//should be either LN_Value_doc_ST_Wrap_notBeside or
LN_Value_doc_ST_Wrap_around or LN_Value_doc_ST_Wrap_auto
OSL_ENSURE( sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_around ||
sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_notBeside ||
+ sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_through ||
+ sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_none ||
sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_auto,
- "wrap not around, not_Beside or auto?");
+ "wrap not around, not_Beside, through, none or
auto?");
if( sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_around ||
+ sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_through ||
sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_auto )
pParaProperties->SetWrap (
text::WrapTextMode_DYNAMIC ) ;
+ else if (sal::static_int_cast<Id>(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_none)
+ pParaProperties->SetWrap (
text::WrapTextMode_THROUGH ) ;
else
pParaProperties->SetWrap ( text::WrapTextMode_NONE
) ;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
