Копирование символа конца параграфа через бинарник.

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

Common/wordcopypaste.js

@@ -2530,11 +2530,10 @@ PasteProcessor.prototype =
 			}
 		}
 		
-		if(aContent.length > 0)
-		{
-			//todo в зависимости от наличия символа конца параграфа
+		if(oReadResult.bLastRun)
+			this.bInBlock = false;
+		else
 			this.bInBlock = true;
-		}
 		//создаем список используемых шрифтов
 		var AllFonts = new Object();
         for ( var Index = 0, Count = aContent.length; Index < Count; Index++ )

Word/Editor/Serialize2.js

@@ -268,7 +268,8 @@ var c_oSerRunType = {
     fldstart: 9,
     fldend: 10,
 	CommentReference: 11,
-	pptxDrawing: 12
+	pptxDrawing: 12,
+	_LastRun: 13 //для копирования через бинарник
 };
 var c_oSerImageType = {
     MediaId:0,
@@ -2260,6 +2261,13 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap)
                     oThis.memory.WriteLong(c_oSerPropLenType.Null);
                 });
 		}
+		if(bUseSelection && ParaEnd < Content.length - 1)
+		{
+			this.WriteRun(function(){
+                    oThis.memory.WriteByte(c_oSerRunType._LastRun);
+					oThis.memory.WriteLong(c_oSerPropLenType.Null);
+                });
+		}
     };
     this.WriteText = function()
     {
@@ -2992,7 +3000,8 @@ function BinaryFileReader(doc, openParams)
 		lvlStyles: null,
 		DefpPr: null,
 		DefrPr: null,
-		DocumentContent: null
+		DocumentContent: null,
+		bLastRun: null
 	};
     this.getbase64DecodedData = function(szSrc)
     {
@@ -3153,6 +3162,7 @@ function BinaryFileReader(doc, openParams)
 		this.oReadResult.tableStyles = [];
 		this.oReadResult.lvlStyles = [];
 		this.oReadResult.DocumentContent = [];
+		this.oReadResult.bLastRun = null;
 		
         var res = c_oSerConstants.ReadOk;
         //mtLen
@@ -5530,6 +5540,8 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
 					this.oComments[oCommon.Id] = {Ref: oCommon};
 			}
         }
+		else if (c_oSerRunType._LastRun === type)
+			this.oReadResult.bLastRun = true;
         else
             res = c_oSerConstants.ReadUnknown;
         return res;