Skip to content

S
sdkjs
Commit 923d83a6 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov
Browse files
Options

сохранение автофигур в Spreadsheet 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50406 954022d7-b5bf-4e40-9824-e11837661b57
parent c746abb7
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 80 deletions
Common/Shapes/SerializeWriter.js
View file @ 923d83a6
......@@ -2053,8 +2053,13 @@ function CBinaryFileWriter()
oThis.WriteUChar(g_nodeAttributeStart);
oThis.WriteUChar(g_nodeAttributeEnd);
var sFindString = editor.DocumentUrl + "media/";
var api_sheet = window["Asc"]["editor"];
var sFindString;
if(api_sheet)
sFindString = api_sheet.wbModel.sUrlPath + "media/";
else
sFindString = editor.DocumentUrl + "media/";
var _src = fill.RasterImageId;
if(0 == _src.indexOf(sFindString))
_src = _src.substring(sFindString.length);
......
Excel/model/Serialize.js
View file @ 923d83a6
......@@ -2128,13 +2128,12 @@ function BinaryWorkbookTableWriter(memory, wb)
this.bs.WriteItem(c_oSerDefinedNameTypes.LocalSheetId, function(){oThis.memory.WriteLong(LocalSheetId);});
};
};
function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, oDrawings, aDxfs, aXfs, aFonts, aFills, aBorders, aNums, idWorksheet)
function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aFonts, aFills, aBorders, aNums, idWorksheet)
{
this.memory = memory;
this.bs = new BinaryCommonWriter(this.memory);
this.wb = wb;
this.oSharedStrings = oSharedStrings;
this.oDrawings = oDrawings;
this.aDxfs = aDxfs;
this.aXfs = aXfs;
this.aFonts = aFonts;
......@@ -2657,18 +2656,8 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, oDrawings, aDxf
var oBinaryChartWriter = new BinaryChartWriter(this.memory);
this.bs.WriteItem(c_oSer_DrawingType.GraphicFrame, function(){oBinaryChartWriter.Write(oDrawing.graphicObject);});
}
else if (oDrawing.isImage())
{
var imageUrl = oDrawing.graphicObject.getImageUrl();
if ( (null != imageUrl) && ("" != imageUrl)) {
if (window['scriptBridge']) {
this.bs.WriteItem(c_oSer_DrawingType.Pic, function(){oThis.WritePic(imageUrl.replace(/^.*(\\|\/|\:)/, ''));});
} else {
this.bs.WriteItem(c_oSer_DrawingType.Pic, function(){oThis.WritePic(imageUrl);});
}
}
}
else
this.bs.WriteItem(c_oSer_DrawingType.pptxDrawing, function(){window.global_pptx_content_writer.WriteDrawing(oThis.memory, oDrawing.graphicObject, null, null, null);});
};
this.WriteFromTo = function(oFromTo)
{
......@@ -2712,25 +2701,6 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, oDrawings, aDxf
this.memory.WriteDouble2(oPos.Y);
}
};
this.WritePic = function(oPic)
{
var oThis = this;
if(null != oPic && "" != oPic)
{
var sSrc = oPic;
var sLocalUrl = this.wb.sUrlPath + "media/";
if(0 == sSrc.indexOf(sLocalUrl))
sSrc = sSrc.substring(sLocalUrl.length);
var nIndex = this.oDrawings.items[sSrc];
if(null == nIndex)
{
nIndex = this.oDrawings.length;
this.oDrawings.items[sSrc] = nIndex;
this.oDrawings.length++;
}
this.bs.WriteItem(c_oSer_DrawingType.PicSrc, function(){oThis.memory.WriteLong(nIndex);});
}
};
this.WriteSheetData = function(ws)
{
var oThis = this;
......@@ -3309,12 +3279,11 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, oDrawings, aDxf
}
};
/** @constructor */
function BinaryOtherTableWriter(memory, wb, oDrawings)
function BinaryOtherTableWriter(memory, wb)
{
this.memory = memory;
this.wb = wb;
this.bs = new BinaryCommonWriter(this.memory);
this.oDrawings = oDrawings;
this.Write = function()
{
var oThis = this;
......@@ -3323,38 +3292,8 @@ function BinaryOtherTableWriter(memory, wb, oDrawings)
this.WriteOtherContent = function()
{
var oThis = this;
//borders
this.bs.WriteItem(c_oSer_OtherType.Media, function(){oThis.WriteMedia();});
this.bs.WriteItem(c_oSer_OtherType.Theme, function(){window.global_pptx_content_writer.WriteTheme(oThis.memory, oThis.wb.theme);});
};
this.WriteMedia = function()
{
var oThis = this;
var aDrawings = new Array(this.oDrawings.length);
for(var src in this.oDrawings.items)
{
var nIndex = this.oDrawings.items[src];
aDrawings[nIndex] = src;
}
for(var i = 0, length = aDrawings.length; i < length; ++i)
{
var src = aDrawings[i];
this.bs.WriteItem(c_oSer_OtherType.MediaItem, function(){oThis.WriteMediaItem(src, i);});
}
};
this.WriteMediaItem = function(src, index)
{
var oThis = this;
if(null != src)
{
this.memory.WriteByte(c_oSer_OtherType.MediaSrc);
this.memory.WriteString2(src);
}
if(null != index)
this.bs.WriteItem(c_oSer_OtherType.MediaId, function(){oThis.memory.WriteLong(index);});
};
};
/** @constructor */
function BinaryFileWriter(wb)
......@@ -3367,7 +3306,9 @@ function BinaryFileWriter(wb)
this.Write = function(idWorksheet)
{
//если idWorksheet не null, то надо серализовать только его.
window.global_pptx_content_writer._Start();
this.WriteMainTable(idWorksheet);
window.global_pptx_content_writer._End();
return this.WriteFileHeader(this.Memory.GetCurPosition()) + this.Memory.GetBase64Memory();
}
this.WriteFileHeader = function(nDataSize)
......@@ -3385,7 +3326,6 @@ function BinaryFileWriter(wb)
//Write mtLen
this.Memory.WriteByte(0);
var oSharedStrings = {index: 0, strings: new Object()};
var oDrawings = {length: 0, items: new Object()};
//Write SharedStrings
var nSharedStringsPos = this.ReserveTable(c_oSerTableTypes.SharedStrings);
//Write Styles
......@@ -3399,10 +3339,10 @@ function BinaryFileWriter(wb)
var aBorders = new Array();
var aNums = new Array();
var aDxfs = new Array();
var oBinaryWorksheetsTableWriter = new BinaryWorksheetsTableWriter(this.Memory, this.wb, oSharedStrings, oDrawings, aDxfs, aXfs, aFonts, aFills, aBorders, aNums, idWorksheet);
var oBinaryWorksheetsTableWriter = new BinaryWorksheetsTableWriter(this.Memory, this.wb, oSharedStrings, aDxfs, aXfs, aFonts, aFills, aBorders, aNums, idWorksheet);
this.WriteTable(c_oSerTableTypes.Worksheets, oBinaryWorksheetsTableWriter);
//OtherTable
this.WriteTable(c_oSerTableTypes.Other, new BinaryOtherTableWriter(this.Memory, this.wb, oDrawings));
this.WriteTable(c_oSerTableTypes.Other, new BinaryOtherTableWriter(this.Memory, this.wb));
//Write SharedStrings
this.WriteReserved(new BinarySharedStringsTableWriter(this.Memory, oSharedStrings), nSharedStringsPos);
//Write Styles
......
Word/Editor/SerializeCommon.js
View file @ 923d83a6
......@@ -717,15 +717,15 @@ function CPPTXContentWriter()
this.BinaryFileWriter.StartRecord(0);
this.BinaryFileWriter.StartRecord(1);
if (grObject instanceof WordShape)
if ((undefined !== window.WordShape && grObject instanceof WordShape) || (undefined !== window.CShape && grObject instanceof CShape))
{
this.WriteShape(grObject, Document, oMapCommentId, oNumIdMap);
}
else if (grObject instanceof WordImage)
else if ((undefined !== window.WordImage && grObject instanceof WordImage) || (undefined !== window.CImageShape && grObject instanceof CImageShape))
{
this.WriteImage(grObject);
}
else if (grObject instanceof WordGroupShapes)
else if ((undefined !== window.WordGroupShapes && grObject instanceof WordGroupShapes) || (undefined !== window.CGroupShape && grObject instanceof CGroupShape))
{
this.WriteGroup(grObject, Document, oMapCommentId, oNumIdMap);
}
......@@ -909,18 +909,19 @@ function CPPTXContentWriter()
for (var i = 0; i < _len; i++)
{
_writer.StartRecord(0);
if (spTree[i] instanceof WordShape)
var elem = spTree[i];
if ((undefined !== window.WordShape && elem instanceof WordShape) || (undefined !== window.CShape && elem instanceof CShape))
{
this.WriteShape(spTree[i], Document, oMapCommentId, oNumIdMap);
this.WriteShape(elem, Document, oMapCommentId, oNumIdMap);
}
else if(spTree[i] instanceof WordImage)
else if ((undefined !== window.WordImage && elem instanceof WordImage) || (undefined !== window.CImageShape && elem instanceof CImageShape))
{
this.WriteImage(spTree[i]);
this.WriteImage(elem);
}
else if (spTree[i] instanceof WordGroupShapes)
else if ((undefined !== window.WordGroupShapes && elem instanceof WordGroupShapes) || (undefined !== window.CGroupShape && elem instanceof CGroupShape))
{
this.WriteGroup(spTree[i], Document, oMapCommentId, oNumIdMap);
this.WriteGroup(elem, Document, oMapCommentId, oNumIdMap);
}
_writer.EndRecord(0);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7