рефакторинг

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

Common/Charts/libraries/OfficeExcel.bar.js

@@ -218,13 +218,6 @@
         if (this._otherProps._crosshairs) {
             OfficeExcel.DrawCrosshairs(this);
         }
-        
-        /**
-        * If the canvas is annotatable, do install the event handlers
-        */
-        if (this._otherProps._annotatable) {
-            OfficeExcel.Annotate(this);
-        }
 
         /**
         * This function enables resizing

Common/Charts/libraries/OfficeExcel.common.core.js

@@ -1974,9 +1974,6 @@
             context.fill();
         }
 
-        if (OfficeExcel.ClearAnnotations)
-            OfficeExcel.ClearAnnotations(canvas.id);
-
         OfficeExcel.FireCustomEvent(canvas.__object__, 'onclear');
     }
 

Common/Charts/libraries/OfficeExcel.hbar.js

@@ -368,13 +368,6 @@
         */
         OfficeExcel.DrawInGraphLabels(this);
         
-        /**
-        * If the canvas is annotatable, do install the event handlers
-        */
-        if (this._otherProps._annotatable) {
-            OfficeExcel.Annotate(this);
-        }
-        
         /**
         * This function enables resizing
         */

Common/Charts/libraries/OfficeExcel.line.js

@@ -394,10 +394,6 @@
         // Draw crosschairs
         OfficeExcel.DrawCrosshairs(this);
 
-        // If the canvas is annotatable, do install the event handlers
-        if (this._otherProps._annotatable)
-            OfficeExcel.Annotate(this);
-
         // Redraw the lines if a filled range is on the cards
         if (this._otherProps._filled && this._otherProps._filled_range && this.data.length == 2) {
 

Common/Charts/libraries/OfficeExcel.pie.js

@@ -491,14 +491,6 @@
 
         OfficeExcel.NoShadow(this);
         
-        /**
-        * If the canvas is annotatable, do install the event handlers
-        */
-        if (this._otherProps._annotatable) {
-            OfficeExcel.Annotate(this);
-        }
-
-        
         /**
         * This function enables resizing
         */

Common/Charts/libraries/OfficeExcel.scatter.js

@@ -407,13 +407,6 @@
         OfficeExcel.DrawCrosshairs(this);
 
         
-        /**
-        * If the canvas is annotatable, do install the event handlers
-        */
-        if (this._otherProps._annotatable) {
-            OfficeExcel.Annotate(this);
-        }
-        
         /**
         * This function enables resizing
         */

Excel/SpreadsheetTestMenu.html

@@ -125,7 +125,6 @@
 		<script type="text/javascript" src="../Common/SerializeCommonWordExcel.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.core.js"></script>
 
-		<script src="../Common/Charts/libraries/OfficeExcel.common.annotate.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.context.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.effects.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.key.js"></script>

Excel/index.html

@@ -194,7 +194,6 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/SerializeCommonWordExcel.js"></script>
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.core.js"></script>
 
-	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.annotate.js"></script>
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.context.js"></script>
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.effects.js"></script>
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.key.js"></script>

Word/TextEditor.html

@@ -46,7 +46,6 @@
 		<script type="text/javascript" src="../Common/Charts/charts.js"></script>
 		<script type="text/javascript" src="../Common/SerializeCommonWordExcel.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.core.js"></script>
-		<script src="../Common/Charts/libraries/OfficeExcel.common.annotate.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.context.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.effects.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.key.js"></script>

Word/index.html

@@ -111,7 +111,6 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/commonDefines.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/SerializeCommonWordExcel.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.core.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.annotate.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.context.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.effects.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.key.js"></script>