Commit 56eac2cf authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov

Bug 27082 - При переоткрытии документа теряется вставленное изображение

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59005 954022d7-b5bf-4e40-9824-e11837661b57
parent bee934d2
...@@ -196,33 +196,34 @@ namespace NSBinPptxRW ...@@ -196,33 +196,34 @@ namespace NSBinPptxRW
void CImageManager2::SaveImageAsPng(const CString& strFileSrc, const CString& strFileDst) void CImageManager2::SaveImageAsPng(const CString& strFileSrc, const CString& strFileDst)
{ {
NSFile::CFileBinary oFile; NSFile::CFileBinary oFileSrc, oFileDst;
if (!oFileSrc.OpenFile(std::wstring(strFileSrc.GetString())) || !oFileDst.CreateFileW(std::wstring(strFileDst.GetString())))
if (!oFile.OpenFile(std::wstring(strFileSrc.GetString())))
return; return;
CxImage img; CxImage img;
if( img.Decode( oFile.GetFileNative(), 0 ) ) if( img.Decode( oFileSrc.GetFileNative(), 0 ) )
{ {
img.Encode( oFile.GetFileNative(), _CXIMAGE_FORMAT_PNG ); img.Encode( oFileDst.GetFileNative(), _CXIMAGE_FORMAT_PNG );
} }
oFile.CloseFile(); oFileSrc.CloseFile();
oFileDst.CloseFile();
} }
void CImageManager2::SaveImageAsJPG(const CString& strFileSrc, const CString& strFileDst) void CImageManager2::SaveImageAsJPG(const CString& strFileSrc, const CString& strFileDst)
{ {
NSFile::CFileBinary oFile; NSFile::CFileBinary oFileSrc, oFileDst;
if (!oFile.OpenFile(std::wstring(strFileSrc.GetString()))) if (!oFileSrc.OpenFile(std::wstring(strFileSrc.GetString())) || !oFileDst.CreateFileW(std::wstring(strFileDst.GetString())))
return; return;
CxImage img; CxImage img;
if( img.Decode( oFile.GetFileNative(), 0 ) ) if( img.Decode( oFileSrc.GetFileNative(), 0 ) )
{ {
img.Encode( oFile.GetFileNative(), _CXIMAGE_FORMAT_JPG ); img.Encode( oFileDst.GetFileNative(), _CXIMAGE_FORMAT_JPG );
} }
oFile.CloseFile(); oFileSrc.CloseFile();
oFileDst.CloseFile();
} }
bool CImageManager2::IsNeedDownload(const CString& strFile) bool CImageManager2::IsNeedDownload(const CString& strFile)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment