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

fix: Bug 29371 - Ошибка в обработке формул при открытии таблицы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62632 954022d7-b5bf-4e40-9824-e11837661b57
parent 8fad211f
...@@ -77,6 +77,17 @@ ...@@ -77,6 +77,17 @@
<script type="text/javascript" src="model/CollaborativeEditing.js"></script> <script type="text/javascript" src="model/CollaborativeEditing.js"></script>
<script type="text/javascript" src="model/ConditionalFormatting.js"></script> <script type="text/javascript" src="model/ConditionalFormatting.js"></script>
<script type="text/javascript" src="model/CellComment.js"></script>
<script type="text/javascript" src="model/Private/CellComment.js"></script>
<script type="text/javascript" src="../Common/NumFormat.js"></script>
<script type="text/javascript" src="model/Serialize.js"></script>
<script type="text/javascript" src="model/WorkbookElems.js"></script>
<script type="text/javascript" src="model/Workbook.js"></script>
<script type="text/javascript" src="model/CellInfo.js"></script>
<script type="text/javascript" src="model/AdvancedOptions.js"></script>
<script type="text/javascript" src="model/History.js"></script>
<script type="text/javascript" src="model/UndoRedo.js"></script>
<script type="text/javascript" src="model/FormulaObjects/parserFormula.js"></script> <script type="text/javascript" src="model/FormulaObjects/parserFormula.js"></script>
<script type="text/javascript" src="model/FormulaObjects/dateandtimeFunctions.js"></script> <script type="text/javascript" src="model/FormulaObjects/dateandtimeFunctions.js"></script>
<script type="text/javascript" src="model/FormulaObjects/engineeringFunctions.js"></script> <script type="text/javascript" src="model/FormulaObjects/engineeringFunctions.js"></script>
...@@ -89,17 +100,6 @@ ...@@ -89,17 +100,6 @@
<script type="text/javascript" src="model/FormulaObjects/lookupandreferenceFunctions.js"></script> <script type="text/javascript" src="model/FormulaObjects/lookupandreferenceFunctions.js"></script>
<script type="text/javascript" src="model/FormulaObjects/informationFunctions.js"></script> <script type="text/javascript" src="model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="model/FormulaObjects/logicalFunctions.js"></script> <script type="text/javascript" src="model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="model/CellComment.js"></script>
<script type="text/javascript" src="model/Private/CellComment.js"></script>
<script type="text/javascript" src="../Common/NumFormat.js"></script>
<script type="text/javascript" src="model/Serialize.js"></script>
<script type="text/javascript" src="model/WorkbookElems.js"></script>
<script type="text/javascript" src="model/Workbook.js"></script>
<script type="text/javascript" src="model/CellInfo.js"></script>
<script type="text/javascript" src="model/AdvancedOptions.js"></script>
<script type="text/javascript" src="model/History.js"></script>
<script type="text/javascript" src="model/UndoRedo.js"></script>
<script type="text/javascript" src="../Common/scroll.js"></script> <script type="text/javascript" src="../Common/scroll.js"></script>
<script type="text/javascript" src="view/PopUpSelector.js"></script> <script type="text/javascript" src="view/PopUpSelector.js"></script>
......
...@@ -3522,7 +3522,10 @@ parserFormula.prototype = { ...@@ -3522,7 +3522,10 @@ parserFormula.prototype = {
this.outStack = []; this.outStack = [];
this.elemArr = []; this.elemArr = [];
return false;*/ return false;*/
// this.outStack.push( new cError(cErrorType.wrong_name) ); if( this.operand_str == null ){
this.outStack.push( new cError(cErrorType.wrong_name) );
return this.isParsed = false;
}
this.outStack.push( new cName( this.operand_str, this.wb ) ); this.outStack.push( new cName( this.operand_str, this.wb ) );
operand_expected = false; operand_expected = false;
if( this.operand_str != null ){ if( this.operand_str != null ){
......
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