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
86139e1b
Commit
86139e1b
authored
Aug 04, 2016
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Bug 32913
parent
ff6fd90a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
25 deletions
+29
-25
common/Drawings/Format/Shape.js
common/Drawings/Format/Shape.js
+2
-1
common/wordcopypaste.js
common/wordcopypaste.js
+27
-24
No files found.
common/Drawings/Format/Shape.js
View file @
86139e1b
...
@@ -473,7 +473,7 @@ function ConvertTableToGraphicFrame(oTable, oPresentation){
...
@@ -473,7 +473,7 @@ function ConvertTableToGraphicFrame(oTable, oPresentation){
}
}
var
nIndex
=
oTable2
.
Content
.
length
;
var
nIndex
=
oTable2
.
Content
.
length
;
oTable2
.
Content
[
nIndex
]
=
oNewRow
;
oTable2
.
Content
[
nIndex
]
=
oNewRow
;
History
.
Add
(
oTable2
,
{
Type
:
AscDFH
.
historyitem_Table_AddRow
,
Pos
:
Index
,
Item
:
{
Row
:
oTable2
.
Content
[
nIndex
],
TableRowsBottom
:
{},
RowsInfo
:
{}
}
}
);
History
.
Add
(
oTable2
,
{
Type
:
AscDFH
.
historyitem_Table_AddRow
,
Pos
:
n
Index
,
Item
:
{
Row
:
oTable2
.
Content
[
nIndex
],
TableRowsBottom
:
{},
RowsInfo
:
{}
}
}
);
}
}
if
(
!
oGraphicFrame
.
spPr
){
if
(
!
oGraphicFrame
.
spPr
){
...
@@ -491,6 +491,7 @@ function ConvertTableToGraphicFrame(oTable, oPresentation){
...
@@ -491,6 +491,7 @@ function ConvertTableToGraphicFrame(oTable, oPresentation){
}
}
oGraphicFrame
.
setGraphicObject
(
oTable2
);
oGraphicFrame
.
setGraphicObject
(
oTable2
);
oGraphicFrame
.
setBDeleted
(
false
);
oGraphicFrame
.
setBDeleted
(
false
);
return
oGraphicFrame
;
}
}
function
RecalculateDocContentByMaxLine
(
oDocContent
,
dMaxWidth
,
bNeedRecalcAllDrawings
)
function
RecalculateDocContentByMaxLine
(
oDocContent
,
dMaxWidth
,
bNeedRecalcAllDrawings
)
...
...
common/wordcopypaste.js
View file @
86139e1b
...
@@ -3783,32 +3783,35 @@ PasteProcessor.prototype =
...
@@ -3783,32 +3783,35 @@ PasteProcessor.prototype =
_convertTableToPPTX
:
function
(
table
)
_convertTableToPPTX
:
function
(
table
)
{
{
//TODO пересмотреть обработку для вложенных таблиц(можно сделать так, как при копировании из документов в таблицы)
//TODO пересмотреть обработку для вложенных таблиц(можно сделать так, как при копировании из документов в таблицы)
var
allRows
=
[];
var
oTable
=
AscFormat
.
ExecuteNoHistory
(
function
(){
this
.
maxTableCell
=
0
;
var
allRows
=
[];
table
=
this
.
_replaceInnerTables
(
table
,
allRows
,
true
);
this
.
maxTableCell
=
0
;
table
=
this
.
_replaceInnerTables
(
table
,
allRows
,
true
);
//ковертим внутренние параграфы
table
.
bPresentation
=
true
;
//ковертим внутренние параграфы
for
(
var
i
=
0
;
i
<
table
.
Content
.
length
;
i
++
)
table
.
bPresentation
=
true
;
{
for
(
var
i
=
0
;
i
<
table
.
Content
.
length
;
i
++
)
for
(
var
j
=
0
;
j
<
table
.
Content
[
i
].
Content
.
length
;
j
++
)
{
{
for
(
var
j
=
0
;
j
<
table
.
Content
[
i
].
Content
.
length
;
j
++
)
var
cDocumentContent
=
table
.
Content
[
i
].
Content
[
j
].
Content
;
{
cDocumentContent
.
bPresentation
=
true
;
var
cDocumentContent
=
table
.
Content
[
i
].
Content
[
j
].
Content
;
var
nIndex
=
0
;
cDocumentContent
.
bPresentation
=
true
;
for
(
var
n
=
0
;
n
<
cDocumentContent
.
Content
.
length
;
n
++
)
var
nIndex
=
0
;
{
for
(
var
n
=
0
;
n
<
cDocumentContent
.
Content
.
length
;
n
++
)
if
(
cDocumentContent
.
Content
[
n
]
instanceof
Paragraph
)
{
{
cDocumentContent
.
Content
[
nIndex
]
=
AscFormat
.
ConvertParagraphToPPTX
(
cDocumentContent
.
Content
[
nIndex
]);
if
(
cDocumentContent
.
Content
[
n
]
instanceof
Paragraph
)
++
nIndex
;
{
}
cDocumentContent
.
Content
[
nIndex
]
=
AscFormat
.
ConvertParagraphToPPTX
(
cDocumentContent
.
Content
[
nIndex
]);
++
nIndex
;
}
}
}
}
}
}
}
table
.
Set_TableLayout
(
tbllayout_Fixed
);
return
table
;
return
table
;
},
this
,
[]);
return
oTable
;
},
},
_replaceInnerTables
:
function
(
table
,
allRows
,
isRoot
)
_replaceInnerTables
:
function
(
table
,
allRows
,
isRoot
)
...
...
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