diff options
20 files changed, 75 insertions, 69 deletions
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 574b4a90d27a..031cc1a95d25 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -200,7 +200,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) aColor >>= nColor; } } - catch (::com::sun::star::beans::UnknownPropertyException) + catch (const ::com::sun::star::beans::UnknownPropertyException&) { // Ignore exception and return default color. } @@ -254,7 +254,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) OSL_TRACE ("no Background property in page"); } } - catch (::com::sun::star::beans::UnknownPropertyException) + catch (const ::com::sun::star::beans::UnknownPropertyException&) { OSL_TRACE ("caught excption due to unknown property"); // Ignore exception and return default color. @@ -351,7 +351,7 @@ void AccessiblePageShape::dispose (void) xPageProperties->getPropertyValue(A2S("LinkDisplayName")) >>= sCurrentSlideName; } } - catch (beans::UnknownPropertyException&) + catch (const beans::UnknownPropertyException&) { } diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index a80feb80e3f7..ea869cc064cc 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -142,7 +142,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) mbLabelPlaying = sal_False; } - catch( css::lang::IllegalArgumentException ) + catch(const css::lang::IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot access play button" ); @@ -161,9 +161,8 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) maUpdateTimer.SetTimeout( 100 ); maUpdateTimer.Start(); } - catch( css::uno::Exception& e ) + catch (const css::uno::Exception&) { - (void)e; mxPlayer.clear(); } @@ -176,7 +175,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) mbLabelPlaying = sal_True; } - catch( css::lang::IllegalArgumentException ) + catch (const css::lang::IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot access play button" ); @@ -212,7 +211,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG ) String( SdResId( STR_PLAY ) ) ); mbLabelPlaying = sal_False; } - catch( css::lang::IllegalArgumentException ) + catch (const css::lang::IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot access play button" ); @@ -237,7 +236,7 @@ void SdFileDialog_Imp::CheckSelectionState() else mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_True ); } - catch( css::lang::IllegalArgumentException ) + catch (const css::lang::IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot access \"selection\" checkbox" ); @@ -271,7 +270,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); } - catch( css::lang::IllegalArgumentException ) + catch (const css::lang::IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot set play button label" ); @@ -284,7 +283,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, { mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_False ); } - catch( css::lang::IllegalArgumentException ) + catch (const css::lang::IllegalArgumentException&) { #ifdef DBG_UTIL OSL_FAIL( "Cannot disable selection checkbox" ); diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 8f1c4135e3a2..1ed3d3d9b8c7 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -825,7 +825,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void) } while (false); // One 'loop'. } - catch (uno::Exception e) + catch (const uno::Exception&) { // When there is an exception then simply use the default value of // bIsEnabled and disable the controls. diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index 7c8141da4cab..67b3f8616721 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -116,14 +116,14 @@ void ConfigurationControllerBroadcaster::NotifyListeners ( aEvent.UserData = iListener->maUserData; iListener->mxListener->notifyConfigurationChange(aEvent); } - catch (lang::DisposedException& rException) + catch (const lang::DisposedException& rException) { // When the exception comes from the listener itself then // unregister it. if (rException.Context == iListener->mxListener) RemoveListener(iListener->mxListener); } - catch(RuntimeException&) + catch (const RuntimeException&) { DBG_UNHANDLED_EXCEPTION(); } @@ -172,7 +172,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners ( { NotifyListeners(aEvent); } - catch (lang::DisposedException) + catch (const lang::DisposedException&) { } } @@ -211,7 +211,7 @@ void ConfigurationControllerBroadcaster::DisposeAndClear (void) RemoveListener(iMap->second.front().mxListener); xListener->disposing(aEvent); } - catch (RuntimeException&) + catch (const RuntimeException&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 59a1d9a0b65d..fed1af0420b4 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -243,7 +243,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) ++aIter; } } - catch(IllegalArgumentException) + catch (const IllegalArgumentException&) { } } diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 4e48d5ac2510..e1a9bf2cce37 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -174,8 +174,12 @@ IMPL_LINK(CacheCompactor, CompactionCallback, Timer*, EMPTYARG) { Run(); } - catch(::com::sun::star::uno::RuntimeException e) { } - catch(::com::sun::star::uno::Exception e) { } + catch (const ::com::sun::star::uno::RuntimeException&) + { + } + catch (const ::com::sun::star::uno::Exception&) + { + } mbIsCompactionRunning = false; return 1; diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 0677035e31e4..18d2156af44a 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -285,7 +285,7 @@ void GenericPageCache::ReleasePreviewBitmap (const CacheKey aKey) { mpQueueProcessor->Start(maRequestQueue.GetFrontPriorityClass()); } - catch (::com::sun::star::uno::RuntimeException) + catch (const ::com::sun::star::uno::RuntimeException&) { } } diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 97de9f7b2c20..6d9c5af8ae0c 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -259,7 +259,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript aPage); } } - catch (Exception aException) + catch (const Exception&) { // We have not been able to set the current page at the main view. // This is sad but still leaves us in a valid state. Therefore, diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 3daf7d49d6db..704244d90144 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -635,7 +635,7 @@ MasterPageContainer::Implementation::~Implementation (void) { xCloseable->close(true); } - catch (::com::sun::star::util::CloseVetoException aException) + catch (const ::com::sun::star::util::CloseVetoException&) { } } diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 8e834b222d3e..5f2b782356df 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -163,7 +163,7 @@ Image TemplatePreviewProvider::operator() ( } } } - catch (uno::Exception& rException) + catch (const uno::Exception& rException) { OSL_TRACE ( "caught exception while trying to access Thumbnail/thumbnail.png of %s: %s", @@ -196,7 +196,7 @@ Image TemplatePreviewProvider::operator() ( } } } - catch (uno::Exception& rException) + catch (const uno::Exception& rException) { OSL_TRACE ( "caught exception while trying to access Thumbnails/thumbnail.png of %s: %s", @@ -207,7 +207,7 @@ Image TemplatePreviewProvider::operator() ( } } } - catch (uno::Exception& rException) + catch (const uno::Exception& rException) { OSL_TRACE ( "caught exception while trying to access tuhmbnail of %s: %s", @@ -291,7 +291,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume } } } - catch (uno::RuntimeException) + catch (const uno::RuntimeException&) { DBG_UNHANDLED_EXCEPTION(); pPage = NULL; diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 91c277a50b1d..9891e574e9f3 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -206,10 +206,10 @@ EventMultiplexer::~EventMultiplexer (void) mpImpl->release(); mpImpl.release(); } - catch (RuntimeException aException) + catch (const RuntimeException&) { } - catch (Exception aException) + catch (const Exception&) { } } @@ -445,7 +445,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) { xSet->addPropertyChangeListener(msCurrentPagePropertyName, this); } - catch (beans::UnknownPropertyException) + catch (const beans::UnknownPropertyException&) { OSL_TRACE("EventMultiplexer::ConnectToController: CurrentPage unknown"); } @@ -454,7 +454,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) { xSet->addPropertyChangeListener(msEditModePropertyName, this); } - catch (beans::UnknownPropertyException) + catch (const beans::UnknownPropertyException&) { OSL_TRACE("EventMultiplexer::ConnectToController: IsMasterPageMode unknown"); } @@ -467,7 +467,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) xSelection->addSelectionChangeListener(this); } } - catch (const lang::DisposedException aException) + catch (const lang::DisposedException&) { mbListeningToController = false; } @@ -492,7 +492,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) { xSet->removePropertyChangeListener(msCurrentPagePropertyName, this); } - catch (beans::UnknownPropertyException aEvent) + catch (const beans::UnknownPropertyException&) { OSL_TRACE ("DisconnectFromController: CurrentPage unknown"); } @@ -501,7 +501,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) { xSet->removePropertyChangeListener(msEditModePropertyName, this); } - catch (beans::UnknownPropertyException aEvent) + catch (const beans::UnknownPropertyException&) { OSL_TRACE ("DisconnectFromController: IsMasterPageMode unknown"); } diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index e68ff356e7b0..4ba616330965 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -89,9 +89,8 @@ sal_Int32 IdleDetection::CheckSlideShowRunning (void) if (xFrame.is() && xFrame->isActive()) bIgnoreFrame = false; } - catch (uno::RuntimeException e) + catch (const uno::RuntimeException&) { - (void) e; } if (bIgnoreFrame) continue; diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 6822b917cb7d..cbd75f6979a6 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -91,7 +91,7 @@ void TimerBasedTaskExecution::ReleaseTask ( ::boost::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution); pExecution->Release(); } - catch (::boost::bad_weak_ptr) + catch (const ::boost::bad_weak_ptr&) { // When a bad_weak_ptr has been thrown then the object pointed // to by rpTask has been released right after we checked that it diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 6b67bcead477..c76c325d0480 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -367,7 +367,7 @@ void SAL_CALL if (pListener != NULL) pListener->selectionChanged (rEvent); } - catch (RuntimeException aException) + catch (const RuntimeException&) { } } @@ -461,7 +461,7 @@ void DrawController::FireSelectionChangeListener() throw() if (pL != NULL) pL->selectionChanged( aEvent ); } - catch (RuntimeException aException) + catch (const RuntimeException&) { } } @@ -524,9 +524,8 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw() mpCurrentPage.reset(pNewCurrentPage); } - catch( uno::Exception& e ) + catch (const uno::Exception&) { - (void)e; OSL_FAIL( (::rtl::OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), " "exception caught: ") + @@ -549,7 +548,7 @@ void DrawController::FirePropertyChange ( { fire (&nHandle, &rNewValue, &rOldValue, 1, sal_False); } - catch (RuntimeException aException) + catch (const RuntimeException&) { // Ignore this exception. Exceptions should be handled in the // fire() function so that all listeners are called. This is @@ -808,7 +807,7 @@ sal_Bool DrawController::convertFastPropertyValue ( rOldValue = mxSubController->getFastPropertyValue(nHandle); bResult = (rOldValue != rConvertedValue); } - catch(beans::UnknownPropertyException aException) + catch (const beans::UnknownPropertyException&) { // The prperty is unknown and thus an illegal argument to this method. throw com::sun::star::lang::IllegalArgumentException(); @@ -883,7 +882,7 @@ void DrawController::ProvideFrameworkControllers (void) xContext, xController); } - catch (RuntimeException&) + catch (const RuntimeException&) { mxConfigurationController = NULL; mxModuleController = NULL; diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index 59564ef71985..a4c58c7be005 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -100,7 +100,7 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) nPageNumber -=1; // Transform 1-based page numbers to 0-based ones. rSelector.SelectPage(nPageNumber); } - catch(RuntimeException e) + catch (const RuntimeException&) { } } diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 31eb68e2341c..1fd57d052eda 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -968,7 +968,7 @@ void Outliner::ProvideNextTextObject (void) { mpView->SdrEndTextEdit(); } - catch (::com::sun::star::uno::Exception e) + catch (const ::com::sun::star::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index e62aa1635414..509d878d5ad9 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -676,7 +676,7 @@ void ToolBarManager::Implementation::SetValid (bool bValid) Any aValue (xFrameProperties->getPropertyValue(OUSTRING("LayoutManager"))); aValue >>= mxLayouter; } - catch (RuntimeException aException) + catch (const RuntimeException&) { } diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx index ea0f40471686..d1079731096a 100644 --- a/sd/source/ui/view/UpdateLockManager.cxx +++ b/sd/source/ui/view/UpdateLockManager.cxx @@ -288,8 +288,9 @@ void UpdateLockManager::Implementation::Unlock (void) } } } - catch (RuntimeException) - { } + catch (const RuntimeException&) + { + } // Force a rearrangement of the UI elements of the views. mrBase.Rearrange(); @@ -410,9 +411,8 @@ Reference< ::com::sun::star::frame::XLayoutManager> ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")))); aValue >>= xLayoutManager; } - catch (const beans::UnknownPropertyException& rException) + catch (const beans::UnknownPropertyException&) { - (void)rException; } } mxLayoutManager = xLayoutManager; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index fdd23b247c38..cfb3193aba2a 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -392,8 +392,9 @@ void ViewShellBase::LateInit (const ::rtl::OUString& rsDefaultView) } } } - catch (RuntimeException&) - {} + catch (const RuntimeException&) + { + } // AutoLayouts have to be ready. GetDocument()->StopWorkStartupDelay(); @@ -1193,7 +1194,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB } } } - catch ( Exception& ) + catch (const Exception&) { } @@ -1395,7 +1396,7 @@ void ViewShellBase::Implementation::SetPaneVisibility ( xConfigurationController->requestResourceDeactivation( xPaneId); } - catch (const Exception &) + catch (const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -1491,7 +1492,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) break; } } - catch (DeploymentException) + catch (const DeploymentException&) { } @@ -1531,7 +1532,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) nItemId = aSetIterator.NextWhich(); } } - catch (RuntimeException&) + catch (const RuntimeException&) { DBG_UNHANDLED_EXCEPTION(); } @@ -1635,13 +1636,13 @@ void CurrentPageSetter::operator() (bool) Reference<beans::XPropertySet> xSet (mrBase.GetController(), UNO_QUERY_THROW); xSet->setPropertyValue (String::CreateFromAscii("CurrentPage"), aPage); } - catch (RuntimeException aException) + catch (const RuntimeException&) { // We have not been able to set the current page at the main view. // This is sad but still leaves us in a valid state. Therefore, // this exception is silently ignored. } - catch (beans::UnknownPropertyException aException) + catch (const beans::UnknownPropertyException&) { DBG_ASSERT(false,"CurrentPage property unknown"); } diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 588fd65604a7..f075af56bb39 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -136,8 +136,9 @@ ViewTabBar::ViewTabBar ( xTunnel->getSomething(DrawController::getUnoTunnelId())); mpViewShellBase = pController->GetViewShellBase(); } - catch(RuntimeException&) - {} + catch (const RuntimeException&) + { + } // Register as listener at XConfigurationController. Reference<XControllerManager> xControllerManager (mxController, UNO_QUERY); @@ -189,7 +190,7 @@ void ViewTabBar::disposing (void) { mxConfigurationController->removeConfigurationChangeListener(this); } - catch (lang::DisposedException e) + catch (const lang::DisposedException&) { // Receiving a disposed exception is the normal case. Is there // a way to avoid it? @@ -236,8 +237,9 @@ void ViewTabBar::disposing (void) xTunnel->getSomething(DrawController::getUnoTunnelId())); pBase = pController->GetViewShellBase(); } - catch(RuntimeException&) - {} + catch (const RuntimeException&) + { + } // The ViewTabBar supports at the moment only the center pane. if (rxViewTabBarId.is() @@ -260,8 +262,9 @@ void ViewTabBar::disposing (void) if (xCC.is()) xPane = Reference<XPane>(xCC->getResource(rxViewTabBarId->getAnchor()), UNO_QUERY); } - catch (RuntimeException&) - {} + catch (const RuntimeException&) + { + } // Tunnel through the XWindow to the VCL side. try @@ -272,8 +275,9 @@ void ViewTabBar::disposing (void) if (pPane != NULL) pWindow = pPane->GetWindow()->GetParent(); } - catch (RuntimeException&) - {} + catch (const RuntimeException&) + { + } } return pWindow; @@ -437,7 +441,7 @@ bool ViewTabBar::ActivatePage (void) FrameworkHelper::msCenterPaneURL)), UNO_QUERY); } - catch (DeploymentException) + catch (const DeploymentException&) { } @@ -464,7 +468,7 @@ bool ViewTabBar::ActivatePage (void) UpdateActiveButton(); } } - catch (RuntimeException&) + catch (const RuntimeException&) { DBG_UNHANDLED_EXCEPTION(); } |