Tag: cws_src680_odbmacros2 User: fs Date: 2008-02-07 15:49:11+0000 Modified: dba/dbaccess/source/ui/browser/dbloader.cxx
Log: #i10000# 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.5&r2=1.31.64.6 Delta lines: +10 -12 --------------------- --- dbloader.cxx 2008-02-06 08:35:12+0000 1.31.64.5 +++ dbloader.cxx 2008-02-07 15:49:08+0000 1.31.64.6 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader.cxx,v $ * - * $Revision: 1.31.64.5 $ + * $Revision: 1.31.64.6 $ * - * last change: $Author: fs $ $Date: 2008/02/06 08:35:12 $ + * last change: $Author: fs $ $Date: 2008/02/07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -235,10 +235,10 @@ // if a data source browser is loaded without its tree pane, then we assume it to be a // table data view, effectively. In this case, we need to adjust the module identifier. // 2008-02-05 / i85879 / [EMAIL PROTECTED] - ::comphelper::NamedValueCollection aArgs( rArgs ); + ::comphelper::NamedValueCollection aLoadArgs( rArgs ); if ( ( sComponentURL == URL_COMPONENT_DATASOURCEBROWSER ) - && ( ( sal_False == aArgs.getOrDefault( (::rtl::OUString)PROPERTY_SHOWTREEVIEW, sal_True ) ) - || ( sal_False == aArgs.getOrDefault( (::rtl::OUString)PROPERTY_SHOWTREEVIEWBUTTON, sal_True ) ) + && ( ( sal_False == aLoadArgs.getOrDefault( (::rtl::OUString)PROPERTY_SHOWTREEVIEW, sal_True ) ) + || ( sal_False == aLoadArgs.getOrDefault( (::rtl::OUString)PROPERTY_SHOWTREEVIEWBUTTON, sal_True ) ) ) ) { @@ -255,15 +255,14 @@ if ( sComponentURL == URL_COMPONENT_REPORTDESIGN ) { - ::comphelper::NamedValueCollection aArgs( rArgs ); - sal_Bool bPreview = aArgs.getOrDefault( "Preview", sal_False ); + sal_Bool bPreview = aLoadArgs.getOrDefault( "Preview", sal_False ); if ( bPreview ) { // report designs cannot be previewed if ( rListener.is() ) rListener->loadCancelled( this ); return; } - Reference< XModel > xReportModel( aArgs.getOrDefault( "Model", Reference< XModel >() ) ); + Reference< XModel > xReportModel( aLoadArgs.getOrDefault( "Model", Reference< XModel >() ) ); if ( xReportModel.is() ) { xController.set( m_xServiceFactory->createInstance( @@ -281,10 +280,9 @@ Reference< XModel > xDatabaseDocument; if ( bSuccess ) { - ::comphelper::NamedValueCollection aArgs( m_aArgs ); - Reference< XDataSource > xDataSource ( aArgs.getOrDefault( "DataSource", Reference< XDataSource >() ) ); - ::rtl::OUString sDataSourceName( aArgs.getOrDefault( "DataSourceName", ::rtl::OUString() ) ); - Reference< XConnection > xConnection ( aArgs.getOrDefault( "ActiveConnection", Reference< XConnection >() ) ); + Reference< XDataSource > xDataSource ( aLoadArgs.getOrDefault( "DataSource", Reference< XDataSource >() ) ); + ::rtl::OUString sDataSourceName( aLoadArgs.getOrDefault( "DataSourceName", ::rtl::OUString() ) ); + Reference< XConnection > xConnection ( aLoadArgs.getOrDefault( "ActiveConnection", Reference< XConnection >() ) ); if ( xDataSource.is() ) { xDatabaseDocument.set( getDataSourceOrModel( xDataSource ), UNO_QUERY ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
