Bug 28875 - Ошибка в консоли после выбора Background Color

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

Common/apiCommon.js

@@ -1235,7 +1235,7 @@
     prot["get_Count"] = prot["asc_getCount"] = prot.asc_getCount;
     prot["get_Tab"] = prot["asc_getTab"] = prot.asc_getTab;
     prot["add_Tab"] = prot["asc_addTab"] = prot.asc_addTab;
-    prot["clear"] = prot["asc_clear"] = prot.asc_clear;
+    prot["clear"] = prot.clear = prot["asc_clear"] = prot.asc_clear;
 
 
     /** @constructor */
@@ -2169,7 +2169,6 @@
     prot["get_hex"] = prot["asc_getHex"] = prot.asc_getHex;
     prot["get_color"] = prot["asc_getColor"] = prot.asc_getColor;
     prot["get_hex"] = prot["asc_getHex"] = prot.asc_getHex;
-    prot["get_color"] = prot["asc_getColor"] = prot.asc_getColor;
 
 
 
@@ -2340,7 +2339,7 @@
         asc_putLineendsize: function(v){this.LineEndSize = v;},
 
         asc_getCanChangeArrows: function(){return this.canChangeArrows;}
-    }
+    };
 
 //{ asc_CStroke export
     window["CAscStroke"] = window["Asc"]["asc_CStroke"] = window["asc_CStroke"] = asc_CStroke;

Excel/model/WorkbookElems.js

@@ -284,13 +284,13 @@ function CorrectAscColor(asc_color)
 
 	var ret = null;
 
-	var _type = asc_color.get_type();
+	var _type = asc_color.asc_getType();
 	switch (_type)
 	{
 		case c_oAscColor.COLOR_TYPE_SCHEME:
 		{
 			// тут выставляется ТОЛЬКО из меню. поэтому:
-			var _index = asc_color.get_value() >> 0;
+			var _index = asc_color.asc_getValue() >> 0;
 			var _id = (_index / 6) >> 0;
 			var _pos = _index - _id * 6;
 			var basecolor = g_oColorManager.getThemeColor(_id);
@@ -301,7 +301,7 @@ function CorrectAscColor(asc_color)
 		}
 		default:
 		{
-			ret = new RgbColor((asc_color.get_r() << 16) + (asc_color.get_g() << 8) + asc_color.get_b());
+			ret = new RgbColor((asc_color.asc_getR() << 16) + (asc_color.asc_getG() << 8) + asc_color.asc_getB());
 		}
 	}
 	return ret;

PowerPoint/api.js

@@ -2062,9 +2062,9 @@ asc_docs_api.prototype.ShapeApply = function(prop)
     {
         if (prop.fill.fill != null && prop.fill.type == c_oAscFill.FILL_TYPE_BLIP)
         {
-            image_url = prop.fill.fill.get_url();
+            image_url = prop.fill.fill.asc_getUrl();
 
-            var _tx_id = prop.fill.fill.get_texture_id();
+            var _tx_id = prop.fill.fill.asc_getTextureId();
             if (null != _tx_id && 0 <= _tx_id && _tx_id < g_oUserTexturePresets.length)
             {
                 image_url = g_oUserTexturePresets[_tx_id];
@@ -2157,7 +2157,7 @@ asc_docs_api.prototype.SetSlideProps = function(prop)
 
     if (_back_fill)
     {
-        if (_back_fill.get_type() == c_oAscFill.FILL_TYPE_NOFILL)
+        if (_back_fill.asc_getType() == c_oAscFill.FILL_TYPE_NOFILL)
         {
             var bg = new CBg();
             bg.bgPr = new CBgPr();

Word/api.js

@@ -4710,9 +4710,9 @@ asc_docs_api.prototype.AddImageToPage = function(sUrl, nPageIndex, dX, dY, dW, d
         oPosV.put_Align(false);
         oPosV.put_Value(dY);
         var oImageProps = new asc_CImgProperty();
-        oImageProps.put_WrappingStyle(c_oAscWrapStyle2.Square);
-        oImageProps.put_PositionH(oPosH);
-        oImageProps.put_PositionV(oPosV);
+        oImageProps.asc_putWrappingStyle(c_oAscWrapStyle2.Square);
+        oImageProps.asc_putPositionH(oPosH);
+        oImageProps.asc_putPositionV(oPosV);
 
         LogicDocument.Create_NewHistoryPoint(historydescription_Document_AddImageToPage);
         LogicDocument.Start_SilentMode();