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
239b5dbf
Commit
239b5dbf
authored
Nov 28, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug #36451 (ole object old style in master slide)
parent
c046776b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
4 deletions
+11
-4
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
+11
-4
No files found.
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
View file @
239b5dbf
...
...
@@ -637,11 +637,18 @@ namespace PPTX
{
pWriter
->
StartRecord
(
SPTREE_TYPE_OLE
);
if
(
oleObject
->
m_sShapeId
.
IsInit
()
&&
(
!
blipFill
.
blip
->
embed
.
IsInit
()
&&
blipFill
.
blip
->
oleFilepathImage
.
empty
())
&&
parentFileIs
<
PPTX
::
Slide
>
()
&&
parentFileAs
<
PPTX
::
Slide
>
().
Vml
.
IsInit
())
OOX
::
CVmlDrawing
*
pVml
=
NULL
;
if
(
parentFileIs
<
PPTX
::
Slide
>
())
{
OOX
::
CVmlDrawing
*
pVml
=
parentFileAs
<
PPTX
::
Slide
>
().
Vml
.
operator
->
();
pVml
=
parentFileAs
<
PPTX
::
Slide
>
().
Vml
.
operator
->
();
}
else
if
(
parentFileIs
<
PPTX
::
SlideMaster
>
())
{
pVml
=
parentFileAs
<
PPTX
::
SlideMaster
>
().
Vml
.
operator
->
();
}
if
(
oleObject
->
m_sShapeId
.
IsInit
()
&&
pVml
&&
!
blipFill
.
blip
->
embed
.
IsInit
()
&&
blipFill
.
blip
->
oleFilepathImage
.
empty
())
{
std
::
map
<
std
::
wstring
,
OOX
::
CVmlDrawing
::
_vml_shape
>::
iterator
pPair
=
pVml
->
m_mapShapes
.
find
(
*
oleObject
->
m_sShapeId
);
if
(
pVml
->
m_mapShapes
.
end
()
!=
pPair
)
{
...
...
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