Commit af2734d9 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 32367

parent 3aab105d
......@@ -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",
......
......@@ -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;
......
"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);
"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);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment