diff options
Diffstat (limited to 'cli_ure/source')
| -rw-r--r-- | cli_ure/source/climaker/climaker_app.cxx | 2 | ||||
| -rw-r--r-- | cli_ure/source/native/makefile.mk | 2 | ||||
| -rw-r--r-- | cli_ure/source/native/native_bootstrap.cxx | 2 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 4 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_data.cxx | 2 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_proxy.cxx | 2 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_uno.cxx | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index 3ceda3f0d367..4f540a6c188e 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -718,7 +718,7 @@ SAL_IMPLEMENT_MAIN() osl_getThreadTextEncoding() ) ); fprintf( stderr, - "\n> error: .NET exception occured: %s\n> dying abnormally...", + "\n> error: .NET exception occurred: %s\n> dying abnormally...", msg.getStr() ); ret = 1; } diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk index a19337ce2c96..1cce59ef366c 100644 --- a/cli_ure/source/native/makefile.mk +++ b/cli_ure/source/native/makefile.mk @@ -152,7 +152,7 @@ $(SIGN): $(SHL1TARGETN) #do not forget to deliver cli_cppuhelper.config. It is NOT embedded in the policy file. .IF "$(CCNUMVER)" >= "001399999999" #.NET 2 and higher -# If the x86 switch is ommitted then the system assumes the assembly to be MSIL. +# If the x86 switch is omitted then the system assumes the assembly to be MSIL. # The policy file is still found when an application tries to load an older # cli_cppuhelper.dll but the system cannot locate it. It possibly assumes that the # assembly is also 'MSIL' like its policy file. diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx index 8dfa92aa60f5..2c4bbaa0d624 100644 --- a/cli_ure/source/native/native_bootstrap.cxx +++ b/cli_ure/source/native/native_bootstrap.cxx @@ -69,7 +69,7 @@ namespace * @param subKeyName name of the subkey to open * * @return the installation path or NULL, if no installation was found or - * if an error occured + * if an error occurred */ WCHAR* getPathFromRegistryKey( HKEY hroot, LPCWSTR subKeyName ) { diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 4845d51e9e8f..9fe5d0f79760 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -190,8 +190,8 @@ namespace cli_uno I doubt that the the case that the ref count raises from 0 to 1 can occur. uno_ext_getMapping returns an acquired mapping. Every time that function is called then a new mapping is created. Following the - rules of ref counted objects, then if the ref count is null noone has - a reference to the object anymore. Hence noone can call acquire. If someone + rules of ref counted objects, then if the ref count is null no one has + a reference to the object anymore. Hence no one can call acquire. If someone calls acquire then they must have kept an unacquired pointer which is illegal. */ diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 61295a0c4041..d8fccccb85e3 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -1647,7 +1647,7 @@ void Bridge::map_to_cli( } OSL_ASSERT (nPos != -1); int offset = pCTD->pMemberOffsets[nPos]; - //Whith the offset within the exception we can get the message string + //With the offset within the exception we can get the message string System::String* sMessage = mapUnoString(*(rtl_uString**) ((char*) uno_data + offset)); //We need to find a constructor for the exception that takes the message string diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 9425ab044a06..8afa3449f716 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -1102,7 +1102,7 @@ void SAL_CALL cli_proxy_dispatch( { uno_any_construct( (uno_Any *)uno_ret, 0, 0, 0 ); } - // no excetpion occured + // no excetpion occurred *uno_exc = 0; } else diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index e34fe411a71c..9f21c68f0c4f 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -183,7 +183,7 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI, } return 0; // void return } - else // exception occured + else // exception occurred { // destruct uno in args for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) @@ -276,7 +276,7 @@ void Bridge::call_cli( map_to_uno( uno_ret, retInvoke, return_type, false /* no assign */); } - // no exception occured + // no exception occurred *uno_exc = 0; } |