diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-09-13 19:18:47 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-14 09:45:23 +0200 |
commit | 170c2fe7131923ff9b1d93847e9413ff1d3f1d69 (patch) | |
tree | d2afe5b3842f7178349441c3c11b16b01ad095d0 /sc/source/filter/excel/excimp8.cxx | |
parent | ee5582bacf99beac1b8a4206f57a2a5d3d3d980f (diff) |
ImportTyp never passed null arg
Change-Id: Ibd126b4812f08f96f5c354e946a38b36aa492da0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102597
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/filter/excel/excimp8.cxx')
-rw-r--r-- | sc/source/filter/excel/excimp8.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 0fef106161be..cb28f003c064 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -156,30 +156,30 @@ ImportExcel8::~ImportExcel8() void ImportExcel8::Calccount() { - ScDocOptions aOpt = pD->GetDocOptions(); + ScDocOptions aOpt = rD.GetDocOptions(); aOpt.SetIterCount( aIn.ReaduInt16() ); - pD->SetDocOptions( aOpt ); + rD.SetDocOptions( aOpt ); } void ImportExcel8::Precision() { - ScDocOptions aOpt = pD->GetDocOptions(); + ScDocOptions aOpt = rD.GetDocOptions(); aOpt.SetCalcAsShown( aIn.ReaduInt16() == 0 ); - pD->SetDocOptions( aOpt ); + rD.SetDocOptions( aOpt ); } void ImportExcel8::Delta() { - ScDocOptions aOpt = pD->GetDocOptions(); + ScDocOptions aOpt = rD.GetDocOptions(); aOpt.SetIterEps( aIn.ReadDouble() ); - pD->SetDocOptions( aOpt ); + rD.SetDocOptions( aOpt ); } void ImportExcel8::Iteration() { - ScDocOptions aOpt = pD->GetDocOptions(); + ScDocOptions aOpt = rD.GetDocOptions(); aOpt.SetIter( aIn.ReaduInt16() == 1 ); - pD->SetDocOptions( aOpt ); + rD.SetDocOptions( aOpt ); } void ImportExcel8::Boundsheet() @@ -199,17 +199,17 @@ void ImportExcel8::Boundsheet() SCTAB nScTab = nBdshtTab; if( nScTab > 0 ) { - OSL_ENSURE( !pD->HasTable( nScTab ), "ImportExcel8::Boundsheet - sheet exists already" ); - pD->MakeTable( nScTab ); + OSL_ENSURE( !rD.HasTable( nScTab ), "ImportExcel8::Boundsheet - sheet exists already" ); + rD.MakeTable( nScTab ); } if( ( nGrbit & 0x0001 ) || ( nGrbit & 0x0002 ) ) - pD->SetVisible( nScTab, false ); + rD.SetVisible( nScTab, false ); - if( !pD->RenameTab( nScTab, aName ) ) + if( !rD.RenameTab( nScTab, aName ) ) { - pD->CreateValidTabName( aName ); - pD->RenameTab( nScTab, aName ); + rD.CreateValidTabName( aName ); + rD.RenameTab( nScTab, aName ); } nBdshtTab++; @@ -396,9 +396,9 @@ void ImportExcel8::PostDocLoad() ImportExcel::PostDocLoad(); // check scenarios; Attention: This increases the table count of the document!! - if( !pD->IsClipboard() && !maScenList.aEntries.empty() ) + if( !rD.IsClipboard() && !maScenList.aEntries.empty() ) { - pD->UpdateChartListenerCollection(); // references in charts must be updated + rD.UpdateChartListenerCollection(); // references in charts must be updated maScenList.Apply( GetRoot() ); } |