Kaydet (Commit) 5645564d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Wunused-variable

Change-Id: I4727687b1f359ecf4eb8855b7894bf2a2047ba9d
üst e4274443
...@@ -327,10 +327,13 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch ...@@ -327,10 +327,13 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
else else
xDispatcher->dispatch( aURL, aArgs2 ); xDispatcher->dispatch( aURL, aArgs2 );
} }
catch (const ::com::sun::star::uno::Exception&) catch (const ::com::sun::star::uno::Exception& e)
{ {
OUString aMsg = "Desktop::OpenDefault() IllegalArgumentException while calling XNotifyingDispatch: "; SAL_WARN(
OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); "desktop.app",
"Desktop::OpenDefault() ignoring Exception while"
" calling XNotifyingDispatch: \"" << e.Message
<< "\"");
} }
} }
} }
...@@ -385,15 +388,17 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch ...@@ -385,15 +388,17 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
} }
catch (const ::com::sun::star::lang::IllegalArgumentException& iae) catch (const ::com::sun::star::lang::IllegalArgumentException& iae)
{ {
OUString aMsg = "Dispatchwatcher IllegalArgumentException while calling loadComponentFromURL: " SAL_WARN(
+ iae.Message; "desktop.app",
OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); "Dispatchwatcher IllegalArgumentException while calling"
" loadComponentFromURL: \"" << iae.Message << "\"");
} }
catch (const com::sun::star::io::IOException& ioe) catch (const com::sun::star::io::IOException& ioe)
{ {
OUString aMsg = "Dispatchwatcher IOException while calling loadComponentFromURL: " SAL_WARN(
+ ioe.Message; "desktop.app",
OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); "Dispatchwatcher IOException while calling"
" loadComponentFromURL: \"" << ioe.Message << "\"");
} }
if ( aDispatchRequest.aRequestType == REQUEST_OPEN || if ( aDispatchRequest.aRequestType == REQUEST_OPEN ||
aDispatchRequest.aRequestType == REQUEST_VIEW || aDispatchRequest.aRequestType == REQUEST_VIEW ||
......
...@@ -883,8 +883,8 @@ uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPa ...@@ -883,8 +883,8 @@ uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPa
} }
catch (const com::sun::star::uno::Exception& e) catch (const com::sun::star::uno::Exception& e)
{ {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); SAL_WARN(
OSL_FAIL(aMsg.getStr()); "desktop.migration", "ignoring Exception \"" << e.Message << "\"");
} }
return xNameAccess; return xNameAccess;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment