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
bd92ba82
Commit
bd92ba82
authored
Apr 19, 2016
by
konovalovsergey
Committed by
Alexander.Trofimov
May 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
в tcPr shd если есть themeColor или Color, то Value по умолчанию ShdClear
parent
523f6840
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
7 deletions
+17
-7
word/Editor/Serialize2.js
word/Editor/Serialize2.js
+17
-7
No files found.
word/Editor/Serialize2.js
View file @
bd92ba82
...
...
@@ -7462,17 +7462,27 @@ Binary_tblPrReader.prototype =
{
if
(
null
==
Pr
.
Shd
)
Pr
.
Shd
=
new
CDocumentShd
();
var
oNewShd
=
{
Value
:
undefined
,
Color
:
undefined
,
Unifill
:
undefined
};
var
themeColor
=
{
Auto
:
null
,
Color
:
null
,
Tint
:
null
,
Shade
:
null
};
res
=
this
.
bcr
.
Read2
(
length
,
function
(
t
,
l
){
return
oThis
.
bcr
.
ReadShd
(
t
,
l
,
Pr
.
Shd
,
themeColor
);
return
oThis
.
bcr
.
ReadShd
(
t
,
l
,
oNew
Shd
,
themeColor
);
});
if
(
true
==
themeColor
.
Auto
&&
null
!=
Pr
.
Shd
.
Color
)
Pr
.
Shd
.
Color
.
Auto
=
true
;
//todo менять полностью цвет
var
unifill
=
CreateThemeUnifill
(
themeColor
.
Color
,
themeColor
.
Tint
,
themeColor
.
Shade
);
var
unifill
=
CreateThemeUnifill
(
themeColor
.
Color
,
themeColor
.
Tint
,
themeColor
.
Shade
);
if
(
true
==
themeColor
.
Auto
)
{
if
(
!
oNewShd
.
Color
)
{
oNewShd
.
Color
=
new
CDocumentColor
(
255
,
255
,
255
);
}
oNewShd
.
Color
.
Auto
=
true
;
}
if
(
null
!=
unifill
)
Pr
.
Shd
.
Unifill
=
unifill
;
else
if
(
null
!=
Pr
.
Shd
.
Color
&&
!
Pr
.
Shd
.
Color
.
Auto
)
Pr
.
Shd
.
Unifill
=
CreteSolidFillRGB
(
Pr
.
Shd
.
Color
.
r
,
Pr
.
Shd
.
Color
.
g
,
Pr
.
Shd
.
Color
.
b
);
oNewShd
.
Unifill
=
unifill
;
else
if
(
null
!=
oNewShd
.
Color
&&
!
oNewShd
.
Color
.
Auto
)
oNewShd
.
Unifill
=
CreteSolidFillRGB
(
oNewShd
.
Color
.
r
,
oNewShd
.
Color
.
g
,
oNewShd
.
Color
.
b
);
//если есть themeColor или Color, то Value по умолчанию ShdClear(Тарифы_на_комплексное_обслуживание_клиен.docx)
if
(
undefined
==
oNewShd
.
Value
&&
oNewShd
.
Unifill
)
{
oNewShd
.
Value
=
Asc
.
c_oAscShdClear
;
}
Pr
.
Shd
.
Set_FromObject
(
oNewShd
);
}
else
if
(
c_oSerProp_cellPrType
.
TableCellBorders
===
type
)
{
...
...
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