From 76f94eaacc783f7919e133f736ff87eecb0c0e35 Mon Sep 17 00:00:00 2001
From: "Elena.Subbotina" <Elena.Subbotina@onlyoffice.com>
Date: Thu, 16 Sep 2021 19:08:03 +0300
Subject: [PATCH] fix bug #52607

---
 ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp | 4 ++--
 HtmlFile2/htmlfile2.cpp                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
index 376c12744c..046bc58a36 100755
--- a/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
@@ -630,8 +630,8 @@ namespace DocFileFormat
 						d = (int)_writeTocLink.find(L" ");
 						_writeTocLink = _writeTocLink.substr(0, d);
 						
-						_writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
-						_writeAfterRun +=	_writeTocLink;
+						_writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor=\"");
+						_writeAfterRun +=	XmlUtils::EncodeXmlString(_writeTocLink);
 						_writeAfterRun +=	std::wstring (L"\" w:history=\"1\">");
 
 						break;								
diff --git a/HtmlFile2/htmlfile2.cpp b/HtmlFile2/htmlfile2.cpp
index 61052ed190..6f906b7ecf 100644
--- a/HtmlFile2/htmlfile2.cpp
+++ b/HtmlFile2/htmlfile2.cpp
@@ -1380,7 +1380,7 @@ private:
             if(nSharp == std::wstring::npos)
                 oXml->WriteString(NSFile::GetFileName(sRef));
             else
-                oXml->WriteString(sRef.c_str() + nSharp + 1);
+                oXml->WriteEncodeXmlString(sRef.c_str() + nSharp + 1);
         }
         // Внешняя ссылка
         else