diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-22 09:06:06 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-22 12:46:43 +0000 |
commit | ed7c80d3353bd21d9c278a209adb4e62669b3978 (patch) | |
tree | 68a8c518415b139a44f7ea9efc2e605ecabe859f /sw/source/ui/uno | |
parent | 3679b7651737eba53c3779126246e4f0292570eb (diff) |
these can be const
Diffstat (limited to 'sw/source/ui/uno')
-rw-r--r-- | sw/source/ui/uno/dlelstnr.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uno/swdetect.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 18 |
3 files changed, 16 insertions, 14 deletions
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index 374abaa693fa..ce9d963e7932 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -83,7 +83,7 @@ SwLinguServiceEventListener::SwLinguServiceEventListener() xBC->addLinguServiceEventListener( (XLinguServiceEventListener *) this ); } } - catch (uno::Exception &) + catch (const uno::Exception&) { OSL_FAIL("exception caught in SwLinguServiceEventListener c-tor" ); } diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index c95900fb928b..c9dabe8a44a4 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -224,7 +224,9 @@ SwFilterDetect::~SwFilterDetect() ucbhelper::CONTINUATION_APPROVE ) ); xInteraction->handle( xRequest ); } - catch ( Exception & ) {}; + catch (const Exception&) + { + } } } else @@ -247,7 +249,7 @@ SwFilterDetect::~SwFilterDetect() aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pPreFilter ? pPreFilter->IsOwnTemplateFormat() : sal_False, &aFilterName ); } - catch( lang::WrappedTargetException& aWrap ) + catch (const lang::WrappedTargetException& aWrap) { packages::zip::ZipIOException aZipException; @@ -297,11 +299,11 @@ SwFilterDetect::~SwFilterDetect() } } } - catch( uno::RuntimeException& ) + catch (const uno::RuntimeException&) { throw; } - catch( uno::Exception& ) + catch (const uno::Exception&) { aTypeName.Erase(); aPreselectedFilterName.Erase(); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 1a1b5b0ef4b5..0b0fc022b11f 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -134,13 +134,13 @@ static CloseResult CloseModelAndDocSh( //! I.e. now that object is responsible for closing the model and doc shell. xClose->close( sal_True ); } - catch (util::CloseVetoException &) + catch (const util::CloseVetoException&) { //! here we have the problem that the temporary file that is //! currently being printed will never be deleted. :-( eResult = eVetoed; } - catch ( const uno::RuntimeException& ) + catch (const uno::RuntimeException&) { eResult = eFailed; } @@ -170,7 +170,7 @@ static sal_Bool LoadFromURL_impl( xTmpModel = Reference < XModel >( xDesktop->loadComponentFromURL( rURL, C2U("_blank"), 0, aArgs ), UNO_QUERY ); } - catch( Exception & ) + catch (const Exception&) { return sal_False; } @@ -260,7 +260,7 @@ namespace OSL_FAIL("DelayedFileDeletion::DelayedFileDeletion: model is no component!" ); } } - catch( const Exception& ) + catch (const Exception&) { OSL_FAIL("DelayedFileDeletion::DelayedFileDeletion: could not register as event listener at the model!" ); } @@ -281,7 +281,7 @@ namespace m_xDocument->close( bDeliverOwnership ); bSuccess = sal_True; } - catch( const util::CloseVetoException& ) + catch (const util::CloseVetoException&) { // somebody vetoed -> next try if ( m_nPendingDeleteAttempts ) @@ -293,7 +293,7 @@ namespace else bSuccess = sal_True; // can't do anything here ... } - catch( const Exception& ) + catch (const Exception&) { OSL_FAIL("DelayedFileDeletion::OnTryDeleteFile: caught a strange exception!" ); bSuccess = sal_True; @@ -317,7 +317,7 @@ namespace { m_xDocument->removeCloseListener( this ); } - catch( const Exception & ) + catch (const Exception&) { OSL_FAIL("DelayedFileDeletion::implTakeOwnership: could not revoke the listener!" ); } @@ -599,7 +599,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( if ( bEverythingsFine ) bValid = sal_True; } - catch( const Exception& ) + catch (const Exception&) { bValid = sal_False; } @@ -805,7 +805,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( xStorable->storeAsURL( aTmpFileName, Sequence< PropertyValue >() ); bStoredAsTemporary = sal_True; } - catch( const Exception& ) + catch (const Exception&) { } } |