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
04a1c2e0
Commit
04a1c2e0
authored
Aug 25, 2016
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reworked some functions in Footnotes based on columns
parent
67431313
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
125 additions
and
56 deletions
+125
-56
word/Editor/Document.js
word/Editor/Document.js
+3
-2
word/Editor/FootEndNote.js
word/Editor/FootEndNote.js
+4
-2
word/Editor/Footnotes.js
word/Editor/Footnotes.js
+117
-51
word/Editor/Paragraph_Recalculate.js
word/Editor/Paragraph_Recalculate.js
+1
-1
No files found.
word/Editor/Document.js
View file @
04a1c2e0
...
@@ -1053,7 +1053,8 @@ CDocumentRecalcInfo.prototype =
...
@@ -1053,7 +1053,8 @@ CDocumentRecalcInfo.prototype =
Set_FootnoteReference
:
function
(
oFootnoteReference
,
nPageAbs
,
nColumnAbs
)
Set_FootnoteReference
:
function
(
oFootnoteReference
,
nPageAbs
,
nColumnAbs
)
{
{
this
.
FootnoteReference
=
oFootnoteReference
;
this
.
FootnoteReference
=
oFootnoteReference
;
this
.
FlowObjectPage
=
nPageAbs
;
this
.
FootnotePage
=
nPageAbs
;
this
.
FootnoteColumn
=
nColumnAbs
;
},
},
Check_FootnoteReference
:
function
(
oFootnoteReference
)
Check_FootnoteReference
:
function
(
oFootnoteReference
)
...
@@ -2867,7 +2868,7 @@ CDocument.prototype.private_RecalculateShiftFootnotes = function(nPageAbs, nColu
...
@@ -2867,7 +2868,7 @@ CDocument.prototype.private_RecalculateShiftFootnotes = function(nPageAbs, nColu
{
{
var
dFootnotesHeight
=
this
.
Footnotes
.
GetHeight
(
nPageAbs
,
nColumnAbs
);
var
dFootnotesHeight
=
this
.
Footnotes
.
GetHeight
(
nPageAbs
,
nColumnAbs
);
var
oPageMetrics
=
this
.
Get_PageContentStartPos
(
nPageAbs
);
var
oPageMetrics
=
this
.
Get_PageContentStartPos
(
nPageAbs
);
this
.
Footnotes
.
Shift
(
nPageAbs
,
0
,
oPageMetrics
.
YLimit
-
dFootnotesHeight
);
this
.
Footnotes
.
Shift
(
nPageAbs
,
nColumnAbs
,
0
,
oPageMetrics
.
YLimit
-
dFootnotesHeight
);
};
};
CDocument
.
prototype
.
private_RecalculateFlowTable
=
function
(
RecalcInfo
)
CDocument
.
prototype
.
private_RecalculateFlowTable
=
function
(
RecalcInfo
)
{
{
...
...
word/Editor/FootEndNote.js
View file @
04a1c2e0
...
@@ -45,11 +45,13 @@ function CFootEndnote(DocumentController)
...
@@ -45,11 +45,13 @@ function CFootEndnote(DocumentController)
AscCommon
.
extendClass
(
CFootEndnote
,
CDocumentContent
);
AscCommon
.
extendClass
(
CFootEndnote
,
CDocumentContent
);
CFootEndnote
.
prototype
.
GetRelaitivePageIndex
=
function
(
Page
Abs
)
CFootEndnote
.
prototype
.
GetRelaitivePageIndex
=
function
(
nPageAbs
,
nColumn
Abs
)
{
{
// TODO: Переделать с учетом колонок
var
StartPageAbs
=
this
.
Get_StartPage_Absolute
();
var
StartPageAbs
=
this
.
Get_StartPage_Absolute
();
var
PagesCount
=
this
.
Get_PagesCount
();
var
PagesCount
=
this
.
Get_PagesCount
();
return
Math
.
max
(
0
,
Math
.
min
(
PagesCount
-
1
,
PageAbs
-
StartPageAbs
));
return
Math
.
max
(
0
,
Math
.
min
(
PagesCount
-
1
,
n
PageAbs
-
StartPageAbs
));
};
};
CFootEndnote
.
prototype
.
Write_ToBinary2
=
function
(
Writer
)
CFootEndnote
.
prototype
.
Write_ToBinary2
=
function
(
Writer
)
{
{
...
...
word/Editor/Footnotes.js
View file @
04a1c2e0
This diff is collapsed.
Click to expand it.
word/Editor/Paragraph_Recalculate.js
View file @
04a1c2e0
...
@@ -1872,7 +1872,7 @@ Paragraph.prototype.private_RecalculateLineCheckFootnotes = function(CurLine, Cu
...
@@ -1872,7 +1872,7 @@ Paragraph.prototype.private_RecalculateLineCheckFootnotes = function(CurLine, Cu
else
else
{
{
// TODO: Реализовать
// TODO: Реализовать
RecalcInfo
.
Set_PageBrea
FlowObjectPageBrea
kBefore
(
true
);
RecalcInfo
.
Set_PageBreakBefore
(
true
);
this
.
Parent
.
Footnotes
.
RemoveFootnoteFromPage
(
nPageAbs
,
nColumnAbs
,
oFootnote
);
this
.
Parent
.
Footnotes
.
RemoveFootnoteFromPage
(
nPageAbs
,
nColumnAbs
,
oFootnote
);
PRS
.
RecalcResult
=
recalcresult_CurPage
|
recalcresultflags_Column
|
recalcresultflags_Footnotes
;
PRS
.
RecalcResult
=
recalcresult_CurPage
|
recalcresultflags_Column
|
recalcresultflags_Footnotes
;
return
false
;
return
false
;
...
...
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