ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#113182: DOCX filter: new values of wrap property in text box

Browse Source 
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 <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Serge Krot
2018-03-16 15:40:45 +01:00
committed by Thorsten Behrens
parent 1a4fcb7fea
commit be02ce71f2
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/qa/extras/ooxmlimport/data/tdf113182.docx
Executable
BIN
View File
Binary file not shown.
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+8
View File
@@ -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");
writerfilter/source/dmapper/DomainMapper.cxx
+6 -1
View File
@@ -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 ) ;
}