diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-03-02 18:43:33 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-03-02 18:43:33 +0100 |
| commit | 4d27fc437055d49dd18fc048d3fc2fbdfc50735a (patch) | |
| tree | 943f6953770996eab42c9b9bd847ece2bee87d0e /unotools | |
| parent | f20bccf2958c070cfa1ec08b20f71bb0f70b8cd1 (diff) | |
| parent | 127c0f02d44c1ded4e452a6f40561775f5e43e4e (diff) | |
CWS-TOOLING: integrate CWS sb111
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 eda74f873b5f..e191f471057a 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -600,9 +600,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(), @@ -619,10 +619,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 f196ebba0863..802a63782cf9 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -159,7 +159,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 @@ -333,8 +332,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!"); } //------------------------------------------------------------------------ |