Tag: cws_src680_dba30a User: fs Date: 2008-02-25 13:23:53+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.32.10.1&r2=1.32.10.2 Delta lines: +11 -12 --------------------- --- dbloader.cxx 2008-02-05 21:38:27+0000 1.32.10.1 +++ dbloader.cxx 2008-02-25 13:23:50+0000 1.32.10.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader.cxx,v $ * - * $Revision: 1.32.10.1 $ + * $Revision: 1.32.10.2 $ * - * last change: $Author: fs $ $Date: 2008/02/05 21:38:27 $ + * last change: $Author: fs $ $Date: 2008/02/25 13:23:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -234,10 +234,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 ) ) ) ) { @@ -254,23 +254,22 @@ if ( sComponentURL == URL_COMPONENT_REPORTDESIGN ) { - ::comphelper::SequenceAsHashMap lDescriptor(rArgs); - sal_Bool bPreview = lDescriptor.getUnpackedValueOrDefault(INFO_PREVIEW, sal_False ); + sal_Bool bPreview = aLoadArgs.getOrDefault( "Preview", sal_False ); if ( bPreview ) { if (rListener.is()) rListener->loadCancelled(this); return; } - Reference< XModel > xModel = lDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")), Reference< XModel >()); - if ( xModel.is() ) + Reference< XModel > xReportModel( aLoadArgs.getOrDefault( "Model", Reference< XModel >() ) ); + if ( xReportModel.is() ) { xController.set(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ReportDesign"))),UNO_QUERY); if ( xController.is() ) { - xController->attachModel(xModel); - xModel->connectController( xController ); - xModel->setCurrentController(xController); + xController->attachModel(xReportModel); + xReportModel->connectController( xController ); + xReportModel->setCurrentController(xController); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
