diff options
Diffstat (limited to 'connectivity/source/commontools/conncleanup.cxx')
| -rw-r--r-- | connectivity/source/commontools/conncleanup.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 0d8547923e87..9f3476bd1c3e 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.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. @@ -45,7 +46,7 @@ namespace dbtools //===================================================================== static const ::rtl::OUString& getActiveConnectionPropertyName() { - static const ::rtl::OUString s_sActiveConnectionPropertyName = ::rtl::OUString::createFromAscii("ActiveConnection"); + static const ::rtl::OUString s_sActiveConnectionPropertyName( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" )); return s_sActiveConnectionPropertyName; } @@ -72,7 +73,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OAutoConnectionDisposer::OAutoConnectionDisposer: caught an exception!" ); + OSL_FAIL( "OAutoConnectionDisposer::OAutoConnectionDisposer: caught an exception!" ); } } @@ -86,7 +87,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OAutoConnectionDisposer::startPropertyListening: caught an exception!" ); + OSL_FAIL( "OAutoConnectionDisposer::startPropertyListening: caught an exception!" ); } } @@ -107,7 +108,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OAutoConnectionDisposer::stopPropertyListening: caught an exception!" ); + OSL_FAIL( "OAutoConnectionDisposer::stopPropertyListening: caught an exception!" ); } } @@ -122,7 +123,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OAutoConnectionDisposer::startRowSetListening: caught an exception!" ); + OSL_FAIL( "OAutoConnectionDisposer::startRowSetListening: caught an exception!" ); } m_bRSListening = sal_True; } @@ -137,7 +138,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OAutoConnectionDisposer::stopRowSetListening: caught an exception!" ); + OSL_FAIL( "OAutoConnectionDisposer::stopRowSetListening: caught an exception!" ); } m_bRSListening = sal_False; } @@ -181,8 +182,6 @@ namespace dbtools // check this here. // // Yes, this is a HACK :( - // - // 94407 - 08.11.2001 - fs@openoffice.org if ( xNewConnection.get() != m_xOriginalConnection.get() ) { #if OSL_DEBUG_LEVEL > 0 @@ -221,7 +220,7 @@ namespace dbtools } catch(Exception&) { - OSL_ENSURE(sal_False, "OAutoConnectionDisposer::clearConnection: caught an exception!"); + OSL_FAIL("OAutoConnectionDisposer::clearConnection: caught an exception!"); } } //--------------------------------------------------------------------- @@ -245,3 +244,4 @@ namespace dbtools } // namespace dbtools //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |