diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-09-08 23:00:27 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-09-08 23:51:41 +0300 |
commit | 9a8e2d09bc2111371f149498481dd422b86f9b68 (patch) | |
tree | 14d40d448c39fd126337cb52ab8c8826a61c6700 /framework/source/helper/ocomponentenumeration.cxx | |
parent | b022cfb6caccaee89c3f95dcdd585a4e77eb61df (diff) |
Use SAL_WARN_IF instead of framework's home-grown LOG_ASSERT(2)
Also remove declarations for debug function that don't exist (have been
removed (misguidedly?) as unused perhaps).
Change-Id: I0bc3320c52b3d50dc851a07fdc30b593cc4856b1
Diffstat (limited to 'framework/source/helper/ocomponentenumeration.cxx')
-rw-r--r-- | framework/source/helper/ocomponentenumeration.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 67c66e2a48e9..c1b3ea885973 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -49,7 +49,7 @@ OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Referenc { // Safe impossible states // "Method" not defined for ALL parameters! - LOG_ASSERT( impldbg_checkParameter_OComponentEnumerationCtor( seqComponents ), "OComponentEnumeration::OComponentEnumeration()\nInvalid parameter detected!\n" ) + SAL_WARN_IF( !impldbg_checkParameter_OComponentEnumerationCtor( seqComponents ), "fwk", "OComponentEnumeration::OComponentEnumeration(): Invalid parameter detected!" ); } //***************************************************************************************************************** @@ -75,7 +75,7 @@ aEvent // Safe impossible cases // This method is not specified for all incoming parameters. - LOG_ASSERT( impldbg_checkParameter_disposing( aEvent ), "OComponentEnumeration::disposing()\nInvalid parameter detected!\n" ) + SAL_WARN_IF( !impldbg_checkParameter_disposing( aEvent ), "fwk", "OComponentEnumeration::disposing(): Invalid parameter detected!" ); // Reset instance to defaults, release references and free memory. impl_resetObject(); @@ -157,8 +157,6 @@ void OComponentEnumeration::impl_resetObject() But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ -#ifdef ENABLE_ASSERTIONS - //***************************************************************************************************************** // An empty list is allowed ... hasMoreElements() will return false then! sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) @@ -193,8 +191,6 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObj return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS - } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |