summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-28 18:00:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-28 18:03:38 +0100
commitabb5e84c74b781f3615862695db4e5eaadc12cfe (patch)
treeba41cdf48ffc90fe20ecaf3de164efc98abc0356
parentcead54b6e555fe907348943b4586e956771f6ad0 (diff)
Do not corrupt URIs entered into the Hyperlink dialog
...by fully decoding them via DECODE_WITH_CHARSET (where charset defaults to UTF-8) instead of merely normalizing them to IRIs via DECODE_TO_IRI. For example, entering http://example.com/foo%2Fbar into the Hyperlink dialog would have resulted in a corrupted URI http://example.com/foo/bar Change-Id: Ic37859afa59c3fdc3280cf4803d4334026e1f336
-rw-r--r--cui/source/dialogs/hlinettp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 61089258bbdd..7b198b62f8b5 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -176,7 +176,7 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const
aURL.SetUserAndPass ( m_pEdLogin->GetText(), m_pEdPassword->GetText() );
if ( aURL.GetProtocol() != INET_PROT_NOT_VALID )
- return aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
+ return aURL.GetMainURL( INetURLObject::DECODE_TO_IURI );
else //#105788# always create a URL even if it is not valid
return aStrURL;
}