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
85fa456b
Commit
85fa456b
authored
Jul 01, 2017
by
SergeyLuzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug with bullet properties
parent
f6acd148
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
3 deletions
+39
-3
word/Editor/Hyperlink.js
word/Editor/Hyperlink.js
+13
-0
word/Editor/Paragraph.js
word/Editor/Paragraph.js
+25
-2
word/Editor/Paragraph_Recalculate.js
word/Editor/Paragraph_Recalculate.js
+1
-1
No files found.
word/Editor/Hyperlink.js
View file @
85fa456b
...
...
@@ -63,6 +63,19 @@ ParaHyperlink.prototype.Get_Id = function()
return
this
.
Id
;
};
ParaHyperlink
.
prototype
.
Get_FirstTextPr2
=
function
()
{
for
(
var
i
=
0
;
i
<
this
.
Content
.
length
;
++
i
)
{
if
(
this
.
Content
[
i
].
Type
===
para_Run
&&
!
this
.
Content
[
i
].
Is_Empty
())
{
return
this
.
Content
[
i
].
Get_CompiledPr
();
}
}
return
null
;
};
ParaHyperlink
.
prototype
.
Copy
=
function
(
Selected
)
{
var
NewHyperlink
=
CParagraphContentWithParagraphLikeContent
.
prototype
.
Copy
.
apply
(
this
,
arguments
);
...
...
word/Editor/Paragraph.js
View file @
85fa456b
...
...
@@ -325,6 +325,29 @@ Paragraph.prototype.Get_FirstTextPr = function()
return
this
.
Content
[
0
].
Get_CompiledPr
();
};
Paragraph
.
prototype
.
Get_FirstTextPr2
=
function
()
{
var
HyperlinkPr
;
for
(
var
i
=
0
;
i
<
this
.
Content
.
length
;
++
i
)
{
if
(
!
this
.
Content
[
i
].
Is_Empty
())
{
if
(
para_Run
===
this
.
Content
[
i
].
Type
)
{
return
this
.
Content
[
i
].
Get_CompiledPr
();
}
else
if
(
para_Hyperlink
===
this
.
Content
[
i
].
Type
)
{
HyperlinkPr
=
this
.
Content
[
i
].
Get_FirstTextPr2
();
if
(
HyperlinkPr
)
{
return
HyperlinkPr
;
}
}
}
}
return
this
.
Get_CompiledPr2
(
false
).
TextPr
;
};
Paragraph
.
prototype
.
GetAllDrawingObjects
=
function
(
DrawingObjs
)
{
if
(
undefined
===
DrawingObjs
)
...
...
@@ -1992,9 +2015,9 @@ Paragraph.prototype.Internal_Draw_4 = function(CurPage, pGraphics, Pr, BgColor,
if
(
true
!=
this
.
IsEmpty
())
{
if
(
Pr
.
ParaPr
.
Ind
.
FirstLine
<
0
)
NumberingItem
.
Draw
(
X
,
Y
,
pGraphics
,
this
.
Get_FirstTextPr
(),
PDSE
);
NumberingItem
.
Draw
(
X
,
Y
,
pGraphics
,
this
.
Get_FirstTextPr
2
(),
PDSE
);
else
NumberingItem
.
Draw
(
this
.
Pages
[
CurPage
].
X
+
Pr
.
ParaPr
.
Ind
.
Left
,
Y
,
pGraphics
,
this
.
Get_FirstTextPr
(),
PDSE
);
NumberingItem
.
Draw
(
this
.
Pages
[
CurPage
].
X
+
Pr
.
ParaPr
.
Ind
.
Left
,
Y
,
pGraphics
,
this
.
Get_FirstTextPr
2
(),
PDSE
);
}
}
...
...
word/Editor/Paragraph_Recalculate.js
View file @
85fa456b
...
...
@@ -2990,7 +2990,7 @@ CParagraphRecalculateStateWrap.prototype =
}
// Найдем настройки для первого текстового элемента
var
FirstTextPr
=
Para
.
Get_FirstTextPr
();
var
FirstTextPr
=
Para
.
Get_FirstTextPr
2
();
NumberingItem
.
Bullet
=
Bullet
;
NumberingItem
.
BulletNum
=
BulletNum
+
1
;
...
...
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