Tag: cws_src680_odbmacros2 User: fs Date: 2008-02-11 11:16:50+0000 Modified: dba/dbaccess/source/ui/browser/dbloader.cxx dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: replace ShowTreeView/Button with (Enable|Show)Browser File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dbloader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dbloader.cxx?r1=1.31.64.6&r2=1.31.64.7 Delta lines: +17 -14 --------------------- --- dbloader.cxx 2008-02-07 15:49:08+0000 1.31.64.6 +++ dbloader.cxx 2008-02-11 11:16:47+0000 1.31.64.7 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader.cxx,v $ * - * $Revision: 1.31.64.6 $ + * $Revision: 1.31.64.7 $ * - * last change: $Author: fs $ $Date: 2008/02/07 15:49:08 $ + * last change: $Author: fs $ $Date: 2008/02/11 11:16:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -236,11 +236,13 @@ // table data view, effectively. In this case, we need to adjust the module identifier. // 2008-02-05 / i85879 / [EMAIL PROTECTED] ::comphelper::NamedValueCollection aLoadArgs( rArgs ); - if ( ( sComponentURL == URL_COMPONENT_DATASOURCEBROWSER ) - && ( ( sal_False == aLoadArgs.getOrDefault( (::rtl::OUString)PROPERTY_SHOWTREEVIEW, sal_True ) ) - || ( sal_False == aLoadArgs.getOrDefault( (::rtl::OUString)PROPERTY_SHOWTREEVIEWBUTTON, sal_True ) ) - ) - ) + + if ( sComponentURL == URL_COMPONENT_DATASOURCEBROWSER ) + { + sal_Bool bDisableBrowser = ( sal_False == aLoadArgs.getOrDefault( "ShowTreeViewButton", sal_True ) ) // compatibility name + || ( sal_False == aLoadArgs.getOrDefault( (::rtl::OUString)PROPERTY_ENABLE_BROWSER, sal_True ) ); + + if ( bDisableBrowser ) { try { @@ -252,6 +254,7 @@ DBG_UNHANDLED_EXCEPTION(); } } + } if ( sComponentURL == URL_COMPONENT_REPORTDESIGN ) { File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.192.2.9&r2=1.192.2.10 Delta lines: +17 -8 -------------------- --- unodatbr.cxx 2008-02-06 21:44:26+0000 1.192.2.9 +++ unodatbr.cxx 2008-02-11 11:16:47+0000 1.192.2.10 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.192.2.9 $ + * $Revision: 1.192.2.10 $ * - * last change: $Author: fs $ $Date: 2008/02/06 21:44:26 $ + * last change: $Author: fs $ $Date: 2008/02/11 11:16:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2900,14 +2900,23 @@ rArguments.get_ensureType( "Frame", xFrame ); rArguments.get_ensureType( (::rtl::OUString)PROPERTY_SHOWMENU, m_bShowMenu ); - m_bEnableBrowser = rArguments.getOrDefault( (::rtl::OUString)PROPERTY_SHOWTREEVIEWBUTTON, sal_True ); - sal_Bool bShowTreeView = ( m_bEnableBrowser ) - && ( rArguments.getOrDefault( (::rtl::OUString)PROPERTY_SHOWTREEVIEW, sal_True ) ); + // disable the browser if either of ShowTreeViewButton (compatibility name) or EnableBrowser + // 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 ), + "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_False == rArguments.getOrDefault( "ShowTreeView" ), sal_True ) ) // compatibility name + || ( sal_False == rArguments.getOrDefault( (::rtl::OUString)PROPERTY_SHOW_BROWSER, sal_True ) ); - if ( bShowTreeView ) - showExplorer(); - else + if ( bHideTreeView ) hideExplorer(); + else + showExplorer(); if ( m_bPreview ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
