+ asc_removeHyperlink

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

Excel/api.js

@@ -2635,6 +2635,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 					this.wb.restoreFocus();
 				}
 			},
+			
+			asc_removeHyperlink: function () {
+				if ( ws.objectRender.selectedGraphicObjectsExists() )
+					ws.objectRender.controller.removeHyperlink();
+			},
 
 			asc_insertFormula: function (functionName, autoComplet) {
 				this.wb.insertFormulaInEditor(functionName, autoComplet);
@@ -3307,6 +3312,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 
 		prot["asc_selectFunction"] = prot.asc_selectFunction;
 		prot["asc_insertHyperlink"] = prot.asc_insertHyperlink;
+		prot["asc_removeHyperlink"] = prot.asc_removeHyperlink;
 		prot["asc_insertFormula"] = prot.asc_insertFormula;
 		prot["asc_getFormulasInfo"] = prot.asc_getFormulasInfo;
 		prot["asc_setFontRenderingMode"] = prot.asc_setFontRenderingMode;

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -284,6 +284,10 @@ DrawingObjectsController.prototype =
         }
     },
 	
+	removeHyperlink: function () {
+        // TODO
+    },
+	
 	canAddHyperlink: function() {
         if(this.State.textObject)
         {
@@ -1198,9 +1202,9 @@ DrawingObjectsController.prototype =
 
     Get_SelectedText: function()
     {
-        if(this.State.textObject && this.State.textObject.Get_SelectedText)
+        if(this.curState.textObject && this.curState.textObject.Get_SelectedText)
         {
-            return this.State.textObject.Get_SelectedText();
+            return this.curState.textObject.Get_SelectedText();
         }
     },
 	

Excel/view/WorksheetView.js

@@ -5660,7 +5660,11 @@
 				var cell_info = new asc_CCellInfo();
 				cell_info.name =  this._getColumnTitle(c1) + this._getRowTitle(r1);
 				cell_info.formula = c.getFormula();
-				cell_info.text = c.getValueForEdit();
+				
+				if ( isGraphicObject && textPr && paraPr )
+					cell_info.text = this.objectRender.controller.Get_SelectedText();
+				else
+					cell_info.text = c.getValueForEdit();
 				
 				this.isUpdateSelection = false;
 				if ( isGraphicObject && textPr && paraPr ) {