diff options
author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /cppu | |
parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) |
Resync to trunk, windows non-pro build
aoo/aw080
Diffstat (limited to 'cppu')
-rw-r--r-- | cppu/inc/uno/threadpool.h | 4 | ||||
-rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 2 | ||||
-rw-r--r-- | cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 2 | ||||
-rw-r--r-- | cppu/source/threadpool/threadpool.hxx | 2 | ||||
-rw-r--r-- | cppu/source/uno/data.cxx | 2 | ||||
-rw-r--r-- | cppu/source/uno/lbmap.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/cppu/inc/uno/threadpool.h b/cppu/inc/uno/threadpool.h index 835afb5b6b81..a72d15d65df4 100644 --- a/cppu/inc/uno/threadpool.h +++ b/cppu/inc/uno/threadpool.h @@ -64,7 +64,7 @@ void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) /** - If the internal refcount drops to zero, the association betwen threadId and + If the internal refcount drops to zero, the association between threadId and thread is broken. */ void SAL_CALL uno_releaseIdFromCurrentThread() @@ -117,7 +117,7 @@ void SAL_CALL uno_threadpool_detach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); /** - Puts a job into the pool. A job may eiter be a request or a reply + Puts a job into the pool. A job may either be a request or a reply (replies have a 0 in the doRequest parameter). This function is non-blocking. A request may either be synchronous or asynchronous. diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 9c1ec2e4b263..2b0a7fa4fee8 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -242,7 +242,7 @@ void LogProbe( rtl_logfile_longTrace( "} LogBridge () %s",sTemp.getStr()); if ( ppException && *ppException ) { - rtl_logfile_trace( " excption occured : "); + rtl_logfile_trace( " exception occurred : "); typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType ); const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding())); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index 73b5cb263c08..c09c5516a7fb 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -488,7 +488,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, *ppException = 0; } - else // exception occured + else // exception occurred { for (sal_Int32 nPos = 0; nPos < nParams; ++ nPos) { diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx index 1b3ed0309844..b7056ed145e1 100644 --- a/cppu/source/threadpool/threadpool.hxx +++ b/cppu/source/threadpool/threadpool.hxx @@ -115,7 +115,7 @@ namespace cppu_threadpool { void * enter( const ByteSequence &aThreadId, sal_Int64 nDisposeId ); /******** - * @return true, if queue could be succesfully revoked. + * @return true, if queue could be successfully revoked. ********/ sal_Bool revokeQueue( const ByteSequence & aThreadId , sal_Bool bAsynchron ); diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index d23f61e7901d..2465c47805b1 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -104,7 +104,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p #if OSL_DEBUG_LEVEL > 1 OUStringBuffer buf( 128 ); buf.appendAscii( - RTL_CONSTASCII_STRINGPARAM("### exception occured querying for interface ") ); + RTL_CONSTASCII_STRINGPARAM("### exception occurred querying for interface ") ); buf.append( * reinterpret_cast< OUString const * >( &pDestType->pTypeName ) ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": [") ); buf.append( * reinterpret_cast< OUString const * >( &pExc->pType->pTypeName ) ); diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 4b19b70aa701..55c85e75782b 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -253,7 +253,7 @@ static void SAL_CALL mediate_mapInterface( OSL_ENSURE( 0 != pTo, "### cannot release out interface: leaking!" ); if (0 != pTo) (*pTo->releaseInterface)( pTo, pOut ); - *ppOut = 0; // set to 0 anyway, because mapping was not successfull! + *ppOut = 0; // set to 0 anyway, because mapping was not successful! } } else |