filter/source/config/cache/filtercache.cxx | 11 +++--------
filter/source/config/cache/filtercache.hxx | 6 +++---
2 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 2ccc311712e39109991ed9b0fd82e9e82ccf3b7d
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 17 09:04:50 2017 +0000
coverity#1398821 Uncaught exception
and
coverity#1398820 Uncaught exception
coverity#1398819 Uncaught exception
Change-Id: I68bba7043426ef5bd4146127fa115b31d03b8797
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 5b0d6db..c0867ed 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -198,9 +198,8 @@ void FilterCache::takeOver(const FilterCache& rClone)
// <- SAFE ----------------------------------
}
-
void FilterCache::load(EFillState eRequired)
- throw(css::uno::Exception)
+ throw(css::uno::Exception, std::exception)
{
// SAFE -> ----------------------------------
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -240,7 +239,6 @@ void FilterCache::load(EFillState eRequired)
// <- SAFE
}
-
bool FilterCache::isFillState(FilterCache::EFillState eState) const
throw(css::uno::Exception)
{
@@ -1402,12 +1400,11 @@ void FilterCache::impl_load(EFillState eRequiredState)
// <- SAFE
}
-
void FilterCache::impl_loadSet(const css::uno::Reference<
css::container::XNameAccess >& xConfig,
EItemType
eType ,
EReadOption
eOption,
CacheItemList*
pCache )
- throw(css::uno::Exception)
+ throw(css::uno::Exception, std::exception)
{
// get access to the right configuration set
OUString sSetName;
@@ -1709,10 +1706,9 @@ CacheItem FilterCache::impl_loadItem(const
css::uno::Reference< css::container::
return aItem;
}
-
CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType
eType,
const OUString&
sItem)
- throw(css::uno::Exception)
+ throw (css::uno::Exception, std::exception)
{
CacheItemList* pList = nullptr;
css::uno::Reference< css::uno::XInterface > xConfig ;
@@ -1783,7 +1779,6 @@ CacheItemList::iterator
FilterCache::impl_loadItemOnDemand( EItemType
return pList->find(sItem);
}
-
void FilterCache::impl_saveItem(const css::uno::Reference<
css::container::XNameReplace >& xItem,
EItemType
eType,
const CacheItem & aItem)
diff --git a/filter/source/config/cache/filtercache.hxx
b/filter/source/config/cache/filtercache.hxx
index d2bd7ad..74529e7 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -318,7 +318,7 @@ class FilterCache : public BaseLock
is already fully filled!
*/
void load(EFillState eRequired)
- throw(css::uno::Exception);
+ throw (css::uno::Exception, std::exception);
/** @short return the current fill state of this cache.
@@ -742,7 +742,7 @@ class FilterCache : public BaseLock
EItemType
eType ,
EReadOption
eOption,
CacheItemList*
pCache )
- throw(css::uno::Exception);
+ throw (css::uno::Exception, std::exception);
/** @short read the specified container item from the given
configuration set.
@@ -801,7 +801,7 @@ class FilterCache : public BaseLock
*/
CacheItemList::iterator impl_loadItemOnDemand( EItemType
eType,
const OUString& sItem)
- throw(css::uno::Exception);
+ throw (css::uno::Exception, std::exception);
/** TODO */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
