User: ihi Date: 2006/08/28 08:05:32 Modified: dba/dbaccess/source/ui/app/AppControllerDnD.cxx
Log: INTEGRATION: CWS dba205a (1.16.10); FILE MERGED 2006/07/31 09:24:23 oj 1.16.10.1: #i67549 # ensure that a connection exists File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerDnD.cxx?r1=1.16&r2=1.17 Delta lines: +5 -4 ------------------- --- AppControllerDnD.cxx 10 Jul 2006 15:22:54 -0000 1.16 +++ AppControllerDnD.cxx 28 Aug 2006 15:05:29 -0000 1.17 @@ -666,9 +666,10 @@ case E_TABLE: case E_QUERY: { + SharedConnection xConnection( ensureConnection() ); Reference< XDatabaseMetaData> xMetaData; - if ( m_xDataSourceConnection.is() ) - xMetaData = m_xDataSourceConnection->getMetaData(); + if ( xConnection.is() ) + xMetaData = xConnection->getMetaData(); ::rtl::OUString sName = getContainer()->getQualifiedName(NULL,xMetaData); if ( sName.getLength() ) @@ -677,11 +678,11 @@ if ( eType == E_TABLE ) { - pData = new ODataClipboard(sDataSource, CommandType::TABLE, sName, m_xDataSourceConnection, getNumberFormatter(m_xDataSourceConnection,getORB()), getORB()); + pData = new ODataClipboard(sDataSource, CommandType::TABLE, sName, xConnection, getNumberFormatter(xConnection,getORB()), getORB()); } else { - pData = new ODataClipboard(sDataSource, CommandType::QUERY, sName, getNumberFormatter(m_xDataSourceConnection,getORB()), getORB()); + pData = new ODataClipboard(sDataSource, CommandType::QUERY, sName, getNumberFormatter(xConnection,getORB()), getORB()); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
