diff options
Diffstat (limited to 'sw/source/core')
-rw-r--r-- | sw/source/core/tox/ToxLinkProcessor.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/tox/txmsrt.cxx | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx b/sw/source/core/tox/ToxLinkProcessor.cxx index c86cde923fef..825e37c16f65 100644 --- a/sw/source/core/tox/ToxLinkProcessor.cxx +++ b/sw/source/core/tox/ToxLinkProcessor.cxx @@ -13,6 +13,7 @@ #include <SwStyleNameMapper.hxx> #include <ndtxt.hxx> #include <sal/log.hxx> +#include <rtl/uri.hxx> namespace sw { @@ -37,8 +38,15 @@ ToxLinkProcessor::CloseLink(sal_Int32 endPosition, const OUString& url) return; } + // url contains '|' which must be encoded; also in some cases contains + // arbitrary strings that need to be encoded + assert(url[0] == '#'); // all links are internal + OUString const uri("#" + rtl::Uri::encode(url.copy(1), + rtl_UriCharClassUricNoSlash, + rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8)); + std::unique_ptr<ClosedLink> pClosedLink( - new ClosedLink(url, m_pStartedLink->mStartPosition, endPosition)); + new ClosedLink(uri, m_pStartedLink->mStartPosition, endPosition)); const OUString& characterStyle = m_pStartedLink->mCharacterStyle; sal_uInt16 poolId = ObtainPoolId(characterStyle); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index f626f09afc40..3bdd2871c23c 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -19,7 +19,6 @@ #include <unotools/charclass.hxx> #include <osl/diagnose.h> -#include <rtl/uri.hxx> #include <txtfld.hxx> #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> @@ -204,10 +203,7 @@ std::pair<OUString, bool> SwTOXSortTabBase::GetURL(SwRootFrame const*const pLayo + OUStringChar(toxMarkSeparator) + typeName + OUStringChar(cMarkSeparator) + "toxmark" ); - OUString const uri(rtl::Uri::encode(decodedUrl, rtl_UriCharClassUricNoSlash, - rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8)); - - return std::make_pair(uri, true); + return std::make_pair(decodedUrl, true); } bool SwTOXSortTabBase::IsFullPara() const |