framework/source/accelerators/globalacceleratorconfiguration.cxx | 4 +-- framework/source/accelerators/moduleacceleratorconfiguration.cxx | 4 +-- framework/source/accelerators/presethandler.cxx | 12 +++++----- framework/source/services/autorecovery.cxx | 10 ++++---- svx/source/unodraw/unoshcol.cxx | 4 +-- 5 files changed, 17 insertions(+), 17 deletions(-)
New commits: commit f58c49b39a7c6a8490033360f78768ee0a26f167 Author: Julien Nabet <[email protected]> Date: Thu Feb 2 22:53:48 2012 +0100 Some cppcheck cleaning diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 84da269..c5853f8 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -119,8 +119,8 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache() m_xCfgListener = new WeakChangesListener(this); xBroadcaster->addChangesListener(m_xCfgListener); } - catch(const css::uno::RuntimeException& exRun) - { throw exRun; } + catch(const css::uno::RuntimeException&) + { throw; } catch(const css::uno::Exception&) {} } diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 9c3fb8f..7100685 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -153,8 +153,8 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache() m_xCfgListener = new WeakChangesListener(this); xBroadcaster->addChangesListener(m_xCfgListener); } - catch(const css::uno::RuntimeException& exRun) - { throw exRun; } + catch(const css::uno::RuntimeException&) + { throw; } catch(const css::uno::Exception&) {} } diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index d276b48..b68fdc4 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -501,8 +501,8 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType xUser = m_lDocumentStorages.openPath(sRelPathUser , eUserMode ); xShare = xUser; } - catch(const css::uno::RuntimeException& exRun) - { throw exRun; } + catch(const css::uno::RuntimeException&) + { throw; } catch(const css::uno::Exception&) { xShare.clear(); xUser.clear(); } } @@ -822,8 +822,8 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring else xPath = m_aSharedStorages->m_lStoragesUser.openPath(sPath, eMode); } - catch(const css::uno::RuntimeException& exRun) - { throw exRun; } + catch(const css::uno::RuntimeException&) + { throw; } catch(const css::uno::Exception&) { xPath.clear(); } return xPath; @@ -921,8 +921,8 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat if (xFolder->isStorageElement(pNames[i])) lSubFolders.push_back(pNames[i]); } - catch(const css::uno::RuntimeException& exRun) - { throw exRun; } + catch(const css::uno::RuntimeException&) + { throw; } catch(const css::uno::Exception&) {} } diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 6d2b6b6..cae935b 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1336,7 +1336,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn nRetry = 0; } - catch(const css::uno::Exception& ex) + catch(const css::uno::Exception&) { // a) FULL DISC seams to be the problem behind => show error and retry it forever (e.g. retry=300) // b) unknown problem (may be locking problem) => reset RETRY value to more usefull value(!) (e.g. retry=3) @@ -1355,7 +1355,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL; else if (nRetry <= GIVE_UP_RETRY) - throw ex; // force stacktrace to know if there exist might other reasons, why an AutoSave can fail !!! + throw; // force stacktrace to know if there exist might other reasons, why an AutoSave can fail !!! --nRetry; } @@ -2374,7 +2374,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& bError = sal_False; nRetry = 0; } - catch(const css::uno::Exception& ex) + catch(const css::uno::Exception&) { bError = sal_True; @@ -2395,7 +2395,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL; else if (nRetry <= GIVE_UP_RETRY) - throw ex; // force stacktrace to know if there exist might other reasons, why an AutoSave can fail !!! + throw; // force stacktrace to know if there exist might other reasons, why an AutoSave can fail !!! --nRetry; } @@ -3444,7 +3444,7 @@ void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() } } catch(const css::uno::RuntimeException& exRun) - { throw exRun; } + { throw; } catch(const css::uno::Exception&) {} diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 8686887..1e02c9c 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -137,14 +137,14 @@ void SvxShapeCollection::dispose() // notify subclasses to do their dispose disposing(); } - catch(const ::com::sun::star::uno::Exception& e) + catch(const ::com::sun::star::uno::Exception&) { // catch exception and throw again but signal that // the object was disposed. Dispose should be called // only once. mrBHelper.bDisposed = sal_True; mrBHelper.bInDispose = sal_False; - throw e; + throw; } // the values bDispose and bInDisposing must set in this order. _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
