Commit 02d9dd54 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

отрицательные CT_RotX

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63374 954022d7-b5bf-4e40-9824-e11837661b57
parent 2174cce4
...@@ -4927,7 +4927,7 @@ BinaryChartWriter.prototype.WriteCT_RotX = function (oVal) { ...@@ -4927,7 +4927,7 @@ BinaryChartWriter.prototype.WriteCT_RotX = function (oVal) {
var oThis = this; var oThis = this;
if (null != oVal) { if (null != oVal) {
this.bs.WriteItem(c_oserct_rotxVAL, function () { this.bs.WriteItem(c_oserct_rotxVAL, function () {
oThis.memory.WriteByte(oVal); oThis.memory.WriteSByte(oVal);
}); });
} }
} }
...@@ -10569,7 +10569,7 @@ BinaryChartReader.prototype.ReadCT_RotX = function (type, length, val) { ...@@ -10569,7 +10569,7 @@ BinaryChartReader.prototype.ReadCT_RotX = function (type, length, val) {
var oThis = this; var oThis = this;
if (c_oserct_rotxVAL === type) { if (c_oserct_rotxVAL === type) {
var oNewVal; var oNewVal;
oNewVal = this.stream.GetUChar(); oNewVal = this.stream.GetChar();
val.m_val = oNewVal; val.m_val = oNewVal;
} }
else else
......
...@@ -548,6 +548,14 @@ FT_Stream2.prototype.GetUChar = function() { ...@@ -548,6 +548,14 @@ FT_Stream2.prototype.GetUChar = function() {
return 0; return 0;
return this.data[this.cur++]; return this.data[this.cur++];
}; };
FT_Stream2.prototype.GetChar = function() {
if (this.cur >= this.size)
return 0;
var m = this.data[this.cur++];
if (m > 127)
m -= 256;
return m;
};
FT_Stream2.prototype.GetByte = function() { FT_Stream2.prototype.GetByte = function() {
return this.GetUChar(); return this.GetUChar();
}; };
......
...@@ -1097,7 +1097,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1097,7 +1097,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll; oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
oAdditionalData["data"] = oBinaryFileWriter.Write(); oAdditionalData["data"] = oBinaryFileWriter.Write();
var t = this; var t = this;
g_fSaveWithParts(function(fCallback1, oAdditionalData1){sendCommand2(fCallback1, this.fCallbackSendCommand, oAdditionalData1);}, g_fSaveWithParts(function(fCallback1, oAdditionalData1){sendCommand2(fCallback1, t.fCallbackSendCommand, oAdditionalData1);},
function (incomeObject) { function (incomeObject) {
if(null != incomeObject && "save" == incomeObject["type"]) if(null != incomeObject && "save" == incomeObject["type"])
t.asc_processSavedFile(incomeObject["data"], false); t.asc_processSavedFile(incomeObject["data"], false);
...@@ -1124,7 +1124,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1124,7 +1124,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
oAdditionalData["innersave"] = true; oAdditionalData["innersave"] = true;
oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll; oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
oAdditionalData["data"] = data; oAdditionalData["data"] = data;
g_fSaveWithParts(function(fCallback1, oAdditionalData1){sendCommand2(fCallback1, this.fCallbackSendCommand, oAdditionalData1);}, /*callback*/ function(incomeObject){ g_fSaveWithParts(function(fCallback1, oAdditionalData1){sendCommand2(fCallback1, that.fCallbackSendCommand, oAdditionalData1);}, /*callback*/ function(incomeObject){
if(null != incomeObject && "save" == incomeObject["type"]) if(null != incomeObject && "save" == incomeObject["type"])
that.asc_processSavedFile(incomeObject["data"], true); that.asc_processSavedFile(incomeObject["data"], true);
}, oAdditionalData); }, oAdditionalData);
...@@ -1174,7 +1174,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1174,7 +1174,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} }
} }
var t = this; var t = this;
g_fSaveWithParts(function(fCallback1, oAdditionalData1){sendCommand2(fCallback1, this.fCallbackSendCommand, oAdditionalData1);}, fCallback, oAdditionalData); g_fSaveWithParts(function(fCallback1, oAdditionalData1){sendCommand2(fCallback1, t.fCallbackSendCommand, oAdditionalData1);}, fCallback, oAdditionalData);
}; };
......
...@@ -548,6 +548,13 @@ function CMemory(bIsNoInit) ...@@ -548,6 +548,13 @@ function CMemory(bIsNoInit)
this.CheckSize(1); this.CheckSize(1);
this.data[this.pos++] = val; this.data[this.pos++] = val;
} }
this.WriteSByte = function(val)
{
this.CheckSize(1);
if (val < 0)
val += 256;
this.data[this.pos++] = val;
}
this.WriteLong = function(val) this.WriteLong = function(val)
{ {
this.CheckSize(4); this.CheckSize(4);
......
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