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

[Tünde Tóth (via logerrit)]

 dev/null                                     |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   11 -----------
 sw/source/filter/ww8/docxattributeoutput.cxx |    1 -
 3 files changed, 12 deletions(-)

New commits:
commit d137a6944e42f5a59d6c318999edbf97d05cb9fd
Author:     Tünde Tóth <tundeth at gmail.com>
AuthorDate: Wed Aug 14 14:31:37 2019 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Wed Aug 21 11:49:55 2019 +0200

    clean up "tdf#125298 DOCX export: fix bookmark name truncation"
    
    This reverts the remaining of the
    commit b9afb9959c31c3c57d0f2fe91107a92abfd82cdb "tdf#113483: DOCX: fix
    encoding of bookmarks with non-ASCII letters", not reverted by the
    replacement commit 1cbf0ee54519bf81d934609352e8a1a641d8a534
    "tdf#125298 DOCX export: fix bookmark name truncation".
    
    Change-Id: Ia00bae9615f9417becd866b313175563e21c4808
    Reviewed-on: https://gerrit.libreoffice.org/77458
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: László Németh <nemeth at numbertext.org>

diff --git a/sw/qa/extras/ooxmlexport/data/tdf113483_crossreflink_nonascii_bookmarkname.docx b/sw/qa/extras/ooxmlexport/data/tdf113483_crossreflink_nonascii_bookmarkname.docx
deleted file mode 100644
index ec129909bc01..000000000000
Binary files a/sw/qa/extras/ooxmlexport/data/tdf113483_crossreflink_nonascii_bookmarkname.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 5ed31b49c97f..e59e65e19312 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -336,17 +336,6 @@ DECLARE_OOXMLIMPORT_TEST(testTdf123460, "tdf123460.docx")
     CPPUNIT_ASSERT_EQUAL(true, bCaught);
 }
 
-//tdf#113483: fix handling of non-ascii characters in bookmark names and instrText xml tags
-DECLARE_OOXMLEXPORT_TEST(testTdf113483, "tdf113483_crossreflink_nonascii_bookmarkname.docx")
-{
-    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-    if (!pXmlDoc)
-        return;
-    // check whether test file keeps non-ascii values or not
-    assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:bookmarkStart[1]", "name", OUString::fromUtf8("Els\u0151"));
-    assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[5]/w:r[2]/w:instrText[1]", OUString::fromUtf8(" REF Els\u0151 \\h "));
-}
-
 //tdf#125298: fix charlimit restrictions in bookmarknames and field references if they contain non-ascii characters
 DECLARE_OOXMLEXPORT_TEST(testTdf125298, "tdf125298_crossreflink_nonascii_charlimit.docx")
 {
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4a087e8188a4..3d705d76a83a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -96,7 +96,6 @@
 #include <svl/grabbagitem.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <tools/datetimeutils.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/whiter.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>