Commit ed2022c1 authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander Trofimov

CPicture заменен на CObject

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60221 954022d7-b5bf-4e40-9824-e11837661b57
parent f8bb147a
...@@ -4676,16 +4676,15 @@ namespace BinDocxRW ...@@ -4676,16 +4676,15 @@ namespace BinDocxRW
break; break;
CString* pXml = NULL; CString* pXml = NULL;
OOX::Logic::CPicture* pPicture = static_cast<OOX::Logic::CPicture*>(item); OOX::Logic::CObject* pObject = static_cast<OOX::Logic::CObject*>(item);
pXml = pPicture->m_sXml.GetPointer(); pXml = pObject->m_sXml.GetPointer();
int nCurPos1 = m_oBcw.WriteItemStart(c_oSerRunType::pptxDrawing); int nCurPos1 = m_oBcw.WriteItemStart(c_oSerRunType::pptxDrawing);
WriteDrawing(pXml, NULL, NULL); WriteDrawing(pXml, NULL, NULL);
m_oBcw.WriteItemEnd(nCurPos1); m_oBcw.WriteItemEnd(nCurPos1);
//write equation //write equation
/*OOX::Logic::CObject* pObject = static_cast<OOX::Logic::CObject*>(item); /*if (pObject->m_oOleObject.IsInit())
if (pObject->m_oOleObject.IsInit())
{ {
CString sProgID = pObject->m_oOleObject->m_sProgId.get().GetString(); CString sProgID = pObject->m_oOleObject->m_sProgId.get().GetString();
if ( _T("Equation.3") == sProgID) if ( _T("Equation.3") == sProgID)
......
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