diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp index d270acbe07..e53cbbac32 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp @@ -133,12 +133,12 @@ namespace PPTX oleObject.Init(); node.ReadAttributeBase(L"progId", oleObject->m_sProgId); node.ReadAttributeBase(L"r:id", oleObject->m_oId); - int imgW = node.GetAttributeInt(L"imgW", 0); + int imgW = node.GetAttributeInt(CString(L"imgW"), 0); if(imgW > 0) { oleObject->m_oDxaOrig = Emu_To_Twips(imgW); } - int imgH = node.GetAttributeInt(L"imgH", 0); + int imgH = node.GetAttributeInt(CString(L"imgH"), 0); if(imgH > 0) { oleObject->m_oDyaOrig = Emu_To_Twips(imgH); diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h index 1aa655d816..31c4e84233 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h @@ -158,8 +158,8 @@ namespace PPTX virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader); virtual void FillParentPointersForChilds(); bool isValid(); - CString COLEObject::GetFullOleName(const PPTX::RId& oRId, FileContainer* pRels)const; - std::wstring COLEObject::GetOleData(const std::wstring& sFilePath)const; + CString GetFullOleName(const PPTX::RId& oRId, FileContainer* pRels)const; + std::wstring GetOleData(const std::wstring& sFilePath)const; public: // Attributes