User: rt Date: 2007-07-24 12:07:24+0000 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: INTEGRATION: CWS dba23b (1.76.10); FILE MERGED 2007/07/11 20:15:59 fs 1.76.10.3: #i10000# 2007/07/11 11:53:17 fs 1.76.10.2: RESYNC: (1.76-1.78); FILE MERGED 2007/07/08 20:36:15 fs 1.76.10.1: during #i65812#: context details not used File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.78&r2=1.79 Delta lines: +3 -4 ------------------- --- genericcontroller.cxx 2007-07-06 08:04:34+0000 1.78 +++ genericcontroller.cxx 2007-07-24 12:07:21+0000 1.79 @@ -982,8 +982,7 @@ { WaitObject aWaitCursor(getView()); - const ::rtl::OUString sNoContext; - ODatasourceConnector aConnector(getORB(), getView(), sNoContext, sNoContext); + ODatasourceConnector aConnector( getORB(), getView(), ::rtl::OUString() ); Reference<XConnection> xConnection = aConnector.connect(_xDataSource); // be notified when connection is in disposing @@ -995,11 +994,11 @@ // ----------------------------------------------------------------------------- Reference< XConnection > OGenericUnoController::connect( const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rContextInformation, - const ::rtl::OUString& _rContextDetails, sal_Bool _bStartListening ) + sal_Bool _bStartListening ) { WaitObject aWaitCursor(getView()); - ODatasourceConnector aConnector(getORB(), getView(), _rContextInformation, _rContextDetails); + ODatasourceConnector aConnector( getORB(), getView(), _rContextInformation ); Reference<XConnection> xConnection = aConnector.connect(_rDataSourceName); // be notified when connection is in disposing --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
