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

Bug 27419 - Убрать пункт меню "shape advanced settings" при выделении группы,...

Bug 27419 - Убрать пункт меню "shape advanced settings" при выделении группы, содержащей диаграмму и автофигуру

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59537 954022d7-b5bf-4e40-9824-e11837661b57
parent a0eb1833
...@@ -5144,13 +5144,13 @@ function CompareShapeProperties(shapeProp1, shapeProp2) ...@@ -5144,13 +5144,13 @@ function CompareShapeProperties(shapeProp1, shapeProp2)
} }
_result_shape_prop.canFill = shapeProp1.canFill === true || shapeProp2.canFill === true; _result_shape_prop.canFill = shapeProp1.canFill === true || shapeProp2.canFill === true;
if(!shapeProp1.bFromChart || !shapeProp2.bFromChart) if(shapeProp1.bFromChart || shapeProp2.bFromChart)
{ {
_result_shape_prop.bFromChart = false; _result_shape_prop.bFromChart = true;
} }
else else
{ {
_result_shape_prop.bFromChart = true; _result_shape_prop.bFromChart = false;
} }
if(shapeProp1.locked || shapeProp1.locked) if(shapeProp1.locked || shapeProp1.locked)
......
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