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

Bug 30452 - Значение "Opacity" изменяется после сборки документа

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64911 954022d7-b5bf-4e40-9824-e11837661b57
parent f0e5e6ba
...@@ -1893,7 +1893,7 @@ function BinaryPPTYLoader() ...@@ -1893,7 +1893,7 @@ function BinaryPPTYLoader()
if (_at222 == 0) if (_at222 == 0)
{ {
uni_fill.setTransparent((255 * s.GetLong() / 100000) >> 0); uni_fill.setTransparent(255 * s.GetLong() / 100000);
} }
} }
...@@ -2172,7 +2172,7 @@ function BinaryPPTYLoader() ...@@ -2172,7 +2172,7 @@ function BinaryPPTYLoader()
{ {
if (mods[i].name == "alpha") if (mods[i].name == "alpha")
{ {
uni_fill.setTransparent((255 * mods[i].val / 100000) >> 0); uni_fill.setTransparent(255 * mods[i].val / 100000);
uni_fill.fill.color.Mods.removeMod(i); uni_fill.fill.color.Mods.removeMod(i);
break; break;
} }
......
...@@ -291,7 +291,7 @@ NullState.prototype = ...@@ -291,7 +291,7 @@ NullState.prototype =
var no_shape_child_array = []; var no_shape_child_array = [];
for(var i = 0; i < drawing_page.inlineObjects.length; ++i) for(var i = 0; i < drawing_page.inlineObjects.length; ++i)
{ {
if(!drawing_page.inlineObjects[i].parent.isShapeChild()) if(!(drawing_page.inlineObjects[i].parent && drawing_page.inlineObjects[i].parent.isShapeChild()))
no_shape_child_array.push(drawing_page.inlineObjects[i]); no_shape_child_array.push(drawing_page.inlineObjects[i]);
} }
ret = handleInlineObjects(this.drawingObjects, no_shape_child_array, e, x, y, pageIndex, true); ret = handleInlineObjects(this.drawingObjects, no_shape_child_array, e, x, y, pageIndex, true);
......
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