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
1d16458f
Commit
1d16458f
authored
Apr 28, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
common/Drawings/Format/GraphicFrame to function-closure
parent
065ae7dc
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
6 deletions
+16
-6
cell/model/clipboard.js
cell/model/clipboard.js
+2
-0
common/Drawings/Format/GraphicFrame.js
common/Drawings/Format/GraphicFrame.js
+7
-0
common/Shapes/Serialize.js
common/Shapes/Serialize.js
+2
-2
common/Shapes/SerializeWriter.js
common/Shapes/SerializeWriter.js
+2
-2
common/editorscommon.js
common/editorscommon.js
+1
-1
common/wordcopypaste.js
common/wordcopypaste.js
+1
-0
slide/Editor/Format/Presentation.js
slide/Editor/Format/Presentation.js
+1
-1
No files found.
cell/model/clipboard.js
View file @
1d16458f
...
@@ -24,6 +24,8 @@
...
@@ -24,6 +24,8 @@
var
pptx_content_writer
=
AscCommon
.
pptx_content_writer
;
var
pptx_content_writer
=
AscCommon
.
pptx_content_writer
;
var
g_dKoef_mm_to_pix
=
AscCommon
.
g_dKoef_mm_to_pix
;
var
g_dKoef_mm_to_pix
=
AscCommon
.
g_dKoef_mm_to_pix
;
var
CGraphicFrame
=
AscFormat
.
CGraphicFrame
;
var
doc
=
window
.
document
;
var
doc
=
window
.
document
;
var
isTruePaste
=
false
;
var
isTruePaste
=
false
;
...
...
common/Drawings/Format/GraphicFrame.js
View file @
1d16458f
"
use strict
"
;
"
use strict
"
;
(
function
(
window
,
undefined
){
// Import
// Import
var
CShape
=
AscFormat
.
CShape
;
var
CShape
=
AscFormat
.
CShape
;
var
HitInLine
=
AscFormat
.
HitInLine
;
var
HitInLine
=
AscFormat
.
HitInLine
;
...
@@ -1238,3 +1240,8 @@ CGraphicFrame.prototype =
...
@@ -1238,3 +1240,8 @@ CGraphicFrame.prototype =
this
.
Id
=
r
.
GetString2
();
this
.
Id
=
r
.
GetString2
();
}
}
};
};
//--------------------------------------------------------export----------------------------------------------------
window
[
'
AscFormat
'
]
=
window
[
'
AscFormat
'
]
||
{};
window
[
'
AscFormat
'
].
CGraphicFrame
=
CGraphicFrame
;
})(
window
);
common/Shapes/Serialize.js
View file @
1d16458f
...
@@ -4869,7 +4869,7 @@ function BinaryPPTYLoader()
...
@@ -4869,7 +4869,7 @@ function BinaryPPTYLoader()
case
5
:
case
5
:
{
{
var
_ret
=
null
;
var
_ret
=
null
;
if
(
"
undefined
"
!=
typeof
(
CGraphicFrame
))
if
(
"
undefined
"
!=
typeof
(
AscFormat
.
CGraphicFrame
))
_ret
=
this
.
ReadGrFrame
();
_ret
=
this
.
ReadGrFrame
();
else
else
_ret
=
this
.
ReadChartDataInGroup
(
shape
);
_ret
=
this
.
ReadChartDataInGroup
(
shape
);
...
@@ -5212,7 +5212,7 @@ function BinaryPPTYLoader()
...
@@ -5212,7 +5212,7 @@ function BinaryPPTYLoader()
var
_rec_start
=
s
.
cur
;
var
_rec_start
=
s
.
cur
;
var
_end_rec
=
_rec_start
+
s
.
GetULong
()
+
4
;
var
_end_rec
=
_rec_start
+
s
.
GetULong
()
+
4
;
var
_graphic_frame
=
new
CGraphicFrame
();
var
_graphic_frame
=
new
AscFormat
.
CGraphicFrame
();
_graphic_frame
.
setParent2
(
this
.
TempMainObject
);
_graphic_frame
.
setParent2
(
this
.
TempMainObject
);
this
.
TempGroupObject
=
_graphic_frame
;
this
.
TempGroupObject
=
_graphic_frame
;
...
...
common/Shapes/SerializeWriter.js
View file @
1d16458f
...
@@ -1532,7 +1532,7 @@ function CBinaryFileWriter()
...
@@ -1532,7 +1532,7 @@ function CBinaryFileWriter()
}
}
default
:
default
:
{
{
if
(
spTree
[
i
]
instanceof
CGraphicFrame
&&
spTree
[
i
].
graphicObject
instanceof
CTable
)
if
(
spTree
[
i
]
instanceof
AscFormat
.
CGraphicFrame
&&
spTree
[
i
].
graphicObject
instanceof
CTable
)
{
{
oThis
.
WriteTable
(
spTree
[
i
]);
oThis
.
WriteTable
(
spTree
[
i
]);
}
}
...
@@ -3258,7 +3258,7 @@ function CBinaryFileWriter()
...
@@ -3258,7 +3258,7 @@ function CBinaryFileWriter()
}
}
default
:
default
:
{
{
if
(
spTree
[
i
]
instanceof
CGraphicFrame
&&
spTree
[
i
].
graphicObject
instanceof
CTable
)
if
(
spTree
[
i
]
instanceof
AscFormat
.
CGraphicFrame
&&
spTree
[
i
].
graphicObject
instanceof
CTable
)
{
{
oThis
.
WriteTable
(
spTree
[
i
]);
oThis
.
WriteTable
(
spTree
[
i
]);
}
}
...
...
common/editorscommon.js
View file @
1d16458f
...
@@ -2116,7 +2116,7 @@ CTableId.prototype.Read_Class_FromBinary = function(Reader)
...
@@ -2116,7 +2116,7 @@ CTableId.prototype.Read_Class_FromBinary = function(Reader)
case
AscDFH
.
historyitem_type_SlideComments
:
Element
=
new
SlideComments
();
break
;
case
AscDFH
.
historyitem_type_SlideComments
:
Element
=
new
SlideComments
();
break
;
case
AscDFH
.
historyitem_type_PropLocker
:
Element
=
new
PropLocker
();
break
;
case
AscDFH
.
historyitem_type_PropLocker
:
Element
=
new
PropLocker
();
break
;
case
AscDFH
.
historyitem_type_Theme
:
Element
=
new
AscFormat
.
CTheme
();
break
;
case
AscDFH
.
historyitem_type_Theme
:
Element
=
new
AscFormat
.
CTheme
();
break
;
case
AscDFH
.
historyitem_type_GraphicFrame
:
Element
=
new
CGraphicFrame
();
break
;
case
AscDFH
.
historyitem_type_GraphicFrame
:
Element
=
new
AscFormat
.
CGraphicFrame
();
break
;
}
}
if
(
null
!==
Element
)
if
(
null
!==
Element
)
...
...
common/wordcopypaste.js
View file @
1d16458f
...
@@ -23,6 +23,7 @@ var g_oDocumentUrls = AscCommon.g_oDocumentUrls;
...
@@ -23,6 +23,7 @@ var g_oDocumentUrls = AscCommon.g_oDocumentUrls;
var
g_dKoef_mm_to_pix
=
AscCommon
.
g_dKoef_mm_to_pix
;
var
g_dKoef_mm_to_pix
=
AscCommon
.
g_dKoef_mm_to_pix
;
var
CShape
=
AscFormat
.
CShape
;
var
CShape
=
AscFormat
.
CShape
;
var
CGraphicFrame
=
AscFormat
.
CGraphicFrame
;
var
c_oAscError
=
Asc
.
c_oAscError
;
var
c_oAscError
=
Asc
.
c_oAscError
;
var
c_oAscShdClear
=
Asc
.
c_oAscShdClear
;
var
c_oAscShdClear
=
Asc
.
c_oAscShdClear
;
...
...
slide/Editor/Format/Presentation.js
View file @
1d16458f
...
@@ -1430,7 +1430,7 @@ CPresentation.prototype =
...
@@ -1430,7 +1430,7 @@ CPresentation.prototype =
RowHeight
=
Height
/
Rows
;
RowHeight
=
Height
/
Rows
;
}
}
var
graphic_frame
=
new
CGraphicFrame
();
var
graphic_frame
=
new
AscFormat
.
CGraphicFrame
();
graphic_frame
.
setParent
(
Parent
);
graphic_frame
.
setParent
(
Parent
);
graphic_frame
.
setSpPr
(
new
AscFormat
.
CSpPr
());
graphic_frame
.
setSpPr
(
new
AscFormat
.
CSpPr
());
graphic_frame
.
spPr
.
setParent
(
graphic_frame
);
graphic_frame
.
spPr
.
setParent
(
graphic_frame
);
...
...
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