Commit 5f5d1cad authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov

Bug 26965 - [Conversion] MS PP выдаёт ошибку при открытии презентации, содержащей диаграмму.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59158 954022d7-b5bf-4e40-9824-e11837661b57
parent cd8b9de3
...@@ -3773,12 +3773,15 @@ HRESULT CDrawingConverter::SetDstContentRels() ...@@ -3773,12 +3773,15 @@ HRESULT CDrawingConverter::SetDstContentRels()
{ {
++m_pReader->m_nCurrentRelsStack; ++m_pReader->m_nCurrentRelsStack;
if (0 == m_pReader->m_nCurrentRelsStack) // m_pRels word.
{ // , m_pReader.
m_pReader->m_pRels->Clear(); //: Rels, chart, SetDstContentRels Rels
m_pReader->m_pRels->StartRels(); //if (0 == m_pReader->m_nCurrentRelsStack)
} //{
else // m_pReader->m_pRels->Clear();
// m_pReader->m_pRels->StartRels();
//}
//else
{ {
m_pReader->m_stackRels.push_back(m_pReader->m_pRels); m_pReader->m_stackRels.push_back(m_pReader->m_pRels);
NSBinPptxRW::CRelsGenerator* pGenerator = new NSBinPptxRW::CRelsGenerator(m_pReader->m_pRels->m_pManager); NSBinPptxRW::CRelsGenerator* pGenerator = new NSBinPptxRW::CRelsGenerator(m_pReader->m_pRels->m_pManager);
...@@ -3796,7 +3799,7 @@ HRESULT CDrawingConverter::SaveDstContentRels(const CString& bsRelsPath) ...@@ -3796,7 +3799,7 @@ HRESULT CDrawingConverter::SaveDstContentRels(const CString& bsRelsPath)
if (-1 > m_pReader->m_nCurrentRelsStack) if (-1 > m_pReader->m_nCurrentRelsStack)
m_pReader->m_nCurrentRelsStack = -1; m_pReader->m_nCurrentRelsStack = -1;
if (-1 != m_pReader->m_nCurrentRelsStack) //if (-1 != m_pReader->m_nCurrentRelsStack)
{ {
int nIndex = m_pReader->m_stackRels.size() - 1; int nIndex = m_pReader->m_stackRels.size() - 1;
......
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