User: kz Date: 2006/10/05 05:58:40 Modified: dba/dbaccess/source/core/dataaccess/connection.cxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.50.2); FILE MERGED 2006/09/20 11:43:53 fs 1.50.2.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: connection.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/connection.cxx?r1=1.50&r2=1.51 Delta lines: +40 -0 -------------------- --- connection.cxx 17 Sep 2006 06:39:00 -0000 1.50 +++ connection.cxx 5 Oct 2006 12:58:37 -0000 1.51 @@ -122,11 +122,13 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::sdb::application; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::reflection; using namespace ::com::sun::star::container; +using namespace ::com::sun::star::graphic; using namespace ::osl; using namespace ::comphelper; using namespace ::cppu; @@ -376,8 +378,11 @@ } catch(const Exception&) { + DBG_UNHANDLED_EXCEPTION(); } + m_xTableUIProvider = m_xTableUIProvider.query( m_xMasterConnection ); + try { m_xQueries = new OQueryContainer(Reference< XNameContainer >(_rDB.getQueryDefinitions( ),UNO_QUERY), this,_rxORB, &m_aWarnings); @@ -849,6 +854,41 @@ DBG_UNHANDLED_EXCEPTION(); } } + +// ----------------------------------------------------------------------------- +Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException) +{ + Reference< XGraphic > xReturn; + + // ask our aggregate + if ( m_xTableUIProvider.is() ) + xReturn = m_xTableUIProvider->getTableIcon( _TableName, _ColorMode ); + + // ask ourself + // well, we don't have own functionality here ... + // In the future, we might decide to delegate the complete handling to this interface. + // In this case, we would need to load the icon here. + + return xReturn; +} + +// ----------------------------------------------------------------------------- +Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const ::rtl::OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException) +{ + Reference< XInterface > xReturn; + + // ask our aggregate + if ( m_xTableUIProvider.is() ) + xReturn = m_xTableUIProvider->getTableEditor( _DocumentUI, _TableName ); + + // ask ourself + // well, we don't have own functionality here ... + // In the future, we might decide to delegate the complete handling to this interface. + // In this case, we would need to instantiate an css.sdb.TableDesign here. + + return xReturn; +} + //........................................................................ } // namespace dbaccess --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
