Skip to content

O
onlyoffice_core
Commit ab360be6 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

Merge commit 'bab6e40c' into develop

parents 539cb2f3 bab6e40c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp 100644 → 100755
View file @ ab360be6
...@@ -124,6 +124,8 @@ namespace PPTX ...@@ -124,6 +124,8 @@ namespace PPTX
xfrm = oReader; xfrm = oReader;
else if (L"cNvGraphicFramePr" == strName) else if (L"cNvGraphicFramePr" == strName)
nvGraphicFramePr.cNvGraphicFramePr.fromXML( oReader ); nvGraphicFramePr.cNvGraphicFramePr.fromXML( oReader );
else if (L"nvGraphicFramePr" == strName)
nvGraphicFramePr.fromXML( oReader );
else if (L"graphic" == strName) else if (L"graphic" == strName)
{ {
......
X2tConverter/build/Qt/X2tConverter.pri
View file @ ab360be6
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.4.466.0 VERSION = 2.4.467.0
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7