diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 10:07:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 10:07:12 +0000 |
| commit | f5bd4673a8c9e273c6d7000f8cb2230e8aec1b44 (patch) | |
| tree | 1914177f3f1ede6ebed78411303a6127930deaf5 | |
| parent | fe7d7cf74ba88090d30f29328cfe558c2668bc21 (diff) | |
INTEGRATION: CWS fwkmerge1 (1.15.152); FILE MERGED
2004/02/16 13:12:07 lo 1.15.152.2: #115238# fix build in mergeup for #112924#
2004/02/03 13:54:23 lo 1.15.152.1: #115238# merge fix for #112924
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index e59bb3bf1a03..77fa65ab4a5e 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dispatchwatcher.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2003-05-16 14:21:40 $ + * last change: $Author: hr $ $Date: 2004-03-09 11:07:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -343,7 +343,25 @@ void DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ } // This is a synchron loading of a component so we don't have to deal with our statusChanged listener mechanism. - xDoc = Reference < XPrintable >( xDesktop->loadComponentFromURL( aName, aTarget, 0, aArgs ), UNO_QUERY ); + + try + { + xDoc = Reference < XPrintable >( xDesktop->loadComponentFromURL( aName, aTarget, 0, aArgs ), UNO_QUERY ); + } + catch ( ::com::sun::star::lang::IllegalArgumentException& iae) + { + OUString aMsg = OUString::createFromAscii( + "Dispatchwatcher IllegalArgumentException while calling loadComponentFromURL: ") + + iae.Message; + OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + } + catch (com::sun::star::io::IOException& ioe) + { + OUString aMsg = OUString::createFromAscii( + "Dispatchwatcher IOException while calling loadComponentFromURL: ") + + ioe.Message; + OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + } if ( aDispatchRequest.aRequestType == REQUEST_OPEN || aDispatchRequest.aRequestType == REQUEST_VIEW || aDispatchRequest.aRequestType == REQUEST_START || @@ -492,3 +510,11 @@ void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& aEve } } + + + + + + + + |