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
c2508f89
Commit
c2508f89
authored
Sep 15, 2016
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug with recalculating a table with a footnotes on the page.
parent
ac03c4b2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
word/Editor/Table/TableRecalculate.js
word/Editor/Table/TableRecalculate.js
+11
-2
No files found.
word/Editor/Table/TableRecalculate.js
View file @
c2508f89
...
...
@@ -1621,6 +1621,11 @@ CTable.prototype.private_RecalculatePage = function(CurPage)
if
(
true
===
this
.
TurnOffRecalc
)
return
;
var
oTopDocument
=
this
.
Parent
.
Is_TopDocument
(
true
);
var
isTopLogicDocument
=
(
oTopDocument
instanceof
CDocument
?
true
:
false
);
var
nPageAbs
=
this
.
Get_AbsolutePage
(
CurPage
);
var
nColumnAbs
=
this
.
Get_AbsoluteColumn
(
CurPage
);
this
.
TurnOffRecalc
=
true
;
var
FirstRow
=
0
;
...
...
@@ -2280,8 +2285,12 @@ CTable.prototype.private_RecalculatePage = function(CurPage)
var
X_content_end_old
=
Cell
.
Content
.
Pages
[
0
].
XLimit
;
var
Y_content_height_old
=
Cell
.
Content
.
Pages
[
0
].
Bounds
.
Bottom
-
Cell
.
Content
.
Pages
[
0
].
Bounds
.
Top
;
// Проверим по X, Y
if
(
Math
.
abs
(
X_content_start
-
X_content_start_old
)
<
0.001
&&
Math
.
abs
(
X_content_end_old
-
X_content_end
)
<
0.001
&&
Y_content_start
+
Y_content_height_old
<
Y_content_end
)
// Проверим по X, Y.
var
nFootnotesHeight
=
0
;
if
(
oTopDocument
&&
isTopLogicDocument
)
nFootnotesHeight
=
oTopDocument
.
Footnotes
.
GetHeight
(
nPageAbs
,
nColumnAbs
);
if
(
Math
.
abs
(
X_content_start
-
X_content_start_old
)
<
0.001
&&
Math
.
abs
(
X_content_end_old
-
X_content_end
)
<
0.001
&&
Y_content_start
+
Y_content_height_old
<
Y_content_end
-
nFootnotesHeight
)
{
bCanShift
=
true
;
ShiftDy
=
-
Cell
.
Content
.
Pages
[
0
].
Y
+
Y_content_start
;
...
...
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