Перенес Controls.js в Common

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

Build/deploy/sdk_configs/nativeword.json

@@ -74,6 +74,7 @@
                "../../Common/Drawings/Format/Geometry.js",
                "../../Common/Drawings/Format/Path.js",
                "../../Common/Drawings/Format/TextBody.js",
+               "../../Common/Drawings/TextDrawer.js",
 
                "../../Word/Editor/GraphicObjects/Format/ShapePrototype.js",
                "../../Word/Editor/GraphicObjects/Format/ImagePrototype.js",
@@ -117,7 +118,7 @@
                 "../../Word/Drawing/GraphicsEvents.js",
                 "../../Common/Scrolls/iscroll.js",
                 "../../Word/Drawing/WorkEvents.js",
-                "../../Word/Drawing/Controls.js",
+                "../../Common/Controls.js",
                 "../../Word/Drawing/Rulers.js",
 
                 "../../Word/Drawing/documentrenderer.js",

Build/deploy/sdk_configs/webexcel.json

@@ -110,12 +110,13 @@
                 "../../Common/Drawings/Format/ChartSpace.js",
                 "../../Common/Drawings/Format/ChartFormat.js",
                 "../../Common/Drawings/Format/TextBody.js",
+                "../../Common/Drawings/TextDrawer.js",
                 "../../Common/wordcopypaste.js",
                 "../../Excel/view/DrawingObjectsController.js",
                 "../../Excel/model/DrawingObjects/Graphics.js",
 				"../../Excel/model/DrawingObjects/Private/Graphics.js",
                 "../../Excel/model/DrawingObjects/Overlay.js",
-                "../../Excel/model/DrawingObjects/Controls.js",
+                "../../Common/Controls.js",
                 "../../Excel/model/DrawingObjects/ShapeDrawer.js",
                 "../../Excel/model/DrawingObjects/DrawingDocument.js",
                 "../../Excel/model/DrawingObjects/Format/ShapePrototype.js",

Build/deploy/sdk_configs/webpowerpoint.json

@@ -55,7 +55,7 @@
 
                 "../../Word/Drawing/GraphicsEvents.js",
                 "../../Word/Drawing/WorkEvents.js",
-                "../../Word/Drawing/Controls.js",
+                "../../Common/Controls.js",
                 "../../Word/Drawing/Rulers.js",
                 "../../Word/Editor/Table.js",
                 "../../Word/Editor/Common.js",
@@ -109,6 +109,7 @@
                 "../../Common/Drawings/Format/ChartSpace.js",
                 "../../Common/Drawings/Format/ChartFormat.js",
                 "../../Common/Drawings/Format/TextBody.js",
+                "../../Common/Drawings/TextDrawer.js",
                 "../../PowerPoint/Editor/Format/Slide.js",
                 "../../PowerPoint/Editor/Format/SlideMaster.js",
                 "../../PowerPoint/Editor/Format/Layout.js",

Build/deploy/sdk_configs/webword.json

@@ -76,6 +76,7 @@
                 "../../Common/Drawings/Format/Geometry.js",
                 "../../Common/Drawings/Format/Path.js",
                 "../../Common/Drawings/Format/TextBody.js",
+                "../../Common/Drawings/TextDrawer.js",
                 "../../Word/Editor/GraphicObjects/Format/ShapePrototype.js",
                 "../../Word/Editor/GraphicObjects/Format/ImagePrototype.js",
                 "../../Word/Editor/GraphicObjects/Format/GroupPrototype.js",
@@ -119,7 +120,7 @@
                 "../../Word/Drawing/GraphicsEvents.js",
                 "../../Common/Scrolls/iscroll.js",
                 "../../Word/Drawing/WorkEvents.js",
-                "../../Word/Drawing/Controls.js",
+                "../../Common/Controls.js",
                 "../../Word/Drawing/Rulers.js",
                 "../../Word/Drawing/HtmlPage.js",
                 "../../Word/Drawing/documentrenderer.js",

Excel/SpreadsheetTestMenu.html

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

Excel/SpreadsheetTestMobile.html

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

Excel/index.html

@@ -356,7 +356,9 @@
     <script src="../../../../OfficeWeb/Common/Drawings/Format/ChartSpace.js"></script>
     <script src="../../../../OfficeWeb/Common/Drawings/Format/ChartFormat.js"></script>
     <script src="../../../../OfficeWeb/Common/Drawings/Format/TextBody.js"></script>
-	<script src="../../../../OfficeWeb/Word/Drawing/Controls.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/TextDrawer.js"></script>
+
+    <script src="../../../../OfficeWeb/Common/Controls.js"></script>
     
 	<script src="../../../../OfficeWeb/Excel/view/DrawingObjectsController.js"></script>
 

Excel/index_mobile.html

@@ -321,7 +321,7 @@
     <script src="../../../../OfficeWeb/Common/Drawings/Format/ChartSpace.js"></script>
     <script src="../../../../OfficeWeb/Common/Drawings/Format/ChartFormat.js"></script>
 		<script src="../../../../OfficeWeb/Common/Drawings/Format/TextBody.js"></script>
