Commit 6b3532d2 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

- не чистился массив ссылками на ячейки на другом листе в формулах

- правка для bug #31870

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68818 954022d7-b5bf-4e40-9824-e11837661b57
parent 047975c1
...@@ -870,7 +870,6 @@ ...@@ -870,7 +870,6 @@
} }
case cElementType.name : case cElementType.name :
{ {
// continue;
var nameRef = r.oper.toRef(); var nameRef = r.oper.toRef();
if( nameRef instanceof cError ) continue; if( nameRef instanceof cError ) continue;
switch ( nameRef.type ) { switch ( nameRef.type ) {
...@@ -1205,7 +1204,7 @@ ...@@ -1205,7 +1204,7 @@
if ( isFormula ) { if ( isFormula ) {
funcPos = asc_lastidx( s, t.reNotFormula, t.cursorPos ) + 1; funcPos = asc_lastidx( s, t.reNotFormula, t.cursorPos ) + 1;
if ( funcPos > 0 ) { if ( funcPos > 0 ) {
match = s.slice( funcPos ).match( t.reFormula ); match = s.slice( funcPos, t.cursorPos ).match( t.reFormula );
} }
if ( match ) { if ( match ) {
funcName = match[1]; funcName = match[1];
......
...@@ -462,6 +462,9 @@ ...@@ -462,6 +462,9 @@
if (!self.lockDraw) { if (!self.lockDraw) {
ws.cleanSelection(); ws.cleanSelection();
} }
for (var i in self.wsViews) {
self.wsViews[i].cleanFormulaRanges();
}
ws.cleanFormulaRanges(); ws.cleanFormulaRanges();
ws.setFormulaEditMode.apply(ws, arguments); ws.setFormulaEditMode.apply(ws, arguments);
} }
......
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