diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-03-24 13:08:23 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-03-24 13:08:23 +0100 |
| commit | d78584a6e17bb35e0c6c01a306b31fa18bd14ef4 (patch) | |
| tree | 1c0bad71d66eb6c3f5a5f3d03e4556ac6a70d254 /unotools | |
| parent | 20957c82aa3098964e5c7312b7a471f383bcdc62 (diff) | |
| parent | f099cd4586bf41f30dea8190dbd2bd7b4234cf60 (diff) | |
cws tl74: merge with DEV300_m75
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configitem.cxx | 6 | ||||
| -rw-r--r-- | unotools/source/config/confignode.cxx | 3 | ||||
| -rw-r--r-- | unotools/source/config/fltrcfg.cxx | 2 |
3 files changed, 4 insertions, 7 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!"); } //------------------------------------------------------------------------ diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index f9a12e900b7d..94f7ff07d7d7 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -531,7 +531,7 @@ void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag ) BOOL SvtFilterOptions::IsUseEnhancedFields() const { return false; // disable for now; -// return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS ); +// return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS ); } void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag ) |