Commit cbce6e6d authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bug #33550

parent 1722b97e
...@@ -9502,7 +9502,7 @@ CDocument.prototype.private_StartSelectionFromCurPos = function() ...@@ -9502,7 +9502,7 @@ CDocument.prototype.private_StartSelectionFromCurPos = function()
Y = _Y; Y = _Y;
} }
this.CurPage = CurPara.Get_StartPage_Absolute() + CurPara.CurPos.PagesPos; this.CurPage = CurPara.Get_CurrentPage_Absolute();
this.Selection_SetStart(X, Y, MouseEvent); this.Selection_SetStart(X, Y, MouseEvent);
MouseEvent.Type = AscCommon.g_mouse_event_type_move; MouseEvent.Type = AscCommon.g_mouse_event_type_move;
this.Selection_SetEnd(X, Y, MouseEvent); this.Selection_SetEnd(X, Y, MouseEvent);
...@@ -12725,6 +12725,7 @@ CDocument.prototype.controller_MoveCursorUp = function(AddToSelect) ...@@ -12725,6 +12725,7 @@ CDocument.prototype.controller_MoveCursorUp = function(AddToSelect)
this.private_UpdateCursorXY(false, true); this.private_UpdateCursorXY(false, true);
var Result = this.private_MoveCursorUp(this.CurPos.RealX, this.CurPos.RealY, AddToSelect); var Result = this.private_MoveCursorUp(this.CurPos.RealX, this.CurPos.RealY, AddToSelect);
// TODO: Вообще Word селектит до начала данной колонки в таком случае, а не до начала документа
if (true === AddToSelect && true !== Result) if (true === AddToSelect && true !== Result)
this.Cursor_MoveToStartPos(true); this.Cursor_MoveToStartPos(true);
......
...@@ -177,6 +177,11 @@ CFootEndnote.prototype.OnFastRecalculate = function() ...@@ -177,6 +177,11 @@ CFootEndnote.prototype.OnFastRecalculate = function()
{ {
this.NeedUpdateHint = true; this.NeedUpdateHint = true;
}; };
CFootEndnote.prototype.Get_ColumnFields = function(ElementIndex, ColumnIndex)
{
var PageAbs = this.Get_StartPage_Absolute();
return this.Parent.GetColumnFields(PageAbs, ColumnIndex);
};
//--------------------------------------------------------export---------------------------------------------------- //--------------------------------------------------------export----------------------------------------------------
window['AscCommonWord'] = window['AscCommonWord'] || {}; window['AscCommonWord'] = window['AscCommonWord'] || {};
......
...@@ -219,7 +219,7 @@ CFootnotesController.prototype.Reset = function(nPageIndex, oSectPr) ...@@ -219,7 +219,7 @@ CFootnotesController.prototype.Reset = function(nPageIndex, oSectPr)
_X += oSectPr.Get_ColumnSpace(nTempColumnIndex); _X += oSectPr.Get_ColumnSpace(nTempColumnIndex);
} }
var _XLimit = (nColumnsCount - 1 !== nColumnIndex ? X + oSectPr.Get_ColumnWidth(nColumnIndex) : XLimit); var _XLimit = (nColumnsCount - 1 !== nColumnIndex ? _X + oSectPr.Get_ColumnWidth(nColumnIndex) : XLimit);
var oColumn = new CFootEndnotePageColumn(); var oColumn = new CFootEndnotePageColumn();
oColumn.X = _X; oColumn.X = _X;
...@@ -3113,6 +3113,14 @@ CFootnotesController.prototype.GetCurrentSectionPr = function() ...@@ -3113,6 +3113,14 @@ CFootnotesController.prototype.GetCurrentSectionPr = function()
{ {
return null; return null;
}; };
CFootnotesController.prototype.GetColumnFields = function(nPageAbs, nColumnAbs)
{
var oColumn = this.private_GetPageColumn(nPageAbs, nColumnAbs);
if (!oColumn)
return {X : 0, XLimit : 297};
return {X : oColumn.X, XLimit : oColumn.XLimit};
};
function CFootEndnotePageColumn() function CFootEndnotePageColumn()
......
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