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
d64109ea
Commit
d64109ea
authored
May 26, 2017
by
Sergey Konovalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imagedata for document signature
parent
ec064bbd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
+1
-1
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.cpp
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.cpp
+2
-2
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.h
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.h
+1
-1
No files found.
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
View file @
d64109ea
...
...
@@ -553,7 +553,7 @@ namespace PPTX
std
::
wstring
strFillNode
;
std
::
wstring
strStrokeNode
;;
CalculateFill
(
spPr
,
style
,
oTheme
,
oClrMap
,
strFillAttr
,
strFillNode
,
bOle
);
CalculateFill
(
spPr
,
style
,
oTheme
,
oClrMap
,
strFillAttr
,
strFillNode
,
bOle
,
bSignature
);
CalculateLine
(
spPr
,
style
,
oTheme
,
oClrMap
,
strStrokeAttr
,
strStrokeNode
,
bOle
,
bSignature
);
pWriter
->
StartNode
(
L"v:shape"
);
...
...
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.cpp
View file @
d64109ea
...
...
@@ -59,7 +59,7 @@ namespace PPTX
}
void
CalculateFill
(
PPTX
::
Logic
::
SpPr
&
oSpPr
,
nullable
<
ShapeStyle
>&
pShapeStyle
,
NSCommon
::
smart_ptr
<
PPTX
::
Theme
>&
oTheme
,
NSCommon
::
smart_ptr
<
PPTX
::
Logic
::
ClrMap
>&
oClrMap
,
std
::
wstring
&
strAttr
,
std
::
wstring
&
strNode
,
bool
bOle
)
NSCommon
::
smart_ptr
<
PPTX
::
Logic
::
ClrMap
>&
oClrMap
,
std
::
wstring
&
strAttr
,
std
::
wstring
&
strNode
,
bool
bOle
,
bool
bSignature
)
{
PPTX
::
Logic
::
UniFill
fill
;
DWORD
ARGB
=
0
;
...
...
@@ -113,7 +113,7 @@ namespace PPTX
std
::
wstring
strId
=
oBlip
.
blip
->
embed
->
ToString
();
if
(
bOl
e
)
if
(
bOle
||
bSignatur
e
)
{
strAttr
=
_T
(
" filled=
\"
f
\"
"
);
strNode
=
_T
(
"<v:imagedata r:id=
\"
"
)
+
strId
+
_T
(
"
\"
o:title=
\"\"
/>"
);
...
...
ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.h
View file @
d64109ea
...
...
@@ -44,7 +44,7 @@ namespace PPTX
namespace
Logic
{
void
CalculateFill
(
PPTX
::
Logic
::
SpPr
&
oSpPr
,
nullable
<
ShapeStyle
>&
pShapeStyle
,
smart_ptr
<
PPTX
::
Theme
>&
oTheme
,
smart_ptr
<
PPTX
::
Logic
::
ClrMap
>&
oClrMap
,
std
::
wstring
&
strAttr
,
std
::
wstring
&
strNode
,
bool
bOle
=
false
);
smart_ptr
<
PPTX
::
Logic
::
ClrMap
>&
oClrMap
,
std
::
wstring
&
strAttr
,
std
::
wstring
&
strNode
,
bool
bOle
=
false
,
bool
bSignature
=
false
);
void
CalculateLine
(
PPTX
::
Logic
::
SpPr
&
oSpPr
,
nullable
<
ShapeStyle
>&
pShapeStyle
,
smart_ptr
<
PPTX
::
Theme
>&
oTheme
,
smart_ptr
<
PPTX
::
Logic
::
ClrMap
>&
oClrMap
,
std
::
wstring
&
strAttr
,
std
::
wstring
&
strNode
,
bool
bOle
=
false
,
bool
bSignature
=
false
);
...
...
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