diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-26 20:53:54 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-30 23:49:59 -0400 |
| commit | d528b30b9f643d44cf2a24fa81ef6a7d1a80fcb9 (patch) | |
| tree | 2127070f46ad2f1714807a81350739e0062693b9 /sc/source/core/tool/interpr4.cxx | |
| parent | 1ce304cca32116de2ff3ea8dcac62a3be61aac77 (diff) | |
More on the ref object.
Change-Id: Id75bf12a04a1756aed4178df397c5a28787307a8
Diffstat (limited to 'sc/source/core/tool/interpr4.cxx')
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 5ad79c481944..e211d9988ca8 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -1872,10 +1872,7 @@ void ScInterpreter::PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab) if (!IfErrorPushError()) { ScSingleRefData aRef; - aRef.InitFlags(); - aRef.nCol = nCol; - aRef.nRow = nRow; - aRef.nTab = nTab; + aRef.InitAddress(ScAddress(nCol,nRow,nTab)); PushTempTokenWithoutError( new ScSingleRefToken( aRef ) ); } } @@ -1887,13 +1884,7 @@ void ScInterpreter::PushDoubleRef(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, if (!IfErrorPushError()) { ScComplexRefData aRef; - aRef.InitFlags(); - aRef.Ref1.nCol = nCol1; - aRef.Ref1.nRow = nRow1; - aRef.Ref1.nTab = nTab1; - aRef.Ref2.nCol = nCol2; - aRef.Ref2.nRow = nRow2; - aRef.Ref2.nTab = nTab2; + aRef.InitRange(ScRange(nCol1,nRow1,nTab1,nCol2,nRow2,nTab2)); PushTempTokenWithoutError( new ScDoubleRefToken( aRef ) ); } } @@ -1905,10 +1896,7 @@ void ScInterpreter::PushExternalSingleRef( if (!IfErrorPushError()) { ScSingleRefData aRef; - aRef.InitFlags(); - aRef.nCol = nCol; - aRef.nRow = nRow; - aRef.nTab = nTab; + aRef.InitAddress(ScAddress(nCol,nRow,nTab)); PushTempTokenWithoutError( new ScExternalSingleRefToken(nFileId, rTabName, aRef)) ; } } @@ -1921,13 +1909,7 @@ void ScInterpreter::PushExternalDoubleRef( if (!IfErrorPushError()) { ScComplexRefData aRef; - aRef.InitFlags(); - aRef.Ref1.nCol = nCol1; - aRef.Ref1.nRow = nRow1; - aRef.Ref1.nTab = nTab1; - aRef.Ref2.nCol = nCol2; - aRef.Ref2.nRow = nRow2; - aRef.Ref2.nTab = nTab2; + aRef.InitRange(ScRange(nCol1,nRow1,nTab1,nCol2,nRow2,nTab2)); PushTempTokenWithoutError( new ScExternalDoubleRefToken(nFileId, rTabName, aRef) ); } } |