diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-19 13:13:16 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-19 14:52:50 +0200 |
commit | 447a013299d148df12ff17306fff77bb7f85eba1 (patch) | |
tree | d577aabfb9b650bc46fdcf2289aae2b1561f1e4e /dbaccess/source/ui/app | |
parent | 78098b8494be7123bc4a8b50faa13445e5afd8ce (diff) |
clang-tidy readability-simplify-boolean-expr in dbaccess..framework
Change-Id: I96e1bd4000f4ade6ccfac53c57653772b249df99
Reviewed-on: https://gerrit.libreoffice.org/36678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 14 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 44 |
2 files changed, 21 insertions, 37 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index c53476d3b72f..950fbe17ac46 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -518,15 +518,11 @@ bool OAppDetailPageHelper::isLeaf(SvTreeListEntry* _pEntry) if ( !_pEntry ) return false; sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() ); - if ( ( nEntryType == DatabaseObjectContainer::TABLES ) - || ( nEntryType == DatabaseObjectContainer::CATALOG ) - || ( nEntryType == DatabaseObjectContainer::SCHEMA ) - || ( nEntryType == DatabaseObjectContainer::FORMS_FOLDER ) - || ( nEntryType == DatabaseObjectContainer::REPORTS_FOLDER ) - ) - return false; - - return true; + return !( ( nEntryType == DatabaseObjectContainer::TABLES ) + || ( nEntryType == DatabaseObjectContainer::CATALOG ) + || ( nEntryType == DatabaseObjectContainer::SCHEMA ) + || ( nEntryType == DatabaseObjectContainer::FORMS_FOLDER ) + || ( nEntryType == DatabaseObjectContainer::REPORTS_FOLDER )); } bool OAppDetailPageHelper::isALeafSelected() const diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 389a1bb5d628..6695065bb57e 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -149,22 +149,16 @@ void OAppBorderWindow::ImplInitSettings() { // FIXME RenderContext const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - if( true ) - { - vcl::Font aFont; - aFont = rStyleSettings.GetFieldFont(); - aFont.SetColor( rStyleSettings.GetWindowTextColor() ); - SetPointFont(*this, aFont); - } - if( true ) - { - SetTextColor( rStyleSettings.GetFieldTextColor() ); - SetTextFillColor(); - } + vcl::Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + SetPointFont(*this, aFont); + + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); - if( true ) - SetBackground( rStyleSettings.GetDialogColor() ); + SetBackground( rStyleSettings.GetDialogColor() ); } @@ -547,22 +541,16 @@ void OApplicationView::ImplInitSettings() { // FIXME RenderContext const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - if( true ) - { - vcl::Font aFont; - aFont = rStyleSettings.GetFieldFont(); - aFont.SetColor( rStyleSettings.GetWindowTextColor() ); - SetPointFont(*this, aFont); - } - if( true ) - { - SetTextColor( rStyleSettings.GetFieldTextColor() ); - SetTextFillColor(); - } + vcl::Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + SetPointFont(*this, aFont); + + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); - if( true ) - SetBackground( rStyleSettings.GetFieldColor() ); + SetBackground( rStyleSettings.GetFieldColor() ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |