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
2688eda2
Commit
2688eda2
authored
May 27, 2016
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
копирование OleObject; исправлено падение при dblClick по OleObject в презентациях и таблицах
parent
8d20c9f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
1 deletion
+35
-1
common/Drawings/CommonController.js
common/Drawings/CommonController.js
+1
-1
common/Drawings/Format/OleObject.js
common/Drawings/Format/OleObject.js
+34
-0
No files found.
common/Drawings/CommonController.js
View file @
2688eda2
...
...
@@ -879,7 +879,7 @@ DrawingObjectsController.prototype =
if
(
object
.
getObjectType
()
===
AscDFH
.
historyitem_type_ChartSpace
&&
this
.
handleChartDoubleClick
)
this
.
handleChartDoubleClick
(
drawing
,
object
,
e
,
x
,
y
,
pageIndex
);
if
(
object
.
getObjectType
()
===
AscDFH
.
historyitem_type_OleObject
&&
this
.
handle
Char
tDoubleClick
){
if
(
object
.
getObjectType
()
===
AscDFH
.
historyitem_type_OleObject
&&
this
.
handle
OleObjec
tDoubleClick
){
this
.
handleOleObjectDoubleClick
(
drawing
,
object
,
e
,
x
,
y
,
pageIndex
);
}
else
if
(
2
==
e
.
ClickCount
&&
drawing
instanceof
ParaDrawing
&&
drawing
.
Is_MathEquation
())
...
...
common/Drawings/Format/OleObject.js
View file @
2688eda2
...
...
@@ -38,6 +38,40 @@ function (window, undefined) {
this
.
m_nPixWidth
=
nPixWidth
;
this
.
m_nPixHeight
=
nPixHeight
;
};
COleObject
.
prototype
.
copy
=
function
()
{
var
copy
=
new
COleObject
();
if
(
this
.
nvPicPr
)
{
copy
.
setNvPicPr
(
this
.
nvPicPr
.
createDuplicate
());
}
if
(
this
.
spPr
)
{
copy
.
setSpPr
(
this
.
spPr
.
createDuplicate
());
copy
.
spPr
.
setParent
(
copy
);
}
if
(
this
.
blipFill
)
{
copy
.
setBlipFill
(
this
.
blipFill
.
createDuplicate
());
}
if
(
this
.
style
)
{
copy
.
setStyle
(
this
.
style
.
createDuplicate
());
}
copy
.
setBDeleted
(
this
.
bDeleted
);
if
(
this
.
fromSerialize
)
{
copy
.
setBFromSerialize
(
true
);
}
copy
.
setData
(
this
.
m_sData
);
copy
.
setApplicationId
(
this
.
m_sApplicationId
);
copy
.
setPixSizes
(
this
.
m_nPixWidth
,
this
.
m_nPixHeight
);
copy
.
cachedImage
=
this
.
getBase64Img
();
copy
.
cachedPixH
=
this
.
cachedPixH
;
copy
.
cachedPixW
=
this
.
cachedPixW
;
return
copy
;
};
window
[
'
AscFormat
'
]
=
window
[
'
AscFormat
'
]
||
{};
window
[
'
AscFormat
'
].
COleObject
=
COleObject
;
})(
window
);
\ No newline at end of file
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