From 428b161983fb584288d75131d53c76216a71853b Mon Sep 17 00:00:00 2001 From: Ivan Morozov Date: Fri, 29 Jan 2021 18:40:43 +0300 Subject: [PATCH] trying to save correct audio files --- ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp | 2 +- ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp b/ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp index a6318252af..7b94fb02dd 100644 --- a/ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp +++ b/ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp @@ -453,7 +453,6 @@ void CPPTUserInfo::ReadExtenalObjects(std::wstring strFolderMem) oInfo.m_strFilePath = m_oExMedia.m_strPresentationDirectory; oInfo.m_dwID = 0xFFFFFFFF; m_oExMedia.m_arImages.push_back(oInfo); - m_oExMedia.m_arAudios.push_back(oInfo); // Experimental // читаем все внешние объекты std::vector oArrayExObjects; @@ -2293,6 +2292,7 @@ void CPPTUserInfo::LoadExternal(CRecordExObjListContainer* pExObjects) oInfo.m_strFilePath = m_oExMedia.m_strPresentationDirectory + FILE_SEPARATOR_STR + oArrayStrings[0]->m_strText + _T(".audio"); oInfo.m_dwID = (_UINT32)XmlUtils::GetInteger(oArrayStrings[2]->m_strText.c_str()); + m_oExMedia.m_arAudios.push_back(oInfo); oArrayData[0]->SaveToFile(oInfo.m_strFilePath); } } diff --git a/ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.h b/ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.h index 2d7d379636..6bdb05ca19 100644 --- a/ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.h +++ b/ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.h @@ -56,7 +56,7 @@ protected: bool ReadCurrentUser(POLE::Stream *pStm); void ReadEncryptedSummary(); void ReadDocumentSummary(); - void ReadPictures(); + void ReadPictures(); private: bool m_bDualStorage;