Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
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
sdkjs
Commits
205196a1
Commit
205196a1
authored
8 years ago
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/3.8.1' into develop
parents
3b047fcf
74c9ec39
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
51 deletions
+6
-51
common/Shapes/SerializeWriter.js
common/Shapes/SerializeWriter.js
+6
-51
No files found.
common/Shapes/SerializeWriter.js
View file @
205196a1
...
...
@@ -2866,16 +2866,21 @@ function CBinaryFileWriter()
image
.
spPr
.
WriteXfrm
=
image
.
spPr
.
xfrm
;
var
bSetGeometry
=
false
;
if
(
image
.
spPr
.
geometry
===
undefined
||
image
.
spPr
.
geometry
==
null
)
{
// powerpoint!
image
.
spPr
.
geometry
=
AscFormat
.
CreateGeometry
(
"
rect
"
);
bSetGeometry
=
true
;
image
.
spPr
.
geometry
=
AscFormat
.
ExecuteNoHistory
(
function
(){
return
AscFormat
.
CreateGeometry
(
"
rect
"
);},
this
,
[]);
}
var
unifill
=
new
AscFormat
.
CUniFill
();
unifill
.
fill
=
image
.
blipFill
oThis
.
WriteRecord1
(
1
,
unifill
,
oThis
.
WriteUniFill
);
oThis
.
WriteRecord1
(
2
,
image
.
spPr
,
oThis
.
WriteSpPr
);
if
(
bSetGeometry
){
image
.
spPr
.
geometry
=
null
;
}
oThis
.
WriteRecord2
(
3
,
image
.
style
,
oThis
.
WriteShapeStyle
);
image
.
spPr
.
WriteXfrm
=
null
;
...
...
@@ -4521,8 +4526,6 @@ function CBinaryFileWriter()
shape
.
spPr
.
WriteXfrm
=
shape
.
spPr
.
xfrm
;
shape
.
spPr
.
Geometry
=
shape
.
spPr
.
geometry
;
var
tmpFill
=
shape
.
spPr
.
Fill
;
var
isUseTmpFill
=
false
;
if
(
tmpFill
!==
undefined
&&
tmpFill
!=
null
)
...
...
@@ -4567,7 +4570,6 @@ function CBinaryFileWriter()
_writer
.
EndRecord
();
}
delete
shape
.
spPr
.
Geometry
;
if
(
isUseTmpFill
)
{
shape
.
spPr
.
Fill
=
tmpFill
;
...
...
@@ -4594,12 +4596,6 @@ function CBinaryFileWriter()
image
.
spPr
.
WriteXfrm
=
image
.
spPr
.
xfrm
;
image
.
spPr
.
Geometry
=
image
.
spPr
.
geometry
;
if
(
image
.
spPr
.
Geometry
===
undefined
||
image
.
spPr
.
Geometry
==
null
)
{
// powerpoint!
image
.
spPr
.
Geometry
=
AscFormat
.
CreateGeometry
(
"
rect
"
);
}
var
_unifill
=
null
;
if
(
image
.
blipFill
instanceof
AscFormat
.
CUniFill
)
...
...
@@ -4617,7 +4613,6 @@ function CBinaryFileWriter()
_writer
.
WriteRecord2
(
3
,
image
.
style
,
_writer
.
WriteShapeStyle
);
delete
image
.
spPr
.
WriteXfrm
;
delete
image
.
spPr
.
Geometry
;
_writer
.
EndRecord
();
}
...
...
@@ -4635,46 +4630,6 @@ function CBinaryFileWriter()
_writer
.
WriteUChar
(
g_nodeAttributeEnd
);
}
this
.
WriteImageBySrc
=
function
(
memory
,
src
,
w
,
h
)
{
this
.
arrayStackStarts
.
push
(
this
.
BinaryFileWriter
.
pos
);
var
_writer
=
this
.
BinaryFileWriter
;
_writer
.
StartRecord
(
0
);
_writer
.
StartRecord
(
1
);
_writer
.
StartRecord
(
2
);
//_writer.WriteRecord1(0, image.nvPicPr, _writer.WriteUniNvPr);
var
spPr
=
new
AscFormat
.
CSpPr
();
spPr
.
WriteXfrm
=
new
AscFormat
.
CXfrm
();
spPr
.
WriteXfrm
.
offX
=
0
;
spPr
.
WriteXfrm
.
offY
=
0
;
spPr
.
WriteXfrm
.
extX
=
w
;
spPr
.
WriteXfrm
.
extY
=
h
;
spPr
.
Geometry
=
AscFormat
.
CreateGeometry
(
"
rect
"
);
var
_unifill
=
new
AscFormat
.
CUniFill
();
_unifill
.
fill
=
new
AscFormat
.
CBlipFill
();
_unifill
.
fill
.
RasterImageId
=
src
;
_writer
.
WriteRecord1
(
1
,
_unifill
,
_writer
.
WriteUniFill
);
_writer
.
WriteRecord1
(
2
,
spPr
,
_writer
.
WriteSpPr
);
_writer
.
EndRecord
();
_writer
.
EndRecord
();
_writer
.
EndRecord
();
var
oldPos
=
this
.
arrayStackStarts
[
this
.
arrayStackStarts
.
length
-
1
];
memory
.
WriteBuffer
(
this
.
BinaryFileWriter
.
data
,
oldPos
,
this
.
BinaryFileWriter
.
pos
-
oldPos
);
this
.
BinaryFileWriter
.
pos
=
oldPos
;
this
.
arrayStackStarts
.
splice
(
this
.
arrayStackStarts
.
length
-
1
,
1
);
}
this
.
WriteGroup
=
function
(
group
,
Document
,
oMapCommentId
,
oNumIdMap
,
copyParams
,
saveParams
)
{
var
_writer
=
this
.
BinaryFileWriter
;
...
...
This diff is collapsed.
Click to expand it.
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