diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-21 10:55:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-21 10:55:38 +0000 |
| commit | fdaada09a985aabaaa9338ff393bade79b7f6a23 (patch) | |
| tree | 4ae0f3b55f34c514d1d41b11729233d3dc3fb59a /sc/source/filter/excel/excform.cxx | |
| parent | e08081a7e2fbb3c8831445d0544766ea047df915 (diff) | |
INTEGRATION: CWS dr41 (1.34.134); FILE MERGED
2005/10/04 22:06:54 dr 1.34.134.3: RESYNC: (1.34-1.36); FILE MERGED
2005/09/28 08:42:20 dr 1.34.134.2: #i55144# internal references with/without sheet names
2005/08/25 14:24:58 dr 1.34.134.1: #i42727# BAHTTEXT
Diffstat (limited to 'sc/source/filter/excel/excform.cxx')
| -rw-r--r-- | sc/source/filter/excel/excform.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 03428b152da6..d93c81266eff 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -4,9 +4,9 @@ * * $RCSfile: excform.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: hr $ $Date: 2005-09-28 11:41:05 $ + * last change: $Author: rt $ $Date: 2005-10-21 11:55:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -742,9 +742,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, UINT32 nFormulaLen, if( nExtSheet <= 0 ) { // in aktuellem Workbook - BOOL b3D = ( static_cast<SCTAB>(nTabFirst) != aEingPos.Tab() ) || bRangeName; aSRD.nTab = static_cast<SCTAB>(nTabFirst); - aSRD.SetFlag3D( b3D ); + aSRD.SetFlag3D( TRUE ); aSRD.SetTabRel( FALSE ); ExcRelToScRel( nRow, nCol, aSRD, bRangeName ); @@ -763,13 +762,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, UINT32 nFormulaLen, if( nTabLast != nTabFirst ) { - aCRD.Ref1 = aSRD; - aCRD.Ref2.nCol = aSRD.nCol; - aCRD.Ref2.nRow = aSRD.nRow; + aCRD.Ref1 = aCRD.Ref2 = aSRD; aCRD.Ref2.nTab = static_cast<SCTAB>(nTabLast); - b3D = ( static_cast<SCTAB>(nTabLast) != aEingPos.Tab() ); - aCRD.Ref2.SetFlag3D( b3D ); - aCRD.Ref2.SetTabRel( FALSE ); aCRD.Ref2.SetTabDeleted( !ValidTab(static_cast<SCTAB>(nTabLast)) ); aStack << aPool.Store( aCRD ); } @@ -819,9 +813,9 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, UINT32 nFormulaLen, rR1.nTab = static_cast<SCTAB>(nTabFirst); rR2.nTab = static_cast<SCTAB>(nTabLast); - rR1.SetFlag3D( ( static_cast<SCTAB>(nTabFirst) != aEingPos.Tab() ) || bRangeName ); + rR1.SetFlag3D( TRUE ); rR1.SetTabRel( FALSE ); - rR2.SetFlag3D( ( static_cast<SCTAB>(nTabLast) != aEingPos.Tab() ) || bRangeName ); + rR2.SetFlag3D( nTabFirst != nTabLast ); rR2.SetTabRel( FALSE ); ExcRelToScRel( nRowFirst, nColFirst, aCRD.Ref1, bRangeName ); @@ -1345,9 +1339,12 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, BYTE nAnz ) { TokenId n = eParam[ nAnz - 1 ]; //##### GRUETZE FUER BASIC-FUNCS RICHTEN! - if( aPool.IsExternal( n ) ) + if( const String* pExt = aPool.GetExternal( n ) ) { - aPool << n; + if( const XclFunctionInfo* pFuncInfo = maFuncProv.GetFuncInfoFromXclMacroName( *pExt ) ) + aPool << pFuncInfo->meOpCode; + else + aPool << n; nAnz--; } else |