Commit 00731b1b authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

textures in diagramms

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60090 954022d7-b5bf-4e40-9824-e11837661b57
parent cb195ce4
...@@ -5042,6 +5042,8 @@ function BinaryPPTYLoader() ...@@ -5042,6 +5042,8 @@ function BinaryPPTYLoader()
_stream.size = s.size; _stream.size = s.size;
_chart = new CChartSpace(); _chart = new CChartSpace();
_chart.setBDeleted(false); _chart.setBDeleted(false);
window.global_pptx_content_loader.ImageMapChecker = this.ImageMapChecker;
window.global_pptx_content_loader.Reader.ImageMapChecker = this.ImageMapChecker;
var oBinaryChartReader = new BinaryChartReader(_stream); var oBinaryChartReader = new BinaryChartReader(_stream);
oBinaryChartReader.ExternalReadCT_ChartSpace(_length, _chart, this.presentation); oBinaryChartReader.ExternalReadCT_ChartSpace(_length, _chart, this.presentation);
} }
......
...@@ -986,12 +986,13 @@ asc_docs_api.prototype.OpenDocument2 = function(url, gObject) ...@@ -986,12 +986,13 @@ asc_docs_api.prototype.OpenDocument2 = function(url, gObject)
this.InitEditor(); this.InitEditor();
this.DocumentUrl = url; this.DocumentUrl = url;
this.DocumentType = 2; this.DocumentType = 2;
var _loader = window.global_pptx_content_loader;
var _loader = new BinaryPPTYLoader();
_loader.Api = this; _loader.Api = this;
g_oIdCounter.Set_Load(true); g_oIdCounter.Set_Load(true);
_loader.Reader.Load(gObject, this.WordControl.m_oLogicDocument); _loader.Load(gObject, this.WordControl.m_oLogicDocument);
_loader.Reader.Check_TextFit(); _loader.Check_TextFit();
this.LoadedObject = 1; this.LoadedObject = 1;
g_oIdCounter.Set_Load(false); g_oIdCounter.Set_Load(false);
...@@ -5186,18 +5187,18 @@ window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, ve ...@@ -5186,18 +5187,18 @@ window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, ve
g_oIdCounter.Set_Load(true); g_oIdCounter.Set_Load(true);
var _loader = window.global_pptx_content_loader; var _loader = new BinaryPPTYLoader();
_loader.Api = this; _loader.Api = this;
if (version === undefined) if (version === undefined)
{ {
_loader.Reader.Load(base64File, this.WordControl.m_oLogicDocument); _loader.Load(base64File, this.WordControl.m_oLogicDocument);
_loader.Reader.Check_TextFit(); _loader.Check_TextFit();
} }
else else
{ {
_loader.Reader.Load2(base64File, this.WordControl.m_oLogicDocument); _loader.Load2(base64File, this.WordControl.m_oLogicDocument);
_loader.Reader.Check_TextFit(); _loader.Check_TextFit();
} }
this.LoadedObject = 1; this.LoadedObject = 1;
......
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