Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
ef7df690
Commit
ef7df690
authored
Mar 01, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linux build fix
parent
b3961994
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
10 deletions
+8
-10
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+3
-5
ASCOfficePPTXFile/PPTXFormat/Logic/SpTree.h
ASCOfficePPTXFile/PPTXFormat/Logic/SpTree.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.cpp
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.cpp
+1
-1
X2tConverter/build/Qt/X2tConverter.pri
X2tConverter/build/Qt/X2tConverter.pri
+1
-1
No files found.
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @
ef7df690
...
...
@@ -2962,12 +2962,10 @@ void CDrawingConverter::doc_LoadGroup(PPTX::Logic::SpTreeElem *result, XmlUtils:
{
if
(
!
result
)
return
;
PPTX
::
Logic
::
SpTree
*
pTree
=
new
PPTX
::
Logic
::
SpTree
(
);
PPTX
::
Logic
::
SpTree
*
pTree
=
new
PPTX
::
Logic
::
SpTree
(
L"wp"
);
if
(
bIsTop
)
pTree
->
m_name
=
L"wpg:wgp"
;
else
pTree
->
m_name
=
L"wpg:grpSp"
;
if
(
bIsTop
)
pTree
->
m_lGroupIndex
=
0
;
else
pTree
->
m_lGroupIndex
=
1
;
XmlUtils
::
CXmlNodes
oNodes
;
if
(
oNode
.
GetNodes
(
L"*"
,
oNodes
))
...
...
ASCOfficePPTXFile/PPTXFormat/Logic/SpTree.h
View file @
ef7df690
...
...
@@ -110,7 +110,7 @@ namespace PPTX
{
if
(
elem
.
getType
()
==
OOX
::
et_p_ShapeTree
)
{
smart_ptr
<
SpTree
>
&
e
=
elem
.
GetElem
().
smart_dynamic_cast
<
SpTree
>
();
smart_ptr
<
SpTree
>
e
=
elem
.
GetElem
().
smart_dynamic_cast
<
SpTree
>
();
e
->
m_lGroupIndex
=
m_lGroupIndex
+
1
;
}
SpTreeElems
.
push_back
(
elem
);
...
...
@@ -156,7 +156,7 @@ namespace PPTX
{
if
(
elem
.
getType
()
==
OOX
::
et_p_ShapeTree
)
{
smart_ptr
<
SpTree
>
&
e
=
elem
.
GetElem
().
smart_dynamic_cast
<
SpTree
>
();
smart_ptr
<
SpTree
>
e
=
elem
.
GetElem
().
smart_dynamic_cast
<
SpTree
>
();
e
->
m_lGroupIndex
=
m_lGroupIndex
+
1
;
}
SpTreeElems
.
push_back
(
elem
);
...
...
@@ -302,7 +302,7 @@ namespace PPTX
{
if
(
elm
.
getType
()
==
OOX
::
et_p_ShapeTree
)
{
smart_ptr
<
SpTree
>
&
e
=
elm
.
GetElem
().
smart_dynamic_cast
<
SpTree
>
();
smart_ptr
<
SpTree
>
e
=
elm
.
GetElem
().
smart_dynamic_cast
<
SpTree
>
();
e
->
m_lGroupIndex
=
m_lGroupIndex
+
1
;
}
SpTreeElems
.
push_back
(
elm
);
...
...
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.cpp
View file @
ef7df690
...
...
@@ -357,7 +357,7 @@ namespace PPTX
if
(
getType
()
==
OOX
::
et_p_ShapeTree
)
{
smart_ptr
<
PPTX
::
Logic
::
SpTree
>
&
parent
=
GetElem
().
smart_dynamic_cast
<
PPTX
::
Logic
::
SpTree
>
();
smart_ptr
<
PPTX
::
Logic
::
SpTree
>
parent
=
GetElem
().
smart_dynamic_cast
<
PPTX
::
Logic
::
SpTree
>
();
p
->
m_lGroupIndex
=
parent
->
m_lGroupIndex
+
1
;
}
m_elem
.
reset
(
p
);
...
...
X2tConverter/build/Qt/X2tConverter.pri
View file @
ef7df690
...
...
@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.3.44
4
VERSION = 2.0.3.44
5
DEFINES += INTVER=$$VERSION
TARGET = x2t
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment