diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-27 06:36:44 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-07-13 15:05:24 +0000 |
| commit | 17722af09e527641db7c080013a94ea13f904377 (patch) | |
| tree | b32e36a36a5dcfdb922b9fdb5194bb623fb6a9a3 /sc/source/filter/excel/excform.cxx | |
| parent | ce2a1922f1159369cd28ee60b2999e0652c6abac (diff) | |
loplugin:singlevalfields in sc(part3)
Change-Id: I7309e7e30bd892f0b1bd47c44cdbba79da5e5a9f
Reviewed-on: https://gerrit.libreoffice.org/26686
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/filter/excel/excform.cxx')
| -rw-r--r-- | sc/source/filter/excel/excform.cxx | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index c3190550a68c..a084fb163ab0 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -184,7 +184,6 @@ void ImportExcel::Formula( ExcelToSc::ExcelToSc( XclImpRoot& rRoot ) : ExcelConverterBase(rRoot.GetDocImport().getDoc().GetSharedStringPool(), 512), XclImpRoot( rRoot ), - bExternName( false ), maFuncProv( rRoot ), meBiff( rRoot.GetBiff() ) { @@ -220,8 +219,6 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s ScComplexRefData aCRD; ExtensionTypeVec aExtensions; - bExternName = false; - if( eStatus != ConvOK ) { aIn.Ignore( nFormulaLen ); @@ -711,25 +708,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s sal_uInt16 nUINT16 = aIn.ReaduInt16(); if( nINT16 >= 0 ) { - const ExtName* pExtName = rR.pExtNameBuff->GetNameByIndex( nINT16, nUINT16 ); - if( pExtName && pExtName->IsDDE() && - rR.pExtSheetBuff->IsLink( ( sal_uInt16 ) nINT16 ) ) - { - OUString aAppl, aExtDoc; - TokenId nPar1, nPar2; - - rR.pExtSheetBuff->GetLink( ( sal_uInt16 ) nINT16 , aAppl, aExtDoc ); - nPar1 = aPool.Store( aAppl ); - nPar2 = aPool.Store( aExtDoc ); - nMerk0 = aPool.Store( pExtName->aName ); - aPool << ocDde << ocOpen << nPar1 << ocSep << nPar2 << ocSep - << nMerk0 << ocClose; - - GetDoc().CreateDdeLink( aAppl, aExtDoc, pExtName->aName, SC_DDE_DEFAULT, ScMatrixRef() ); - } - else - aPool << ocBad; - + aPool << ocBad; aPool >> aStack; } else @@ -898,11 +877,6 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s pErgebnis = aPool[ aStack.Get() ]; eRet = ConvErrCount; } - else if( bExternName ) - { - pErgebnis = aPool[ aStack.Get() ]; - eRet = ConvErrExternal; - } else if( bArrayFormula ) { pErgebnis = nullptr; @@ -939,8 +913,6 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_ aCRD.Ref1.SetAbsTab(aEingPos.Tab()); aCRD.Ref2.SetAbsTab(aEingPos.Tab()); - bExternName = false; - if( eStatus != ConvOK ) { aIn.Ignore( nFormulaLen ); @@ -1345,8 +1317,6 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_ eRet = ConvErrNi; else if( aIn.GetRecPos() != nEndPos ) eRet = ConvErrCount; - else if( bExternName ) - eRet = ConvErrExternal; else eRet = ConvOK; |