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

Excel/SpreadsheetTestMenu.html

@@ -108,8 +108,8 @@
 <script type="text/javascript" src="../Common/Shapes/Serialize.js"></script>
 <script type="text/javascript" src="../Common/Shapes/SerializeWriter.js"></script>
 <script type="text/javascript" src="../Word/Editor/SerializeCommon.js"></script>
-<script type="text/javascript" src="../Word/Editor/GraphicObjects/Math.js"></script>
-<script type="text/javascript" src="../Word/Drawing/ArcTo.js"></script>
+<script type="text/javascript" src="../Common/Drawings/Math.js"></script>
+<script type="text/javascript" src="../Common/Drawings/ArcTo.js"></script>
 <script type="text/javascript" src="../Word/Drawing/ColorArray.js"></script>
 <script type="text/javascript" src="../Word/apiCommon.js"></script>
 

Excel/index.html

@@ -183,10 +183,6 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/Serialize.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/SerializeWriter.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/SerializeCommon.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/Format.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/CreateGeometry.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Geometry.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Path.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/Math.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/ArcTo.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/ColorArray.js"></script>
@@ -206,52 +202,47 @@
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.chartProperties.js"></script>
 	
 	<!--for shapes-->
+    <script src="../../../../OfficeWeb/Common/Drawings/Hit.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/States.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/TrackObjects/ResizeTracks.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/TrackObjects/RotateTracks.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/TrackObjects/NewShapeTracks.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/TrackObjects/PolyLine.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/TrackObjects/Spline.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/TrackObjects/MoveTracks.js"></script>
+
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/ChartFormat.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/ChartSpace.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/Constants.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/CreateGeometry.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/Format.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/Geometry.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/Path.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/GroupShape.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/Image.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/Shape.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/Format/TextBody.js"></script>
+    <script src="../../../../OfficeWeb/Common/Drawings/CommonController.js"></script>
+    <script src="../../../../OfficeWeb/Excel/view/DrawingObjectsController.js"></script>
+
+    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/ShapePrototype.js"></script>
+    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/ChartSpacePrototype.js"></script>
+    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Styles.js"></script>
+    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Numbering.js"></script>
+    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/ParagraphContent.js"></script>
+    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Paragraph.js"></script>
+    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/DocumentContent.js"></script>
+    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/FontClassification.js"></script>
+
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Graphics.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Overlay.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Controls.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/DrawingObjectsController.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/DrawingDocument.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/States.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/GlobalLoaders.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/ShapeDrawer.js"></script>
-		
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/GroupShape.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Image.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Shape.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/TextBody.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Styles.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Path.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Geometry.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Paragraph.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/ParagraphContent.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Numbering.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Format.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/DocumentContent.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/FontClassification.js"></script>
-
-
-
-
-
-
-
-
-
-
 
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Tracks/AdjustmentTracks.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Tracks/ResizeTracks.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Tracks/RotateTracks.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Tracks/NewShapeTracks.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Tracks/PolyLine.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Tracks/Spline.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Tracks/MoveTracks.js"></script>
-	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Hit.js"></script>
 	<script src="../../../../OfficeWeb/Excel/model/DrawingObjects/GlobalCounters.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/Chart.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/ChartLayout.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/ChartTitle.js"></script>
-    <script src="../../../../OfficeWeb/Excel/model/DrawingObjects/Format/ChartLegend.js"></script>
 
 
     <!--<script type="text/javascript" src="../../../sdk/Common/docscoapisettings.js"></script>

Excel/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -53,8 +53,6 @@ CChartSpace.prototype.getParentObjects = CShape.prototype.getParentObjects;
 CChartSpace.prototype.recalculateTransform = CShape.prototype.recalculateTransform;
 CChartSpace.prototype.recalculateChart = function()
 {
-
-
 };
 CChartSpace.prototype.draw = function(graphics)
 {