diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-05-11 20:32:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-11 21:06:00 +0100 |
| commit | 6074a4f72c05641fa471981f6a7ffbd19bc20c70 (patch) | |
| tree | 8d05c49a00dfcf4b460010c9be8c6b3787b64702 | |
| parent | 7adbc1c68c02407b31e864cc6aff484949e270fd (diff) | |
coverity#705840 Dereference before null check
Change-Id: I732ded8a169b9bd0be85b193928a39c0a215ec36
| -rw-r--r-- | sc/source/ui/miscdlgs/crnrdlg.cxx | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 7c01a7059225..eaa36018c6b1 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -515,16 +515,13 @@ void ScColRowNameRangesDlg::UpdateNames() if(q>nCol2) q=nCol2; //@008 Baue String zusammen strShow = " ["; - if(pDoc!=NULL) + rString = pDoc->GetString(nCol1, nRow1, nTab1); + strShow += rString; + for(SCCOL i=nCol1+1;i<=q;i++) { - rString = pDoc->GetString(nCol1, nRow1, nTab1); + strShow += ", "; + rString = pDoc->GetString(i, nRow1, nTab1); strShow += rString; - for(SCCOL i=nCol1+1;i<=q;i++) - { - strShow += ", "; - rString = pDoc->GetString(i, nRow1, nTab1); - strShow += rString; - } } if(q<nCol2) // Zu lang? Ergaenzen um ",..." { @@ -560,16 +557,13 @@ void ScColRowNameRangesDlg::UpdateNames() SCROW q=nRow1+3; if(q>nRow2) q=nRow2; strShow = " ["; - if(pDoc!=NULL) + rString = pDoc->GetString(nCol1, nRow1, nTab1); + strShow += rString; + for(SCROW i=nRow1+1;i<=q;i++) { - rString = pDoc->GetString(nCol1, nRow1, nTab1); + strShow += ", "; + rString = pDoc->GetString(nCol1, i, nTab1); strShow += rString; - for(SCROW i=nRow1+1;i<=q;i++) - { - strShow += ", "; - rString = pDoc->GetString(nCol1, i, nTab1); - strShow += rString; - } } if(q<nRow2) { |