git-svn-id:...

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

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -42,6 +42,11 @@ DrawingObjectsController.prototype =
         this.curState.onKeyDown(e);
     },
 
+    onKeyPress: function(e)
+    {
+        this.curState.onKeyPress(e);
+    },
+
     resetSelectionState: function()
     {
         while(this.selectedObjects.length > 0)

Excel/model/DrawingObjects/Format/TextBody.js

@@ -31,6 +31,8 @@ CTxBody.prototype =
         return this.shape.Get_Styles(level);
     },
 
-    paragraphAdd: function()
-    {}
+    paragraphAdd: function(paraItem)
+    {
+        this.content.Paragraph_Add(paraItem);
+    }
 };
\ No newline at end of file

Excel/model/DrawingObjects/States.js

@@ -204,10 +204,14 @@ function NullState(drawingObjectsController, drawingObjects)
         var selected_objects = this.drawingObjectsController.selectedObjects;
         if(selected_objects.length === 1 && selected_objects[0].isShape())
         {
-           // selected_objects[0].
+
         }
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
@@ -379,6 +383,10 @@ function RotateState(drawingObjectsController, drawingObjects, majorObject)
 		asc["editor"].asc_endAddShape();
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.onKeyDown = function(e)
     {
 
@@ -417,6 +425,8 @@ function PreResizeState(drawingObjectsController, drawingObjects, majorObject, c
         this.drawingObjectsController.clearPreTrackObjects();
         this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
     };
+
+
     this.drawSelection = function(drawingDocument)
     {
         DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
@@ -427,6 +437,10 @@ function PreResizeState(drawingObjectsController, drawingObjects, majorObject, c
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
 
@@ -474,6 +488,10 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return {objectId: this.majorObject.drawingBase.id, cursorType: CURSOR_TYPES_BY_CARD_DIRECTION[this.cardDirection]};
@@ -506,6 +524,10 @@ function StartTrackNewShapeState(drawingObjectsController, drawingObjects, prese
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
@@ -687,6 +709,10 @@ function TrackNewShapeState(drawingObjectsController, drawingObjects)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
@@ -774,6 +800,10 @@ function PreMoveState(drawingObjectsController, drawingObjects, startX, startY,
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
@@ -826,6 +856,10 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
@@ -869,6 +903,10 @@ function PreChangeAdjState(drawingObjectsController, drawingObjects)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
@@ -913,6 +951,10 @@ function ChangeAdjState(drawingObjectsController, drawingObjects)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
@@ -1144,6 +1186,10 @@ function GroupState(drawingObjectsController, drawingObjects, group)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawGroupSelection(this.group, drawingDocument);
@@ -1349,6 +1395,10 @@ function PreMoveInGroupState(drawingObjectsController, drawingObjects, group, st
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawGroupSelection(this.group, drawingDocument);
@@ -1406,6 +1456,10 @@ function MoveInGroupState(drawingObjectsController, drawingObjects, group, start
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawGroupSelection(this.group, drawingDocument);
@@ -1443,6 +1497,10 @@ function PreChangeAdjInGroupState(drawingObjectsController, drawingObjects, grou
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawGroupSelection(this.group, drawingDocument);
@@ -1484,6 +1542,10 @@ function ChangeAdjInGroupState(drawingObjectsController, drawingObjects, group)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawGroupSelection(this.group, drawingDocument);
@@ -1521,6 +1583,10 @@ function PreRotateInGroupState(drawingObjectsController, drawingObjects, group,
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawGroupSelection(this.group, drawingDocument);
@@ -1566,6 +1632,10 @@ function RotateInGroupState(drawingObjectsController, drawingObjects, group, maj
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawGroupSelection(this.group, drawingDocument);
@@ -1605,6 +1675,10 @@ function PreResizeInGroupState(drawingObjectsController, drawingObjects, group,
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.drawSelection = function(drawingDocument)
     {
         DrawGroupSelection(this.group, drawingDocument);
@@ -1648,8 +1722,10 @@ function ResizeInGroupState(drawingObjectsController, drawingObjects, group, maj
     };
 
     this.onKeyDown = function(e)
-    {
+    {};
 
+    this.onKeyPress = function(e)
+    {
     };
 
     this.drawSelection = function(drawingDocument)
@@ -1696,6 +1772,11 @@ function SplineBezierState(drawingObjectsController, drawingObjects)
 
     };
 
+
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -1740,6 +1821,10 @@ function SplineBezierState33(drawingObjectsController, drawingObjects, startX, s
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -1789,6 +1874,10 @@ function SplineBezierState2(drawingObjectsController, drawingObjects, startX, st
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -1878,6 +1967,10 @@ function SplineBezierState3(drawingObjectsController, drawingObjects, startX, st
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -1978,6 +2071,10 @@ function SplineBezierState4(drawingObjectsController, drawingObjects, spline)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -2086,6 +2183,10 @@ function SplineBezierState5(drawingObjectsController, drawingObjects, startX, st
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -2132,6 +2233,10 @@ function PolyLineAddState(drawingObjectsController, drawingObjects)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -2188,6 +2293,10 @@ function PolyLineAddState2(drawingObjectsController, drawingObjects, minDistance
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null;
@@ -2230,6 +2339,10 @@ function AddPolyLine2State(drawingObjectsController, drawingObjects)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -2279,6 +2392,10 @@ function AddPolyLine2State2(drawingObjectsController, drawingObjects, x, y, poly
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;
@@ -2366,6 +2483,10 @@ function AddPolyLine2State3(drawingObjectsController, drawingObjects, polyline)
 
     };
 
+    this.onKeyPress = function(e)
+    {
+    };
+
     this.isPointInDrawingObjects = function(x, y)
     {
         return null/*TODO*/;