User: kz Date: 05/06/30 09:30:47 Modified: /dba/dbaccess/source/ui/dlg/ DbAdminImpl.cxx
Log: INTEGRATION: CWS wizopendb (1.8.48); FILE MERGED 2005/06/06 10:40:38 fs 1.8.48.1: #i42477# allow the 'New Database' wizard to load existing documents 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&r2=1.9 Delta lines: +15 -4 -------------------- --- DbAdminImpl.cxx 10 Mar 2005 16:48:20 -0000 1.8 +++ DbAdminImpl.cxx 30 Jun 2005 16:30:42 -0000 1.9 @@ -454,16 +454,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 { @@ -1129,9 +1138,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]
