Копирование merge и hyperlink при копировании sheet

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

Excel/model/Workbook.js

@@ -2286,6 +2286,24 @@ Woorksheet.prototype.clone=function(sNewId){
 		oNewWs.oAllCol = this.oAllCol.clone();
 	for(var i in this.aGCells)
 		oNewWs.aGCells[i] = this.aGCells[i].clone();
+	var aMerged = this.mergeManager.getAll();
+	oNewWs.mergeManager.stopRecalculate();
+	for(var i in aMerged)
+	{
+		var elem = aMerged[i];
+		var range = oNewWs.getRange3(elem.bbox.r1, elem.bbox.c1, elem.bbox.r2, elem.bbox.c2);
+		range.mergeOpen();
+	}
+	oNewWs.mergeManager.startRecalculate();
+	var aHyperlinks = this.hyperlinkManager.getAll();
+	oNewWs.hyperlinkManager.stopRecalculate();
+	for(var i in aHyperlinks)
+	{
+		var elem = aHyperlinks[i];
+		var range = oNewWs.getRange3(elem.bbox.r1, elem.bbox.c1, elem.bbox.r2, elem.bbox.c2);
+		range.setHyperlinkOpen(elem.data);
+	}
+	oNewWs.hyperlinkManager.startRecalculate();
 	if(null != this.Drawings && this.Drawings.length > 0)
     {
 

Excel/model/WorkbookElems.js

@@ -1815,7 +1815,7 @@ Hyperlink.prototype = {
 		if (null !== this.Ref)
 			oNewHyp.Ref = this.Ref.clone();
 		if (null !== this.getLocation())
-			oNewHyp.Location = this.getLocation();
+			oNewHyp.setLocation(this.getLocation());
 		if (null !== this.LocationSheet)
 			oNewHyp.LocationSheet = this.LocationSheet;
 		if (null !== this.LocationRange)
@@ -1824,6 +1824,8 @@ Hyperlink.prototype = {
 			oNewHyp.Hyperlink = this.Hyperlink;
 		if (null !== this.Tooltip)
 			oNewHyp.Tooltip = this.Tooltip;
+		if (null !== this.bVisited)
+			oNewHyp.bVisited = this.bVisited;
 		return oNewHyp;
 	},
 	isEqual : function (obj) {