summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorPKEuS <philipp.kloke@web.de>2012-02-05 11:53:47 +0100
committerJulien Nabet <serval2412@yahoo.fr>2012-02-05 14:29:54 +0100
commitba5a460bc15393cc64522f288b7b2b678d6fcc99 (patch)
treea4a322e415f301aa5d253f6578983d7ca5cbce72 /framework
parent32fa7e9208b2053d2ff7743b88b0c0edacb8a7e7 (diff)
Fixed cppcheck messages about rethrowing copy of exception.
Diffstat (limited to 'framework')
-rw-r--r--framework/source/accelerators/storageholder.cxx8
-rw-r--r--framework/source/helper/persistentwindowstate.cxx12
-rw-r--r--framework/source/jobs/helponstartup.cxx16
-rw-r--r--framework/source/loadenv/loadenv.cxx8
4 files changed, 22 insertions, 22 deletions
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 285b771aee37..4f6b140e0427 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -181,9 +181,9 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl:
{
xChild = StorageHolder::openSubStorageWithFallback(xParent, sChild, nOpenMode, sal_True); // TODO think about delegating fallback decision to our own calli!
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
- catch(const css::uno::Exception& exAny)
+ catch(const css::uno::RuntimeException&)
+ { throw; }
+ catch(const css::uno::Exception&)
{
/* TODO URGENT!
in case we found some "already existing storages" on the path before and increased its UseCount ...
@@ -195,7 +195,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl:
A flush method with the same unique number force increasing of the "UseCount" variable then
inside a synchronized block ...
*/
- throw exAny;
+ throw;
}
// SAFE -> ------------------------------
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index f2e9bcfc89ec..e7ea0650dd23 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -208,8 +208,8 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
{
sModuleName = xModuleManager->identify(xFrame);
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ sModuleName = ::rtl::OUString(); }
@@ -239,8 +239,8 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
sKey,
::comphelper::ConfigurationHelper::E_READONLY) >>= sWindowState;
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ sWindowState = ::rtl::OUString(); }
@@ -270,8 +270,8 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
css::uno::makeAny(sWindowState),
::comphelper::ConfigurationHelper::E_STANDARD);
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{}
}
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index c897ccec7c18..b1d0dab71803 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -268,8 +268,8 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
{
sModuleId = xModuleManager->identify(xDoc);
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ sModuleId = ::rtl::OUString(); }
@@ -310,8 +310,8 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
if (xHelpContent.is())
sCurrentHelpURL = xHelpContent->getURL();
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ sCurrentHelpURL = ::rtl::OUString(); }
@@ -357,8 +357,8 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
if (sHelpURL.equals(sHelpURLForModule))
return sal_True;
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{}
}
@@ -396,8 +396,8 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
sHelpURL = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem);
}
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ sHelpURL = ::rtl::OUString(); }
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index dc5736f4a8e3..0b394066c1f5 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1383,8 +1383,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
// Break search.
break;
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ continue; }
}
@@ -1811,8 +1811,8 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
// <- SOLAR SAFE
}
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{}
}