diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2015-08-25 17:45:11 +0300 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-15 16:50:35 +0200 |
| commit | 3b7ebeb5e7bbbfde0467f043171ab454340eaa0c (patch) | |
| tree | db541a647117b07d474d4076e85163f3f7798ef5 | |
| parent | a5df43611bb27491961f97b758b1c7fc0b3158b0 (diff) | |
tdf#93449 Internal hyperlinks are not exported corectly in HTML
InetURLObject class does not work correctly with internal document
links, containing not full url, but just a fragment. This case added
as an exception for HTML link export.
Change-Id: I44496a1cf186836d4194fc65ce7bf9aeb2f79b65
Reviewed-on: https://gerrit.libreoffice.org/17993
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit fd3468024e1ac199f4a2f4108321ef8100d58414)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/qa/extras/htmlexport/data/tdf90905.odt | bin | 11824 -> 12166 bytes | |||
| -rw-r--r-- | sw/qa/extras/htmlexport/htmlexport.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sw/qa/extras/htmlexport/data/tdf90905.odt b/sw/qa/extras/htmlexport/data/tdf90905.odt Binary files differindex cab8a04fa12e..19a51bdf8fcf 100644 --- a/sw/qa/extras/htmlexport/data/tdf90905.odt +++ b/sw/qa/extras/htmlexport/data/tdf90905.odt diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 77db88b1e95d..2ce1040b2d16 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -250,7 +250,8 @@ DECLARE_HTMLEXPORT_TEST(testExportInternalUrl, "tdf90905.odt") CPPUNIT_ASSERT(pDoc); // Internal url should be valid - assertXPath(pDoc, "/html/body/p/a", "href", "#0.0.1.Text|outline"); + assertXPath(pDoc, "/html/body/p[1]/a", "href", "#0.0.1.Text|outline"); + assertXPath(pDoc, "/html/body/p[2]/a", "href", "#bookmark"); } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index ad50a1440578..c341eab2d1bc 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1198,8 +1198,9 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const OUString& rURL) } } } - else + else if (!sURL.isEmpty() && sURL[0] != '#') { + // Link is not started from "#", so looks like external link. Encode this URL. INetURLObject aURL(sURL); sURL = aURL.GetMainURL(INetURLObject::NO_DECODE); } |