Commit bb791cb4 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent a2c22962
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.2.399 VERSION = 2.0.2.400
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
TEMPLATE = app TEMPLATE = app
......
...@@ -1747,10 +1747,10 @@ namespace BinXlsxRW { ...@@ -1747,10 +1747,10 @@ namespace BinXlsxRW {
//из Drawing могут быть ссылки на объекты в VmlDrawing //из Drawing могут быть ссылки на объекты в VmlDrawing
OOX::CVmlDrawing *currentVmlDrawing = NULL; OOX::CVmlDrawing *currentVmlDrawing = NULL;
if (oWorksheet.m_oLegacyDrawingWorksheet.IsInit() && if (oWorksheet.m_oLegacyDrawing.IsInit() &&
oWorksheet.m_oLegacyDrawingWorksheet->m_oId.IsInit()) oWorksheet.m_oLegacyDrawing->m_oId.IsInit())
{ {
smart_ptr<OOX::File> oFileV = oWorksheet.Find(oWorksheet.m_oLegacyDrawingWorksheet->m_oId->GetValue()); smart_ptr<OOX::File> oFileV = oWorksheet.Find(oWorksheet.m_oLegacyDrawing->m_oId->GetValue());
if (oFileV.IsInit() && OOX::FileTypes::VmlDrawing == oFileV->type()) if (oFileV.IsInit() && OOX::FileTypes::VmlDrawing == oFileV->type())
{ {
currentVmlDrawing = (OOX::CVmlDrawing*)oFileV.operator->(); currentVmlDrawing = (OOX::CVmlDrawing*)oFileV.operator->();
......
...@@ -1889,9 +1889,9 @@ namespace BinXlsxRW { ...@@ -1889,9 +1889,9 @@ namespace BinXlsxRW {
NSCommon::smart_ptr<OOX::File> pVmlDrawingFile(m_pCurVmlDrawing); NSCommon::smart_ptr<OOX::File> pVmlDrawingFile(m_pCurVmlDrawing);
m_pCurVmlDrawing = NULL; m_pCurVmlDrawing = NULL;
const OOX::RId oRId = m_pCurWorksheet->Add(pVmlDrawingFile); const OOX::RId oRId = m_pCurWorksheet->Add(pVmlDrawingFile);
m_pCurWorksheet->m_oLegacyDrawingWorksheet.Init(); m_pCurWorksheet->m_oLegacyDrawing.Init();
m_pCurWorksheet->m_oLegacyDrawingWorksheet->m_oId.Init(); m_pCurWorksheet->m_oLegacyDrawing->m_oId.Init();
m_pCurWorksheet->m_oLegacyDrawingWorksheet->m_oId->SetValue(oRId.get()); m_pCurWorksheet->m_oLegacyDrawing->m_oId->SetValue(oRId.get());
} }
smart_ptr<OOX::File> oCurFile(m_pCurWorksheet); smart_ptr<OOX::File> oCurFile(m_pCurWorksheet);
......
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