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
7b78164f
Commit
7b78164f
authored
Nov 22, 2016
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 33490
parent
373e1056
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
10 deletions
+23
-10
word/Editor/Serialize2.js
word/Editor/Serialize2.js
+19
-10
word/Math/base.js
word/Math/base.js
+4
-0
No files found.
word/Editor/Serialize2.js
View file @
7b78164f
...
@@ -400,7 +400,8 @@ var c_oSerRunType = {
...
@@ -400,7 +400,8 @@ var c_oSerRunType = {
footnoteRef
:
24
,
footnoteRef
:
24
,
endnoteRef
:
25
,
endnoteRef
:
25
,
footnoteReference
:
26
,
footnoteReference
:
26
,
endnoteReference
:
27
endnoteReference
:
27
,
arPr
:
28
};
};
var
c_oSerImageType
=
{
var
c_oSerImageType
=
{
MediaId
:
0
,
MediaId
:
0
,
...
@@ -2032,7 +2033,7 @@ function Binary_pPrWriter(memory, oNumIdMap, oBinaryHeaderFooterTableWriter, sav
...
@@ -2032,7 +2033,7 @@ function Binary_pPrWriter(memory, oNumIdMap, oBinaryHeaderFooterTableWriter, sav
var
color
=
null
;
var
color
=
null
;
if
(
null
!=
border
.
Color
)
if
(
null
!=
border
.
Color
)
color
=
border
.
Color
;
color
=
border
.
Color
;
else
if
(
null
!=
border
.
Unifill
)
{
else
if
(
null
!=
border
.
Unifill
&&
editor
&&
editor
.
WordControl
&&
editor
.
WordControl
.
m_oLogicDocument
)
{
var
doc
=
editor
.
WordControl
.
m_oLogicDocument
;
var
doc
=
editor
.
WordControl
.
m_oLogicDocument
;
border
.
Unifill
.
check
(
doc
.
Get_Theme
(),
doc
.
Get_ColorMap
());
border
.
Unifill
.
check
(
doc
.
Get_Theme
(),
doc
.
Get_ColorMap
());
var
RGBA
=
border
.
Unifill
.
getRGBAColor
();
var
RGBA
=
border
.
Unifill
.
getRGBAColor
();
...
@@ -2157,7 +2158,7 @@ function Binary_rPrWriter(memory, saveParams)
...
@@ -2157,7 +2158,7 @@ function Binary_rPrWriter(memory, saveParams)
var
color
=
null
;
var
color
=
null
;
if
(
null
!=
rPr
.
Color
)
if
(
null
!=
rPr
.
Color
)
color
=
rPr
.
Color
;
color
=
rPr
.
Color
;
else
if
(
null
!=
rPr
.
Unifill
)
{
else
if
(
null
!=
rPr
.
Unifill
&&
editor
&&
editor
.
WordControl
&&
editor
.
WordControl
.
m_oLogicDocument
)
{
var
doc
=
editor
.
WordControl
.
m_oLogicDocument
;
var
doc
=
editor
.
WordControl
.
m_oLogicDocument
;
rPr
.
Unifill
.
check
(
doc
.
Get_Theme
(),
doc
.
Get_ColorMap
());
rPr
.
Unifill
.
check
(
doc
.
Get_Theme
(),
doc
.
Get_ColorMap
());
var
RGBA
=
rPr
.
Unifill
.
getRGBAColor
();
var
RGBA
=
rPr
.
Unifill
.
getRGBAColor
();
...
@@ -2670,13 +2671,19 @@ function Binary_oMathWriter(memory, oMathPara, saveParams)
...
@@ -2670,13 +2671,19 @@ function Binary_oMathWriter(memory, oMathPara, saveParams)
if
(
oElem
.
Get_ReviewType
)
{
if
(
oElem
.
Get_ReviewType
)
{
ReviewType
=
oElem
.
Get_ReviewType
();
ReviewType
=
oElem
.
Get_ReviewType
();
}
}
if
(
reviewtype_Remove
==
ReviewType
||
reviewtype_Add
==
ReviewType
&&
oElem
.
ReviewInfo
)
{
if
(
oElem
.
Is_FromDocument
())
{
var
brPrs
=
new
Binary_rPrWriter
(
this
.
memory
,
this
.
saveParams
);
if
(
reviewtype_Remove
==
ReviewType
||
reviewtype_Add
==
ReviewType
&&
oElem
.
ReviewInfo
)
{
var
recordType
=
reviewtype_Remove
==
ReviewType
?
c_oSerRunType
.
del
:
c_oSerRunType
.
ins
;
var
brPrs
=
new
Binary_rPrWriter
(
this
.
memory
,
this
.
saveParams
);
this
.
bs
.
WriteItem
(
recordType
,
function
(){
WriteTrackRevision
(
oThis
.
bs
,
oThis
.
saveParams
.
trackRevisionId
++
,
oElem
.
ReviewInfo
,
{
brPrs
:
brPrs
,
rPr
:
oElem
.
CtrPrp
});});
var
recordType
=
reviewtype_Remove
==
ReviewType
?
c_oSerRunType
.
del
:
c_oSerRunType
.
ins
;
}
else
{
this
.
bs
.
WriteItem
(
recordType
,
function
(){
WriteTrackRevision
(
oThis
.
bs
,
oThis
.
saveParams
.
trackRevisionId
++
,
oElem
.
ReviewInfo
,
{
brPrs
:
brPrs
,
rPr
:
oElem
.
CtrPrp
});});
this
.
bs
.
WriteItem
(
c_oSerRunType
.
rPr
,
function
(){
oThis
.
brPrs
.
Write_rPr
(
oElem
.
CtrPrp
,
null
,
null
);});
}
else
{
}
this
.
bs
.
WriteItem
(
c_oSerRunType
.
rPr
,
function
(){
oThis
.
brPrs
.
Write_rPr
(
oElem
.
CtrPrp
,
null
,
null
);});
}
}
else
{
this
.
bs
.
WriteItem
(
c_oSerRunType
.
arPr
,
function
()
{
pptx_content_writer
.
WriteRunProperties
(
oThis
.
memory
,
oElem
.
CtrPrp
);
});
}
}
}
this
.
WriteDegHide
=
function
(
DegHide
)
this
.
WriteDegHide
=
function
(
DegHide
)
{
{
...
@@ -10598,6 +10605,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
...
@@ -10598,6 +10605,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var
MathTextRPr
=
new
CTextPr
();
var
MathTextRPr
=
new
CTextPr
();
res
=
this
.
brPrr
.
Read
(
length
,
MathTextRPr
,
null
);
res
=
this
.
brPrr
.
Read
(
length
,
MathTextRPr
,
null
);
props
.
ctrPrp
=
MathTextRPr
;
props
.
ctrPrp
=
MathTextRPr
;
}
else
if
(
c_oSerRunType
.
arPr
===
type
)
{
props
.
ctrPrp
=
pptx_content_loader
.
ReadRunProperties
(
this
.
stream
);
}
else
if
(
c_oSerRunType
.
del
===
type
)
{
}
else
if
(
c_oSerRunType
.
del
===
type
)
{
var
rPrChange
=
new
CTextPr
();
var
rPrChange
=
new
CTextPr
();
var
reviewInfo
=
new
CReviewInfo
();
var
reviewInfo
=
new
CReviewInfo
();
...
...
word/Math/base.js
View file @
7b78164f
...
@@ -2854,6 +2854,10 @@ CMathBase.prototype.Is_ContentUse = function(MathContent)
...
@@ -2854,6 +2854,10 @@ CMathBase.prototype.Is_ContentUse = function(MathContent)
return
false
;
return
false
;
};
};
CMathBase
.
prototype
.
Is_FromDocument
=
function
(
MathContent
)
{
return
this
.
Paragraph
&&
this
.
Paragraph
.
bFromDocument
};
function
CMathBasePr
()
function
CMathBasePr
()
{
{
...
...
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