Commit 3bcc6996 authored by dmitry.shahtanov's avatar dmitry.shahtanov Committed by Alexander.Trofimov

Fixed issue #25525

parent 3a7f999a
...@@ -794,7 +794,7 @@ ...@@ -794,7 +794,7 @@
wsOPEN = this.handlers.trigger( "getCellFormulaEnterWSOpen" ), wsOPEN = this.handlers.trigger( "getCellFormulaEnterWSOpen" ),
ws = wsOPEN ? wsOPEN.model : this.handlers.trigger( "getActiveWS" ); ws = wsOPEN ? wsOPEN.model : this.handlers.trigger( "getActiveWS" );
if ( s.length < 1 || s.charAt( 0 ) !== "=" ) { if ( s.length < 1 || s.charAt( 0 ) !== "=" || this.options.cellNumFormat == 2 ) {
return ret; return ret;
} }
......
...@@ -11357,6 +11357,7 @@ ...@@ -11357,6 +11357,7 @@
autoComplete : arrAutoComplete, autoComplete : arrAutoComplete,
autoCompleteLC : arrAutoCompleteLC, autoCompleteLC : arrAutoCompleteLC,
cellName : c.getName(), cellName : c.getName(),
cellNumFormat : c.getNumFormatType(),
saveValueCallback : function ( val, flags, skipNLCheck ) { saveValueCallback : function ( val, flags, skipNLCheck ) {
var oCellEdit = isMerged ? new asc_Range( mc.c1, mc.r1, mc.c1, mc.r1 ) : new asc_Range( col, row, col, row ); var oCellEdit = isMerged ? new asc_Range( mc.c1, mc.r1, mc.c1, mc.r1 ) : new asc_Range( col, row, col, row );
return t._saveCellValueAfterEdit( oCellEdit, c, val, flags, skipNLCheck, /*isNotHistory*/false, /*lockDraw*/false ); return t._saveCellValueAfterEdit( oCellEdit, c, val, flags, skipNLCheck, /*isNotHistory*/false, /*lockDraw*/false );
......
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