summaryrefslogtreecommitdiff
path: root/bridges/source/jni_uno
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
commit5dfd9daa2f96e79e7f82a90698db628e6991ce32 (patch)
tree363b2dd83235a4087d2b4681ee234fbcd899397d /bridges/source/jni_uno
parent7b277251a7b79fe3f83841ab9e3028670262e4dc (diff)
Replace all occured, occurance etc.feature/currency-64bit
Diffstat (limited to 'bridges/source/jni_uno')
-rw-r--r--bridges/source/jni_uno/jni_base.h6
-rw-r--r--bridges/source/jni_uno/jni_bridge.cxx4
-rw-r--r--bridges/source/jni_uno/jni_java2uno.cxx4
-rw-r--r--bridges/source/jni_uno/jni_uno2java.cxx8
4 files changed, 11 insertions, 11 deletions
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index ce8498826..92edbf678 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -79,7 +79,7 @@ class JNI_context
JNI_context( JNI_context & ); // not impl
void operator = ( JNI_context ); // not impl
- void java_exc_occured() const;
+ void java_exc_occurred() const;
public:
inline explicit JNI_context(
JNI_info const * jni_info, JNIEnv * env, jobject class_loader )
@@ -117,7 +117,7 @@ inline void JNI_context::ensure_no_exception() const
{
if (JNI_FALSE != m_env->ExceptionCheck())
{
- java_exc_occured();
+ java_exc_occurred();
}
}
@@ -127,7 +127,7 @@ inline bool JNI_context::assert_no_exception() const
if (JNI_FALSE != m_env->ExceptionCheck())
{
m_env->ExceptionClear();
- OSL_ENSURE( 0, "unexpected java exception occured!" );
+ OSL_ENSURE( 0, "unexpected java exception occurred!" );
return false;
}
return true;
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index cf5723957..192acca47 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -292,7 +292,7 @@ Bridge::~Bridge() SAL_THROW( () )
//______________________________________________________________________________
-void JNI_context::java_exc_occured() const
+void JNI_context::java_exc_occurred() const
{
// !don't rely on JNI_info!
@@ -302,7 +302,7 @@ void JNI_context::java_exc_occured() const
if (! jo_exc.is())
{
throw BridgeRuntimeError(
- OUSTR("java exception occured, but not available!?") +
+ OUSTR("java exception occurred, but not available!?") +
get_stack_trace() );
}
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index bd1bd2d73..fc7a69ce3 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -109,7 +109,7 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
{
OUStringBuffer buf( 128 );
buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("exception occured java->uno: [") );
+ RTL_CONSTASCII_STRINGPARAM("exception occurred java->uno: [") );
buf.append( OUString::unacquired( &uno_exc->pType->pTypeName ) );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
buf.append(
@@ -360,7 +360,7 @@ jobject Bridge::call_uno(
#endif
return 0; // void return
}
- else // exception occured
+ else // exception occurred
{
// destruct uno in args
for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index d4c59ab2a..6e98119f9 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -78,7 +78,7 @@ void Bridge::handle_java_exc(
if (! jo_exc.is())
{
throw BridgeRuntimeError(
- OUSTR("java exception occured, but no java exception available!?") +
+ OUSTR("java exception occurred, but no java exception available!?") +
jni.get_stack_trace() );
}
@@ -126,7 +126,7 @@ void Bridge::handle_java_exc(
#if OSL_DEBUG_LEVEL > 1
OUStringBuffer trace_buf( 128 );
trace_buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("exception occured uno->java: [") );
+ RTL_CONSTASCII_STRINGPARAM("exception occurred uno->java: [") );
trace_buf.append( exc_name );
trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
trace_buf.append(
@@ -413,7 +413,7 @@ void Bridge::call_java(
}
} // else: already set integral uno return value
- // no exception occured
+ // no exception occurred
*uno_exc = 0;
}
#ifdef BROKEN_ALLOCA
@@ -784,7 +784,7 @@ void SAL_CALL UNO_proxy_dispatch(
reinterpret_cast< uno_Any * >( uno_ret ),
0, 0, 0 );
}
- // no exception occured
+ // no exception occurred
*uno_exc = 0;
}
}