diff options
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configitem.cxx | 6 | ||||
| -rw-r--r-- | unotools/source/config/confignode.cxx | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 3d70f99f4ec0..808a0abc63d0 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -603,9 +603,9 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames) else pRet[i] = xHierarchyAccess->getByHierarchicalName(pNames[i]); } - #ifdef DBG_UTIL catch(Exception& rEx) { +#if OSL_DEBUG_LEVEL > 0 OString sMsg("XHierarchicalNameAccess: "); sMsg += OString(rEx.Message.getStr(), rEx.Message.getLength(), @@ -622,10 +622,10 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames) pNames[i].getLength(), RTL_TEXTENCODING_ASCII_US); OSL_ENSURE(sal_False, sMsg.getStr()); - } #else - catch(Exception&){} + (void) rEx; // avoid warning #endif + } } // In special mode "ALL_LOCALES" we must convert localized values to Sequence< PropertyValue >. diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 4b1b9fe272db..9ba3f642c328 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -145,7 +145,6 @@ namespace utl if (getEscape()) { Reference< XStringEscape > xEscaper(m_xDirectAccess, UNO_QUERY); - OSL_ENSURE(xEscaper.is(), "OConfigurationNode::normalizeName: missing an interface!"); if (xEscaper.is() && sName.getLength()) { try @@ -323,8 +322,6 @@ namespace utl void OConfigurationNode::setEscape(sal_Bool _bEnable) { m_bEscapeNames = _bEnable && Reference< XStringEscape >::query(m_xDirectAccess).is(); - OSL_ENSURE(m_bEscapeNames || !_bEnable, - "OConfigurationNode::setEscape: escaping not enabled - missing the appropriate interface on the node!"); } //------------------------------------------------------------------------ |