добавлены функции

NPER, ACOSH,  ASINH, ATANH, COMBIN, COSH, FACT, FACTDOUBLE, LCM,  MDETERM, MINVERSE, MMULT, MULTINOMIAL, QUOTIENT, RANDBETWEEN, ROMAN, SINH, SUMSQ, TANH, TRUNC
поправлены функции SUMIF, COUNTIF, SEARCH

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

Excel/.unit-tests/FormulaTests.html

@@ -9,7 +9,7 @@
 
 		<link rel="stylesheet" href="qunit/qunit-1.11.0.css" type="text/css" media="screen" />
 		<script type="text/javascript" src="qunit/qunit-1.11.0.js"></script>
-		<script type="text/javascript" src="../../Common/3rdparty/XRegExp/xregexp-all.js"></script>
+		<script type="text/javascript" src="../../../Common/3rdparty/XRegExp/xregexp-all.js"></script>
 
         <script src="../../Common/downloaderfiles.js"></script>
         <script type="text/javascript" src="../../Common/3rdparty/Underscore/underscore-min.js"></script>
@@ -19,6 +19,7 @@
         <script type="text/javascript" src="../../Common/Charts/DrawingObjects.js"></script>
         <script type="text/javascript" src="../../Common/Charts/charts.js"></script>
         <script type="text/javascript" src="../../Common/commonDefines.js"></script>
+        <script type="text/javascript" src="../../Common/editorscommon.js"></script>
 
         <script type="text/javascript" src="../../Common/FontsFreeType/font_engine.js"></script>
         <script type="text/javascript" src="../../Common/FontsFreeType/FontFile.js"></script>
@@ -27,7 +28,6 @@
         <script type="text/javascript" src="../../Word/Drawing/Externals.js"></script>
         <script type="text/javascript" src="../../Word/Drawing/Metafile.js"></script>
         <script type="text/javascript" src="../../Word/Drawing/AllFonts.js"></script>
-		<script type="text/javascript" src="../../Word/Drawing/GlobalLoaders.js"></script>
 
         <script type="text/javascript" src="../utils/utils.js"></script>
         <script type="text/javascript" src="../model/clipboard.js"></script>
@@ -36,10 +36,12 @@
         <script type="text/javascript" src="../graphics/DrawingContext.js"></script>
         <script type="text/javascript" src="../graphics/pdfprinter.js"></script>
 
+        <!--TODO: remove test data-->
         <!-- <script type="text/javascript" src="../offlinedocs/test-workbook9/Editor.js"></script> -->
         <script type="text/javascript" src="../offlinedocs/test-workbook2.js"></script>
 
         <script type="text/javascript" src="../model/CollaborativeEditing.js"></script>
+        <script type="text/javascript" src="../model/ConditionalFormatting.js"></script>
         <script type="text/javascript" src="../model/parserFormula.js"></script>
         <script type="text/javascript" src="../model/dateandtimeFunctions.js"></script>
         <script type="text/javascript" src="../model/engineeringFunctions.js"></script>
@@ -75,14 +77,20 @@
         <script type="text/javascript" src="../api.js"></script>
 
         <!--for presentation-->
-        <script type="text/javascript" src="../Common/PresentationSerializeAdapter.js"></script>
+        <script type="text/javascript" src="../../Common/PresentationSerializeAdapter.js"></script>
 
         <!--for theme-->
         <script type="text/javascript" src="../../Common/Shapes/EditorSettings.js"></script>
         <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/ObjectTypes/Format.js"></script>
+        <script type="text/javascript" src="../model/DrawingObjects/Format/Format.js"></script>
+        <script type="text/javascript" src="../../Word/Editor/GraphicObjects/ObjectTypes/CreateGeometry.js"></script>
+        <script type="text/javascript" src="../model/DrawingObjects/Format/Geometry.js"></script>
+        <script type="text/javascript" src="../model/DrawingObjects/Format/Path.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="../../Word/Drawing/ColorArray.js"></script>
         <script type="text/javascript" src="../../Word/apiCommon.js"></script>
 
         <!--for chart-->
@@ -120,17 +128,34 @@
         <script src="../../Common/Charts/libraries/rgbcolor.js"></script>
 
         <!--for shapes-->
-        <script src="../../Word/Drawing/Graphics.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/DrawingDocument.js"></script>
         <script src="../model/DrawingObjects/States.js"></script>
+        <script src="../model/DrawingObjects/GlobalLoaders.js"></script>
+        <script src="../model/DrawingObjects/GlobalCounters.js"></script>
+        <script src="../model/DrawingObjects/ShapeDrawer.js"></script>
 
         <script src="../model/DrawingObjects/Format/GroupShape.js"></script>
         <script src="../model/DrawingObjects/Format/Image.js"></script>
         <script src="../model/DrawingObjects/Format/Shape.js"></script>
-
+        <script src="../model/DrawingObjects/Format/TextBody.js"></script>
+        <script src="../model/DrawingObjects/Format/Styles.js"></script>
+        <script src="../model/DrawingObjects/Format/Numbering.js"></script>
+        <script src="../model/DrawingObjects/Format/ParagraphContent.js"></script>
+        <script src="../model/DrawingObjects/Format/Paragraph.js"></script>
+        <script src="../model/DrawingObjects/Format/DocumentContent.js"></script>
+        <script src="../model/DrawingObjects/Format/FontClassification.js"></script>
+
+        <script src="../model/DrawingObjects/Tracks/AdjustmentTracks.js"></script>
         <script src="../model/DrawingObjects/Tracks/ResizeTracks.js"></script>
         <script src="../model/DrawingObjects/Tracks/RotateTracks.js"></script>
         <script src="../model/DrawingObjects/Tracks/NewShapeTracks.js"></script>
+        <script src="../model/DrawingObjects/Tracks/PolyLine.js"></script>
+        <script src="../model/DrawingObjects/Tracks/Spline.js"></script>
+        <script src="../model/DrawingObjects/Tracks/MoveTracks.js"></script>
         <script src="../model/DrawingObjects/Hit.js"></script>
 		
 		<script type="text/javascript" src="FormulaTests.js"></script>

Excel/menu/menu.js

@@ -461,6 +461,8 @@
 
 	api.asc_registerCallback("asc_onActiveSheetChanged", onActiveSheetChanged);
 
+//	api.asc_registerCallback("asc_onCellTextChanged", function(){console.log(arguments)});
+
 	api.asc_registerCallback("asc_onConfirmAction", function(){
 		var arg = arguments;
 		$("#ConfirmMess")
@@ -485,7 +487,7 @@
 	});
 
 	api.asc_registerCallback("asc_onEditCell", function (state) {
-		console.log("Cell Edit State - " + state);
+//		console.log("Cell Edit State - " + state);
 	});
 
 	api.asc_registerCallback("asc_onSelectionRangeChanged", function (val) {