diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 19:46:46 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 19:46:46 -0500 |
commit | 3dd131d0a971fb04916ecbffcc031e58d5a29529 (patch) | |
tree | 2e4901d2de2ad61efd1fcefc9e97dce7ddc67150 /extensions/workben/testresource.cxx | |
parent | f919591f5183f316dec470347783748306857d31 (diff) |
merge vosremoval-diagnoses patch
Diffstat (limited to 'extensions/workben/testresource.cxx')
-rw-r--r-- | extensions/workben/testresource.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx index b0b13b338..10dfc1753 100644 --- a/extensions/workben/testresource.cxx +++ b/extensions/workben/testresource.cxx @@ -33,7 +33,7 @@ #include <rtl/ustring.hxx> #include <vos/dynload.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <usr/services.hxx> #include <vcl/svapp.hxx> @@ -78,14 +78,14 @@ void MyApp::Main() Args.getArray()[0].setINT32( 1000 ); BOOL b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL(); - VOS_ENSHURE( b, "hasString" ); + OSL_ENSURE( b, "hasString" ); UString aStr = xResLoader->invoke( L"getString", Args, OutPos, OutArgs ).getString(); - VOS_ENSHURE( aStr == L"Hello", "getString" ); + OSL_ENSURE( aStr == L"Hello", "getString" ); Args.getArray()[0].setINT32( 1001 ); b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL(); - VOS_ENSHURE( !b, "!hasString" ); + OSL_ENSURE( !b, "!hasString" ); xReg->revokeImplementation( aDllName, XSimpleRegistryRef() ); } |