diff options
| -rw-r--r-- | tools/source/debug/debug.cxx | 13 | ||||
| -rw-r--r-- | unotools/source/config/configvaluecontainer.cxx | 10 |
2 files changed, 3 insertions, 20 deletions
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 4b0a37a3dd53..c956ac2366b7 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -304,20 +304,12 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam ) } } -#else - -void* DbgFunc( sal_uInt16, void* ) { return NULL; } - #endif +#if OSL_DEBUG_LEVEL > 0 TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction, const char* fileAndLineNo) { -#if OSL_DEBUG_LEVEL == 0 - (void) caught; - (void) currentFunction; - (void) fileAndLineNo; -#else OString sMessage( "caught an exception!" ); sMessage += "\nin function:"; sMessage += currentFunction; @@ -359,9 +351,10 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const c SAL_DETAIL_LOG_FORMAT( SAL_DETAIL_ENABLE_LOG_WARN, SAL_DETAIL_LOG_LEVEL_WARN, "legacy.osl", fileAndLineNo, "%s", sMessage.getStr()); -#endif } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 99a2e9710759..3c526e95954c 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -57,13 +57,10 @@ namespace utl void bind( void* _pLocation, const Type& _rType ); - bool isBound( ) const { return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); } const OUString& getPath( ) const { return sRelativePath; } LocationType getLocType( ) const { return eLocationType; } void* getLocation( ) const { return pLocation; } const Type& getDataType( ) const { return aDataType; } - - bool operator == ( const NodeValueAccessor& rhs ) const; }; NodeValueAccessor::NodeValueAccessor( const OUString& _rNodePath ) @@ -73,13 +70,6 @@ namespace utl { } - bool NodeValueAccessor::operator == ( const NodeValueAccessor& rhs ) const - { - return ( sRelativePath == rhs.sRelativePath ) - && ( eLocationType == rhs.eLocationType ) - && ( pLocation == rhs.pLocation ); - } - void NodeValueAccessor::bind( void* _pLocation, const Type& _rType ) { DBG_ASSERT( !isBound(), "NodeValueAccessor::bind: already bound!" ); |