Skip to content

S
sdkjs
Commit 3252d5a6 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov
Browse files
Options 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51775 954022d7-b5bf-4e40-9824-e11837661b57
parent 726234d1
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 121 deletions
Common/Shapes/SerializeWriter.js
View file @ 3252d5a6
......@@ -76,6 +76,7 @@ function CBinaryFileWriter()
this.IsUseFullUrl = false;
this.DocumentOrigin = "";
this.PresentationThemesOrigin = "";
var oThis = this;
......@@ -85,6 +86,11 @@ function CBinaryFileWriter()
this.DocumentOrigin = origin;
};
this.Start_UseDocumentOrigin = function(origin)
{
this.PresentationThemesOrigin = origin + "/presentationthemes/";
}
this.End_UseFullUrl = function()
{
this.IsUseFullUrl = false;
......@@ -2076,8 +2082,10 @@ function CBinaryFileWriter()
if (oThis.IsUseFullUrl)
{
if ((0 == _src.indexOf("theme")) && window.editor)
_src = window.editor.ThemeLoader.ThemesUrl + _src;
if (0 != _src.indexOf("http:") && 0 != _src.indexOf("data:") && 0 != _src.indexOf("https:") && 0 != _src.indexOf("ftp:") && 0 != _src.indexOf("file:"))
{
_src = oThis.PresentationThemesOrigin + _src;
}
else if (0 != _src.indexOf("http:") && 0 != _src.indexOf("data:") && 0 != _src.indexOf("https:") && 0 != _src.indexOf("ftp:") && 0 != _src.indexOf("file:"))
_src = oThis.DocumentOrigin + "media/" + _src;
}
......
Common/wordcopypaste.js
View file @ 3252d5a6
......@@ -354,6 +354,7 @@ function CopyProcessor(api, ElemToSelect)
this.oCurHyperlinkElem = null;
this.oPresentationWriter = new CBinaryFileWriter();
this.oPresentationWriter.Start_UseFullUrl(documentOrigin + editor.DocumentUrl);
this.oPresentationWriter.Start_UseDocumentOrigin(documentOrigin);
};
CopyProcessor.prototype =
{
......
Word/Editor/Serialize2.js
View file @ 3252d5a6
......@@ -439,26 +439,26 @@ var c_oSer_StyleType = {
};
var c_oSer_SettingsType = {
ClrSchemeMapping: 0,
DefaultTabStop: 1,
DefaultTabStop: 1,
MathPr: 2
};
var c_oSer_MathPrType = {
BrkBin: 0,
BrkBinSub: 1,
DefJc: 2,
DispDef: 3,
InterSp: 4,
IntLim: 5,
IntraSp: 6,
LMargin: 7,
MathFont: 8,
NaryLim: 9,
PostSp: 10,
PreSp: 11,
RMargin: 12,
SmallFrac: 13,
WrapIndent: 14,
WrapRight: 15
};
var c_oSer_MathPrType = {
BrkBin: 0,
BrkBinSub: 1,
DefJc: 2,
DispDef: 3,
InterSp: 4,
IntLim: 5,
IntraSp: 6,
LMargin: 7,
MathFont: 8,
NaryLim: 9,
PostSp: 10,
PreSp: 11,
RMargin: 12,
SmallFrac: 13,
WrapIndent: 14,
WrapRight: 15
};
var c_oSer_ClrSchemeMappingType = {
Accent1: 0,
......@@ -491,53 +491,53 @@ var c_oSer_FramePrType = {
YAlign: 13
};
var c_oSer_OMathBottomNodesType = {
Aln: 0,
AlnScr: 1,
ArgSz: 2,
BaseJc: 3,
BegChr: 4,
CGp: 5,
CGpRule: 6,
Chr: 7,
Count: 8,
CSp: 9,
DegHide: 10,
Diff: 11,
EndChr: 12,
Grow: 13,
HideBot: 14,
HideLeft: 15,
HideRight: 16,
HideTop: 17,
MJc: 18,
LimLoc: 19,
Lit: 20,
MaxDist: 21,
McJc: 22,
NoBreak: 23,
Nor: 24,
ObjDist: 25,
OpEmu: 26,
PlcHide: 27,
Pos: 28,
RSp: 29,
RSpRule: 30,
Scr: 31,
SepChr: 32,
Show: 33,
Shp: 34,
StrikeBLTR: 35,
StrikeH: 36,
StrikeTLBR: 37,
StrikeV: 38,
Sty: 39,
SubHide: 40,
SupHide: 41,
Transp: 42,
Type: 43,
VertJc: 44,
ZeroAsc: 45,
ZeroDesc: 46,
Aln: 0,
AlnScr: 1,
ArgSz: 2,
BaseJc: 3,
BegChr: 4,
CGp: 5,
CGpRule: 6,
Chr: 7,
Count: 8,
CSp: 9,
DegHide: 10,
Diff: 11,
EndChr: 12,
Grow: 13,
HideBot: 14,
HideLeft: 15,
HideRight: 16,
HideTop: 17,
MJc: 18,
LimLoc: 19,
Lit: 20,
MaxDist: 21,
McJc: 22,
NoBreak: 23,
Nor: 24,
ObjDist: 25,
OpEmu: 26,
PlcHide: 27,
Pos: 28,
RSp: 29,
RSpRule: 30,
Scr: 31,
SepChr: 32,
Show: 33,
Shp: 34,
StrikeBLTR: 35,
StrikeH: 36,
StrikeTLBR: 37,
StrikeV: 38,
Sty: 39,
SubHide: 40,
SupHide: 41,
Transp: 42,
Type: 43,
VertJc: 44,
ZeroAsc: 45,
ZeroDesc: 46,
ZeroWid: 47
};
var c_oSer_OMathBottomNodesValType = {
......@@ -545,58 +545,58 @@ var c_oSer_OMathBottomNodesValType = {
AlnAt: 1
};
var c_oSer_OMathContentType = {
Acc: 0,
AccPr: 1,
ArgPr: 2,
Bar: 3,
BarPr: 4,
BorderBox: 5,
BorderBoxPr: 6,
Box: 7,
BoxPr: 8,
Brk: 9,
CtrlPr: 10,
Delimiter: 11,
DelimiterPr: 12,
EqArr: 13,
EqArrPr: 14,
Fraction: 15,
FPr: 16,
Func: 17,
FuncPr: 18,
GroupChr: 19,
GroupChrPr: 20,
LimLow: 21,
LimLowPr: 22,
LimUpp: 23,
LimUppPr: 24,
Matrix: 25,
MathPr: 26,
Mc: 27,
McPr: 28,
Mcs: 29,
MPr: 30,
Mr: 31,
Nary: 32,
NaryPr: 33,
OMathPara: 34,
OMathParaPr: 35,
Phant: 36,
PhantPr: 37,
MRun: 38,
Rad: 39,
RadPr: 40,
MRPr: 41,
SPre: 42,
SPrePr: 43,
SSub: 44,
SSubPr: 45,
SSubSup: 46,
SSubSupPr: 47,
SSup: 48,
SSupPr: 49,
MText: 50,
Column: 51,
Acc: 0,
AccPr: 1,
ArgPr: 2,
Bar: 3,
BarPr: 4,
BorderBox: 5,
BorderBoxPr: 6,
Box: 7,
BoxPr: 8,
Brk: 9,
CtrlPr: 10,
Delimiter: 11,
DelimiterPr: 12,
EqArr: 13,
EqArrPr: 14,
Fraction: 15,
FPr: 16,
Func: 17,
FuncPr: 18,
GroupChr: 19,
GroupChrPr: 20,
LimLow: 21,
LimLowPr: 22,
LimUpp: 23,
LimUppPr: 24,
Matrix: 25,
MathPr: 26,
Mc: 27,
McPr: 28,
Mcs: 29,
MPr: 30,
Mr: 31,
Nary: 32,
NaryPr: 33,
OMathPara: 34,
OMathParaPr: 35,
Phant: 36,
PhantPr: 37,
MRun: 38,
Rad: 39,
RadPr: 40,
MRPr: 41,
SPre: 42,
SPrePr: 43,
SSub: 44,
SSubPr: 45,
SSubSup: 46,
SSubSupPr: 47,
SSup: 48,
SSupPr: 49,
MText: 50,
Column: 51,
Row: 52
};
var c_oSer_OMathArgNodesType = {
......@@ -742,7 +742,8 @@ function BinaryFileWriter(doc)
{
var api = this.Document.DrawingDocument.m_oWordControl.m_oApi;
window.global_pptx_content_writer.Start_UseFullUrl(documentOrigin + api.DocumentUrl);
window.global_pptx_content_writer._Start();
window.global_pptx_content_writer.Start_UseDocumentOrigin(documentOrigin);
window.global_pptx_content_writer._Start();
this.copyParams.bLockCopyElems = 0;
this.copyParams.itemCount = 0;
this.copyParams.oUsedNumIdMap = new Object();
......
Word/Editor/SerializeCommon.js
View file @ 3252d5a6
......@@ -710,6 +710,10 @@ function CPPTXContentWriter()
{
this.BinaryFileWriter.Start_UseFullUrl(origin);
}
this.Start_UseDocumentOrigin = function(origin)
{
this.BinaryFileWriter.Start_UseDocumentOrigin(origin);
}
this.End_UseFullUrl = function()
{
return this.BinaryFileWriter.End_UseFullUrl();
......
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