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
5ba62cb2
Commit
5ba62cb2
authored
Jun 01, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
79e05885
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp
+6
-0
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
+11
-1
No files found.
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp
View file @
5ba62cb2
...
@@ -282,6 +282,12 @@ namespace NSBinPptxRW
...
@@ -282,6 +282,12 @@ namespace NSBinPptxRW
m_pContentTypes
->
AddDefault
(
strExts
.
substr
(
1
));
m_pContentTypes
->
AddDefault
(
strExts
.
substr
(
1
));
}
}
if
(
oleData
.
empty
()
==
false
)
{
//plugins data - generate ole
typeAdditional
=
1
;
}
_imageManager2Info
oImageManagerInfo
=
GenerateImageExec
(
strImage
,
strExts
,
strAdditional
,
typeAdditional
,
oleData
);
_imageManager2Info
oImageManagerInfo
=
GenerateImageExec
(
strImage
,
strExts
,
strAdditional
,
typeAdditional
,
oleData
);
if
(
!
oImageManagerInfo
.
sFilepathAdditional
.
empty
())
if
(
!
oImageManagerInfo
.
sFilepathAdditional
.
empty
())
...
...
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
View file @
5ba62cb2
...
@@ -1136,8 +1136,18 @@ namespace PPTX
...
@@ -1136,8 +1136,18 @@ namespace PPTX
}
}
}
}
if
(
spPr
.
Geometry
.
is_init
())
bool
bRect
=
bOle
;
//ole ВСЕГДА rect
if
(
spPr
.
Geometry
.
is
<
PPTX
::
Logic
::
PrstGeom
>
())
{
{
const
PPTX
::
Logic
::
PrstGeom
&
lpGeom
=
spPr
.
Geometry
.
as
<
PPTX
::
Logic
::
PrstGeom
>
();
if
(
lpGeom
.
prst
.
get
()
==
L"rect"
)
bRect
=
true
;
}
if
(
bRect
==
false
)
{
//custom vml shape
std
::
wstring
strPath
;
std
::
wstring
strPath
;
std
::
wstring
strTextRect
;
std
::
wstring
strTextRect
;
...
...
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