Tag: cws_src680_hsqlcsv User: fs Date: 2006/09/18 06:52:41 Modified: dba/dbaccess/source/ui/misc/databaseobjectview.cxx
Log: #i69526# XDatabaseDocumentUI File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: databaseobjectview.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/databaseobjectview.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +26 -17 --------------------- --- databaseobjectview.cxx 18 Sep 2006 12:15:13 -0000 1.1.2.1 +++ databaseobjectview.cxx 18 Sep 2006 13:52:38 -0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: databaseobjectview.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: fs $ $Date: 2006/09/18 12:15:13 $ + * last change: $Author: fs $ $Date: 2006/09/18 13:52:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -99,14 +99,23 @@ //====================================================================== //= DatabaseObjectView //====================================================================== - DatabaseObjectView::DatabaseObjectView( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XConnection >& _rxConnection, - const ::rtl::OUString& _rComponentURL ) + DatabaseObjectView::DatabaseObjectView( const Reference< XMultiServiceFactory >& _rxORB, + const Reference< XDatabaseDocumentUI >& _rxApplication, const ::rtl::OUString& _rComponentURL ) :m_xORB( _rxORB ) - ,m_xConnection( _rxConnection ) + ,m_xApplication( _rxApplication ) ,m_sComponentURL( _rComponentURL ) { OSL_ENSURE( m_xORB.is(), "DatabaseObjectView::DatabaseObjectView: invalid service factory!" ); - OSL_ENSURE( m_xConnection.is(), "DatabaseObjectView::DatabaseObjectView: invalid connection!" ); + OSL_ENSURE( m_xApplication.is(), "DatabaseObjectView::DatabaseObjectView: invalid connection!" ); + } + + //---------------------------------------------------------------------- + Reference< XConnection > DatabaseObjectView::getConnection() const + { + Reference< XConnection > xConnection; + if ( m_xApplication.is() ) + xConnection = m_xApplication->getActiveConnection(); + return xConnection; } //---------------------------------------------------------------------- @@ -215,16 +224,16 @@ } _rDispatchArguments[nPos ].Name = PROPERTY_ACTIVECONNECTION; - _rDispatchArguments[nPos++].Value <<= m_xConnection; + _rDispatchArguments[nPos++].Value <<= getConnection(); } //====================================================================== //= QueryDesigner //====================================================================== //---------------------------------------------------------------------- - QueryDesigner::QueryDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XConnection >& _rxConnection, + QueryDesigner::QueryDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, sal_Bool _bCreateView, sal_Bool _bPreferSQLView ) - :DatabaseObjectView( _rxORB, _rxConnection, static_cast< ::rtl::OUString >( URL_COMPONENT_QUERYDESIGN ) ) + :DatabaseObjectView( _rxORB, _rxApplication, static_cast< ::rtl::OUString >( URL_COMPONENT_QUERYDESIGN ) ) ,m_bCreateView( _bCreateView ) ,m_bPreferSQLView( _bPreferSQLView ) { @@ -259,8 +268,8 @@ //= TableDesigner //====================================================================== //---------------------------------------------------------------------- - TableDesigner::TableDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XConnection >& _rxConnection ) - :DatabaseObjectView( _rxORB, _rxConnection, static_cast< ::rtl::OUString >( URL_COMPONENT_TABLEDESIGN ) ) + TableDesigner::TableDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication ) + :DatabaseObjectView( _rxORB, _rxApplication, static_cast< ::rtl::OUString >( URL_COMPONENT_TABLEDESIGN ) ) { } @@ -316,7 +325,7 @@ { Reference< XTableUIProvider > xTableUIProv( getConnection(), UNO_QUERY ); if ( xTableUIProv.is() ) - xDesigner = xTableUIProv->getTableEditor( _rTableName ); + xDesigner = xTableUIProv->getTableEditor( getApplicationUI(), _rTableName ); } catch( const Exception& ) { @@ -329,9 +338,9 @@ //= ResultSetBrowser //====================================================================== //---------------------------------------------------------------------- - ResultSetBrowser::ResultSetBrowser( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XConnection >& _rxConnection, + ResultSetBrowser::ResultSetBrowser( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, sal_Bool _bTable ) - :DatabaseObjectView( _rxORB, _rxConnection, static_cast < ::rtl::OUString >( URL_COMPONENT_DATASOURCEBROWSER ) ) + :DatabaseObjectView( _rxORB, _rxApplication, static_cast < ::rtl::OUString >( URL_COMPONENT_DATASOURCEBROWSER ) ) ,m_bTable(_bTable) { } @@ -378,8 +387,8 @@ //= RelationDesigner //====================================================================== //---------------------------------------------------------------------- - RelationDesigner::RelationDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XConnection >& _rxConnection ) - :DatabaseObjectView( _rxORB, _rxConnection, static_cast< ::rtl::OUString >( URL_COMPONENT_RELATIONDESIGN ) ) + RelationDesigner::RelationDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication ) + :DatabaseObjectView( _rxORB, _rxApplication, static_cast< ::rtl::OUString >( URL_COMPONENT_RELATIONDESIGN ) ) { } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