-		<script src="../../../../OfficeWeb/Word/Drawing/Controls.js"></script>
+		<script src="../../../../OfficeWeb/Common/Controls.js"></script>
 		
 		<script src="../../../../OfficeWeb/Excel/view/DrawingObjectsController.js"></script>
 

PowerPoint/PowerPoint.html

@@ -79,7 +79,7 @@
 
     <script type="text/javascript" src="../Word/Drawing/GraphicsEvents.js"></script>
 	<script type="text/javascript" src="../Word/Drawing/WorkEvents.js"></script>
-	<script type="text/javascript" src="../Word/Drawing/Controls.js"></script>
+	<script type="text/javascript" src="../Common/Controls.js"></script>
 	<script type="text/javascript" src="../Word/Drawing/Rulers.js"></script>
 	<script type="text/javascript" src="../Word/Editor/Table.js"></script>
 	<script type="text/javascript" src="../Word/Editor/Common.js"></script>

PowerPoint/index.html

@@ -286,7 +286,7 @@
 
 <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/GraphicsEvents.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/WorkEvents.js"></script>
-<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Controls.js"></script>
+<script type="text/javascript" src="../../../../OfficeWeb/Common/Controls.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Rulers.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Table.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Common.js"></script>
@@ -350,8 +350,10 @@
 <script src="../../../../OfficeWeb/Common/Drawings/Format/ChartSpace.js"></script>
 <script src="../../../../OfficeWeb/Common/Drawings/Format/ChartFormat.js"></script>
 <script src="../../../../OfficeWeb/Common/Drawings/Format/TextBody.js"></script>
+<script src="../../../../OfficeWeb/Common/Drawings/TextDrawer.js"></script>
 
-<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/Slide.js"></script>
+
+    <script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/Slide.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/SlideMaster.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/Layout.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/Comments.js"></script>

Word/MergeTest.html

@@ -93,7 +93,7 @@
         <script type="text/javascript" src="Drawing/GraphicsEvents.js"></script>
         <script type="text/javascript" src="../Common/Scrolls/iscroll.js"></script>
         <script type="text/javascript" src="Drawing/WorkEvents.js"></script>
-        <script type="text/javascript" src="Drawing/Controls.js"></script>
+        <script type="text/javascript" src="../Common/Controls.js"></script>
         <script type="text/javascript" src="Drawing/Rulers.js"></script>
         <script type="text/javascript" src="Drawing/HtmlPage.js"></script>
         <script type="text/javascript" src="Drawing/documentrenderer.js"></script>

Word/TextEditor.html

@@ -172,7 +172,7 @@
         <script type="text/javascript" src="Drawing/GraphicsEvents.js"></script>
         <script type="text/javascript" src="../Common/Scrolls/iscroll.js"></script>
         <script type="text/javascript" src="Drawing/WorkEvents.js"></script>
-        <script type="text/javascript" src="Drawing/Controls.js"></script>
+        <script type="text/javascript" src="../Common/Controls.js"></script>
         <script type="text/javascript" src="Drawing/Rulers.js"></script>
         <script type="text/javascript" src="Drawing/HtmlPage.js"></script>
         <script type="text/javascript" src="Drawing/documentrenderer.js"></script>

Word/index.html

@@ -321,6 +321,7 @@
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Drawings/Format/Geometry.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Drawings/Format/Path.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Drawings/Format/TextBody.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Common/Drawings/TextDrawer.js"></script>
 
 
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/Format/ShapePrototype.js"></script>
@@ -374,7 +375,7 @@
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/GraphicsEvents.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Scrolls/iscroll.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/WorkEvents.js"></script>
-    <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Controls.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Common/Controls.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Rulers.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/HtmlPage.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/documentrenderer.js"></script>

Word/index_mobile.html

@@ -163,7 +163,7 @@
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/GraphicsEvents.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Scrolls/iscroll.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/WorkEvents.js"></script>
-    <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Controls.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Common/Controls.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Rulers.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/HtmlPage.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/documentrenderer.js"></script>

Word/mobile_editor.html

@@ -99,7 +99,7 @@
     <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/GraphicsEvents.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Common/Scrolls/iscroll.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/WorkEvents.js"></script>
-    <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/Controls.js"></script>
+    <script type="text/javascript" src="../../OfficeWeb/Common/Controls.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/Rulers.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/HtmlPage.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/documentrenderer.js"></script>

Word/test_math.html

@@ -140,7 +140,7 @@
         <script type="text/javascript" src="Drawing/GraphicsEvents.js"></script>
         <script type="text/javascript" src="../Common/Scrolls/iscroll.js"></script>
         <script type="text/javascript" src="Drawing/WorkEvents.js"></script>
-        <script type="text/javascript" src="Drawing/Controls.js"></script>
+        <script type="text/javascript" src="../Common/Controls.js"></script>
         <script type="text/javascript" src="Drawing/Rulers.js"></script>
         <script type="text/javascript" src="Drawing/HtmlPage.js"></script>
         <script type="text/javascript" src="Drawing/documentrenderer.js"></script>