Tag: cws_src680_dba24 User: oj Date: 05/02/18 04:35:41 Modified: /dba/dbaccess/source/ui/browser/ dbloader.cxx, unodatbr.cxx
Log: #i42460# changes for the separation of datasource and database document(model) 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.20.22.1&r2=1.20.22.2 Delta lines: +8 -9 ------------------- --- dbloader.cxx 3 Feb 2005 13:52:13 -0000 1.20.22.1 +++ dbloader.cxx 18 Feb 2005 12:35:38 -0000 1.20.22.2 @@ -122,6 +122,9 @@ #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> #endif +#ifndef DBAUI_TOOLS_HXX +#include "UITools.hxx" +#endif using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -280,21 +283,17 @@ { if(0 == pIter->Name.compareToAscii(PROPERTY_DATASOURCE)) { - xModel.set(pIter->Value,UNO_QUERY); + Reference<XDataSource> xProp(pIter->Value,UNO_QUERY); + xModel.set(getDataSourceOrModel(xProp),UNO_QUERY); break; } else if(0 == pIter->Name.compareToAscii(PROPERTY_DATASOURCENAME)) { ::rtl::OUString sDataSource; pIter->Value >>= sDataSource; + Reference< XNameAccess > xDatabaseContext(m_xServiceFactory->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY); - try - { - xModel.set(xDatabaseContext->getByName(sDataSource),UNO_QUERY); - } - catch(Exception) - { - } + xModel.set(getDataSourceOrModel(getDataSourceByName_displayError(xDatabaseContext,sDataSource,NULL,m_xServiceFactory,sal_False)),UNO_QUERY); break; } else if ( 0 == pIter->Name.compareToAscii( PROPERTY_ACTIVECONNECTION ) ) @@ -304,7 +303,7 @@ { OSL_ENSURE( Reference< XDataSource >( xAsChild->getParent(), UNO_QUERY ).is(), "DBContentLoader::load: a connection whose parent is no data source?" ); - xModel = xModel.query( xAsChild->getParent() ); + xModel.set(getDataSourceOrModel( xAsChild->getParent() ),UNO_QUERY); } } } File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.165.4.2&r2=1.165.4.3 Delta lines: +2 -2 ------------------- --- unodatbr.cxx 10 Feb 2005 11:32:25 -0000 1.165.4.2 +++ unodatbr.cxx 18 Feb 2005 12:35:38 -0000 1.165.4.3 @@ -3389,8 +3389,8 @@ if (pTopLevelSelected) sInitialSelection = getDataSourceAcessor( pTopLevelSelected ); - Reference< XModel > xDocumentModel = - getDataSourceByName_displayError( m_xDatabaseContext, sInitialSelection, getView(), getORB(), true ); + Reference< XModel > xDocumentModel( + getDataSourceOrModel(getDataSourceByName_displayError( m_xDatabaseContext, sInitialSelection, getView(), getORB(), true )),UNO_QUERY); if ( xDocumentModel.is() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
