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

Common/Charts/DrawingObjects.js

@@ -2023,6 +2023,8 @@ function DrawingObjects() {
 	var overlayCtx = null;
 	var shapeCtx = null;
 	var shapeOverlayCtx = null;
+	
+	var trackOverlay = null;
 	var autoShapeTrack = null;
 	
 	var aObjects = null;
@@ -2055,8 +2057,12 @@ function DrawingObjects() {
 		overlayCtx = currentSheet.overlayCtx;
 		shapeCtx = currentSheet.shapeCtx;
 		shapeOverlayCtx = currentSheet.shapeOverlayCtx;
+		
+		trackOverlay = new COverlay();
+		trackOverlay.init( shapeOverlayCtx.m_oContext, "ws-canvas-overlay", 0, 0, shapeOverlayCtx.m_lWidthPix, shapeOverlayCtx.m_lHeightPix, shapeOverlayCtx.m_dWidthMM, shapeOverlayCtx.m_dHeightMM );
+		
 		autoShapeTrack = new CAutoshapeTrack();
-		autoShapeTrack.init( shapeOverlayCtx, 0, 0, shapeOverlayCtx.m_dWidthMM, shapeOverlayCtx.m_dHeightMM, shapeOverlayCtx.m_lWidthPix , shapeOverlayCtx.m_lHeightPix );
+		autoShapeTrack.init( trackOverlay, 0, 0, shapeOverlayCtx.m_lWidthPix, shapeOverlayCtx.m_lHeightPix, shapeOverlayCtx.m_dWidthMM, shapeOverlayCtx.m_dHeightMM );
 				
 		isViewerMode =  function() { return worksheet._trigger("getViewerMode"); };
 
@@ -3809,6 +3815,9 @@ function DrawingObjects() {
 		_this.showDrawingObjects(false);
 	}
 	
+	_this.addGraphicGroup = function() {
+	}
+	
 	_this.insertUngroupedObjects = function(idGroup, aGraphics) {
 		
 		if ( idGroup && aGraphics.length ) {

Excel/SpreadsheetTestMenu.html

@@ -157,8 +157,9 @@
 		<script src="../Common/Charts/libraries/rgbcolor.js"></script>
 		
 		<!--for shapes-->
-		<script src="../Word/Drawing/Graphics.js"></script>
-		<script src="../Word/Drawing/Overlay.js"></script>
+		<script src="model/DrawingObjects/Graphics.js"></script>
+		<script src="model/DrawingObjects/Overlay.js"></script>
+		<script src="model/DrawingObjects/Controls.js"></script>
 		<script src="model/DrawingObjects/DrawingObjectsController.js"></script>
 		<script src="model/DrawingObjects/States.js"></script>