diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:05:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:05:18 +0000 |
| commit | 429995280d54f8dd53f793e867f7ce98f8c18b79 (patch) | |
| tree | dff96d02d1a1c1ac77e27d5a1f50b550570d8205 /unotools/source/config | |
| parent | ca80323add8f218271ce571921642905335a6792 (diff) | |
INTEGRATION: CWS warnings01 (1.8.16); FILE MERGED
2005/12/21 11:41:07 fs 1.8.16.4: #i55991# warning-free code
2005/12/21 11:32:02 fs 1.8.16.3: #i55991# warning-free code
2005/10/27 10:51:15 pl 1.8.16.2: #i55991# removed warnings for solaris platform
2005/10/21 09:48:53 dbo 1.8.16.1: #i53898# warning free code
Diffstat (limited to 'unotools/source/config')
| -rw-r--r-- | unotools/source/config/confignode.cxx | 52 |
1 files changed, 33 insertions, 19 deletions
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index ec5ea149c10d..a292fe0c2959 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: confignode.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:42:09 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:05:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,6 +65,9 @@ #ifndef _RTL_STRING_HXX_ #include <rtl/string.hxx> #endif +#if OSL_DEBUG_LEVEL > 0 +#include <rtl/strbuf.hxx> +#endif //........................................................................ namespace utl @@ -117,8 +120,8 @@ namespace utl :OEventListenerAdapter() ,m_xHierarchyAccess(_rSource.m_xHierarchyAccess) ,m_xDirectAccess(_rSource.m_xDirectAccess) - ,m_xContainerAccess(_rSource.m_xContainerAccess) ,m_xReplaceAccess(_rSource.m_xReplaceAccess) + ,m_xContainerAccess(_rSource.m_xContainerAccess) ,m_xProvider(_rSource.m_xProvider) ,m_bEscapeNames(_rSource.m_bEscapeNames) ,m_sCompletePath(_rSource.m_sCompletePath) @@ -230,10 +233,13 @@ namespace utl } catch (NoSuchElementException&) { - OSL_ENSURE(sal_False, - ::rtl::OString("OConfigurationNode::removeNode: there is no element named!") - += ::rtl::OString(_rName.getStr(), _rName.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("!")); + #if OSL_DEBUG_LEVEL > 0 + rtl::OStringBuffer aBuf( 256 ); + aBuf.append("OConfigurationNode::removeNode: there is no element named!"); + aBuf.append( rtl::OUStringToOString( _rName, RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( "!" ); + OSL_ENSURE(sal_False, aBuf.getStr()); + #endif } catch (WrappedTargetException&) { @@ -336,11 +342,14 @@ namespace utl } catch(NoSuchElementException& e) { - e; // make compiler happy (in the pro version) - OSL_ENSURE(sal_False, - ::rtl::OString("OConfigurationNode::openNode: there is no element named ") - += ::rtl::OString(_rPath.getStr(), _rPath.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("!")); + (void)e; + #if OSL_DEBUG_LEVEL > 0 + rtl::OStringBuffer aBuf( 256 ); + aBuf.append("OConfigurationNode::openNode: there is no element named "); + aBuf.append( rtl::OUStringToOString( _rPath, RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append("!"); + OSL_ENSURE(sal_False, aBuf.getStr()); + #endif } catch(Exception&) { @@ -487,11 +496,14 @@ namespace utl } catch(NoSuchElementException& e) { - e; // make compiler happy - OSL_ENSURE(sal_False, - ::rtl::OString("OConfigurationNode::getNodeValue: caught a NoSuchElementException while trying to open ") - += ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("!")); + #if OSL_DEBUG_LEVEL > 0 + rtl::OStringBuffer aBuf( 256 ); + aBuf.append("OConfigurationNode::getNodeValue: caught a NoSuchElementException while trying to open "); + aBuf.append( rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ) ); + OSL_ENSURE(sal_False, aBuf.getStr()); + #else + (void)e; + #endif } return aReturn; } @@ -664,11 +676,13 @@ namespace utl } catch(Exception& e) { -#if OSL_DEBUG_LEVEL > 0 + #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sMessage( "OConfigurationTreeRoot::createWithProvider: caught an exception while creating the access object!\nmessage:\n" ); sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); OSL_ENSURE( sal_False, sMessage.getStr() ); -#endif + #else + (void)e; + #endif } } bTryAgain = CM_PREFER_UPDATABLE == _eMode; |