Commit 52fe741f authored by ElenaSubbotina's avatar ElenaSubbotina

fix bug #34018

parent 8c2e1738
...@@ -165,15 +165,8 @@ namespace PPTX ...@@ -165,15 +165,8 @@ namespace PPTX
smart_ptr<OOX::File> file = smart_ptr<OOX::File>(new OOX::HyperLink(pRelation->Target())); smart_ptr<OOX::File> file = smart_ptr<OOX::File>(new OOX::HyperLink(pRelation->Target()));
bool res = Event->Progress(0, percent + m_lPercent);
Add(pRelation->rId(), file); Add(pRelation->rId(), file);
if (res || m_bCancelled)
{
m_bCancelled = true;
break;
}
} }
else else
{ {
...@@ -194,7 +187,7 @@ namespace PPTX ...@@ -194,7 +187,7 @@ namespace PPTX
Add(pRelation->rId(), file); Add(pRelation->rId(), file);
smart_ptr<FileContainer> pContainer = file.smart_dynamic_cast<FileContainer>(); smart_ptr<FileContainer> pContainer = file.smart_dynamic_cast<FileContainer>();
bool res = Event->Progress(0, percent + m_lPercent); Event->Progress(0, percent + m_lPercent);
if (pContainer.IsInit()) if (pContainer.IsInit())
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.3.435 VERSION = 2.0.3.436
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
TARGET = x2t TARGET = x2t
......
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