Commit bfb48074 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 30250 - Ошибка в консоли при смене направления Data Series и снятия выделения с диаграммы;

Правка бага с нулевыми размерами при открытии вторым пользователем с накатыванием изменений

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64539 954022d7-b5bf-4e40-9824-e11837661b57
parent 2b7bdb17
...@@ -869,9 +869,9 @@ function DrawingObjects() { ...@@ -869,9 +869,9 @@ function DrawingObjects() {
worksheet.expandRowsOnScroll(true); // для rowOff worksheet.expandRowsOnScroll(true); // для rowOff
} }
var metrics = drawingObject.getGraphicObjectMetrics(); var metrics = drawingObject.getGraphicObjectMetrics();
var isSerialize = drawingObject.graphicObject.fromSerialize;
CheckSpPrXfrm(drawingObject.graphicObject); CheckSpPrXfrm(drawingObject.graphicObject);
var isSerialize = drawingObject.graphicObject.fromSerialize; if(isSerialize)
if(!api.wbModel.bCollaborativeChanges && isSerialize)
{ {
var rot = isRealNumber(drawingObject.graphicObject.spPr.xfrm.rot) ? drawingObject.graphicObject.spPr.xfrm.rot : 0; var rot = isRealNumber(drawingObject.graphicObject.spPr.xfrm.rot) ? drawingObject.graphicObject.spPr.xfrm.rot : 0;
......
...@@ -16082,6 +16082,17 @@ CMultiLvlStrCache.prototype = ...@@ -16082,6 +16082,17 @@ CMultiLvlStrCache.prototype =
this.ptCount = pr; this.ptCount = pr;
}, },
Write_ToBinary2: function(w)
{
w.WriteLong(this.getObjectType());
w.WriteString2(this.Get_Id());
},
Read_FromBinary2: function(r)
{
this.Id = r.GetString2();
},
Undo: function(data) Undo: function(data)
{ {
switch (data.Type) switch (data.Type)
......
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