Commit 2b75eebe authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Получение дефолтовых подписей для диаграмм из ChartTranslateManager'а....

Получение дефолтовых подписей для диаграмм из ChartTranslateManager'а. Подсказки для гиперссылок в автофигурах.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57233 954022d7-b5bf-4e40-9824-e11837661b57
parent 5da80eb8
"use strict"; "use strict";
function getChartTranslateManager()
{
return editor.chartTranslate;
}
CChartSpace.prototype.recalculateTransform = CShape.prototype.recalculateTransform; CChartSpace.prototype.recalculateTransform = CShape.prototype.recalculateTransform;
CChartSpace.prototype.recalculateBounds = function() CChartSpace.prototype.recalculateBounds = function()
{ {
......
...@@ -128,7 +128,8 @@ CGraphicObjects.prototype = ...@@ -128,7 +128,8 @@ CGraphicObjects.prototype =
this.handleEventMode = HANDLE_EVENT_MODE_HANDLE; this.handleEventMode = HANDLE_EVENT_MODE_HANDLE;
if(ret) if(ret)
{ {
this.drawingDocument.SetCursorType(ret.cursorType); if(ret.cursorType !== "text")
this.drawingDocument.SetCursorType(ret.cursorType);
return true; return true;
} }
return false; return false;
......
...@@ -6240,7 +6240,7 @@ Paragraph.prototype = ...@@ -6240,7 +6240,7 @@ Paragraph.prototype =
var TextPr = new CTextPr(); var TextPr = new CTextPr();
TextPr.Color = null; TextPr.Color = null;
TextPr.Underline = null; TextPr.Underline = null;
TextPr.RStyle = editor.WordControl.m_oLogicDocument.Get_Styles().Get_Default_Hyperlink(); TextPr.RStyle = editor ? editor.WordControl.m_oLogicDocument.Get_Styles().Get_Default_Hyperlink() : null;
Hyperlink.Apply_TextPr( TextPr, undefined, false ); Hyperlink.Apply_TextPr( TextPr, undefined, false );
} }
else if ( null !== HyperProps.Text && "" !== HyperProps.Text ) else if ( null !== HyperProps.Text && "" !== HyperProps.Text )
...@@ -9122,6 +9122,10 @@ Paragraph.prototype = ...@@ -9122,6 +9122,10 @@ Paragraph.prototype =
Update_CursorType : function(X, Y, PageIndex) Update_CursorType : function(X, Y, PageIndex)
{ {
var text_transform = null; var text_transform = null;
if(this.Parent && this.Parent.Parent && this.Parent.Parent.transformText)
{
text_transform = this.Parent.Parent.transformText;
}
var MMData = new CMouseMoveData(); var MMData = new CMouseMoveData();
var Coords = this.DrawingDocument.ConvertCoordsToCursorWR( X, Y, this.Get_StartPage_Absolute() + ( PageIndex - this.PageNum ), text_transform ); var Coords = this.DrawingDocument.ConvertCoordsToCursorWR( X, Y, this.Get_StartPage_Absolute() + ( PageIndex - this.PageNum ), text_transform );
MMData.X_abs = Coords.X; MMData.X_abs = Coords.X;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment