diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-05-28 11:35:46 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-05-28 11:57:04 +0200 |
| commit | 16c8e7b4ec816e01ec8b55dfacdec00d87b492fb (patch) | |
| tree | 1b5a199ae006f8d3d917a3b667df33e122a048dd | |
| parent | fecbdd161931822989c56565d23c74b38453cf58 (diff) | |
Revert "tdf#90905 fix for url encoding in internal urls"
This reverts commit 88c8441a73c1b7f2269b0ef92d21c56d901a1d2e.
| -rw-r--r-- | sw/qa/extras/htmlexport/data/tdf90905.odt | bin | 11824 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/htmlexport/htmlexport.cxx | 9 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 8 |
3 files changed, 2 insertions, 15 deletions
diff --git a/sw/qa/extras/htmlexport/data/tdf90905.odt b/sw/qa/extras/htmlexport/data/tdf90905.odt Binary files differdeleted file mode 100644 index cab8a04fa12e..000000000000 --- a/sw/qa/extras/htmlexport/data/tdf90905.odt +++ /dev/null diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 3201cdc800cf..a377195ea3e4 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -183,15 +183,6 @@ DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState, "checkbox-radiobutto } #endif -DECLARE_HTMLEXPORT_TEST(testExportInternalUrl, "tdf90905.odt") -{ - htmlDocPtr pDoc = parseHtml(maTempFile); - CPPUNIT_ASSERT(pDoc); - - // Internal url should be valid - assertXPath(pDoc, "/html/body/p/a", "href", "#0.0.1.Text|outline"); -} - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 24f51edbfc1a..3c84e78a2a1b 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1168,12 +1168,8 @@ void SwHTMLWriter::convertHyperlinkHRefValue( const OUString& rURL ) } } } - else - { - INetURLObject aURL(sURL); - sURL = aURL.GetMainURL(INetURLObject::NO_DECODE); - } - return URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), sURL ); + INetURLObject aURL( sURL ); + return URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), aURL.GetMainURL( INetURLObject::NO_DECODE ) ); } void SwHTMLWriter::OutHyperlinkHRefValue( const OUString& rURL ) |