[Libreoffice-commits] core.git: sw/qa sw/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8export/data/tdf115896_layoutInCell.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx                  |    7 +++++++
 sw/source/filter/ww8/ww8graf.cxx                       |    1 +
 3 files changed, 8 insertions(+)

New commits:
commit 561fe03e429a646411f9dc5e17d48a2f38b1db5a
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Thu Apr 23 15:16:26 2020 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Mon Apr 27 19:20:21 2020 +0200

    tdf#115896 doc import: recognize new version 2013
    
    Now, I don't know for sure that E000 is from
    Office 2013, since I don't know where the document
    came from and I don't have 2013 readily available.
    However, I tried round-tripping the unit
    test in Office 2016 and it gave the version
    number 0x2000.
    
    Change-Id: Ib02f9440de34225affcb2ccbfd96ed89c717085e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92764
    Tested-by: Justin Luth <justin_luth at sil.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/qa/extras/ww8export/data/tdf115896_layoutInCell.doc b/sw/qa/extras/ww8export/data/tdf115896_layoutInCell.doc
new file mode 100644
index 000000000000..c7e6fc6809df
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf115896_layoutInCell.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index fbc4e0d7a6b4..9375b589b06f 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -489,6 +489,13 @@ DECLARE_WW8EXPORT_TEST( testActiveXCheckbox, "checkbox_control.odt" )
     CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER,getProperty<text::TextContentAnchorType>(xPropertySet2,"AnchorType"));
 }
 
+DECLARE_WW8EXPORT_TEST( testTdf115896_layoutInCell, "tdf115896_layoutInCell.doc" )
+{
+    // Check anchor type - was anchored to page because of unknown version of Word
+    uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY_THROW);
+    CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,getProperty<text::TextContentAnchorType>(xPropertySet,"AnchorType"));
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf67207_MERGEFIELD, "mailmerge.doc")
 {
     uno::Reference<beans::XPropertySet> xTextField = getProperty< uno::Reference<beans::XPropertySet> >(getRun(getParagraph(1), 2), "TextField");
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 0090dbba9b02..3c3961695ade 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2472,6 +2472,7 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable
             case 0x6000: // version 11 aka Microsoft Word 2003
             case 0x8000: // version 12 aka Microsoft Word 2007
             case 0xC000: // version 14 aka Microsoft Word 2010
+            case 0xE000: // version 15 aka Microsoft Word 2013
             {
                 // #i98037#
                 // adjustment of conditions needed after deeper analysis of