Commit a13d6929 authored by Oleg Korshul's avatar Oleg Korshul

refactoring

parent 63e82016
...@@ -4292,7 +4292,7 @@ function CDrawingDocument(drawingObjects) ...@@ -4292,7 +4292,7 @@ function CDrawingDocument(drawingObjects)
table.Recalculate_Page(0); table.Recalculate_Page(0);
table.Draw(0, graphics); table.Draw(0, graphics);
var _styleD = new CAscTableStyle(); var _styleD = new Asc.CAscTableStyle();
_styleD.Type = 0; _styleD.Type = 0;
_styleD.Image = _canvas.toDataURL("image/png"); _styleD.Image = _canvas.toDataURL("image/png");
_styleD.Id = i; _styleD.Id = i;
......
...@@ -3592,7 +3592,7 @@ function CDrawingDocument(drawingObjects) ...@@ -3592,7 +3592,7 @@ function CDrawingDocument(drawingObjects)
table.Recalculate_Page(0); table.Recalculate_Page(0);
table.Draw(0, graphics); table.Draw(0, graphics);
var _styleD = new CAscTableStyle(); var _styleD = new Asc.CAscTableStyle();
_styleD.Type = 0; _styleD.Type = 0;
_styleD.Image = _canvas.toDataURL("image/png"); _styleD.Image = _canvas.toDataURL("image/png");
_styleD.Id = i; _styleD.Id = i;
......
...@@ -2986,7 +2986,7 @@ function CDrawingDocument() ...@@ -2986,7 +2986,7 @@ function CDrawingDocument()
graphics.transform(1, 0, 0, 1, 0, 0); graphics.transform(1, 0, 0, 1, 0, 0);
logicDoc.TablesForInterface[i].graphicObject.Draw(0, graphics); logicDoc.TablesForInterface[i].graphicObject.Draw(0, graphics);
var _styleD = new CAscTableStyle(); var _styleD = new Asc.CAscTableStyle();
_styleD.Type = 0; _styleD.Type = 0;
_styleD.Image = _canvas.toDataURL("image/png"); _styleD.Image = _canvas.toDataURL("image/png");
_styleD.Id = logicDoc.TablesForInterface[i].graphicObject.TableStyle; _styleD.Id = logicDoc.TablesForInterface[i].graphicObject.TableStyle;
......
...@@ -1350,6 +1350,7 @@ background-repeat: no-repeat;\ ...@@ -1350,6 +1350,7 @@ background-repeat: no-repeat;\
this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Open); this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Open);
//this.FontLoader.LoadEmbeddedFonts(this.DocumentUrl, this.WordControl.m_oLogicDocument.EmbeddedFonts); //this.FontLoader.LoadEmbeddedFonts(this.DocumentUrl, this.WordControl.m_oLogicDocument.EmbeddedFonts);
this.WordControl.m_oDrawingDocument.CheckFontNeeds();
this.FontLoader.LoadDocumentFonts(this.WordControl.m_oLogicDocument.Fonts, false); this.FontLoader.LoadDocumentFonts(this.WordControl.m_oLogicDocument.Fonts, false);
this.ParcedDocument = true; this.ParcedDocument = true;
......
...@@ -5948,7 +5948,7 @@ function CDrawingDocument() ...@@ -5948,7 +5948,7 @@ function CDrawingDocument()
editor.isShowTableEmptyLineAttack = false; editor.isShowTableEmptyLineAttack = false;
editor.isViewMode = _old_mode; editor.isViewMode = _old_mode;
var _styleD = new CAscTableStyle(); var _styleD = new Asc.CAscTableStyle();
_styleD.Type = 0; _styleD.Type = 0;
_styleD.Image = _canvas.toDataURL("image/png"); _styleD.Image = _canvas.toDataURL("image/png");
_styleD.Id = i; _styleD.Id = i;
......
...@@ -657,7 +657,7 @@ ...@@ -657,7 +657,7 @@
oUnkTypeObj = new asc_CImgProperty(obj); oUnkTypeObj = new asc_CImgProperty(obj);
break; break;
case c_oAscTypeSelectElement.Table: case c_oAscTypeSelectElement.Table:
oUnkTypeObj = new CTableProp(obj); oUnkTypeObj = new Asc.CTableProp(obj);
break; break;
case c_oAscTypeSelectElement.Header: case c_oAscTypeSelectElement.Header:
oUnkTypeObj = new CHeaderProp(obj); oUnkTypeObj = new CHeaderProp(obj);
...@@ -3888,7 +3888,7 @@ background-repeat: no-repeat;\ ...@@ -3888,7 +3888,7 @@ background-repeat: no-repeat;\
var RGBA = tblProp.CellsBackground.Unifill.getRGBAColor(); var RGBA = tblProp.CellsBackground.Unifill.getRGBAColor();
tblProp.CellsBackground.Color = new AscCommonWord.CDocumentColor(RGBA.R, RGBA.G, RGBA.B, false); tblProp.CellsBackground.Color = new AscCommonWord.CDocumentColor(RGBA.R, RGBA.G, RGBA.B, false);
} }
this.SelectedObjectsStack[this.SelectedObjectsStack.length] = new asc_CSelectedObject(c_oAscTypeSelectElement.Table, new CTableProp(tblProp)); this.SelectedObjectsStack[this.SelectedObjectsStack.length] = new asc_CSelectedObject(c_oAscTypeSelectElement.Table, new Asc.CTableProp(tblProp));
}; };
asc_docs_api.prototype.sync_TblWrapStyleChangedCallback = function(style) asc_docs_api.prototype.sync_TblWrapStyleChangedCallback = function(style)
{ {
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
{ {
return this.Type; return this.Type;
}; };
window['Asc']['CAscTableStyle'] = window['Asc'].CAscTableStyle = CAscTableStyle;
CAscTableStyle.prototype['get_Id'] = CAscTableStyle.prototype.get_Id; CAscTableStyle.prototype['get_Id'] = CAscTableStyle.prototype.get_Id;
CAscTableStyle.prototype['get_Image'] = CAscTableStyle.prototype.get_Image; CAscTableStyle.prototype['get_Image'] = CAscTableStyle.prototype.get_Image;
CAscTableStyle.prototype['get_Type'] = CAscTableStyle.prototype.get_Type; CAscTableStyle.prototype['get_Type'] = CAscTableStyle.prototype.get_Type;
......
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