From b78fca42901a01ac207c066ce5c7f635cd9b737a Mon Sep 17 00:00:00 2001
From: Kulikova Svetlana <Svetlana.Kulikova@onlyoffice.com>
Date: Tue, 14 Dec 2021 11:45:26 +0300
Subject: [PATCH] pdf/xps/djvu -> docx_dir -> fromDocxDir

---
 X2tConverter/src/ASCConverters.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/X2tConverter/src/ASCConverters.cpp b/X2tConverter/src/ASCConverters.cpp
index c4e8693d25..2308bb226e 100644
--- a/X2tConverter/src/ASCConverters.cpp
+++ b/X2tConverter/src/ASCConverters.cpp
@@ -4443,7 +4443,7 @@ namespace NExtractTools
            nRes = PdfDjvuXpsToImage(&pReader, sFrom, nFormatFrom, sTo, sTemp, params, pApplicationFonts);
 		   RELEASEOBJECT(pReader);
 	   }
-       else if (AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX == nFormatTo)
+       else
        {
            IOfficeDrawingFile* pReader = NULL;
            switch (nFormatFrom)
@@ -4502,15 +4502,14 @@ namespace NExtractTools
 
                oDocxRenderer.SetTempFolder(sTempDirOut);
                oDocxRenderer.Convert(pReader, sTo, AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX == nFormatTo);
+
+               if (AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX != nFormatTo)
+                   nRes = fromDocxDir(sTempDirOut, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params, L"");
            }
            else
                nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;
            RELEASEOBJECT(pReader);
        }
-       else
-       {
-           nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;
-       }
        RELEASEOBJECT(pApplicationFonts);
        return nRes;
    }