Tag: cws_src680_hsqlcsv User: fs Date: 2006/09/14 04:55:28 Modified: dba/dbaccess/source/ui/app/AppControllerDnD.cxx dba/dbaccess/source/ui/app/AppController.cxx
Log: #i69526# getQualifiedName and getSelectionElementNames do not need XDatabaseMetaData 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.16.22.1 Delta lines: +5 -12 -------------------- --- AppControllerDnD.cxx 10 Jul 2006 15:22:54 -0000 1.16 +++ AppControllerDnD.cxx 14 Sep 2006 11:55:26 -0000 1.16.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppControllerDnD.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.22.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 15:22:54 $ + * last change: $Author: fs $ $Date: 2006/09/14 11:55:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -592,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) @@ -670,7 +663,7 @@ if ( m_xDataSourceConnection.is() ) xMetaData = m_xDataSourceConnection->getMetaData(); - ::rtl::OUString sName = getContainer()->getQualifiedName(NULL,xMetaData); + ::rtl::OUString sName = getContainer()->getQualifiedName( NULL ); if ( sName.getLength() ) { ::rtl::OUString sDataSource = getDatabaseName(); File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.32&r2=1.32.10.1 Delta lines: +11 -11 --------------------- --- AppController.cxx 19 Jul 2006 22:33:43 -0000 1.32 +++ AppController.cxx 14 Sep 2006 11:55:26 -0000 1.32.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.32.10.1 $ * - * last change: $Author: kz $ $Date: 2006/07/19 22:33:43 $ + * last change: $Author: fs $ $Date: 2006/09/14 11:55:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1144,7 +1144,7 @@ case SID_APP_NEW_FOLDER: { ElementType eType = getContainer()->getElementType(); - ::rtl::OUString sName = getContainer()->getQualifiedName(NULL,NULL); + ::rtl::OUString sName = getContainer()->getQualifiedName( NULL ); insertHierachyElement(eType,sName); } break; @@ -1605,7 +1605,7 @@ { try { - openElement( getContainer()->getQualifiedName( _pTree->GetHdlEntry(), m_xMetaData ), getContainer()->getElementType() ); + openElement( getContainer()->getQualifiedName( _pTree->GetHdlEntry() ), getContainer()->getElementType() ); } catch(const Exception&) { @@ -1706,7 +1706,7 @@ { try { - sName = getContainer()->getQualifiedName( NULL, m_xMetaData ); + sName = getContainer()->getQualifiedName( NULL ); OSL_ENSURE( sName.getLength(), "OApplicationController::newElementWithPilot: no name given!" ); } catch(Exception) @@ -1979,7 +1979,7 @@ case E_FORM: case E_REPORT: { - ::rtl::OUString sName = pView->getQualifiedName( _pEntry,NULL); + ::rtl::OUString sName = pView->getQualifiedName( _pEntry ); if ( sName.getLength() ) { Reference< XHierarchicalNameAccess > xContainer(getElements(eType),UNO_QUERY); @@ -1990,7 +1990,7 @@ break; case E_QUERY: { - ::rtl::OUString sName = pView->getQualifiedName( _pEntry,NULL); + ::rtl::OUString sName = pView->getQualifiedName( _pEntry ); if ( pView->isPreviewEnabled() ) { SharedConnection xConnection( ensureConnection() ); @@ -2004,7 +2004,7 @@ SharedConnection xConnection( ensureConnection() ); if ( xConnection.is() ) { - ::rtl::OUString sName = pView->getQualifiedName( _pEntry,xConnection->getMetaData()); + ::rtl::OUString sName = pView->getQualifiedName( _pEntry ); pView->showPreview(getDatabaseName(),xConnection,sName,eType == E_TABLE); return; } @@ -2158,7 +2158,7 @@ ::rtl::OUString sName; if ( pHitEntry ) { - sName = pView->getQualifiedName( pHitEntry,NULL); + sName = pView->getQualifiedName( pHitEntry ); if ( sName.getLength() ) { Reference< XHierarchicalNameAccess > xContainer(getElements(pView->getElementType()),UNO_QUERY); @@ -2227,7 +2227,7 @@ m_aAsyncDrop.aDroppedData = OComponentTransferable::extractComponentDescriptor(aDroppedData); SvLBoxEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); if ( pHitEntry ) - m_aAsyncDrop.aUrl = pView->getQualifiedName( pHitEntry,NULL); + m_aAsyncDrop.aUrl = pView->getQualifiedName( pHitEntry ); sal_Int8 nAction = _rEvt.mnAction; Reference<XContent> xContent; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
