Commit 6c38cfe4 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Убрал лишнюю проверку для парсинга ссылок

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52682 954022d7-b5bf-4e40-9824-e11837661b57
parent bba0288f
...@@ -25,16 +25,11 @@ function convertFormula(formula, ws) { ...@@ -25,16 +25,11 @@ function convertFormula(formula, ws) {
var range = null; var range = null;
if (formula && ws) { if (formula && ws) {
var ref3D = parserHelp.is3DRef(formula, 0); var result = parserHelp.parse3DRef(formula);
if (!ref3D[0]) if (null !== result) {
range = ws.model.getRange2(formula.toUpperCase()); var ws = ws.model.workbook.getWorksheetByName(result.sheet);
else { if (ws)
var resultRef = parserHelp.parse3DRef(formula); range = ws.getRange2(result.range);
if (null !== resultRef) {
var ws = ws.model.workbook.getWorksheetByName(resultRef.sheet);
if (ws)
range = ws.getRange2(resultRef.range);
}
} }
} }
return range; return range;
...@@ -2750,10 +2745,8 @@ function DrawingObjects() { ...@@ -2750,10 +2745,8 @@ function DrawingObjects() {
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
_this.createDrawingObject = function() { _this.createDrawingObject = function() {
return new DrawingBase(worksheet);
var drawing = new DrawingBase(worksheet); };
return drawing;
}
_this.cloneDrawingObject = function(obj) { _this.cloneDrawingObject = function(obj) {
......
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