diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-15 08:48:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-17 08:25:06 +0200 |
| commit | 16690220ed6e68f2e9674a09b5008f38c5e6ed8d (patch) | |
| tree | 2f830b7ac23f136585e7dc4adf5d456f4995cc99 /sc/source/filter/excel | |
| parent | 86d70dc840b88ed827d6d8febaf512264009951d (diff) | |
loplugin:singlevalfields
tighten up the handling of binary operators
Change-Id: I262ec57bf7142fa094d240738150a94d83fd15ee
Reviewed-on: https://gerrit.libreoffice.org/61777
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/excel')
| -rw-r--r-- | sc/source/filter/excel/excform.cxx | 12 | ||||
| -rw-r--r-- | sc/source/filter/excel/excform8.cxx | 18 | ||||
| -rw-r--r-- | sc/source/filter/excel/frmbase.cxx | 4 |
3 files changed, 1 insertions, 33 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 7a2f80ef5fbc..de4f83c73121 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -222,12 +222,6 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream ScComplexRefData aCRD; ExtensionTypeVec aExtensions; - if( eStatus != ConvErr::OK ) - { - aIn.Ignore( nFormulaLen ); - return eStatus; - } - if( nFormulaLen == 0 ) { aPool.Store( OUString("-/-") ); @@ -915,12 +909,6 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std: aCRD.Ref1.SetAbsTab(aEingPos.Tab()); aCRD.Ref2.SetAbsTab(aEingPos.Tab()); - if( eStatus != ConvErr::OK ) - { - aIn.Ignore( nFormulaLen ); - return eStatus; - } - if( nFormulaLen == 0 ) return ConvErr::OK; diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 6cec86f94b11..e3eda3cfd5de 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -150,12 +150,6 @@ ConvErr ExcelToSc8::Convert( std::unique_ptr<ScTokenArray>& rpTokArray, XclImpSt ScComplexRefData aCRD; ExtensionTypeVec aExtensions; - if( eStatus != ConvErr::OK ) - { - aIn.Ignore( nFormulaLen ); - return eStatus; - } - if( nFormulaLen == 0 ) { aPool.Store( OUString( "-/-" ) ); @@ -967,12 +961,6 @@ ConvErr ExcelToSc8::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std ScSingleRefData aSRD; ScComplexRefData aCRD; - if( eStatus != ConvErr::OK ) - { - aIn.Ignore( nFormulaLen ); - return eStatus; - } - if( nFormulaLen == 0 ) return ConvErr::OK; @@ -1311,12 +1299,6 @@ void ExcelToSc8::ConvertExternName( std::unique_ptr<ScTokenArray>& rpArray, XclI ScSingleRefData aSRD; ScComplexRefData aCRD; - if (eStatus != ConvErr::OK) - { - rStrm.Ignore(nFormulaLen); - return; - } - if (nFormulaLen == 0) { aPool.Store(OUString("-/-")); diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index a3c01350fced..465025a349cd 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -151,8 +151,7 @@ const ScRange* ScRangeListTabs::Next () ConverterBase::ConverterBase( svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffer ) : aPool(rSPool), - aEingPos( 0, 0, 0 ), - eStatus( ConvErr::OK ) + aEingPos( 0, 0, 0 ) { OSL_ENSURE( nNewBuffer > 0, "ConverterBase::ConverterBase - nNewBuffer == 0!" ); pBuffer.reset( new sal_Char[ nNewBuffer ] ); @@ -164,7 +163,6 @@ ConverterBase::~ConverterBase() void ConverterBase::Reset() { - eStatus = ConvErr::OK; aPool.Reset(); aStack.Reset(); } |