diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 10:19:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 11:53:58 +0100 |
| commit | 004cc81168ce4e9f9b2f8fddf3361f8c23323673 (patch) | |
| tree | 16c7009a3fac88766214ff073cab5562555a2f3a /dbaccess | |
| parent | 2429c626b4ae5efcd2edf47dabf4add6a7384dff (diff) | |
loplugin:collapseif in dbaccess..lotuswordpro
Change-Id: Ia2a0d25c3833dfde0cd28337361f3cbd2aa29662
Reviewed-on: https://gerrit.libreoffice.org/62934
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 8a2e9d1419e3..9ece79f6830a 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -114,11 +114,8 @@ void OAppBorderWindow::Resize() if ( m_pPanel ) { OApplicationSwapWindow* pSwap = getPanel(); - if ( pSwap ) - { - if ( pSwap->GetEntryCount() != 0 ) - nX = pSwap->GetBoundingBox( pSwap->GetEntry(0) ).GetWidth() + aFLSize.Height(); - } + if ( pSwap && pSwap->GetEntryCount() != 0 ) + nX = pSwap->GetBoundingBox( pSwap->GetEntry(0) ).GetWidth() + aFLSize.Height(); nX = std::max(m_pPanel->GetWidthPixel() ,nX); m_pPanel->SetPosSizePixel(Point(0,0),Size(nX,nOutputHeight)); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 0c7e6c1b0d6e..4863cdf46b22 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2047,11 +2047,8 @@ long OSelectionBrowseBox::GetRealRow(long nRowId) const const long nCount = m_bVisibleRow.size(); for(i=0;i < nCount; ++i) { - if(m_bVisibleRow[i]) - { - if(nErg++ == nRowId) - break; - } + if(m_bVisibleRow[i] && nErg++ == nRowId) + break; } OSL_ENSURE(nErg <= long(m_bVisibleRow.size()),"nErg cannot be greater than BROW_ROW_CNT!"); return i; |