Tag: cws_src680_os63 User: os Date: 05/08/01 23:42:17 Modified: /dba/dbaccess/source/ui/dlg/ DbAdminImpl.cxx
Log: RESYNC: (1.8-1.9); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.8.54.1&r2=1.8.54.2 Delta lines: +18 -7 -------------------- --- DbAdminImpl.cxx 6 Jul 2005 12:50:06 -0000 1.8.54.1 +++ DbAdminImpl.cxx 2 Aug 2005 06:42:14 -0000 1.8.54.2 @@ -460,16 +460,25 @@ } return xDriver; } + +// ----------------------------------------------------------------------------- +Reference< XModel > ODbDataSourceAdministrationHelper::getCurrentModel() +{ + // ensure that the data source / model have been obtained + getCurrentDataSource(); + return m_xModel; +} + // ----------------------------------------------------------------------------- Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSource() { if ( !m_xDatasource.is() ) { - Reference<XInterface> xIn(m_aDataSourceName,UNO_QUERY); + Reference<XInterface> xIn(m_aDataSourceOrName,UNO_QUERY); if ( !xIn.is() ) { ::rtl::OUString sCurrentDatasource; - m_aDataSourceName >>= sCurrentDatasource; + m_aDataSourceOrName >>= sCurrentDatasource; OSL_ENSURE(sCurrentDatasource.getLength(),"No datasource name given!"); try { @@ -1135,9 +1144,11 @@ return sal_True; } // ----------------------------------------------------------------------------- -void ODbDataSourceAdministrationHelper::setCurrentDataSourceName(const ::com::sun::star::uno::Any& _aDataSourceName) +void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) { - m_aDataSourceName = _aDataSourceName; + DBG_ASSERT( !m_aDataSourceOrName.hasValue(), "ODbDataSourceAdministrationHelper::setDataSourceOrName: already have one!" ); + // hmm. We could reset m_xDatasource/m_xModel, probably, and continue working + m_aDataSourceOrName = _rDataSourceOrName; } //......................................................................... } // namespace dbaui --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
