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
3cad6ab0
Commit
3cad6ab0
authored
Aug 01, 2016
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix crash, when we insert table from presentation editor into doc or spreadsheet editors
parent
038f33c9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
40 deletions
+24
-40
cell/model/clipboard.js
cell/model/clipboard.js
+1
-1
common/Shapes/Serialize.js
common/Shapes/Serialize.js
+23
-39
No files found.
cell/model/clipboard.js
View file @
3cad6ab0
...
@@ -1151,7 +1151,7 @@
...
@@ -1151,7 +1151,7 @@
//отдельная обработка для вставки таблички из презентаций
//отдельная обработка для вставки таблички из презентаций
if
(
data
.
Drawings
.
length
===
1
&&
typeof
CGraphicFrame
!==
"
undefined
"
&&
drawingObject
.
graphicObject
instanceof
CGraphicFrame
)
if
(
data
.
Drawings
.
length
===
1
&&
typeof
AscFormat
.
CGraphicFrame
!==
"
undefined
"
&&
drawingObject
.
graphicObject
instanceof
AscFormat
.
CGraphicFrame
)
{
{
//вставляем табличку из презентаций
//вставляем табличку из презентаций
var
oPasteFromBinaryWord
=
new
pasteFromBinaryWord
(
this
,
ws
);
var
oPasteFromBinaryWord
=
new
pasteFromBinaryWord
(
this
,
ws
);
...
...
common/Shapes/Serialize.js
View file @
3cad6ab0
...
@@ -6008,11 +6008,11 @@ function BinaryPPTYLoader()
...
@@ -6008,11 +6008,11 @@ function BinaryPPTYLoader()
}
}
}
}
if
(
this
.
presentation
&&
Array
.
isArray
(
this
.
presentation
.
Slides
)){
var
bLoadVal
=
AscCommon
.
g_oIdCounter
.
m_bLoad
;
var
bLoadVal
=
AscCommon
.
g_oIdCounter
.
m_bLoad
;
var
bRead
=
AscCommon
.
g_oIdCounter
.
m_bRead
;
var
bRead
=
AscCommon
.
g_oIdCounter
.
m_bRead
;
AscCommon
.
g_oIdCounter
.
m_bLoad
=
false
;
AscCommon
.
g_oIdCounter
.
m_bLoad
=
false
;
AscCommon
.
g_oIdCounter
.
m_bRead
=
false
;
AscCommon
.
g_oIdCounter
.
m_bRead
=
false
;
for
(
i
=
0
;
i
<
row
.
Content
.
length
;
++
i
){
for
(
i
=
0
;
i
<
row
.
Content
.
length
;
++
i
){
var
oCell
=
row
.
Content
[
i
];
var
oCell
=
row
.
Content
[
i
];
var
oMargins
=
oCell
.
Get_Margins
();
var
oMargins
=
oCell
.
Get_Margins
();
...
@@ -6033,23 +6033,7 @@ function BinaryPPTYLoader()
...
@@ -6033,23 +6033,7 @@ function BinaryPPTYLoader()
AscCommon
.
g_oIdCounter
.
m_bLoad
=
bLoadVal
;
AscCommon
.
g_oIdCounter
.
m_bLoad
=
bLoadVal
;
AscCommon
.
g_oIdCounter
.
m_bRead
=
bRead
;
AscCommon
.
g_oIdCounter
.
m_bRead
=
bRead
;
row
.
Set_Height
(
Math
.
max
(
1
,
fRowHeight
-
fMaxTopMargin
-
fMaxBottomMargin
-
fMaxTopBorder
/
2
-
fMaxBottomBorder
/
2
),
Asc
.
linerule_AtLeast
);
row
.
Set_Height
(
Math
.
max
(
1
,
fRowHeight
-
fMaxTopMargin
-
fMaxBottomMargin
-
fMaxTopBorder
/
2
-
fMaxBottomBorder
/
2
),
Asc
.
linerule_AtLeast
);
/*
if (row.Content.length == _count)
{
for (var i = 0; i < _count; i++)
{
s.Skip2(1);
var bIsNoHMerge = this.ReadCell(row.Content[i]);
if (bIsNoHMerge === false)
{
row.Remove_Cell(i);
i--;
_count--;
}
}
}
}
*/
s
.
Seek2
(
_end_rec
);
s
.
Seek2
(
_end_rec
);
}
}
...
...
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