copy/paste таблиц из PP

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

Common/Shapes/Serialize.js

@@ -910,7 +910,8 @@ function BinaryPPTYLoader()
                 {
                     var _id = s.GetString2();
                    // _style.Id = _id;
-                    this.presentation.TableStylesIdMap[_style.Id] = true;
+					if(this.presentation.TableStylesIdMa)
+						this.presentation.TableStylesIdMap[_style.Id] = true;
                     this.map_table_styles[_id] = _style;
                     break;
                 }
@@ -1085,7 +1086,8 @@ function BinaryPPTYLoader()
             _style.TablePr.TableBorders.Right = _style.TableWholeTable.TableCellPr.TableCellBorders.Right;
             delete _style.TableWholeTable.TableCellPr.TableCellBorders.Right;
         }
-        this.presentation.globalTableStyles.Add(_style);
+		if(this.presentation.globalTableStyles)
+			this.presentation.globalTableStyles.Add(_style);
     };
 
     this.ReadTableStylePart = function()

Excel/model/clipboard.js

@@ -1781,6 +1781,15 @@
                         case "Drawings":
                         {
                             var objects = this.ReadPresentationShapes(stream, worksheet);
+							
+							//****если записана одна табличка, то вставляем html и поддерживаем все цвета и стили****
+							if(!objects.arrImages.length && objects.arrShapes.length === 1)
+							{
+								var drawing = objects.arrShapes[0].graphicObject;
+								if(typeof CGraphicFrame !== "undefined" && drawing instanceof CGraphicFrame)
+									return false;
+							}
+							
                             var arr_shapes = objects.arrShapes;
 							if(arr_shapes && arr_shapes.length)
 							{
@@ -1815,20 +1824,24 @@
 				var arr_shapes = [];
 				var arr_transforms = [];
 				var arrBase64Img = [];
+				var cStyle;
 				
 				for(var i = 0; i < count; ++i)
 				{
 					//loader.TempMainObject = presentation.Slides[presentation.CurPage];
-					/*var style_index = null;
+					var style_index = null;
+					//читаем флаг о наличии табличного стиля
 					if(!loader.stream.GetBool())
 					{
 						if(loader.stream.GetBool())
 						{
-							style_index = stream.GetULong();
+							loader.stream.Skip2(1);
+							cStyle = loader.ReadTableStyle();
+	
+							loader.stream.GetBool();
+							style_index = stream.GetString2();
 						}
-					}*/
-					
-					loader.stream.GetBool();
+					}
 					
 					var drawing = loader.ReadGraphicObject();