diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /connectivity/source/drivers/hsqldb/HStorageMap.cxx | |
parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'connectivity/source/drivers/hsqldb/HStorageMap.cxx')
-rw-r--r-- | connectivity/source/drivers/hsqldb/HStorageMap.cxx | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 91626906a906..9edd67bdc4f0 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,6 +37,8 @@ #include "diagnose_ex.h" #include <osl/thread.h> +#include <o3tl/compat_functional.hxx> + //........................................................................ namespace connectivity { @@ -76,21 +79,19 @@ namespace connectivity { ::comphelper::disposeComponent(m_xOutputStream); } - catch(DisposedException&) + catch(const DisposedException&) { } - catch(const Exception& e) + catch(const Exception&) { - OSL_UNUSED( e ); - OSL_ENSURE(0,"Could not dispose OutputStream"); + OSL_FAIL("Could not dispose OutputStream"); } m_xOutputStream.clear(); } } - catch(Exception& ex) + catch(const Exception&) { - OSL_UNUSED( ex ); - OSL_ENSURE(0,"Exception catched!"); + OSL_FAIL("Exception caught!"); } } // ----------------------------------------------------------------------------- @@ -155,7 +156,7 @@ namespace connectivity if (JNI_FALSE != env->ExceptionCheck()) { env->ExceptionClear(); - OSL_ENSURE(0,"ExceptionClear"); + OSL_FAIL("ExceptionClear"); } ::rtl::OUString aStr; if ( jstr ) @@ -172,7 +173,7 @@ namespace connectivity if (JNI_FALSE != env->ExceptionCheck()) { env->ExceptionClear(); - OSL_ENSURE(0,"ExceptionClear"); + OSL_FAIL("ExceptionClear"); } return aStr; } @@ -184,9 +185,9 @@ namespace connectivity TStorages& rMap = lcl_getStorageMap(); // check if the storage is already in our map TStorages::iterator aFind = ::std::find_if(rMap.begin(),rMap.end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd(::std::equal_to<Reference<XStorage> >(),_xStorage) - ,::std::compose1(::std::select1st<TStorageURLPair>(),::std::compose1(::std::select1st<TStorages::mapped_type>(),::std::select2nd<TStorages::value_type>()))) + ,::o3tl::compose1(::o3tl::select1st<TStorageURLPair>(),::o3tl::compose1(::o3tl::select1st<TStorages::mapped_type>(),::o3tl::select2nd<TStorages::value_type>()))) ); if ( aFind == rMap.end() ) { @@ -215,9 +216,9 @@ namespace connectivity TStorages& rMap = lcl_getStorageMap(); // check if the storage is already in our map TStorages::iterator aFind = ::std::find_if(rMap.begin(),rMap.end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd(::std::equal_to<Reference<XStorage> >(),_xStorage) - ,::std::compose1(::std::select1st<TStorageURLPair>(),::std::compose1(::std::select1st<TStorages::mapped_type>(),::std::select2nd<TStorages::value_type>()))) + ,::o3tl::compose1(::o3tl::select1st<TStorageURLPair>(),::o3tl::compose1(::o3tl::select1st<TStorages::mapped_type>(),::o3tl::select2nd<TStorages::value_type>()))) ); if ( aFind != rMap.end() ) sKey = aFind->first; @@ -242,7 +243,7 @@ namespace connectivity xTrans->commit(); } } - catch(Exception&) + catch(const Exception&) { } rMap.erase(aFind); @@ -278,7 +279,7 @@ namespace connectivity { pHelper.reset(new StreamHelper(aStoragePair.first.first->openStreamElement(sName,_nMode))); } - catch(Exception& ) + catch(const Exception&) { ::rtl::OUString sStrippedName = removeOldURLPrefix(sOrgName); @@ -289,7 +290,7 @@ namespace connectivity { bIsStream = aStoragePair.first.first->isStreamElement(sStrippedName); } - catch(Exception& ) + catch(const Exception&) { bIsStream = sal_False; } @@ -300,7 +301,7 @@ namespace connectivity } aFind->second.second.insert(TStreamMap::value_type(sName,pHelper)); } - catch(Exception& e) + catch(const Exception& e) { #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sMessage( "[HSQLDB-SDBC] caught an exception while opening a stream\n" ); @@ -310,7 +311,7 @@ namespace connectivity if ( _nMode < 16 ) sMessage += "0"; sMessage += ::rtl::OString::valueOf( _nMode, 16 ).toAsciiUpperCase(); - OSL_ENSURE( false, sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); #endif StorageContainer::throwJavaException(e,env); } @@ -360,3 +361,5 @@ namespace connectivity } // namespace connectivity //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |