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
af2734d9
Commit
af2734d9
authored
May 04, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32367
parent
3aab105d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
35 deletions
+43
-35
build/configs/webpowerpoint.json
build/configs/webpowerpoint.json
+2
-0
slide/Editor/Format/ShapePrototype.js
slide/Editor/Format/ShapePrototype.js
+0
-35
slide/Editor/Format/StylesPrototype.js
slide/Editor/Format/StylesPrototype.js
+29
-0
slide/Editor/Format/TextBodyPrototype.js
slide/Editor/Format/TextBodyPrototype.js
+12
-0
No files found.
build/configs/webpowerpoint.json
View file @
af2734d9
...
...
@@ -48,6 +48,7 @@
"../common/Drawings/Format/ChartSpace.js"
,
"../common/Drawings/Format/ChartFormat.js"
,
"../common/Drawings/Format/TextBody.js"
,
"../slide/Editor/Format/TextBodyPrototype.js"
,
"../common/Drawings/Format/GraphicFrame.js"
,
"../common/Charts/charts.js"
,
"../common/Charts/DrawingArea.js"
,
...
...
@@ -88,6 +89,7 @@
"../slide/Drawing/ThemeLoader.js"
,
"../word/Editor/Serialize2.js"
,
"../word/Editor/Styles.js"
,
"../slide/Editor/Format/StylesPrototype.js"
,
"../word/Editor/Numbering.js"
,
"../slide/Editor/CollaborativeEditing.js"
,
"../word/Drawing/GraphicsEvents.js"
,
...
...
slide/Editor/Format/ShapePrototype.js
View file @
af2734d9
...
...
@@ -26,32 +26,6 @@ pHText[0][AscFormat.phType_subTitle] = "Slide subtitle";// "Подзаголов
pHText
[
0
][
AscFormat
.
phType_tbl
]
=
"
Table
"
;
// "Таблица"; //(Table) ;
pHText
[
0
][
AscFormat
.
phType_title
]
=
"
Slide title
"
;
// "Заголовок слайда" ; //(Title) ;
CRFonts
.
prototype
.
Merge
=
function
(
RFonts
)
{
if
(
undefined
!==
RFonts
.
Ascii
)
this
.
Ascii
=
RFonts
.
Ascii
;
if
(
undefined
!=
RFonts
.
EastAsia
)
this
.
EastAsia
=
RFonts
.
EastAsia
;
else
if
(
undefined
!==
RFonts
.
Ascii
)
this
.
EastAsia
=
RFonts
.
Ascii
;
if
(
undefined
!=
RFonts
.
HAnsi
)
this
.
HAnsi
=
RFonts
.
HAnsi
;
else
if
(
undefined
!==
RFonts
.
Ascii
)
this
.
HAnsi
=
RFonts
.
Ascii
;
if
(
undefined
!=
RFonts
.
CS
)
this
.
CS
=
RFonts
.
CS
;
else
if
(
undefined
!==
RFonts
.
Ascii
)
this
.
CS
=
RFonts
.
Ascii
;
if
(
undefined
!=
RFonts
.
Hint
)
this
.
Hint
=
RFonts
.
Hint
;
};
CShape
.
prototype
.
setDrawingObjects
=
function
(
drawingObjects
)
{
};
...
...
@@ -778,15 +752,6 @@ CShape.prototype.Set_CurrentElement = function(bUpdate, pageIndex)
}
};
AscFormat
.
CTextBody
.
prototype
.
Get_Worksheet
=
function
()
{
return
this
.
parent
&&
this
.
parent
.
Get_Worksheet
&&
this
.
parent
.
Get_Worksheet
();
};
AscFormat
.
CTextBody
.
prototype
.
getDrawingDocument
=
function
()
{
return
this
.
parent
&&
this
.
parent
.
getDrawingDocument
&&
this
.
parent
.
getDrawingDocument
();
};
//--------------------------------------------------------export----------------------------------------------------
window
[
'
AscFormat
'
]
=
window
[
'
AscFormat
'
]
||
{};
window
[
'
AscFormat
'
].
G_O_DEFAULT_COLOR_MAP
=
G_O_DEFAULT_COLOR_MAP
;
...
...
slide/Editor/Format/StylesPrototype.js
0 → 100644
View file @
af2734d9
"
use strict
"
;
(
function
(
window
,
undefined
){
CRFonts
.
prototype
.
Merge
=
function
(
RFonts
)
{
if
(
undefined
!==
RFonts
.
Ascii
)
this
.
Ascii
=
RFonts
.
Ascii
;
if
(
undefined
!=
RFonts
.
EastAsia
)
this
.
EastAsia
=
RFonts
.
EastAsia
;
else
if
(
undefined
!==
RFonts
.
Ascii
)
this
.
EastAsia
=
RFonts
.
Ascii
;
if
(
undefined
!=
RFonts
.
HAnsi
)
this
.
HAnsi
=
RFonts
.
HAnsi
;
else
if
(
undefined
!==
RFonts
.
Ascii
)
this
.
HAnsi
=
RFonts
.
Ascii
;
if
(
undefined
!=
RFonts
.
CS
)
this
.
CS
=
RFonts
.
CS
;
else
if
(
undefined
!==
RFonts
.
Ascii
)
this
.
CS
=
RFonts
.
Ascii
;
if
(
undefined
!=
RFonts
.
Hint
)
this
.
Hint
=
RFonts
.
Hint
;
};
})(
window
);
slide/Editor/Format/TextBodyPrototype.js
0 → 100644
View file @
af2734d9
"
use strict
"
;
(
function
(
window
,
undefined
){
AscFormat
.
CTextBody
.
prototype
.
Get_Worksheet
=
function
()
{
return
this
.
parent
&&
this
.
parent
.
Get_Worksheet
&&
this
.
parent
.
Get_Worksheet
();
};
AscFormat
.
CTextBody
.
prototype
.
getDrawingDocument
=
function
()
{
return
this
.
parent
&&
this
.
parent
.
getDrawingDocument
&&
this
.
parent
.
getDrawingDocument
();
};
})(
window
);
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