minor

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

Excel/view/WorkbookView.js

@@ -524,7 +524,7 @@
 				if ("hyperlink" === ct.target) {
 					// Проверим замерженность
 					var isHyperlinkClick = false;
-					if (ar.c1 === ar.c2 && ar.r1 === ar.r2)
+					if ( (ar.c1 === ar.c2 && ar.r1 === ar.r2) || ws.isSelectOnShape )
 						isHyperlinkClick = true;
 					else {
 						var mergedRange = ws.model.getMergedByCell(ar.r1, ar.c1);
@@ -532,7 +532,7 @@
 							isHyperlinkClick = true;
 					}
 					if (isHyperlinkClick) {
-						if (false === ct.hyperlink.hyperlinkModel.getVisited()) {
+						if (false === ct.hyperlink.hyperlinkModel.getVisited() && !ws.isSelectOnShape) {
 							ct.hyperlink.hyperlinkModel.setVisited(true);
 							if (ct.hyperlink.hyperlinkModel.Ref)
 								ws.changeWorksheet("updateRange", {range: ct.hyperlink.hyperlinkModel.Ref.getBBox0(), isLockDraw: false, canChangeColWidth: false});
@@ -544,6 +544,7 @@
 							case c_oAscHyperlinkType.RangeLink:
 								// ToDo надо поправить отрисовку комментария для данной ячейки (с которой уходим)
 								this.handlers.trigger("asc_onHideComment");
+								ws._checkSelectionShape();
 								this.Api._asc_setWorksheetRange(ct.hyperlink);
 								break;
 						}

Excel/view/WorksheetView.js

@@ -4994,9 +4994,7 @@
 						oHyperlink.Tooltip = drawingInfo.hyperlink.ToolTip;
 						var spl = drawingInfo.hyperlink.Value.split("!");
 						if (spl.length === 2) {
-							oHyperlink.Location = drawingInfo.hyperlink.Value;
-							oHyperlink.LocationSheet = spl[0];
-							oHyperlink.LocationRange = spl[1];
+							oHyperlink.setLocation(drawingInfo.hyperlink.Value);
 						}
 						else
 							oHyperlink.Hyperlink = drawingInfo.hyperlink.Value;
@@ -5774,10 +5772,7 @@
 						
 						var spl = shapeHyperlink.Value.split("!");
 						if (spl.length === 2) {
-							hyperlink.Location = shapeHyperlink.Value;
-							hyperlink.LocationSheet = spl[0];
-							hyperlink.LocationRange = spl[1];
-							this.objectRender.controller.resetSelectionState();
+							hyperlink.setLocation(shapeHyperlink.Value);
 						} else
 							hyperlink.Hyperlink = shapeHyperlink.Value;