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
11870951
Commit
11870951
authored
Mar 03, 2017
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug #34220.
parent
75d9147f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
word/Editor/Document.js
word/Editor/Document.js
+1
-1
word/Editor/DocumentContent.js
word/Editor/DocumentContent.js
+4
-0
word/Editor/HeaderFooter.js
word/Editor/HeaderFooter.js
+14
-4
No files found.
word/Editor/Document.js
View file @
11870951
...
...
@@ -4984,7 +4984,7 @@ CDocument.prototype.Selection_SetStart = function(X, Y, MouseEvent)
var
bInText
=
(
null
===
this
.
Is_InText
(
X
,
Y
,
this
.
CurPage
)
?
false
:
true
);
var
bTableBorder
=
(
null
===
this
.
Is_TableBorder
(
X
,
Y
,
this
.
CurPage
)
?
false
:
true
);
var
nInDrawing
=
this
.
DrawingObjects
.
isPointInDrawingObjects
(
X
,
Y
,
this
.
CurPage
,
this
);
var
bFlowTable
=
(
null
===
this
.
DrawingObjects
.
getTableByXY
(
X
,
Y
,
this
.
CurPage
,
this
)
?
false
:
true
);
var
bFlowTable
=
(
null
===
this
.
DrawingObjects
.
getTableByXY
(
X
,
Y
,
this
.
CurPage
,
this
)
?
false
:
true
);
// Сначала посмотрим, попалили мы в текстовый селект (но при этом не в границу таблицы и не более чем одинарным кликом)
if
(
-
1
!==
this
.
Selection
.
DragDrop
.
Flag
&&
MouseEvent
.
ClickCount
<=
1
&&
false
===
bTableBorder
&&
...
...
word/Editor/DocumentContent.js
View file @
11870951
...
...
@@ -331,6 +331,10 @@ CDocumentContent.prototype.Is_PointInDrawingObjects = function(X, Y, Page
{
return
this
.
LogicDocument
&&
this
.
LogicDocument
.
DrawingObjects
.
pointInObjInDocContent
(
this
,
X
,
Y
,
Page_Abs
);
};
CDocumentContent
.
prototype
.
Is_PointInFlowTable
=
function
(
X
,
Y
,
PageAbs
)
{
return
this
.
LogicDocument
&&
null
!==
this
.
LogicDocument
.
DrawingObjects
.
getTableByXY
(
X
,
Y
,
PageAbs
,
this
);
};
CDocumentContent
.
prototype
.
Get_Numbering
=
function
()
{
return
this
.
Parent
.
Get_Numbering
();
...
...
word/Editor/HeaderFooter.js
View file @
11870951
...
...
@@ -415,6 +415,11 @@ CHeaderFooter.prototype =
return
this
.
Content
.
Is_PointInDrawingObjects
(
X
,
Y
,
this
.
Content
.
Get_StartPage_Absolute
()
);
},
Is_PointInFlowTable
:
function
(
X
,
Y
)
{
return
this
.
Content
.
Is_PointInFlowTable
(
X
,
Y
,
this
.
Content
.
Get_StartPage_Absolute
());
},
CheckRange
:
function
(
X0
,
Y0
,
X1
,
Y1
,
_Y0
,
_Y1
,
X_lf
,
X_rf
,
bMathWrap
)
{
return
this
.
Content
.
CheckRange
(
X0
,
Y0
,
X1
,
Y1
,
_Y0
,
_Y1
,
X_lf
,
X_rf
,
0
,
false
,
bMathWrap
);
...
...
@@ -2091,9 +2096,15 @@ CHeaderFooterController.prototype =
Selection_SetStart
:
function
(
X
,
Y
,
PageIndex
,
MouseEvent
,
bActivate
)
{
// Если мы попадаем в заселекченную автофигуру, пусть она даже выходит за пределы
if
(
true
===
this
.
LogicDocument
.
DrawingObjects
.
pointInSelectedObject
(
X
,
Y
,
PageIndex
)
)
{
var
TempHdrFtr
=
null
;
// Если мы попадаем в заселекченную автофигуру, пусть она даже выходит за пределы
if
(
true
===
this
.
LogicDocument
.
DrawingObjects
.
pointInSelectedObject
(
X
,
Y
,
PageIndex
)
||
(
null
!==
(
TempHdrFtr
=
this
.
Pages
[
PageIndex
].
Header
)
&&
true
===
TempHdrFtr
.
Is_PointInFlowTable
(
X
,
Y
))
||
(
null
!==
(
TempHdrFtr
=
this
.
Pages
[
PageIndex
].
Footer
)
&&
true
===
TempHdrFtr
.
Is_PointInFlowTable
(
X
,
Y
)))
{
if
(
null
!==
TempHdrFtr
)
this
.
CurHdrFtr
=
TempHdrFtr
;
var
NewPos
=
this
.
DrawingDocument
.
ConvertCoordsToAnotherPage
(
X
,
Y
,
PageIndex
,
this
.
CurPage
);
var
_X
=
NewPos
.
X
;
var
_Y
=
NewPos
.
Y
;
...
...
@@ -2112,7 +2123,6 @@ CHeaderFooterController.prototype =
// Сначала проверяем, не попали ли мы в контент документа. Если да, тогда надо
// активировать работу с самим документом (просто вернуть false здесь)
var
TempHdrFtr
=
null
;
var
PageMetrics
=
this
.
LogicDocument
.
Get_PageContentStartPos
(
PageIndex
);
if
(
MouseEvent
.
ClickCount
>=
2
&&
true
!=
editor
.
isStartAddShape
&&
...
...
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