diff --git a/Test/Applications/StandardTester/main.cpp b/Test/Applications/StandardTester/main.cpp index fa29715f0f..96a10c1a5b 100644 --- a/Test/Applications/StandardTester/main.cpp +++ b/Test/Applications/StandardTester/main.cpp @@ -110,6 +110,13 @@ public: m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS, true)); m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_DRAW_VSDX, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_DRAW_VSSX, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_DRAW_VSTX, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_DRAW_VSDM, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_DRAW_VSSM, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_DRAW_VSTM, true)); + m_nCount = 0; m_nCurrent = 0; m_nCurrentComplete = 0; @@ -150,7 +157,8 @@ public: if (sExt == L"docx" || sExt == L"doc" || sExt == L"odt" || sExt == L"rtf" || sExt == L"docxf" || sExt == L"oform" || sExt == L"pptx" || sExt == L"ppt" || sExt == L"odp" || sExt == L"xlsx" || sExt == L"xls" || sExt == L"ods" || - sExt == L"pdf" || sExt == L"xps" || sExt == L"djvu") + sExt == L"pdf" || sExt == L"xps" || sExt == L"djvu" || + sExt == L"vsdx") { m_files.push_back(*iter); } diff --git a/X2tConverter/src/lib/pdf_image.h b/X2tConverter/src/lib/pdf_image.h index 1e005a6c68..70c3d953e1 100644 --- a/X2tConverter/src/lib/pdf_image.h +++ b/X2tConverter/src/lib/pdf_image.h @@ -193,7 +193,7 @@ namespace NExtractTools std::wstring sFileDir = NSDirectory::GetFolderPath(sFrom); std::wstring sImagesDirectory = combinePath(sFileDir, L"media"); - std::wstring sPdfBinFile = combinePath(sFileDir, L"pdf.bin"); + std::wstring sPdfBinFile = combinePath(convertParams.m_sTempDir, L"pdf.bin"); NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); std::wstring sXml = getDoctXml(eFromType, eToType, sFrom, sPdfBinFile, sImagesDirectory, convertParams.m_sThemesDir, -1, L"", params); @@ -257,7 +257,7 @@ namespace NExtractTools std::wstring sFileDir = NSDirectory::GetFolderPath(sFrom); std::wstring sImagesDirectory = combinePath(sFileDir, L"media"); - std::wstring sPdfBinFile = combinePath(sFileDir, L"pdf.bin"); + std::wstring sPdfBinFile = combinePath(convertParams.m_sTempDir, L"pdf.bin"); NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); std::wstring sXml = getDoctXml(eFromType, eToType, sFrom, sPdfBinFile, sImagesDirectory, convertParams.m_sThemesDir, -1, L"", params);