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
90cd3753
Commit
90cd3753
authored
Apr 28, 2017
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented function StartFromNewPage for class CBlockLevelSdt.
parent
b67ea6bf
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
13 deletions
+20
-13
word/Editor/DocumentContent.js
word/Editor/DocumentContent.js
+6
-6
word/Editor/DocumentContentElementBase.js
word/Editor/DocumentContentElementBase.js
+3
-0
word/Editor/Paragraph_Recalculate.js
word/Editor/Paragraph_Recalculate.js
+2
-2
word/Editor/StructuredDocumentTags/BlockLevel.js
word/Editor/StructuredDocumentTags/BlockLevel.js
+4
-0
word/Editor/Table/TableRecalculate.js
word/Editor/Table/TableRecalculate.js
+5
-5
No files found.
word/Editor/DocumentContent.js
View file @
90cd3753
...
@@ -988,7 +988,7 @@ CDocumentContent.prototype.Recalculate_Page = function(PageIndex,
...
@@ -988,7 +988,7 @@ CDocumentContent.prototype.Recalculate_Page = function(PageIndex,
if
((
FrameY2
+
FrameH2
>
YLimit
||
Y
>
YLimit
-
0.001
)
&&
Index
!=
StartIndex
)
if
((
FrameY2
+
FrameH2
>
YLimit
||
Y
>
YLimit
-
0.001
)
&&
Index
!=
StartIndex
)
{
{
this
.
RecalcInfo
.
Set_FrameRecalc
(
true
);
this
.
RecalcInfo
.
Set_FrameRecalc
(
true
);
this
.
Content
[
Index
].
Start
_
FromNewPage
();
this
.
Content
[
Index
].
StartFromNewPage
();
RecalcResult
=
recalcresult_NextPage
;
RecalcResult
=
recalcresult_NextPage
;
}
}
else
else
...
@@ -1574,13 +1574,13 @@ CDocumentContent.prototype.Is_ContentOnFirstPage = function()
...
@@ -1574,13 +1574,13 @@ CDocumentContent.prototype.Is_ContentOnFirstPage = function()
var
Element
=
this
.
Content
[
0
];
var
Element
=
this
.
Content
[
0
];
return
Element
.
Is_ContentOnFirstPage
();
return
Element
.
Is_ContentOnFirstPage
();
};
};
CDocumentContent
.
prototype
.
Start
_FromNewPage
=
function
()
CDocumentContent
.
prototype
.
Start
FromNewPage
=
function
()
{
{
this
.
Pages
.
length
=
1
;
this
.
Pages
.
length
=
1
;
this
.
Pages
[
0
]
=
new
CDocumentPage
();
this
.
Pages
[
0
]
=
new
CDocumentPage
();
var
Element
=
this
.
Content
[
0
];
var
Element
=
this
.
Content
[
0
];
Element
.
Start_
FromNewPage
();
Element
.
Start
FromNewPage
();
};
};
CDocumentContent
.
prototype
.
Get_ParentTextTransform
=
function
()
CDocumentContent
.
prototype
.
Get_ParentTextTransform
=
function
()
{
{
...
...
word/Editor/DocumentContentElementBase.js
View file @
90cd3753
...
@@ -612,6 +612,9 @@ CDocumentContentElementBase.prototype.Get_FirstParagraph = function()
...
@@ -612,6 +612,9 @@ CDocumentContentElementBase.prototype.Get_FirstParagraph = function()
{
{
return
null
;
return
null
;
};
};
CDocumentContentElementBase
.
prototype
.
StartFromNewPage
=
function
()
{
};
//----------------------------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------------------------
// Функции для работы с номерами страниц
// Функции для работы с номерами страниц
//----------------------------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------------------------
...
...
word/Editor/Paragraph_Recalculate.js
View file @
90cd3753
...
@@ -395,7 +395,7 @@ Paragraph.prototype.Recalculate_SkipPage = function(PageIndex)
...
@@ -395,7 +395,7 @@ Paragraph.prototype.Recalculate_SkipPage = function(PageIndex)
{
{
if
(
0
===
PageIndex
)
if
(
0
===
PageIndex
)
{
{
this
.
Start
_
FromNewPage
();
this
.
StartFromNewPage
();
}
}
else
else
{
{
...
@@ -449,7 +449,7 @@ Paragraph.prototype.PrepareRecalculateObject = function()
...
@@ -449,7 +449,7 @@ Paragraph.prototype.PrepareRecalculateObject = function()
/**
/**
* Пересчитываем первую страницу параграфа так, чтобы он начинался с новой страницы.
* Пересчитываем первую страницу параграфа так, чтобы он начинался с новой страницы.
*/
*/
Paragraph
.
prototype
.
Start
_
FromNewPage
=
function
()
Paragraph
.
prototype
.
StartFromNewPage
=
function
()
{
{
this
.
Pages
.
length
=
1
;
this
.
Pages
.
length
=
1
;
this
.
Pages
[
0
]
=
new
CParaPage
(
this
.
X
,
this
.
Y
,
this
.
XLimit
,
this
.
YLimit
,
0
);
this
.
Pages
[
0
]
=
new
CParaPage
(
this
.
X
,
this
.
Y
,
this
.
XLimit
,
this
.
YLimit
,
0
);
...
...
word/Editor/StructuredDocumentTags/BlockLevel.js
View file @
90cd3753
...
@@ -640,6 +640,10 @@ CBlockLevelSdt.prototype.Get_FirstParagraph = function()
...
@@ -640,6 +640,10 @@ CBlockLevelSdt.prototype.Get_FirstParagraph = function()
{
{
return
this
.
Content
.
Get_FirstParagraph
();
return
this
.
Content
.
Get_FirstParagraph
();
};
};
CBlockLevelSdt
.
prototype
.
StartFromNewPage
=
function
()
{
this
.
Content
.
StartFromNewPage
();
};
//----------------------------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------------------------
CBlockLevelSdt
.
prototype
.
Is_HdrFtr
=
function
(
bReturnHdrFtr
)
CBlockLevelSdt
.
prototype
.
Is_HdrFtr
=
function
(
bReturnHdrFtr
)
{
{
...
...
word/Editor/Table/TableRecalculate.js
View file @
90cd3753
...
@@ -65,7 +65,7 @@ CTable.prototype.Recalculate_SkipPage = function(PageIndex)
...
@@ -65,7 +65,7 @@ CTable.prototype.Recalculate_SkipPage = function(PageIndex)
{
{
if
(
0
===
PageIndex
)
if
(
0
===
PageIndex
)
{
{
this
.
Start
_
FromNewPage
();
this
.
StartFromNewPage
();
}
}
else
else
{
{
...
@@ -122,7 +122,7 @@ CTable.prototype.PrepareRecalculateObject = function()
...
@@ -122,7 +122,7 @@ CTable.prototype.PrepareRecalculateObject = function()
this
.
Content
[
Index
].
PrepareRecalculateObject
();
this
.
Content
[
Index
].
PrepareRecalculateObject
();
}
}
};
};
CTable
.
prototype
.
Start
_
FromNewPage
=
function
()
CTable
.
prototype
.
StartFromNewPage
=
function
()
{
{
this
.
Pages
.
length
=
1
;
this
.
Pages
.
length
=
1
;
this
.
Pages
[
0
]
=
new
CTablePage
(
0
,
0
,
0
,
0
,
0
,
0
);
this
.
Pages
[
0
]
=
new
CTablePage
(
0
,
0
,
0
,
0
,
0
,
0
);
...
@@ -164,7 +164,7 @@ CTable.prototype.Start_FromNewPage = function()
...
@@ -164,7 +164,7 @@ CTable.prototype.Start_FromNewPage = function()
for
(
var
CurCell
=
0
;
CurCell
<
CellsCount
;
CurCell
++
)
for
(
var
CurCell
=
0
;
CurCell
<
CellsCount
;
CurCell
++
)
{
{
var
Cell
=
this
.
Content
[
0
].
Get_Cell
(
CurCell
);
var
Cell
=
this
.
Content
[
0
].
Get_Cell
(
CurCell
);
Cell
.
Content
.
Start
_
FromNewPage
();
Cell
.
Content
.
StartFromNewPage
();
Cell
.
PagesCount
=
2
;
Cell
.
PagesCount
=
2
;
}
}
}
}
...
@@ -2437,7 +2437,7 @@ CTable.prototype.private_RecalculatePage = function(CurPage)
...
@@ -2437,7 +2437,7 @@ CTable.prototype.private_RecalculatePage = function(CurPage)
if
(
vmerge_Continue
===
Vmerge
||
VMergeCount
>
1
)
if
(
vmerge_Continue
===
Vmerge
||
VMergeCount
>
1
)
continue
;
continue
;
Cell
.
Content
.
Start
_
FromNewPage
();
Cell
.
Content
.
StartFromNewPage
();
Cell
.
PagesCount
=
2
;
Cell
.
PagesCount
=
2
;
}
}
}
}
...
@@ -2485,7 +2485,7 @@ CTable.prototype.private_RecalculatePage = function(CurPage)
...
@@ -2485,7 +2485,7 @@ CTable.prototype.private_RecalculatePage = function(CurPage)
if
(
vmerge_Continue
===
Vmerge
||
VMergeCount
>
1
)
if
(
vmerge_Continue
===
Vmerge
||
VMergeCount
>
1
)
continue
;
continue
;
Cell
.
Content
.
Start
_
FromNewPage
();
Cell
.
Content
.
StartFromNewPage
();
Cell
.
PagesCount
=
2
;
Cell
.
PagesCount
=
2
;
}
}
...
...
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