Commit 8891790e authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix Bug 35404

parent db519fca
...@@ -2854,12 +2854,7 @@ CPresentation.prototype = ...@@ -2854,12 +2854,7 @@ CPresentation.prototype =
var ParaPr = this.GetCalculatedParaPr(); var ParaPr = this.GetCalculatedParaPr();
if ( null != ParaPr ) if ( null != ParaPr )
{ {
if ( false === this.Document_Is_SelectionLocked(AscCommon.changestype_Paragraph_Properties) )
{
this.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetParagraphAlignHotKey);
this.SetParagraphAlign( ParaPr.Jc === align_Justify ? align_Left : align_Justify ); this.SetParagraphAlign( ParaPr.Jc === align_Justify ? align_Left : align_Justify );
this.Document_UpdateInterfaceState();
}
bRetValue = keydownresult_PreventAll; bRetValue = keydownresult_PreventAll;
} }
} }
...@@ -2874,12 +2869,7 @@ CPresentation.prototype = ...@@ -2874,12 +2869,7 @@ CPresentation.prototype =
{ {
if ( true === e.ShiftKey ) // Ctrl + Shift + L - добавляем список к данному параграфу if ( true === e.ShiftKey ) // Ctrl + Shift + L - добавляем список к данному параграфу
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Drawing_Props) )
{
this.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetParagraphNumberingHotKey);
this.SetParagraphNumbering( { Type : 0, SubType : 1 } ); this.SetParagraphNumbering( { Type : 0, SubType : 1 } );
this.Document_UpdateInterfaceState();
}
bRetValue = keydownresult_PreventAll; bRetValue = keydownresult_PreventAll;
} }
else // Ctrl + L - переключение прилегания параграфа между left и justify else // Ctrl + L - переключение прилегания параграфа между left и justify
...@@ -2887,12 +2877,7 @@ CPresentation.prototype = ...@@ -2887,12 +2877,7 @@ CPresentation.prototype =
var ParaPr = this.GetCalculatedParaPr(); var ParaPr = this.GetCalculatedParaPr();
if ( null != ParaPr ) if ( null != ParaPr )
{ {
if ( false === this.Document_Is_SelectionLocked(AscCommon.changestype_Paragraph_Properties) )
{
this.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetParagraphNumberingHotKey);
this.SetParagraphAlign( ParaPr.Jc === align_Left ? align_Justify : align_Left ); this.SetParagraphAlign( ParaPr.Jc === align_Left ? align_Justify : align_Left );
this.Document_UpdateInterfaceState();
}
bRetValue = keydownresult_PreventAll; bRetValue = keydownresult_PreventAll;
} }
} }
...@@ -2935,12 +2920,7 @@ CPresentation.prototype = ...@@ -2935,12 +2920,7 @@ CPresentation.prototype =
var ParaPr = this.GetCalculatedParaPr(); var ParaPr = this.GetCalculatedParaPr();
if ( null != ParaPr ) if ( null != ParaPr )
{ {
if ( false === this.Document_Is_SelectionLocked(AscCommon.changestype_Paragraph_Properties) )
{
this.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetParagraphAlignHotKey4);
this.SetParagraphAlign( ParaPr.Jc === AscCommon.align_Right ? align_Left : AscCommon.align_Right ); this.SetParagraphAlign( ParaPr.Jc === AscCommon.align_Right ? align_Left : AscCommon.align_Right );
this.Document_UpdateInterfaceState();
}
bRetValue = keydownresult_PreventAll; bRetValue = keydownresult_PreventAll;
} }
} }
...@@ -2974,8 +2954,6 @@ CPresentation.prototype = ...@@ -2974,8 +2954,6 @@ CPresentation.prototype =
} }
} }
else if ( e.KeyCode == 86 && false === editor.isViewMode && true === e.CtrlKey ) // Ctrl + V - paste else if ( e.KeyCode == 86 && false === editor.isViewMode && true === e.CtrlKey ) // Ctrl + V - paste
{
if ( false === this.Document_Is_SelectionLocked(changestype_Drawing_Props) )
{ {
if ( true === e.ShiftKey ) // Ctrl + Shift + V - вставляем по образцу if ( true === e.ShiftKey ) // Ctrl + Shift + V - вставляем по образцу
{ {
...@@ -2983,7 +2961,6 @@ CPresentation.prototype = ...@@ -2983,7 +2961,6 @@ CPresentation.prototype =
bRetValue = keydownresult_PreventAll; bRetValue = keydownresult_PreventAll;
} }
} }
}
else if ( e.KeyCode == 89 && false === editor.isViewMode && true === e.CtrlKey ) // Ctrl + Y - Redo else if ( e.KeyCode == 89 && false === editor.isViewMode && true === e.CtrlKey ) // Ctrl + Y - Redo
{ {
this.Document_Redo(); this.Document_Redo();
......
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