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
f797af5f
Commit
f797af5f
authored
May 30, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
05597753
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
1 deletion
+18
-1
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
+18
-1
No files found.
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
View file @
f797af5f
...
...
@@ -409,7 +409,6 @@ namespace PPTX
pWriter
->
StartRecord
(
4
);
pWriter
->
m_pMainDocument
->
getBinaryContentElem
(
OOX
::
et_w_sdtContent
,
oTextBoxShape
.
GetPointer
(),
*
pWriter
,
lDataSize
);
//pWriter->m_pMainDocument->getBinaryContent(TextBoxShape.get(), *pWriter, lDataSize);
pWriter
->
EndRecord
();
if
(
oTextBoxBodyPr
.
is_init
())
...
...
@@ -419,6 +418,24 @@ namespace PPTX
pWriter
->
EndRecord
();
}
}
else
if
(
strTextBoxShape
.
is_init
())
//после конвертации старого шейпа (vml)
{
long
lDataSize
=
0
;
ULONG
lPos
=
pWriter
->
GetPosition
();
pWriter
->
SetPosition
(
lPos
);
pWriter
->
StartRecord
(
4
);
pWriter
->
m_pMainDocument
->
getBinaryContent
(
strTextBoxShape
.
get
(),
*
pWriter
,
lDataSize
);
pWriter
->
EndRecord
();
if
(
oTextBoxBodyPr
.
is_init
())
{
pWriter
->
StartRecord
(
5
);
oTextBoxBodyPr
->
toPPTY
(
pWriter
);
pWriter
->
EndRecord
();
}
}
else
if
(
txBody
.
is_init
())
{
std
::
wstring
strContent
=
txBody
->
GetDocxTxBoxContent
(
pWriter
,
style
);
...
...
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