summaryrefslogtreecommitdiff
path: root/framework/source/helper/ocomponentaccess.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-09-08 23:00:27 +0300
committerTor Lillqvist <tml@collabora.com>2013-09-08 23:51:41 +0300
commit9a8e2d09bc2111371f149498481dd422b86f9b68 (patch)
tree14d40d448c39fd126337cb52ab8c8826a61c6700 /framework/source/helper/ocomponentaccess.cxx
parentb022cfb6caccaee89c3f95dcdd585a4e77eb61df (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/ocomponentaccess.cxx')
-rw-r--r--framework/source/helper/ocomponentaccess.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 32cb0ac5bc98..85e62cd4ab28 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -46,7 +46,7 @@ OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwne
, m_xOwner ( xOwner )
{
// Safe impossible cases
- LOG_ASSERT( impldbg_checkParameter_OComponentAccessCtor( xOwner ), "OComponentAccess::OComponentAccess()\nInvalid parameter detected!\n" )
+ SAL_WARN_IF( !impldbg_checkParameter_OComponentAccessCtor( xOwner ), "fwk", "OComponentAccess::OComponentAccess(): Invalid parameter detected!" );
}
//*****************************************************************************************************************
@@ -200,8 +200,6 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons
But ... look for right testing! See using of this methods!
-----------------------------------------------------------------------------------------------------------------*/
-#ifdef ENABLE_ASSERTIONS
-
//*****************************************************************************************************************
sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< XDesktop >& xOwner )
{
@@ -219,8 +217,6 @@ sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const
return bOK ;
}
-#endif // #ifdef ENABLE_ASSERTIONS
-
} // namespace framework
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */