diff options
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/viewoptions.cxx | 9 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 5 |
2 files changed, 3 insertions, 11 deletions
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index a4c49a4a3373..318b021ab90b 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -55,13 +55,8 @@ } #endif // DEBUG_VIEWOPTIONS -#define SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION) \ - { \ - OUStringBuffer sMsg(256); \ - sMsg.append("Unexpected exception caught. Original message was:\n\"" ); \ - sMsg.append (SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION.Message); \ - sMsg.append("\"" ); \ - } +#define SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex) \ + SAL_WARN("unotools", "Unexpected exception caught. Original message was: " << ex.Message); // initialization! diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 3f7731d99602..868100fe3cc3 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -705,7 +705,6 @@ static bool UCBOpenContentSync( xListener); } - Any aResult; bool bException(false); bool bAborted(false); bool bResultAchieved(false); @@ -810,7 +809,6 @@ static bool UCBOpenContentSync( case Moderator::ResultType::RESULT: { bResultAchieved = true; - aResult = res.result; break; } case Moderator::ResultType::COMMANDABORTED: @@ -909,13 +907,12 @@ static bool UCBOpenContentSync_( if ( xProps.is() ) xProps->addPropertiesChangeListener( Sequence< OUString >(), xListener ); - Any aResult; bool bException = false; bool bAborted = false; try { - aResult = aContent.executeCommand( rArg.Name, rArg.Argument ); + aContent.executeCommand( rArg.Name, rArg.Argument ); } catch (const CommandAbortedException&) { |