Skip to content

C
core
Kaydet (Commit) 4bece188 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Simplify sal_Bool expressions 

Change-Id: I4f9dd7b273e52fa97a7f79bf77a76ae5412c5e10
üst d0b17e6e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dbaccess/source/ui/browser/dbloader.cxx
Dosyayı görüntüle @ 4bece188
...@@ -191,8 +191,8 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU ...@@ -191,8 +191,8 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
if ( sComponentURL == URL_COMPONENT_DATASOURCEBROWSER ) if ( sComponentURL == URL_COMPONENT_DATASOURCEBROWSER )
{ {
bool bDisableBrowser = ( sal_False == aLoadArgs.getOrDefault( "ShowTreeViewButton", sal_True ) ) // compatibility name bool bDisableBrowser = !aLoadArgs.getOrDefault( "ShowTreeViewButton", sal_True ) // compatibility name
|| ( sal_False == aLoadArgs.getOrDefault( OUString(PROPERTY_ENABLE_BROWSER), sal_True ) ); || !aLoadArgs.getOrDefault( OUString(PROPERTY_ENABLE_BROWSER), sal_True );
if ( bDisableBrowser ) if ( bDisableBrowser )
{ {
......
dbaccess/source/ui/browser/unodatbr.cxx
Dosyayı görüntüle @ 4bece188
...@@ -3109,16 +3109,16 @@ void SbaTableQueryBrowser::impl_initialize() ...@@ -3109,16 +3109,16 @@ void SbaTableQueryBrowser::impl_initialize()
// disable the browser if either of ShowTreeViewButton (compatibility name) or EnableBrowser // disable the browser if either of ShowTreeViewButton (compatibility name) or EnableBrowser
// is present and set to FALSE // is present and set to FALSE
bool bDisableBrowser = ( sal_False == rArguments.getOrDefault( "ShowTreeViewButton", sal_True ) ) // compatibility name bool bDisableBrowser = !rArguments.getOrDefault( "ShowTreeViewButton", sal_True ) // compatibility name
|| ( sal_False == rArguments.getOrDefault( OUString(PROPERTY_ENABLE_BROWSER), sal_True ) ); || !rArguments.getOrDefault( OUString(PROPERTY_ENABLE_BROWSER), sal_True );
OSL_ENSURE( !rArguments.has( "ShowTreeViewButton" ), OSL_ENSURE( !rArguments.has( "ShowTreeViewButton" ),
"SbaTableQueryBrowser::impl_initialize: ShowTreeViewButton is superseded by EnableBrowser!" ); "SbaTableQueryBrowser::impl_initialize: ShowTreeViewButton is superseded by EnableBrowser!" );
m_bEnableBrowser = !bDisableBrowser; m_bEnableBrowser = !bDisableBrowser;
// hide the tree view it is disabled in general, or if the settings tell to hide it initially // hide the tree view it is disabled in general, or if the settings tell to hide it initially
bool bHideTreeView = ( !m_bEnableBrowser ) bool bHideTreeView = ( !m_bEnableBrowser )
|| ( sal_False == rArguments.getOrDefault( "ShowTreeView", sal_True ) ) // compatibility name || !rArguments.getOrDefault( "ShowTreeView", sal_True ) // compatibility name
|| ( sal_False == rArguments.getOrDefault( OUString(PROPERTY_SHOW_BROWSER), sal_True ) ); || !rArguments.getOrDefault( OUString(PROPERTY_SHOW_BROWSER), sal_True );
OSL_ENSURE( !rArguments.has( "ShowTreeView" ), OSL_ENSURE( !rArguments.has( "ShowTreeView" ),
"SbaTableQueryBrowser::impl_initialize: ShowTreeView is superseded by ShowBrowser!" ); "SbaTableQueryBrowser::impl_initialize: ShowTreeView is superseded by ShowBrowser!" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment