pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48977 954022d7-b5bf-4e40-9824-e11837661b57

Browse Source
This commit is contained in:
Igor.Zotov
2013-08-20 14:53:01 +00:00
committed by Alexander.Trofimov
parent 1519d0b8ea
commit da1eb14314
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Common/wordcopypaste.js
View File

@ -2454,6 +2454,7 @@ PasteProcessor.prototype =
var addStyles = [];
var api = this.api;
var oStyleTypes = {par: 1, table: 2, lvl: 3};
var addNewStyles = false;
var fParseStyle = function(aStyles, oDocumentStyles, oReadResult, nStyleType)
{
if(aStyles == undefined)
@ -2484,26 +2485,29 @@ PasteProcessor.prototype =
}
if(!isAlreadyContainsStyle && isEqualName != null)//если нашли имя такого же стиля
{
if(nStyleType == 1 || nStyleType == 3)
if(nStyleType == oStyleTypes.par || nStyleType == oStyleTypes.lvl)
elem.pPr.PStyle = isEqualName;
else if (nStyleType == 2)
else if (nStyleType == oStyleTypes.table)
elem.pPr.TableStyle = isEqualName;
addStyles[addStyles.length] = isEqualName;
}
else if(!isAlreadyContainsStyle && isEqualName == null)//нужно добавить новый стиль
{
oDocumentStyles[stylePaste.style.Name] = stylePaste.style;
if(nStyleType == 1 || nStyleType == 3)
if(nStyleType == oStyleTypes.par || nStyleType == oStyleTypes.lvl)
elem.pPr.PStyle = stylePaste.style.Name;
else if (nStyleType == 2)
else if (nStyleType == oStyleTypes.table)
elem.pPr.TableStyle = stylePaste.style.Name;
addStyles[addStyles.length] = stylePaste.style.Name;
//добавляем картинки стилей в меню
api.GenerateStyles();
addNewStyles = true;
}
}
}
//добавляем картинки стилей в меню
if(addNewStyles)
api.GenerateStyles();
}
fParseStyle(oBinaryFileReader.oReadResult.paraStyles, this.oDocument.Styles.Style, oBinaryFileReader.oReadResult, oStyleTypes.par);
fParseStyle(oBinaryFileReader.oReadResult.tableStyles, this.oDocument.Styles.Style, oBinaryFileReader.oReadResult, oStyleTypes.table);
fParseStyle(oBinaryFileReader.oReadResult.lvlStyles, this.oDocument.Styles.Style, oBinaryFileReader.oReadResult, oStyleTypes.lvl);
@ -2514,7 +2518,7 @@ PasteProcessor.prototype =
{
for(var i in aContent)
{
if(!aContent[i].TableGrid)
if(aContent[i].GetType() != oStyleTypes.table)
{
styleName = aContent[i].Style_Get();
for(var k = 0; k < addStyles.length; k++)