Merge commit 'bab6e40c' into develop

ab360be6 · ElenaSubbotina · 539cb2f3 · bab6e40c · ab360be6 · ab360be6
Commit ab360be6 authored Jun 28, 2017 by ElenaSubbotina
Showing with 3 additions and 1 deletion

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp +2 -0

X2tConverter/build/Qt/X2tConverter.pri X2tConverter/build/Qt/X2tConverter.pri +1 -1

No files found.
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
@@ -124,6 +124,8 @@ namespace PPTX
 				xfrm = oReader;
 			else if (L"cNvGraphicFramePr" == strName)
 				nvGraphicFramePr.cNvGraphicFramePr.fromXML( oReader );
+			else if (L"nvGraphicFramePr" == strName)
+				nvGraphicFramePr.fromXML( oReader );
 				
 			else if (L"graphic" == strName)
 			{

--- a/X2tConverter/build/Qt/X2tConverter.pri
+++ b/X2tConverter/build/Qt/X2tConverter.pri
@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui

-VERSION = 2.4.466.0
+VERSION = 2.4.467.0
 DEFINES += INTVER=$$VERSION

 TARGET = x2t