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
288d8930
Commit
288d8930
authored
Jan 31, 2017
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 33801
parent
4d519e8f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
7 deletions
+14
-7
ASCOfficePPTXFile/PPTXFormat/Logic/Paragraph.h
ASCOfficePPTXFile/PPTXFormat/Logic/Paragraph.h
+14
-7
No files found.
ASCOfficePPTXFile/PPTXFormat/Logic/Paragraph.h
View file @
288d8930
...
@@ -60,11 +60,13 @@ namespace PPTX
...
@@ -60,11 +60,13 @@ namespace PPTX
return
*
this
;
return
*
this
;
}
}
private:
public:
virtual
void
fromXML2
(
XmlUtils
::
CXmlNode
&
node
,
bool
bClear
)
virtual
void
fromXML
(
XmlUtils
::
CXmlNode
&
node
)
{
{
RunElems
.
clear
();
if
(
bClear
)
{
RunElems
.
clear
();
}
XmlUtils
::
CXmlNodes
oNodes
;
XmlUtils
::
CXmlNodes
oNodes
;
if
(
node
.
GetNodes
(
_T
(
"*"
),
oNodes
))
if
(
node
.
GetNodes
(
_T
(
"*"
),
oNodes
))
...
@@ -94,19 +96,24 @@ namespace PPTX
...
@@ -94,19 +96,24 @@ namespace PPTX
//todo better check (a14 can be math, slicer)
//todo better check (a14 can be math, slicer)
if
(
oNodeChoice
.
GetAttributeIfExist
(
L"Requires"
,
sRequires
)
&&
L"a14"
==
sRequires
)
if
(
oNodeChoice
.
GetAttributeIfExist
(
L"Requires"
,
sRequires
)
&&
L"a14"
==
sRequires
)
{
{
fromXML
(
oNodeChoic
e
);
fromXML
2
(
oNodeChoice
,
fals
e
);
}
}
else
if
(
oNode
.
GetNode
(
_T
(
"mc:Fallback"
),
oNodeFall
))
else
if
(
oNode
.
GetNode
(
_T
(
"mc:Fallback"
),
oNodeFall
))
{
{
fromXML
(
oNodeFall
);
fromXML
2
(
oNodeFall
,
false
);
}
}
}
}
}
}
}
}
}
}
FillParentPointersForChilds
();
FillParentPointersForChilds
();
}
}
public:
virtual
void
fromXML
(
XmlUtils
::
CXmlNode
&
node
)
{
fromXML2
(
node
,
true
);
}
virtual
std
::
wstring
toXML
()
const
virtual
std
::
wstring
toXML
()
const
{
{
XmlUtils
::
CNodeValue
oValue
;
XmlUtils
::
CNodeValue
oValue
;
...
...
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