Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 02:18:37+0000 Modified: dba/dbaccess/source/ui/app/AppControllerDnD.cxx
Log: RESYNC: (1.20-1.23); FILE MERGED 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.22.4&r2=1.16.22.5 Delta lines: +4 -9 ------------------- --- AppControllerDnD.cxx 2006-12-18 07:50:54+0000 1.16.22.4 +++ AppControllerDnD.cxx 2008-01-17 02:18:35+0000 1.16.22.5 @@ -482,7 +482,7 @@ String sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) ); sConnectingContext.SearchAndReplaceAscii("$name$", getStrippedDatabaseName()); - m_xDataSourceConnection.reset( connect( getDatabaseName(), sConnectingContext, rtl::OUString(), sal_True ) ); + m_xDataSourceConnection.reset( connect( getDatabaseName(), sConnectingContext, sal_True ) ); if ( m_xDataSourceConnection.is() ) m_xMetaData = m_xDataSourceConnection->getMetaData(); @@ -516,11 +516,6 @@ return bIsConnectionReadOnly; } // ----------------------------------------------------------------------------- -sal_Bool OApplicationController::isRelationDesignAllowed() const -{ - return sal_True; -} -// ----------------------------------------------------------------------------- Reference< XNameAccess > OApplicationController::getElements(ElementType _eType) { OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); @@ -597,7 +592,7 @@ m_bCurrentlyModified = (xModi.is() && xModi->isModified()); } // ----------------------------------------------------------------------------- -void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames) +void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames) const { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); @@ -840,7 +835,7 @@ else { xNewQuery->setPropertyValue(PROPERTY_COMMAND,makeAny(sCommand)); - xNewQuery->setPropertyValue(PROPERTY_USE_ESCAPE_PROCESSING,makeAny(bEscapeProcessing)); + xNewQuery->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,makeAny(bEscapeProcessing)); } // insert xDestQueries->insertByName( sTargetName, makeAny(xNewQuery) ); @@ -887,7 +882,7 @@ catch(const SQLException&) { showError( SQLExceptionInfo( ::cppu::getCaughtException() ) ); } catch(const Exception& ) { - DBG_ERROR("OApplicationController::paste: caught a strange exception!"); + DBG_UNHANDLED_EXCEPTION(); } return sal_False; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
