diff options
author | Alexis Ledoux <aledoux@openoffice.org> | 2002-09-24 11:59:32 +0000 |
---|---|---|
committer | Alexis Ledoux <aledoux@openoffice.org> | 2002-09-24 11:59:32 +0000 |
commit | fcf8adb82fb421cd7cc4fb6b98a821f1234cd465 (patch) | |
tree | 668e60aaacc29ed4e64981f6235f3c06b9a6b672 | |
parent | e082fb611958cee8b945bf6fb9feaf48b5fa63f2 (diff) |
Changes from OUString + to OUString concat for exception
-rw-r--r-- | scripting/source/runtimemgr/ScriptNameResolverImpl.cxx | 17 | ||||
-rwxr-xr-x | scripting/source/runtimemgr/ScriptRuntimeManager.cxx | 31 | ||||
-rw-r--r-- | scripting/source/runtimemgr/StorageBridge.cxx | 13 |
3 files changed, 39 insertions, 22 deletions
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx index e14f1b43710c..cf7ffeb89490 100644 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx +++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ScriptNameResolverImpl.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dfoster $ $Date: 2002-09-20 14:33:29 $ + * last change: $Author: aledoux $ $Date: 2002-09-24 12:59:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,7 +146,8 @@ throw (lang::IllegalArgumentException, script::CannotConvertException, RuntimeEx } catch (Exception & e) { - throw RuntimeException(OUSTR("ScriptNameResolverImpl::resolve : problem with getPropertyValue")+e.Message, + OUString temp = OUSTR("ScriptNameResolverImpl::resolve : problem with getPropertyValue"); + throw RuntimeException(temp.concat(e.Message), Reference<XInterface> ()); } #ifdef _DEBUG @@ -191,6 +192,7 @@ throw (lang::IllegalArgumentException, script::CannotConvertException, RuntimeEx OSL_TRACE("unknown exception thrown by storage %d, failed to match uri",*iter); } #endif + } @@ -279,17 +281,20 @@ ScriptNameResolverImpl::resolveURIFromStorageID(sal_Int16 sid, const Reference< } catch (lang::IllegalArgumentException & iae) { - throw lang::IllegalArgumentException(OUSTR("ScriptRuntimeManager::resolveURIFromStorageID IllegalArgumentException: ")+iae.Message, + OUString temp = OUSTR("ScriptRuntimeManager::resolveURIFromStorageID IllegalArgumentException: "); + throw lang::IllegalArgumentException(temp.concat(iae.Message), Reference<XInterface> (), iae.ArgumentPosition); } catch (RuntimeException & re) { - throw RuntimeException(OUSTR("ScriptRuntimeManager::resolveURIFromStorageID RuntimeException: ")+re.Message, + OUString temp = OUSTR("ScriptRuntimeManager::resolveURIFromStorageID RuntimeException: "); + throw RuntimeException(temp.concat(re.Message), Reference<XInterface> ()); } catch (Exception & e) { - throw RuntimeException(OUSTR("ScriptNameResolverImpl::resolveURIFromStorageID : Unknown Exception caught - RuntimeException rethrown")+e.Message, + OUString temp = OUSTR("ScriptNameResolverImpl::resolveURIFromStorageID : Unknown Exception caught - RuntimeException rethrown"); + throw RuntimeException(temp.concat(e.Message), Reference<XInterface> ()); } #ifdef _DEBUG diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index 858ea33ae472..c33084d5b69e 100755 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ScriptRuntimeManager.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dfoster $ $Date: 2002-09-20 14:33:31 $ + * last change: $Author: aledoux $ $Date: 2002-09-24 12:59:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,7 +125,8 @@ throw(RuntimeException) } catch (Exception &e) { - throw RuntimeException(OUSTR("ScriptRuntimeManager::GetScriptRuntime: ") + e.Message, Reference< XInterface >()); + OUString temp = OUSTR("ScriptRuntimeManager::GetScriptRuntime: "); + throw RuntimeException( temp.concat(e.Message), Reference< XInterface >()); } return xScriptInvocation; @@ -152,7 +153,8 @@ throw(RuntimeException) } catch (Exception &e) { - throw RuntimeException(OUSTR("ScriptRuntimeManager::GetScriptNameResolver: ") + e.Message, Reference< XInterface >()); + OUString temp = OUSTR("ScriptRuntimeManager::GetScriptNameResolver: "); + throw RuntimeException( temp.concat(e.Message), Reference< XInterface >()); } return xScriptNameResolver; } @@ -184,22 +186,26 @@ Any SAL_CALL ScriptRuntimeManager::invoke( } catch (lang::IllegalArgumentException & iae) { - throw lang::IllegalArgumentException(OUSTR("ScriptRuntimeManager::invoke IllegalArgumentException: ")+iae.Message, + OUString temp = OUSTR("ScriptRuntimeManager::invoke IllegalArgumentException: "); + throw lang::IllegalArgumentException(temp.concat(iae.Message), Reference<XInterface> (), iae.ArgumentPosition); } catch (script::CannotConvertException & cce) { - throw script::CannotConvertException(OUSTR("ScriptRuntimeManager::invoke CannotConvertException: ")+cce.Message, + OUString temp = OUSTR("ScriptRuntimeManager::invoke CannotConvertException: "); + throw script::CannotConvertException(temp.concat(cce.Message), Reference<XInterface> (), cce.DestinationTypeClass, cce.Reason, cce.ArgumentIndex); } catch (reflection::InvocationTargetException & ite) { - throw reflection::InvocationTargetException(OUSTR("ScriptRuntimeManager::invoke InvocationTargetException: ")+ite.Message, + OUString temp = OUSTR("ScriptRuntimeManager::invoke InvocationTargetException: "); + throw reflection::InvocationTargetException(temp.concat(ite.Message), Reference<XInterface> (), ite.TargetException); } catch (RuntimeException & re) { - throw RuntimeException(OUSTR("ScriptRuntimeManager::invoke RuntimeException: ")+re.Message, + OUString temp = OUSTR("ScriptRuntimeManager::invoke RuntimeException: "); + throw RuntimeException(temp.concat(re.Message), Reference<XInterface> ()); } #ifdef _DEBUG @@ -229,17 +235,20 @@ throw(lang::IllegalArgumentException, script::CannotConvertException, RuntimeExc } catch (lang::IllegalArgumentException & iae) { - throw lang::IllegalArgumentException(OUSTR("ScriptRuntimeManager::resolve IllegalArgumentException: ")+iae.Message, + OUString temp = OUSTR("ScriptRuntimeManager::resolve IllegalArgumentException: "); + throw lang::IllegalArgumentException(temp.concat(iae.Message), Reference<XInterface> (), iae.ArgumentPosition); } catch (script::CannotConvertException & cce) { - throw script::CannotConvertException(OUSTR("ScriptRuntimeManager::resolve CannotConvertException: ")+cce.Message, + OUString temp = OUSTR("ScriptRuntimeManager::resolve CannotConvertException: "); + throw script::CannotConvertException(temp.concat(cce.Message), Reference<XInterface> (), cce.DestinationTypeClass, cce.Reason, cce.ArgumentIndex); } catch (RuntimeException & re) { - throw RuntimeException(OUSTR("ScriptRuntimeManager::resolve RuntimeException: ")+re.Message, + OUString temp = OUSTR("ScriptRuntimeManager::resolve RuntimeException: "); + throw RuntimeException(temp.concat(re.Message), Reference<XInterface> ()); } #ifdef _DEBUG diff --git a/scripting/source/runtimemgr/StorageBridge.cxx b/scripting/source/runtimemgr/StorageBridge.cxx index f03ff74a7379..b46d85c98c79 100644 --- a/scripting/source/runtimemgr/StorageBridge.cxx +++ b/scripting/source/runtimemgr/StorageBridge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: StorageBridge.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dfoster $ $Date: 2002-09-20 14:33:32 $ + * last change: $Author: aledoux $ $Date: 2002-09-24 12:59:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,8 @@ StorageBridge::StorageBridge( const Reference< XComponentContext >& xContext, sa } catch(RuntimeException& re) { - throw RuntimeException(OUSTR("StorageBridge::StorageBridge(salIn32&): ") + re.Message, Reference< XInterface >()); + OUString temp = OUSTR("StorageBridge::StorageBridge(salIn32&): "); + throw RuntimeException( temp.concat(re.Message), Reference< XInterface >()); } } @@ -129,7 +130,8 @@ StorageBridge::initStorage() throw (::com::sun::star::uno::RuntimeException) } catch (Exception e) { - throw RuntimeException(OUSTR("StorageBridge::StorageBridge: ") + e.Message, Reference< XInterface >()); + OUString temp = OUSTR("StorageBridge::StorageBridge: "); + throw RuntimeException( temp.concat(e.Message), Reference< XInterface >()); } } //************************************************************************* @@ -145,7 +147,8 @@ throw (lang::IllegalArgumentException, RuntimeException) } catch (Exception e) { - throw RuntimeException(OUSTR("StorageBridge::getImplementations: ") + e.Message, Reference< XInterface >()); + OUString temp = OUSTR("StorageBridge::getImplementations: "); + throw RuntimeException( temp.concat(e.Message), Reference< XInterface >()); } return results; } |