mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "coverity#1169848 Uncaught exception"

Browse Source 
This reverts commit b0a7722ebf, now that
fced31697b "comphelper::SequenceAsHashMap: throw
IllegalArgumentException" made the underlying problem go away.

Conflicts:
	framework/source/services/modulemanager.cxx

Change-Id: I6599cf25d4f28d2bab19da67d5de5caacd84a622
This commit is contained in:
Stephan Bergmann
2014-11-19 18:36:49 +01:00
parent 5252652ac5
commit 9dc7bae64d
1 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/source/services/modulemanager.cxx
View File

@@ -235,8 +235,6 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
css::lang::WrappedTargetException , css::lang::WrappedTargetException ,
css::uno::RuntimeException, std::exception ) css::uno::RuntimeException, std::exception )
{ {
try
{
::comphelper::SequenceAsHashMap lProps(aValue); ::comphelper::SequenceAsHashMap lProps(aValue);
if (lProps.empty() ) if (lProps.empty() )
{ {
@@ -256,7 +254,7 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
"/org.openoffice.Setup/Office/Factories", "/org.openoffice.Setup/Office/Factories",
::comphelper::ConfigurationHelper::E_STANDARD); ::comphelper::ConfigurationHelper::E_STANDARD);
css::uno::Reference< css::container::XNameAccess > xModules (xCfg, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameAccess > xModules (xCfg, css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNameReplace > xModule; css::uno::Reference< css::container::XNameReplace > xModule ;
xModules->getByName(sName) >>= xModule; xModules->getByName(sName) >>= xModule;
if (!xModule.is()) if (!xModule.is())
@@ -268,7 +266,7 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
::comphelper::SequenceAsHashMap::const_iterator pProp; ::comphelper::SequenceAsHashMap::const_iterator pProp;
for ( pProp = lProps.begin(); for ( pProp = lProps.begin();
pProp != lProps.end(); pProp != lProps.end() ;
++pProp ) ++pProp )
{ {
const OUString& sPropName = pProp->first; const OUString& sPropName = pProp->first;
@@ -280,14 +278,6 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
} }
::comphelper::ConfigurationHelper::flush(xCfg); ::comphelper::ConfigurationHelper::flush(xCfg);
}
catch (const css::beans::IllegalTypeException& e)
{
css::uno::Any a(e);
throw css::lang::WrappedTargetException(
OUString("ModuleManager::replaceByName: IllegalType exception"),
css::uno::Reference<css::uno::XInterface>(*this), a);
}
} }
css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName) css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)