diff options
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/bootstrap/bootstrap.xml | 4 | ||||
-rw-r--r-- | stoc/source/corereflection/criface.cxx | 4 | ||||
-rw-r--r-- | stoc/source/invocation/invocation.cxx | 6 | ||||
-rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 2 | ||||
-rw-r--r-- | stoc/source/proxy_factory/proxyfac.cxx | 2 | ||||
-rw-r--r-- | stoc/source/security/access_controller.cxx | 2 | ||||
-rw-r--r-- | stoc/source/security/permissions.cxx | 4 | ||||
-rw-r--r-- | stoc/source/servicemanager/servicemanager.cxx | 8 | ||||
-rw-r--r-- | stoc/source/tdmanager/tdmgr.cxx | 6 | ||||
-rw-r--r-- | stoc/test/javavm/testjavavm.cxx | 4 | ||||
-rw-r--r-- | stoc/test/testconv.cxx | 4 | ||||
-rw-r--r-- | stoc/test/testcorefl.cxx | 6 | ||||
-rw-r--r-- | stoc/test/testiadapter.cxx | 2 | ||||
-rw-r--r-- | stoc/test/testintrosp.cxx | 4 |
14 files changed, 29 insertions, 29 deletions
diff --git a/stoc/source/bootstrap/bootstrap.xml b/stoc/source/bootstrap/bootstrap.xml index e63b84a78efd..d51b724b66f1 100644 --- a/stoc/source/bootstrap/bootstrap.xml +++ b/stoc/source/bootstrap/bootstrap.xml @@ -57,7 +57,7 @@ <author> Juergen Schmidt </author> <name> com.sun.star.comp.stoc.NestedRegistry </name> <description> - This component provides access to a simple hierachical registry. The registry based on + This component provides access to a simple hierarchical registry. The registry based on two registry file. </description> <loader-name> com.sun.star.loader.SharedLibrary </loader-name> @@ -235,7 +235,7 @@ This service is an implementation of the com.sun.star.security.Policy service. <author> Juergen Schmidt </author> <name> com.sun.star.comp.stoc.SimpleRegistry </name> <description> - This component provides access to a simple hierachical registry. The registry based on + This component provides access to a simple hierarchical registry. The registry based on one registry file. </description> <loader-name> com.sun.star.loader.SharedLibrary </loader-name> diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 9fcf498a830a..bc26d0cb9550 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -330,7 +330,7 @@ void IdlAttributeFieldImpl::checkException( throw WrappedTargetRuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( - "non-RuntimeException occured when accessing an" + "non-RuntimeException occurred when accessing an" " interface type attribute")), context, e); } @@ -744,7 +744,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & InvocationTargetException aExc; aExc.Context = *(const Reference< XInterface > *)rObj.getValue(); - aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("exception occured during invocation!") ); + aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred during invocation!") ); uno_any_destruct( &aExc.TargetException, reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 2ea5e8260f9e..370f51ffe5a6 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -638,7 +638,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) catch (Exception & exc) { throw InvocationTargetException( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception occured in setValue(): ") ) + + OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred in setValue(): ") ) + exc.Message, Reference< XInterface >(), makeAny( exc /* though sliced */ ) ); } } @@ -1145,11 +1145,11 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection")) ) >>= xCoreReflection; - OSL_ENSURE( xCoreReflection.is(), "### CoreReflection singleton not accessable!?" ); + OSL_ENSURE( xCoreReflection.is(), "### CoreReflection singleton not accessible!?" ); if (! xCoreReflection.is()) { throw DeploymentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessable") ), + OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessible") ), Reference< XInterface >() ); } // xCoreReflection = Reference<XIdlReflection>( diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 5e7f8c268c8c..b0418cee2ff7 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -299,7 +299,7 @@ bool AdapterImpl::coerce_assign( m_pFactory->m_pConverter, m_pFactory->m_pConvertToTD, &ret, args, &p_exc ); - if (p_exc) // exception occured + if (p_exc) // exception occurred { OSL_ASSERT( p_exc->pType->eTypeClass == typelib_TypeClass_EXCEPTION ); diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 543386b472cc..1a65eefb7a55 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -155,7 +155,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface( } else { - // exception occured: + // exception occurred: OSL_ENSURE( typelib_typedescriptionreference_isAssignableFrom( ::getCppuType( reinterpret_cast< diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index ec2d6368903d..70c32513d5eb 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -849,7 +849,7 @@ PermissionCollection AccessController::getEffectivePermissions( clearPostPoned(); // safety: exception could have happened before checking postponed? OUStringBuffer buf( 64 ); buf.appendAscii( - RTL_CONSTASCII_STRINGPARAM("deployment error (AccessControlException occured): ") ); + RTL_CONSTASCII_STRINGPARAM("deployment error (AccessControlException occurred): ") ); buf.append( exc.Message ); throw DeploymentException( buf.makeStringAndClear(), exc.Context ); } diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index d74dd5769631..e9c95c7c33ca 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -416,11 +416,11 @@ bool FilePermission::implies( Permission const & perm ) const SAL_THROW( () ) #ifdef SAL_W32 return ((0 == ::rtl_ustr_compareIgnoreAsciiCase_WithLength( demanded.m_url.pData->buffer, len, m_url.pData->buffer, len )) && - (0 > demanded.m_url.indexOf( '/', len ))); // in addition, no deeper pathes + (0 > demanded.m_url.indexOf( '/', len ))); // in addition, no deeper paths #else return ((0 == ::rtl_ustr_reverseCompare_WithLength( demanded.m_url.pData->buffer, len, m_url.pData->buffer, len )) && - (0 > demanded.m_url.indexOf( '/', len ))); // in addition, no deeper pathes + (0 > demanded.m_url.indexOf( '/', len ))); // in addition, no deeper paths #endif } return false; diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index b642066697ce..fe69bec5e937 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -928,7 +928,7 @@ void OServiceManager::onUnloadingNotify() IT_MM it_end1= m_ServiceMap.end(); list<IT_MM> listDeleteServiceMap; typedef list<IT_MM>::const_iterator CIT_DMM; - // find occurences in m_ServiceMap + // find occurrences in m_ServiceMap for(IT_MM it_i1= m_ServiceMap.begin(); it_i1 != it_end1; it_i1++) { if( m_SetLoadedFactories.find( it_i1->second) != it_SetEnd) @@ -1041,7 +1041,7 @@ void OServiceManager::disposing() { #if OSL_DEBUG_LEVEL > 1 OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### RuntimeException occured upon disposing factory: %s", str.getStr() ); + OSL_TRACE( "### RuntimeException occurred upon disposing factory: %s", str.getStr() ); #else (void) exc; // unused #endif @@ -1263,7 +1263,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( { #if OSL_DEBUG_LEVEL > 1 OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### DisposedException occured: %s", str.getStr() ); + OSL_TRACE( "### DisposedException occurred: %s", str.getStr() ); #else (void) exc; // unused #endif @@ -1327,7 +1327,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( { #if OSL_DEBUG_LEVEL > 1 OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### DisposedException occured: %s", str.getStr() ); + OSL_TRACE( "### DisposedException occurred: %s", str.getStr() ); #else (void) exc; // unused #endif diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx index b13ff438593a..a063763b95a9 100644 --- a/stoc/source/tdmanager/tdmgr.cxx +++ b/stoc/source/tdmanager/tdmgr.cxx @@ -475,7 +475,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement ) catch (container::NoSuchElementException & exc) { throw lang::IllegalArgumentException( - OUSTR("NoSuchElementException occured: ") + + OUSTR("NoSuchElementException occurred: ") + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } @@ -511,13 +511,13 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement ) catch (reflection::NoSuchTypeNameException & exc) { throw lang::IllegalArgumentException( - OUSTR("NoSuchTypeNameException occured: ") + exc.Message, + OUSTR("NoSuchTypeNameException occurred: ") + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } catch (reflection::InvalidTypeNameException & exc) { throw lang::IllegalArgumentException( - OUSTR("InvalidTypeNameException occured: ") + exc.Message, + OUSTR("InvalidTypeNameException occurred: ") + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } } diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index 242f1faee7a5..ddf38e867ff2 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -181,9 +181,9 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - OSL_ENSURE( sal_False, "### exception occured!" ); + OSL_ENSURE( sal_False, "### exception occurred!" ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### exception occured: " ); + OSL_TRACE( "### exception occurred: " ); OSL_TRACE( aMsg.getStr() ); OSL_TRACE( "\n" ); } diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index dfbd9475d130..441f4d80c98d 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -689,9 +689,9 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - OSL_ENSURE( sal_False, "### exception occured!" ); + OSL_ENSURE( sal_False, "### exception occurred!" ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### exception occured: " ); + OSL_TRACE( "### exception occurred: " ); OSL_TRACE( aMsg.getStr() ); OSL_TRACE( "\n" ); } diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index 4815ea96acf5..bd9f7056a9e8 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -387,7 +387,7 @@ SAL_IMPLEMENT_MAIN() "/singletons/com.sun.star.reflection.theCoreReflection")) ) >>= xRefl; OSL_ENSURE( - xRefl.is(), "### CoreReflection singleton not accessable!?" ); + xRefl.is(), "### CoreReflection singleton not accessible!?" ); bSucc = test_corefl( xRefl ); @@ -395,10 +395,10 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - OSL_ENSURE( sal_False, "### exception occured!" ); + OSL_ENSURE( sal_False, "### exception occurred!" ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### exception occured: " ); + OSL_TRACE( "### exception occurred: " ); OSL_TRACE( aMsg.getStr() ); OSL_TRACE( "\n" ); } diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index 8e0107b7823b..37be8fb1426a 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -1054,7 +1054,7 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - fprintf( stderr, "> exception occured: " ); + fprintf( stderr, "> exception occurred: " ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "%s\n", aMsg.getStr() ); } diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index c52b1f267969..52832375e4a3 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -1581,9 +1581,9 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - OSL_ENSURE( sal_False, "### exception occured!" ); + OSL_ENSURE( sal_False, "### exception occurred!" ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### exception occured: " ); + OSL_TRACE( "### exception occurred: " ); OSL_TRACE( aMsg.getStr() ); OSL_TRACE( "\n" ); } |