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
5bb207fa
Commit
5bb207fa
authored
Oct 07, 2016
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug #33003 Fixed an issue with zero width frame.
parent
0c6199da
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
4 deletions
+36
-4
word/Editor/Document.js
word/Editor/Document.js
+3
-3
word/Editor/DocumentContent.js
word/Editor/DocumentContent.js
+1
-1
word/Editor/Paragraph.js
word/Editor/Paragraph.js
+22
-0
word/Editor/Run.js
word/Editor/Run.js
+10
-0
No files found.
word/Editor/Document.js
View file @
5bb207fa
...
...
@@ -3065,7 +3065,7 @@ CDocument.prototype.private_RecalculateFlowParagraph = function(RecalcIn
if
(
-
1
===
FrameW
&&
1
===
FlowCount
&&
1
===
Element
.
Lines
.
length
&&
undefined
===
FramePr
.
Get_W
())
{
FrameW
=
Element
.
Lines
[
0
].
Ranges
[
0
].
W
;
FrameW
=
Element
.
GetAutoWidthForDropCap
()
;
var
ParaPr
=
Element
.
Get_CompiledPr2
(
false
).
ParaPr
;
FrameW
+=
ParaPr
.
Ind
.
Left
+
ParaPr
.
Ind
.
FirstLine
;
...
...
word/Editor/DocumentContent.js
View file @
5bb207fa
...
...
@@ -788,7 +788,7 @@ CDocumentContent.prototype.Recalculate_Page = function(PageIndex,
// отсутствует, когда, у нас ровно 1 параграф, с 1 строкой.
if
(
-
1
===
FrameW
&&
1
===
FlowCount
&&
1
===
Element
.
Lines
.
length
&&
undefined
===
FramePr
.
Get_W
())
{
FrameW
=
Element
.
Lines
[
0
].
Ranges
[
0
].
W
;
FrameW
=
Element
.
GetAutoWidthForDropCap
()
;
var
ParaPr
=
Element
.
Get_CompiledPr2
(
false
).
ParaPr
;
FrameW
+=
ParaPr
.
Ind
.
Left
+
ParaPr
.
Ind
.
FirstLine
;
...
...
word/Editor/Paragraph.js
View file @
5bb207fa
...
...
@@ -14009,6 +14009,28 @@ Paragraph.prototype.Get_FootnotesList = function(oEngine)
return
;
}
};
Paragraph
.
prototype
.
GetAutoWidthForDropCap
=
function
()
{
if
(
this
.
Is_Empty
())
{
var
oEndRun
=
this
.
Content
[
this
.
Content
.
length
-
1
];
if
(
!
oEndRun
||
oEndRun
.
Type
!==
para_Run
)
return
0
;
var
oParaEnd
=
oEndRun
.
GetParaEnd
();
if
(
!
oParaEnd
)
return
0
;
return
oParaEnd
.
Get_WidthVisible
();
}
else
{
if
(
this
.
Lines
.
length
<=
0
||
this
.
Lines
[
0
].
Ranges
.
length
<=
0
)
return
0
;
return
this
.
Lines
[
0
].
Ranges
[
0
].
W
;
}
};
var
pararecalc_0_All
=
0
;
var
pararecalc_0_None
=
1
;
...
...
word/Editor/Run.js
View file @
5bb207fa
...
...
@@ -11195,6 +11195,16 @@ ParaRun.prototype.Is_UseInDocument = function()
{
return
(
this
.
Paragraph
&&
true
===
this
.
Paragraph
.
Is_UseInDocument
()
&&
true
===
this
.
Is_UseInParagraph
()
?
true
:
false
);
};
ParaRun
.
prototype
.
GetParaEnd
=
function
()
{
for
(
var
nIndex
=
0
,
nCount
=
this
.
Content
.
length
;
nIndex
<
nCount
;
++
nIndex
)
{
if
(
this
.
Content
[
nIndex
].
Type
===
para_End
)
return
this
.
Content
[
nIndex
];
}
return
null
;
};
function
CParaRunStartState
(
Run
)
{
...
...
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