Tag: odbmacros_2_5 User: fs Date: 2008-02-18 14:01:06+0000 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: 'resync': merge changes 1.192.2.12->1.192.2.13 File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.192.2.12.2.1&r2=1.192.2.12.2.2 Delta lines: +6 -4 ------------------- --- unodatbr.cxx 2008-02-14 12:25:00+0000 1.192.2.12.2.1 +++ unodatbr.cxx 2008-02-18 14:01:03+0000 1.192.2.12.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.192.2.12.2.1 $ + * $Revision: 1.192.2.12.2.2 $ * - * last change: $Author: fs $ $Date: 2008/02/14 12:25:00 $ + * last change: $Author: fs $ $Date: 2008/02/18 14:01:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2904,14 +2904,16 @@ // is present and set to FALSE sal_Bool bDisableBrowser = ( sal_False == rArguments.getOrDefault( "ShowTreeViewButton", sal_True ) ) // compatibility name || ( sal_False == rArguments.getOrDefault( (::rtl::OUString)PROPERTY_ENABLE_BROWSER, sal_True ) ); - OSL_ENSURE( !rArguments.has( (::rtl::OUString)PROPERTY_ENABLE_BROWSER ), + OSL_ENSURE( !rArguments.has( "ShowTreeViewButton" ), "SbaTableQueryBrowser::impl_initialize: ShowTreeViewButton is superseded by EnableBrowser!" ); m_bEnableBrowser = !bDisableBrowser; // hide the tree view it is disabled in general, or if the settings tell to hide it initially - sal_Bool bHideTreeView = ( m_bEnableBrowser ) + sal_Bool bHideTreeView = ( !m_bEnableBrowser ) || ( sal_False == rArguments.getOrDefault( "ShowTreeView", sal_True ) ) // compatibility name || ( sal_False == rArguments.getOrDefault( (::rtl::OUString)PROPERTY_SHOW_BROWSER, sal_True ) ); + OSL_ENSURE( !rArguments.has( "ShowTreeView" ), + "SbaTableQueryBrowser::impl_initialize: ShowTreeView is superseded by ShowBrowser!" ); if ( bHideTreeView ) hideExplorer(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
