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
adac6b23
Commit
adac6b23
authored
Dec 01, 2016
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
return scheme color for cell background
parent
c233a952
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
6 deletions
+20
-6
slide/apiCommon.js
slide/apiCommon.js
+12
-5
word/api.js
word/api.js
+8
-1
No files found.
slide/apiCommon.js
View file @
adac6b23
...
@@ -257,8 +257,15 @@ CLayoutThumbnail.prototype.get_Height = function() { return this.Height; };
...
@@ -257,8 +257,15 @@ CLayoutThumbnail.prototype.get_Height = function() { return this.Height; };
function
CBackground
(
obj
)
function
CBackground
(
obj
)
{
{
if
(
obj
)
if
(
obj
)
{
if
(
obj
.
Unifill
&&
obj
.
Unifill
.
fill
&&
obj
.
Unifill
.
fill
.
type
===
window
[
'
Asc
'
].
c_oAscFill
.
FILL_TYPE_SOLID
&&
obj
.
Unifill
.
fill
.
color
)
{
this
.
Color
=
AscCommon
.
CreateAscColor
(
obj
.
Unifill
.
fill
.
color
);
}
else
{
{
this
.
Color
=
(
undefined
!=
obj
.
Color
&&
null
!=
obj
.
Color
)
?
AscCommon
.
CreateAscColorCustom
(
obj
.
Color
.
r
,
obj
.
Color
.
g
,
obj
.
Color
.
b
)
:
null
;
this
.
Color
=
(
undefined
!=
obj
.
Color
&&
null
!=
obj
.
Color
)
?
AscCommon
.
CreateAscColorCustom
(
obj
.
Color
.
r
,
obj
.
Color
.
g
,
obj
.
Color
.
b
)
:
null
;
}
this
.
Value
=
(
undefined
!=
obj
.
Value
)
?
obj
.
Value
:
null
;
this
.
Value
=
(
undefined
!=
obj
.
Value
)
?
obj
.
Value
:
null
;
}
}
else
else
...
@@ -267,10 +274,10 @@ function CBackground (obj)
...
@@ -267,10 +274,10 @@ function CBackground (obj)
this
.
Value
=
1
;
this
.
Value
=
1
;
}
}
}
}
CBackground
.
prototype
.
get_Color
=
function
(){
return
this
.
Color
;}
CBackground
.
prototype
.
get_Color
=
function
(){
return
this
.
Color
;}
;
CBackground
.
prototype
.
put_Color
=
function
(
v
){
this
.
Color
=
(
v
)
?
v
:
null
;}
CBackground
.
prototype
.
put_Color
=
function
(
v
){
this
.
Color
=
(
v
)
?
v
:
null
;}
;
CBackground
.
prototype
.
get_Value
=
function
(){
return
this
.
Value
;}
CBackground
.
prototype
.
get_Value
=
function
(){
return
this
.
Value
;}
;
CBackground
.
prototype
.
put_Value
=
function
(
v
){
this
.
Value
=
v
;}
CBackground
.
prototype
.
put_Value
=
function
(
v
){
this
.
Value
=
v
;}
;
function
CTablePositionH
(
obj
)
function
CTablePositionH
(
obj
)
{
{
...
...
word/api.js
View file @
adac6b23
...
@@ -4139,8 +4139,15 @@ background-repeat: no-repeat;\
...
@@ -4139,8 +4139,15 @@ background-repeat: no-repeat;\
function
CBackground
(
obj
)
function
CBackground
(
obj
)
{
{
if
(
obj
)
if
(
obj
)
{
if
(
obj
.
Unifill
&&
obj
.
Unifill
.
fill
&&
obj
.
Unifill
.
fill
.
type
===
window
[
'
Asc
'
].
c_oAscFill
.
FILL_TYPE_SOLID
&&
obj
.
Unifill
.
fill
.
color
)
{
this
.
Color
=
AscCommon
.
CreateAscColor
(
obj
.
Unifill
.
fill
.
color
);
}
else
{
{
this
.
Color
=
(
undefined
!=
obj
.
Color
&&
null
!=
obj
.
Color
)
?
AscCommon
.
CreateAscColorCustom
(
obj
.
Color
.
r
,
obj
.
Color
.
g
,
obj
.
Color
.
b
)
:
null
;
this
.
Color
=
(
undefined
!=
obj
.
Color
&&
null
!=
obj
.
Color
)
?
AscCommon
.
CreateAscColorCustom
(
obj
.
Color
.
r
,
obj
.
Color
.
g
,
obj
.
Color
.
b
)
:
null
;
}
this
.
Value
=
(
undefined
!=
obj
.
Value
)
?
obj
.
Value
:
null
;
this
.
Value
=
(
undefined
!=
obj
.
Value
)
?
obj
.
Value
:
null
;
}
}
else
else
...
...
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