User: kz Date: 2006/10/05 05:59:35 Modified: dba/dbaccess/source/ui/app/AppControllerDnD.cxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.18.2); FILE MERGED 2006/09/20 11:43:54 fs 1.18.2.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein 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.18&r2=1.19 Delta lines: +2 -12 -------------------- --- AppControllerDnD.cxx 17 Sep 2006 06:54:04 -0000 1.18 +++ AppControllerDnD.cxx 5 Oct 2006 12:59:33 -0000 1.19 @@ -150,9 +150,6 @@ #ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> #endif -#ifndef _DBAUI_QUERYDESIGNACCESS_HXX_ -#include "querydesignaccess.hxx" -#endif #ifndef _SV_SVAPP_HXX //autogen #include <vcl/svapp.hxx> #endif @@ -595,14 +592,7 @@ OSL_ENSURE(getContainer(),"View isn't valid! -> GPF"); - Reference< XDatabaseMetaData> xMetaData; - if ( getContainer()->getElementType() == E_TABLE ) - { - if ( m_xDataSourceConnection.is() ) - xMetaData = m_xDataSourceConnection->getMetaData(); - } - - getContainer()->getSelectionElementNames(_rNames,xMetaData); + getContainer()->getSelectionElementNames( _rNames ); } // ----------------------------------------------------------------------------- ::std::auto_ptr<OLinkedDocumentsAccess> OApplicationController::getDocumentsAccess(ElementType _eType) @@ -674,7 +664,7 @@ if ( xConnection.is() ) xMetaData = xConnection->getMetaData(); - ::rtl::OUString sName = getContainer()->getQualifiedName(NULL,xMetaData); + ::rtl::OUString sName = getContainer()->getQualifiedName( NULL ); if ( sName.getLength() ) { ::rtl::OUString sDataSource = getDatabaseName(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
