diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2011-02-10 14:13:16 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2011-02-10 14:13:16 +0100 |
commit | 20a76c9e43b593e503a2901f6a8d53eb0b4bc4f3 (patch) | |
tree | ba392036e9faabbda843d9cbe13ef4d2fca85233 /sd | |
parent | 1bfa0da5cb6eb1fb6857b4dc4dec09eada5a66cf (diff) |
Some cppcheck cleaning
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 | ||||
-rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsListener.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/view/viewoverlaymanager.cxx | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 8f937a927242..c63aaf9f07c0 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1336,15 +1336,15 @@ sal_Bool ImplSdPPTImport::Import() // this is defaulted, maybe there is no SSDocInfoAtom String aCustomShow; sal_uInt32 nFlags = 1; // Bit 0: Auto advance - sal_uInt32 nPenColor = 0x1000000; - sal_Int32 nRestartTime = 0x7fffffff; sal_uInt16 nStartSlide = 0; - sal_Int16 nEndSlide = 0; // read the pres. configuration rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 ); if ( SeekToRec( rStCtrl, PPT_PST_SSDocInfoAtom, maDocHd.GetRecEndFilePos(), &aCustomShowHeader ) ) { + sal_uInt32 nPenColor = 0x1000000; + sal_Int32 nRestartTime = 0x7fffffff; + sal_Int16 nEndSlide = 0; rStCtrl >> nPenColor >> nRestartTime >> nStartSlide diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 28d0e8dd64e3..c3a544f799c0 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -1088,7 +1088,7 @@ sal_Bool SdXMLFilter::Export() } } } - catch(uno::Exception e) + catch(uno::Exception &e) { #if OSL_DEBUG_LEVEL > 1 ByteString aError( "uno Exception caught while exporting:\n" ); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index bc52b9dab76b..ec448db5f87d 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -655,7 +655,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if ( pFrameItem ) pFrame = &pFrameItem->GetFrame()->GetFrame(); } - catch (::com::sun::star::uno::Exception e) + catch (::com::sun::star::uno::Exception &e) { DBG_ASSERT (FALSE, "caught IllegalArgumentException while loading document from Impress autopilot"); } diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index dd24374002e2..609eff609332 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -236,7 +236,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) #endif } } - catch (RuntimeException e) + catch (RuntimeException &e) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 092c69fcd08f..2ea515126c3b 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -130,11 +130,11 @@ CacheConfiguration::CacheConfiguration (void) xHierarchy->getByHierarchicalName(sPathToNode), UNO_QUERY); } - catch (RuntimeException aException) + catch (RuntimeException &aException) { (void)aException; } - catch (Exception aException) + catch (Exception &aException) { (void)aException; } @@ -153,7 +153,7 @@ Any CacheConfiguration::GetValue (const ::rtl::OUString& rName) { aResult = mxCacheNode->getByName(rName); } - catch (Exception aException) + catch (Exception &aException) { (void)aException; } diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index f3115b1b46b5..7b043564851c 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -220,12 +220,12 @@ void QueueProcessor::ProcessOneRequest ( } } } - catch (::com::sun::star::uno::RuntimeException aException) + catch (::com::sun::star::uno::RuntimeException &aException) { (void) aException; OSL_ASSERT("RuntimeException caught in QueueProcessor"); } - catch (::com::sun::star::uno::Exception aException) + catch (::com::sun::star::uno::Exception &aException) { (void) aException; OSL_ASSERT("Exception caught in QueueProcessor"); diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 176dd8a9fc8a..8273bdda4aa0 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -228,7 +228,7 @@ void Listener::ConnectToController (void) { xSet->addPropertyChangeListener(String::CreateFromAscii("CurrentPage"), this); } - catch (beans::UnknownPropertyException aEvent) + catch (beans::UnknownPropertyException&) { DBG_UNHANDLED_EXCEPTION(); } @@ -236,7 +236,7 @@ void Listener::ConnectToController (void) { xSet->addPropertyChangeListener(String::CreateFromAscii("IsMasterPageMode"), this); } - catch (beans::UnknownPropertyException aEvent) + catch (beans::UnknownPropertyException&) { DBG_UNHANDLED_EXCEPTION(); } @@ -284,7 +284,7 @@ void Listener::DisconnectFromController (void) Reference<lang::XEventListener>( static_cast<XWeak*>(this), UNO_QUERY)); } - catch (beans::UnknownPropertyException aEvent) + catch (beans::UnknownPropertyException&) { DBG_UNHANDLED_EXCEPTION(); } @@ -484,7 +484,7 @@ void SAL_CALL Listener::propertyChange ( mrController.GetPageSelector().SelectPage(nCurrentPage-1); mrController.GetCurrentSlideManager()->CurrentSlideHasChanged(nCurrentPage-1); } - catch (beans::UnknownPropertyException aEvent) + catch (beans::UnknownPropertyException&) { DBG_UNHANDLED_EXCEPTION(); } @@ -568,7 +568,7 @@ void Listener::UpdateEditMode (void) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode")))); aValue >>= bIsMasterPageMode; } - catch (beans::UnknownPropertyException e) + catch (beans::UnknownPropertyException&) { // When the property is not supported then the master page mode // is not supported, too. diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 677c490266be..c2bccbbffae1 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -206,10 +206,10 @@ extern ::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) { - int nHighlightId = 0; if( pHdlList && pHdlList->GetView()) { + int nHighlightId = 0; OutputDevice* pDev = pHdlList->GetView()->GetFirstOutputDevice(); if( pDev == 0 ) pDev = Application::GetDefaultDevice(); |