diff options
Diffstat (limited to 'cppu')
-rw-r--r-- | cppu/inc/com/sun/star/uno/Any.h | 2 | ||||
-rw-r--r-- | cppu/inc/com/sun/star/uno/Sequence.hxx | 11 | ||||
-rw-r--r-- | cppu/inc/com/sun/star/uno/Type.hxx | 26 | ||||
-rw-r--r-- | cppu/inc/cppu/unotype.hxx | 66 | ||||
-rw-r--r-- | cppu/qa/cppumaker/test_cppumaker.cxx | 3 | ||||
-rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 4 | ||||
-rw-r--r-- | cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 2 | ||||
-rw-r--r-- | cppu/source/threadpool/threadpool.cxx | 6 | ||||
-rw-r--r-- | cppu/source/uno/IdentityMapping.cxx | 2 | ||||
-rw-r--r-- | cppu/source/uno/lbenv.cxx | 13 |
10 files changed, 76 insertions, 59 deletions
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h index a2fe589682f4..b904d08ec356 100644 --- a/cppu/inc/com/sun/star/uno/Any.h +++ b/cppu/inc/com/sun/star/uno/Any.h @@ -375,7 +375,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v @return type of IDL type any */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Any * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Any * ) SAL_THROW( () ) { return ::cppu::UnoType< ::com::sun::star::uno::Any >::get(); } diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx index c86c629df7bc..c8907d34e6bd 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.hxx +++ b/cppu/inc/com/sun/star/uno/Sequence.hxx @@ -225,7 +225,9 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence( namespace cppu { template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *) { +getTypeFavourUnsigned( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Sequence< T > const *) +{ if (::com::sun::star::uno::Sequence< T >::s_pType == 0) { ::typelib_static_sequence_type_init( &::com::sun::star::uno::Sequence< T >::s_pType, @@ -240,7 +242,9 @@ getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *) { } template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *) { +getTypeFavourChar( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Sequence< T > const *) +{ //TODO On certain platforms with weak memory models, the following code can // result in some threads observing that td points to garbage: static typelib_TypeDescriptionReference * td = 0; @@ -261,7 +265,8 @@ getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *) { // generic sequence template template< class E > inline const ::com::sun::star::uno::Type & -SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * ) +SAL_CALL getCppuType( + SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Sequence< E > * ) SAL_THROW( () ) { return ::cppu::getTypeFavourUnsigned( diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx index 46fd86329424..6b53d8192931 100644 --- a/cppu/inc/com/sun/star/uno/Type.hxx +++ b/cppu/inc/com/sun/star/uno/Type.hxx @@ -103,7 +103,7 @@ typelib_TypeDescriptionReference * Array< T >::s_pType = 0; } } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Type * ) SAL_THROW( () ) { return ::cppu::UnoType< ::com::sun::star::uno::Type >::get(); } @@ -125,13 +125,13 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THR { return ::cppu::UnoType< bool >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Bool * ) SAL_THROW( () ) { return ::cppu::UnoType< bool >::get(); } inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( - bool const * ) SAL_THROW( () ) + SAL_UNUSED_PARAMETER bool const * ) SAL_THROW( () ) { return ::cppu::UnoType< bool >::get(); } @@ -145,52 +145,52 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( return ::cppu::UnoType< ::cppu::UnoCharType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int8 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int8 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::rtl::OUString * ) SAL_THROW( () ) { return ::cppu::UnoType< ::rtl::OUString >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int16 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int16 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt16 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int32 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int32 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt32 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_uInt32 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int64 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int64 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt64 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_uInt64 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const float * ) SAL_THROW( () ) { return ::cppu::UnoType< float >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const double * ) SAL_THROW( () ) { return ::cppu::UnoType< double >::get(); } diff --git a/cppu/inc/cppu/unotype.hxx b/cppu/inc/cppu/unotype.hxx index eedd01d7c7fb..a62a137d62ce 100644 --- a/cppu/inc/cppu/unotype.hxx +++ b/cppu/inc/cppu/unotype.hxx @@ -123,90 +123,96 @@ namespace cppu { namespace detail { #endif inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::cppu::UnoVoidType const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoVoidType const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_VOID); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(bool const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER bool const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_BOOLEAN); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Bool const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Bool const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_BOOLEAN); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Int8 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Int8 const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_BYTE); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Int16 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Int16 const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_SHORT); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::cppu::UnoUnsignedShortType const *) { +cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::cppu::UnoUnsignedShortType const *) +{ return ::cppu::detail::getTypeFromTypeClass( ::typelib_TypeClass_UNSIGNED_SHORT); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Int32 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Int32 const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_LONG); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_uInt32 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_uInt32 const *) { return ::cppu::detail::getTypeFromTypeClass( ::typelib_TypeClass_UNSIGNED_LONG); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_Int64 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_Int64 const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_HYPER); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::sal_uInt64 const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::sal_uInt64 const *) { return ::cppu::detail::getTypeFromTypeClass( ::typelib_TypeClass_UNSIGNED_HYPER); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(float const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER float const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_FLOAT); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(double const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER double const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_DOUBLE); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::cppu::UnoCharType const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoCharType const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_CHAR); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::rtl::OUString const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::rtl::OUString const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_STRING); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Type const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::com::sun::star::uno::Type const *) +{ return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_TYPE); } inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Any const *) { +cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::com::sun::star::uno::Any const *) +{ return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_ANY); } template< typename T > inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::cppu::UnoSequenceType< T > const *) { +cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::cppu::UnoSequenceType< T > const *) +{ //TODO: depending on memory model, the following might not work reliably static typelib_TypeDescriptionReference * p = 0; if (p == 0) { @@ -217,23 +223,29 @@ cppu_detail_getUnoType(::cppu::UnoSequenceType< T > const *) { } template< typename T > inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Sequence< T > const *) { +cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Sequence< T > const *) +{ return cppu_detail_getUnoType( static_cast< ::cppu::UnoSequenceType< T > * >(0)); } -inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Exception const *) { +inline ::com::sun::star::uno::Type const & cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Exception const *) +{ return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_EXCEPTION); } -inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::XInterface const *) { +inline ::com::sun::star::uno::Type const & cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::XInterface const *) +{ return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_INTERFACE); } template< typename T > inline ::com::sun::star::uno::Type const & -cppu_detail_getUnoType(::com::sun::star::uno::Reference< T > const *) { +cppu_detail_getUnoType( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Reference< T > const *) +{ return ::cppu::UnoType< T >::get(); } @@ -287,7 +299,7 @@ private: @since UDK 3.2.2 */ template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourUnsigned(T const *) { +getTypeFavourUnsigned(SAL_UNUSED_PARAMETER T const *) { return ::cppu::UnoType< T >::get(); } @@ -302,7 +314,7 @@ getTypeFavourUnsigned(T const *) { @since UDK 3.2.2 */ inline ::com::sun::star::uno::Type const & -getTypeFavourUnsigned(::sal_uInt16 const *) { +getTypeFavourUnsigned(SAL_UNUSED_PARAMETER ::sal_uInt16 const *) { return ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get(); } @@ -334,7 +346,7 @@ getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *); @since UDK 3.2.3 */ template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourChar(T const *) { +getTypeFavourChar(SAL_UNUSED_PARAMETER T const *) { return ::cppu::UnoType< T >::get(); } @@ -350,7 +362,7 @@ getTypeFavourChar(T const *) { @since UDK 3.2.3 */ inline ::com::sun::star::uno::Type const & -getTypeFavourChar(::sal_Unicode const *) { +getTypeFavourChar(SAL_UNUSED_PARAMETER ::sal_Unicode const *) { return ::cppu::UnoType< ::cppu::UnoCharType >::get(); } diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 3770cb307afa..4b95d476c163 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -380,7 +380,8 @@ namespace com { namespace sun { namespace star { namespace uno { std::ostream & operator <<( - std::ostream & out, com::sun::star::uno::Exception const &) + std::ostream & out, + SAL_UNUSED_PARAMETER com::sun::star::uno::Exception const &) { return out << "<UNO exception>"; } diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index f6077d2a750e..0451f9484579 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -209,8 +209,8 @@ int LogBridge::v_isValid(rtl::OUString * pReason) void LogProbe( bool pre, - void * /*pThis*/, - void * /*pContext*/, + SAL_UNUSED_PARAMETER void * /*pThis*/, + SAL_UNUSED_PARAMETER void * /*pContext*/, typelib_TypeDescriptionReference * pReturnTypeRef, typelib_MethodParameter * pParams, sal_Int32 nParams, diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index 002b7eb56822..5d334be5cfad 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -183,7 +183,7 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch( ppException ); }} -extern "C" void SAL_CALL Proxy_free(uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C() +extern "C" void SAL_CALL Proxy_free(SAL_UNUSED_PARAMETER uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C() { Proxy * pThis = static_cast<Proxy * >(reinterpret_cast<uno_Interface *>(pProxy)); delete pThis; diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 312fd89c4375..9dda867a0878 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -428,7 +428,7 @@ uno_threadpool_create() SAL_THROW_EXTERN_C() } extern "C" void SAL_CALL -uno_threadpool_attach( uno_ThreadPool ) SAL_THROW_EXTERN_C() +uno_threadpool_attach(SAL_UNUSED_PARAMETER uno_ThreadPool) SAL_THROW_EXTERN_C() { sal_Sequence *pThreadId = 0; uno_getIdOfCurrentThread( &pThreadId ); @@ -453,14 +453,14 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) } extern "C" void SAL_CALL -uno_threadpool_detach( uno_ThreadPool ) SAL_THROW_EXTERN_C() +uno_threadpool_detach(SAL_UNUSED_PARAMETER uno_ThreadPool) SAL_THROW_EXTERN_C() { // we might do here some tiding up in case a thread called attach but never detach } extern "C" void SAL_CALL uno_threadpool_putJob( - uno_ThreadPool, + SAL_UNUSED_PARAMETER uno_ThreadPool, sal_Sequence *pThreadId, void *pJob, void ( SAL_CALL * doRequest ) ( void *pThreadSpecificData ), diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx index 868a4d7c5e3c..ee1d9d1412e1 100644 --- a/cppu/source/uno/IdentityMapping.cxx +++ b/cppu/source/uno/IdentityMapping.cxx @@ -76,7 +76,7 @@ static void SAL_CALL s_release(uno_Mapping * pMapping) SAL_THROW(()) static void SAL_CALL s_mapInterface(uno_Mapping * pMapping, void ** ppOut, void * pInterface, - struct _typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/) + SAL_UNUSED_PARAMETER struct _typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/) SAL_THROW(()) { *ppOut = pInterface; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 79581a5d765b..baced8b1d3dd 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -616,7 +616,7 @@ static void SAL_CALL defenv_harden( } //------------------------------------------------------------------------------ -static void SAL_CALL defenv_dispose( uno_Environment * ) +static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * ) { } } @@ -908,7 +908,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier( //============================================================================== static void SAL_CALL unoenv_acquireInterface( - uno_ExtEnvironment *, void * pUnoI_ ) + SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ ) { uno_Interface * pUnoI = reinterpret_cast< uno_Interface * >(pUnoI_); (*pUnoI->acquire)( pUnoI ); @@ -916,7 +916,7 @@ static void SAL_CALL unoenv_acquireInterface( //============================================================================== static void SAL_CALL unoenv_releaseInterface( - uno_ExtEnvironment *, void * pUnoI_ ) + SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ ) { uno_Interface * pUnoI = reinterpret_cast< uno_Interface * >(pUnoI_); (*pUnoI->release)( pUnoI ); @@ -1059,8 +1059,7 @@ inline void EnvironmentsData::getRegisteredEnvironments( } static bool loadEnv(OUString const & cLibStem, - uno_Environment * pEnv, - void * /*pContext*/) + uno_Environment * pEnv) { #ifdef IOS oslModule hMod; @@ -1121,7 +1120,7 @@ static uno_Environment * initDefaultEnvironment( rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1); libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") ); - if(!loadEnv(libStem, pEnv, pContext)) + if(!loadEnv(libStem, pEnv)) { pEnv->release(pEnv); return NULL; @@ -1136,7 +1135,7 @@ static uno_Environment * initDefaultEnvironment( aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM("_uno" ) ); OUString aStr( aLibName.makeStringAndClear() ); - if (!loadEnv(aStr, pEnv, pContext)) + if (!loadEnv(aStr, pEnv)) { pEnv->release(pEnv); return NULL; |