summaryrefslogtreecommitdiffstats
path: root/stoc
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2010-12-05 19:11:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-06 09:16:29 +0000
commit36e2296bf8fae3c66a66eada3595cbb2628a4833 (patch)
treeea0857de290ed5b5874ec3f17d131fd61f827314 /stoc
parentRemove redundant comments (diff)
downloadcore-36e2296bf8fae3c66a66eada3595cbb2628a4833.tar.gz
core-36e2296bf8fae3c66a66eada3595cbb2628a4833.zip
Replace all occured, occurance etc.
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/corereflection/criface.cxx4
-rw-r--r--stoc/source/invocation/invocation.cxx2
-rw-r--r--stoc/source/invocation_adapterfactory/iafactory.cxx2
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx2
-rw-r--r--stoc/source/security/access_controller.cxx2
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx8
-rw-r--r--stoc/source/tdmanager/tdmgr.cxx6
-rw-r--r--stoc/test/javavm/testjavavm.cxx4
-rw-r--r--stoc/test/testconv.cxx4
-rw-r--r--stoc/test/testcorefl.cxx4
-rw-r--r--stoc/test/testiadapter.cxx2
-rw-r--r--stoc/test/testintrosp.cxx4
12 files changed, 22 insertions, 22 deletions
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index e1404dcff058..ee5bd66f2865 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -335,7 +335,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);
}
@@ -749,7 +749,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 dd6779c17a5e..bce34fa3ee35 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -639,7 +639,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 */ ) );
}
}
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index ecea87911b20..3227ce4342f1 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -304,7 +304,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 a0840a82c848..3dc80ff99f44 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -160,7 +160,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 e6da746cb837..816dd6868798 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -852,7 +852,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/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 4d35bbd87fd0..58e9ccb7a69d 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -929,7 +929,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)
@@ -1042,7 +1042,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
@@ -1264,7 +1264,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
@@ -1328,7 +1328,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 2632b5a054f2..41d328313087 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -476,7 +476,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 */ );
}
@@ -512,13 +512,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 a873cb0cfd95..e74cf0a8b417 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -183,9 +183,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 35733dc771a6..05ebf9a82de5 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -694,9 +694,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 34faf2f7c4b5..75d0782b1cf5 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -400,10 +400,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 a38612a629bb..8479a6934803 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -1059,7 +1059,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 c27fae201b6f..fdee2ab6619a 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1582,9 +1582,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" );
}