diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-10-05 11:59:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-10-05 11:59:33 +0000 |
| commit | 577bc9d8fe6ac45b85975897008e05b88b37e07f (patch) | |
| tree | 3cbd9c3a104add344551d449a496c390c1b8ffe4 /dbaccess/source/ui/app/AppControllerDnD.cxx | |
| parent | INTEGRATION: CWS hsqlcsvstage1 (1.14.60); FILE MERGED (diff) | |
| download | core-577bc9d8fe6ac45b85975897008e05b88b37e07f.tar.gz core-577bc9d8fe6ac45b85975897008e05b88b37e07f.zip | |
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
Diffstat (limited to 'dbaccess/source/ui/app/AppControllerDnD.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppControllerDnD.cxx | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index c79ccd256ca9..1d6a6337f110 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AppControllerDnD.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:54:04 $ + * last change: $Author: kz $ $Date: 2006-10-05 12:59:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUSt 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 @@ TransferableHelper* OApplicationController::copyObject() 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(); |