pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[mobile] сборка конвертера

Browse Source
This commit is contained in:
alexey.musinov
2016-05-23 12:57:10 +03:00
parent 1b953d680b
commit 58df15f501
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
View File

@ -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);

4
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h
View File

@ -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