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
d97ddef2
Commit
d97ddef2
authored
8 years ago
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Bug 33110
parent
9eb68152
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
17 deletions
+17
-17
word/Editor/DocumentContent.js
word/Editor/DocumentContent.js
+4
-2
word/Editor/GraphicObjects/Format/GroupPrototype.js
word/Editor/GraphicObjects/Format/GroupPrototype.js
+9
-9
word/Editor/Paragraph/ParaDrawing.js
word/Editor/Paragraph/ParaDrawing.js
+4
-6
No files found.
word/Editor/DocumentContent.js
View file @
d97ddef2
...
...
@@ -1233,6 +1233,10 @@ CDocumentContent.prototype.Draw = function(nPageIndex,
pGraphics
.
AddClipRect
(
ClipInfo
.
X0
,
Bounds
.
Top
-
Correction
,
Math
.
abs
(
ClipInfo
.
X1
-
ClipInfo
.
X0
),
Bounds
.
Bottom
-
Bounds
.
Top
+
Correction
);
}
if
(
this
.
LogicDocument
)
this
.
LogicDocument
.
DrawingObjects
.
drawWrappingObjectsInContent
(
this
.
Get_AbsolutePage
(
CurPage
),
pGraphics
,
this
);
var
Page_StartPos
=
this
.
Pages
[
CurPage
].
Pos
;
var
Page_EndPos
=
this
.
Pages
[
CurPage
].
EndPos
;
for
(
var
Index
=
Page_StartPos
;
Index
<=
Page_EndPos
;
Index
++
)
...
...
@@ -1241,8 +1245,6 @@ CDocumentContent.prototype.Draw = function(nPageIndex,
this
.
Content
[
Index
].
Draw
(
ElementPageIndex
,
pGraphics
);
}
if
(
this
.
LogicDocument
)
this
.
LogicDocument
.
DrawingObjects
.
drawWrappingObjectsInContent
(
this
.
Get_AbsolutePage
(
CurPage
),
pGraphics
,
this
);
if
(
ClipInfo
)
{
...
...
This diff is collapsed.
Click to expand it.
word/Editor/GraphicObjects/Format/GroupPrototype.js
View file @
d97ddef2
...
...
@@ -372,15 +372,15 @@ CGroupShape.prototype.recalculateBounds = function()
for
(
var
i
=
0
;
i
<
sp_tree
.
length
;
++
i
)
{
sp_tree
[
i
].
recalculate
();
//
var bounds = sp_tree[i].bounds;
//
var l = bounds.l;
//
var r = bounds.r;
//
var t = bounds.t;
//
var b = bounds.b;
//
x_arr_max.push(r);
//
x_arr_min.push(l);
//
y_arr_max.push(b);
//
y_arr_min.push(t);
var
bounds
=
sp_tree
[
i
].
bounds
;
var
l
=
bounds
.
l
;
var
r
=
bounds
.
r
;
var
t
=
bounds
.
t
;
var
b
=
bounds
.
b
;
x_arr_max
.
push
(
r
);
x_arr_min
.
push
(
l
);
y_arr_max
.
push
(
b
);
y_arr_min
.
push
(
t
);
}
...
...
This diff is collapsed.
Click to expand it.
word/Editor/Paragraph/ParaDrawing.js
View file @
d97ddef2
...
...
@@ -683,12 +683,10 @@ ParaDrawing.prototype.getXfrmExtY = function()
};
ParaDrawing
.
prototype
.
Get_Bounds
=
function
()
{
return
{
Left
:
this
.
X
,
Top
:
this
.
Y
,
Bottom
:
this
.
Y
+
this
.
getXfrmExtY
(),
Right
:
this
.
X
+
this
.
getXfrmExtX
()
};
var
W
,
H
;
W
=
this
.
GraphicObj
.
bounds
.
w
;
H
=
this
.
GraphicObj
.
bounds
.
h
;
return
{
Left
:
this
.
X
,
Top
:
this
.
Y
,
Bottom
:
this
.
Y
+
H
,
Right
:
this
.
X
+
W
};
};
ParaDrawing
.
prototype
.
Search
=
function
(
Str
,
Props
,
SearchEngine
,
Type
)
{
...
...
This diff is collapsed.
Click to expand it.
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