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 | 53f428d9bf8f9648e21bf89cfbb406747536ed09 (patch) | |
| tree | ff94ef032b339ea4a9aa9c216a2980887f9d2137 /extensions/workben | |
| parent | b8c819c04af6e12001dcc069a854cc6221f7e1a0 (diff) | |
merge vosremoval-diagnoses patch
Diffstat (limited to 'extensions/workben')
| -rw-r--r-- | extensions/workben/pythonautotest.cxx | 2 | ||||
| -rw-r--r-- | extensions/workben/pythontest.cxx | 2 | ||||
| -rw-r--r-- | extensions/workben/testcomponent.cxx | 2 | ||||
| -rw-r--r-- | extensions/workben/testresource.cxx | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index eb5a52470bcc..b355c70239f2 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -34,7 +34,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> #include <usr/ustring.hxx> diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index 34a86ef00194..14806e90a57b 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -35,7 +35,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> #include <usr/ustring.hxx> diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 1d1bc1579e5b..d77926c212df 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -41,7 +41,7 @@ #include <smart/com/sun/star/lang/XComponent.hxx> #include <vos/dynload.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <usr/services.hxx> #include <vcl/svapp.hxx> #include <usr/ustring.hxx> diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx index d073d30ad590..16ab7d558ea4 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() ); } |