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
326d50b3
Commit
326d50b3
authored
Aug 26, 2016
by
GoshaZotov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v4.1.0' into develop
parents
8784300a
eca32e0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
cell/model/clipboard.js
cell/model/clipboard.js
+2
-2
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+1
-1
No files found.
cell/model/clipboard.js
View file @
326d50b3
...
...
@@ -2521,7 +2521,7 @@
//настройки параграфа
paragraph
.
elem
.
CompiledPr
.
NeedRecalc
=
true
;
var
paraPr
=
paragraph
.
elem
.
Get_CompiledPr
();
var
paragraphFontFamily
=
paraPr
.
TextPr
.
FontFamily
.
Name
;
//
var paragraphFontFamily = paraPr.TextPr.FontFamily.Name;
//горизонтальное выравнивание
var
horisonalAlign
=
this
.
_getAlignHorisontal
(
paraPr
);
...
...
@@ -2540,7 +2540,7 @@
//Numbering
var
LvlPr
=
null
;
var
Lvl
=
null
;
var
oNumPr
=
paragraph
.
elem
.
Numbering_Get
()
;
var
oNumPr
=
paragraph
.
elem
.
Numbering_Get
?
paragraph
.
elem
.
Numbering_Get
()
:
null
;
var
numberingText
=
null
;
var
formatText
;
if
(
oNumPr
!=
null
)
...
...
cell/view/WorksheetView.js
View file @
326d50b3
...
...
@@ -9646,7 +9646,7 @@
r1
:
range
.
first
.
row
,
r2
:
range
.
last
.
row
,
c1
:
range
.
first
.
col
,
c2
:
range
.
last
.
col
};
n
++
;
if
(
currentObj
[
0
]
==
undefined
)
if
(
c
ontentC
urrentObj
[
0
]
==
undefined
)
{
range
.
setValue
(
''
);
}
...
...
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