From bb516d11cd50bd402359e7fdf92489dc1a1a25fa Mon Sep 17 00:00:00 2001
From: Kulikova Svetlana <Svetlana.Kulikova@onlyoffice.com>
Date: Tue, 20 Oct 2020 09:45:27 +0300
Subject: [PATCH] to get together

---
 DesktopEditor/doctrenderer/doctrenderer.cpp | 12 ------------
 DesktopEditor/doctrenderer/doctrenderer.h   |  2 --
 X2tConverter/src/ASCConverters.cpp          |  2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/DesktopEditor/doctrenderer/doctrenderer.cpp b/DesktopEditor/doctrenderer/doctrenderer.cpp
index 7d452e5c09..1d918a541d 100644
--- a/DesktopEditor/doctrenderer/doctrenderer.cpp
+++ b/DesktopEditor/doctrenderer/doctrenderer.cpp
@@ -44,7 +44,6 @@
 
 namespace NSDoctRenderer
 {
-    /*
     void ParseStringAsInts(const std::string& s, std::vector<int>& arr)
     {
         const char* data = s.c_str();
@@ -74,7 +73,6 @@ namespace NSDoctRenderer
         if (cur > curOld)
             arr.push_back(valCur);
     }
-    */
 
     class CExecuteParams
     {
@@ -135,7 +133,6 @@ namespace NSDoctRenderer
         }
 
     public:
-        /*
         bool FromXml(const std::wstring& strXml)
         {
             XmlUtils::CXmlNode oNode;
@@ -198,11 +195,9 @@ namespace NSDoctRenderer
 
             return true;
         }
-        */
     };
 }
 
-/*
 namespace NSDoctRenderer
 {
     std::wstring string_replaceAll(std::wstring str, const std::wstring& from, const std::wstring& to)
@@ -216,11 +211,9 @@ namespace NSDoctRenderer
         return str;
     }    
 }
-*/
 
 namespace NSDoctRenderer
 {
-    /*
     static void string_replace(std::wstring& text, const std::wstring& replaceFrom, const std::wstring& replaceTo)
     {
         size_t posn = 0;
@@ -238,7 +231,6 @@ namespace NSDoctRenderer
         string_replace(text, L">", L"&gt;");
         string_replace(text, L"\"", L"&quot;");
     }
-    */
 
     class CDoctRenderer_Private
     {
@@ -623,7 +615,6 @@ namespace NSDoctRenderer
             return bIsBreak;
         }
 
-        /*
         bool ExecuteScript(const std::string& strScript, const std::wstring& sCachePath, std::wstring& strError, std::wstring& strReturnParams)
         {
             LOGGER_SPEED_START
@@ -961,10 +952,8 @@ namespace NSDoctRenderer
             RELEASEARRAYOBJECTS(pData);
             return sReturn;
         }
-        */
     };
 
-    /*
     CDoctrenderer::CDoctrenderer(const std::wstring& sAllFontsPath)
     {
         m_pInternal = new CDoctRenderer_Private(sAllFontsPath);
@@ -1116,7 +1105,6 @@ namespace NSDoctRenderer
     {
         return m_pInternal->m_arImagesInChanges;
     }
-    */
 }
 
 bool Doct_renderer_SaveFile_ForBuilder(int nFormat, const std::wstring& strDstFile,
diff --git a/DesktopEditor/doctrenderer/doctrenderer.h b/DesktopEditor/doctrenderer/doctrenderer.h
index d26627b954..d3af309cfd 100644
--- a/DesktopEditor/doctrenderer/doctrenderer.h
+++ b/DesktopEditor/doctrenderer/doctrenderer.h
@@ -54,7 +54,6 @@ namespace NSDoctRenderer
     }
 }
 
-/*
 namespace NSDoctRenderer
 {
     class CDoctRenderer_Private;
@@ -73,6 +72,5 @@ namespace NSDoctRenderer
         CDoctRenderer_Private* m_pInternal;
     };
 }
-*/
 
 #endif // DOCTRENDERER_H
diff --git a/X2tConverter/src/ASCConverters.cpp b/X2tConverter/src/ASCConverters.cpp
index d728663df2..6df5b09c1c 100644
--- a/X2tConverter/src/ASCConverters.cpp
+++ b/X2tConverter/src/ASCConverters.cpp
@@ -4689,7 +4689,7 @@ namespace NExtractTools
 		}
 
 		//clean up v8
-		NSDoctRenderer::CDocBuilder::Dispose();
+        // NSDoctRenderer::CDocBuilder::Dispose();
 		if (SUCCEEDED_X2T(result) && oInputParams.m_bOutputConvertCorrupted)
 		{
 			return AVS_FILEUTILS_ERROR_CONVERT_CORRUPTED;