git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53691 954022d7-b5bf-4e40-9824-e11837661b57

Excel/SpreadsheetTestMenu.html

@@ -156,7 +156,8 @@
 <script src="../Excel/model/DrawingObjects/Graphics.js"></script>
 <script src="model/DrawingObjects/Overlay.js"></script>
 <script src="../Word/Drawing/Controls.js"></script>
-<script src="../Word/Drawing/ShapeDrawer.js"></script>
+<script src="../Excel/model/DrawingObjects/ShapeDrawer.js"></script>
+
 <script src="../Word/Editor/CollaborativeEditing.js"></script>
 
 

Excel/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -157,12 +157,12 @@ CChartSpace.prototype.recalculate = function()
 	if(this.recalcInfo.recalculateMarkers)
 	{
 		this.recalculateMarkers();
-        this.recalcInfo.recalculateBaseColors = false;
+        this.recalcInfo.recalculateMarkers = false;
 	}
 	if(this.recalcInfo.recalculateSeriesColors)
 	{
 		this.recalculateSeriesColors();
-        this.recalcInfo.recalculateBaseColors = false;
+        this.recalcInfo.recalculateSeriesColors = false;
 	}
 	
     if(this.recalcInfo.recalculateChart)