diff options
author | Joachim Lingner <jl@openoffice.org> | 2001-03-12 14:53:51 +0000 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2001-03-12 14:53:51 +0000 |
commit | e5b2329213c48bb2fdefbffab6635a0bcc05f5fc (patch) | |
tree | ce53a7b149d9885bbfde85f2e840f54193571900 /io | |
parent | b3fc09987116a82f56b25e83be6422fda6088fef (diff) |
OSL_ENSHURE replaced by OSL_ENSURE
Diffstat (limited to 'io')
-rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 6 | ||||
-rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 6 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 6 | ||||
-rw-r--r-- | io/source/connector/connector.cxx | 6 | ||||
-rw-r--r-- | io/source/stm/factreg.cxx | 6 | ||||
-rw-r--r-- | io/source/stm/opump.cxx | 10 | ||||
-rw-r--r-- | io/test/stm/datatest.cxx | 8 | ||||
-rw-r--r-- | io/test/stm/testfactreg.cxx | 6 | ||||
-rw-r--r-- | io/test/testcomponent.cxx | 6 | ||||
-rw-r--r-- | io/test/testconnection.cxx | 10 |
10 files changed, 35 insertions, 35 deletions
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 64bcf94ab15d..1076d6269a8b 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TextInputStream.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:24:17 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:50:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -699,7 +699,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSHURE( sal_False, "### InvalidRegistryException!" ); + OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } } return sal_False; diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 2f54064b021e..c6cb13ee7901 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TextOutputStream.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:24:17 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:50:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -323,7 +323,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSHURE( sal_False, "### InvalidRegistryException!" ); + OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } } return sal_False; diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 1b257e27d89f..b89b22709ad0 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acceptor.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jbu $ $Date: 2001-01-08 10:30:15 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:50:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -449,7 +449,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSHURE( sal_False, "### InvalidRegistryException!" ); + OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } } return sal_False; diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 0353a49aa97b..1614af3dcc92 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -2,9 +2,9 @@ * * $RCSfile: connector.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jbu $ $Date: 2001-01-08 13:03:49 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:51:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -367,7 +367,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSHURE( sal_False, "### InvalidRegistryException!" ); + OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } } return sal_False; diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx index 75dbc5fe72e1..976df27ad1bb 100644 --- a/io/source/stm/factreg.cxx +++ b/io/source/stm/factreg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: factreg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:24:18 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:51:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -147,7 +147,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSHURE( sal_False, "### InvalidRegistryException!" ); + OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } } return sal_False; diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index c51358c611dd..a948879c3346 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -2,9 +2,9 @@ * * $RCSfile: opump.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jbu $ $Date: 2001-01-25 14:04:57 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:51:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,7 +160,7 @@ void Pump::fireError( list< Reference< XStreamListener > > &aList , Any & except catch ( RuntimeException &e ) { OString sMessage = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ); - OSL_ENSHURE( !"com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners", sMessage.getStr() ); + OSL_ENSURE( !"com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners", sMessage.getStr() ); } } } @@ -270,7 +270,7 @@ void Pump::run() catch ( RuntimeException &e ) { OString sMessage = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ); - OSL_ENSHURE( !"com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners", sMessage.getStr() ); + OSL_ENSURE( !"com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners", sMessage.getStr() ); } } } @@ -279,7 +279,7 @@ void Pump::run() // we are the last on the stack. // this is to avoid crashing the program, when e.g. a bridge crashes OString sMessage = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ); - OSL_ENSHURE( !"com.sun.star.comp.stoc.Pump: unexpected exception", sMessage.getStr() ); + OSL_ENSURE( !"com.sun.star.comp.stoc.Pump: unexpected exception", sMessage.getStr() ); } release(); diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 9f425e02973f..353d5b23b88e 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -2,9 +2,9 @@ * * $RCSfile: datatest.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jbu $ $Date: 2000-12-08 11:07:33 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:53:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,7 @@ #include <osl/conditn.hxx> #include <osl/mutex.hxx> -#include <vos/thread.hxx> +//#include <vos/thread.hxx> #include <assert.h> #include <string.h> @@ -88,7 +88,7 @@ using namespace ::rtl; using namespace ::osl; using namespace ::cppu; -using namespace ::vos; +//using namespace ::vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx index 2cfbdefa944e..079e6b8329e1 100644 --- a/io/test/stm/testfactreg.cxx +++ b/io/test/stm/testfactreg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testfactreg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:24:19 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:53:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,7 +152,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSHURE( sal_False, "### InvalidRegistryException!" ); + OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } } return sal_False; diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index ebfaf6d0be95..ca863f3aa49c 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testcomponent.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mfe $ $Date: 2001-02-01 12:40:06 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:53:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ #include <cppuhelper/servicefactory.hxx> #include <vos/dynload.hxx> -#include <vos/diagnose.hxx> +//#include <vos/diagnose.hxx> #include <assert.h> diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index 4c7adab9b4e3..31a00110aad4 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testconnection.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mfe $ $Date: 2001-02-01 12:40:06 $ + * last change: $Author: jl $ $Date: 2001-03-12 15:53:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -192,7 +192,7 @@ void testConnection( const OUString &sConnectionDescription , { Sequence < sal_Int8 > seq(10); r->write( seq ); - OSL_ENSHURE( 0 , "expected exception not thrown" ); + OSL_ENSURE( 0 , "expected exception not thrown" ); } catch ( IOException & ) { @@ -200,7 +200,7 @@ void testConnection( const OUString &sConnectionDescription , } catch ( ... ) { - OSL_ENSHURE( 0 , "wrong exception was thrown" ); + OSL_ENSURE( 0 , "wrong exception was thrown" ); } thread.join(); @@ -228,7 +228,7 @@ int __cdecl main( int argc, char * argv[] ) Reference< XImplementationRegistration > xImplReg( xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY ); - OSL_ENSHURE( xImplReg.is(), "### no impl reg!" ); + OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); OUString aLibName = OUString::createFromAscii( REG_PREFIX ); aLibName += OUString::createFromAscii("connectr"); |