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
1b0a9437
Commit
1b0a9437
authored
Mar 25, 2016
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #32018 Теперь таблица вставленная в колонку растягивается по ширине минимальной колонки.
parent
fd4b4d76
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
word/Editor/Document.js
word/Editor/Document.js
+13
-13
No files found.
word/Editor/Document.js
View file @
1b0a9437
...
...
@@ -3836,29 +3836,29 @@ CDocument.prototype =
{
case
type_Paragraph
:
{
// Если на текущй странице одна колонка, тогда мы добавляем таблицу по ширине этой колонке, а если
// колонок больше одной, тогда добавляем таблицу минимальной ширины.
// Ширину таблицы делаем по минимальной ширине колонки.
var
Page
=
this
.
Pages
[
this
.
CurPage
];
var
SectionIndex
=
this
.
private_GetPageSectionByContentPosition
(
this
.
CurPage
,
this
.
CurPos
.
ContentPos
);
var
Section
=
Page
.
Sections
[
SectionIndex
];
var
SectPr
=
this
.
SectionsInfo
.
Get_SectPr
(
this
.
CurPos
.
ContentPos
).
SectPr
;
var
PageFields
=
this
.
Get_PageFields
(
this
.
CurPage
);
// Создаем новую таблицу
var
W
=
(
PageFields
.
XLimit
-
PageFields
.
X
+
2
*
1.9
);
var
W
=
(
PageFields
.
XLimit
-
PageFields
.
X
+
2
*
1.9
);
var
Grid
=
[];
if
(
Sect
ion
.
Columns
.
length
>
1
)
if
(
Sect
Pr
.
Get_ColumnsCount
()
>
1
)
{
if
(
Cols
<=
3
)
W
=
1124
/
20
*
25.4
/
72
;
else
W
=
360
/
20
*
25.4
/
72
*
Cols
;
for
(
var
CurCol
=
0
,
ColsCount
=
SectPr
.
Get_ColumnsCount
();
CurCol
<
ColsCount
;
++
CurCol
)
{
var
ColumnWidth
=
SectPr
.
Get_ColumnWidth
(
CurCol
);
if
(
W
>
ColumnWidth
)
W
=
ColumnWidth
;
}
W
+=
2
*
1.9
;
}
W
=
Math
.
max
(
W
,
Cols
*
2
*
1.9
);
W
=
Math
.
max
(
W
,
Cols
*
2
*
1.9
);
for
(
var
Index
=
0
;
Index
<
Cols
;
Index
++
)
Grid
[
Index
]
=
W
/
Cols
;
...
...
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