[Libreoffice-commits] .: comphelper/source cui/source filter/source framework/source sfx2/source svl/source svx/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Sun Feb 5 01:50:57 PST 2012
comphelper/source/misc/mediadescriptor.cxx | 8 ++--
cui/source/customize/cfgutil.cxx | 24 +++++++-------
filter/source/config/cache/filtercache.cxx | 4 +-
framework/source/dispatch/dispatchinformationprovider.cxx | 4 +-
framework/source/services/pathsettings.cxx | 12 +++----
sfx2/source/appl/appserv.cxx | 8 ++--
sfx2/source/appl/workwin.cxx | 8 ++--
svl/source/config/itemholder2.cxx | 4 +-
svx/source/unodraw/recoveryui.cxx | 4 +-
9 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit fa6665282e2a7c8753eb35b2f03499134413caca
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Feb 5 10:49:59 2012 +0100
Some cppcheck cleaning
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 90b713c..038e718 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -369,8 +369,8 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
}
}
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException& )
+ { throw; }
catch(const css::uno::Exception&)
{}
@@ -750,8 +750,8 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s
return xUriRef->getUriReference();
}
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f5fb4a8..02055ae 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -172,8 +172,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
if (xStyle.is())
xStyle->getPropertyValue(STYLEPROP_UINAME) >>= aStyle.sLabel;
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ aStyle.sLabel = ::rtl::OUString(); }
@@ -212,8 +212,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
else
xFamilyInfo->getPropertyValue(STYLEPROP_UINAME) >>= aFamilyInfo.sLabel;
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ return ::std::vector< SfxStyleInfo_Impl >(); }
@@ -236,8 +236,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
xFamilies->getByName(sFamily) >>= xStyleSet;
lStyleNames = xStyleSet->getElementNames();
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ return ::std::vector< SfxStyleInfo_Impl >(); }
@@ -259,8 +259,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
continue;
xStyle->getPropertyValue(PROP_UINAME) >>= aStyleInfo.sLabel;
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ continue; }
@@ -513,8 +513,8 @@ void SfxConfigGroupListBox_Impl::InitModule()
pEntry->SetUserData(pInfo);
}
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{}
}
@@ -879,8 +879,8 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
sUIName = lProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ), ::rtl::OUString());
}
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(css::uno::Exception&)
{ sUIName = ::rtl::OUString(); }
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index b623e13..ca1af31 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -931,8 +931,8 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirect
{
aValue = xAccess->getByName(sKey);
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
#if OSL_DEBUG_LEVEL > 0
catch(const css::uno::Exception& ex)
#else
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index ba8ff65..7352b21 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -138,8 +138,8 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati
lInfos[rInfo.Command] = rInfo;
}
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ continue; }
}
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 9e26c30..4a5dd53 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -413,12 +413,12 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa
// will produce strings with same content (because some variables are redundant!)
impl_subst(aPath, sal_False);
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::container::NoSuchElementException&)
{ eOp = PathSettings::E_REMOVED; }
- catch(const css::uno::Exception& exAny)
- { throw exAny; }
+ catch(const css::uno::Exception&)
+ { throw; }
#ifdef MIGRATE_OLD_USER_PATHES
try
@@ -433,8 +433,8 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa
impl_subst(lOldVals, fa_getSubstitution(), sal_False);
impl_mergeOldUserPaths(aPath, lOldVals);
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
// Normal(!) exceptions can be ignored!
// E.g. in case an addon installs a new path, which was not well known for an OOo 1.x installation
// we cant find a value for it inside the "old" configuration. So a NoSuchElementException
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index bc4b1f4..8070b51 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -586,9 +586,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
aValue >>= xLayoutManager;
}
- catch ( const ::com::sun::star::uno::RuntimeException& e )
+ catch ( const ::com::sun::star::uno::RuntimeException& )
{
- throw e;
+ throw;
}
catch ( ::com::sun::star::uno::Exception& )
{
@@ -889,8 +889,8 @@ static ::rtl::OUString getConfigurationStringValue(
rKey,
::comphelper::ConfigurationHelper::E_READONLY) >>= aDefVal;
}
- catch(const com::sun::star::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const com::sun::star::uno::RuntimeException&)
+ { throw; }
catch(const com::sun::star::uno::Exception&)
{}
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 9281858..68c24ed 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -201,9 +201,9 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr
catch ( css::lang::DisposedException& )
{
}
- catch ( const css::uno::RuntimeException& e )
+ catch ( const css::uno::RuntimeException& )
{
- throw e;
+ throw;
}
catch ( css::uno::Exception& )
{
@@ -262,9 +262,9 @@ throw( css::uno::RuntimeException )
catch ( css::lang::DisposedException& )
{
}
- catch ( const css::uno::RuntimeException& e )
+ catch ( const css::uno::RuntimeException& )
{
- throw e;
+ throw;
}
catch ( css::uno::Exception& )
{
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index f2545d4..a4bbc97 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -62,9 +62,9 @@ ItemHolder2::ItemHolder2()
if (xCfg.is())
xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
}
- catch(const css::uno::RuntimeException& rREx)
+ catch(const css::uno::RuntimeException&)
{
- throw rREx;
+ throw;
}
#ifdef DBG_UTIL
catch(const css::uno::Exception& rEx)
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 5a33691..c831fba 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -389,8 +389,8 @@ void RecoveryUI::impl_showAllRecoveredDocs()
xWindow->setVisible(sal_True);
}
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
+ catch(const css::uno::RuntimeException&)
+ { throw; }
catch(const css::uno::Exception&)
{ continue; }
}
More information about the Libreoffice-commits
mailing list