Commit 82b0f4bc authored by konovalovsergey's avatar konovalovsergey

DiagramDrawing losing images

parent 56352392
...@@ -1744,6 +1744,9 @@ void CDrawingConverter::doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtil ...@@ -1744,6 +1744,9 @@ void CDrawingConverter::doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtil
if (pDiagramDrawing) if (pDiagramDrawing)
{ {
result->InitElem(new PPTX::Logic::SpTree(*pDiagramDrawing->m_oShapeTree)); result->InitElem(new PPTX::Logic::SpTree(*pDiagramDrawing->m_oShapeTree));
//to correct write blipFill rId to binary
m_strCurrentRelsPath = pDiagramDrawing->GetReadPath().GetPath();
SetCurrentRelsPath();
} }
else else
{//BG-FSC1.docx {//BG-FSC1.docx
......
...@@ -213,6 +213,7 @@ namespace OOX ...@@ -213,6 +213,7 @@ namespace OOX
} }
virtual void read(const CPath& oRootPath, const CPath& oFilePath) virtual void read(const CPath& oRootPath, const CPath& oFilePath)
{ {
m_oReadPath = oFilePath;
IFileContainer::Read( oRootPath, oFilePath ); IFileContainer::Read( oRootPath, oFilePath );
//#ifdef USE_LITE_READER //#ifdef USE_LITE_READER
...@@ -259,7 +260,12 @@ namespace OOX ...@@ -259,7 +260,12 @@ namespace OOX
{ {
return type().DefaultFileName(); return type().DefaultFileName();
} }
const CPath& GetReadPath()
{
return m_oReadPath;
}
CPath m_oReadPath;
NSCommon::nullable<PPTX::Logic::SpTree> m_oShapeTree; NSCommon::nullable<PPTX::Logic::SpTree> m_oShapeTree;
}; };
......
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