User: vg Date: 06/03/31 04:12:51 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx
Log: INTEGRATION: CWS dba203b (1.66.98); FILE MERGED 2006/03/27 09:31:55 fs 1.66.98.1: m_bDescribingSupportedFeatures available in non-pro version all the time File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.66&r2=1.67 Delta lines: +5 -5 ------------------- --- genericcontroller.cxx 23 Sep 2005 12:21:38 -0000 1.66 +++ genericcontroller.cxx 31 Mar 2006 12:12:49 -0000 1.67 @@ -162,7 +162,7 @@ ,m_pView(NULL) ,m_bPreview(sal_False) ,m_bReadOnly(sal_False) -#if OSL_DEBUG_LEVEL >= 2 +#ifdef DBG_UTIL ,m_bDescribingSupportedFeatures( false ) #endif { @@ -195,12 +195,12 @@ getView()->Show(); } -#if OSL_DEBUG_LEVEL >= 2 +#ifdef DBG_UTIL m_bDescribingSupportedFeatures = true; #endif m_aSupportedFeatures.clear(); describeSupportedFeatures(); -#if OSL_DEBUG_LEVEL >= 2 +#ifdef DBG_UTIL m_bDescribingSupportedFeatures = false; #endif @@ -830,8 +830,8 @@ void OGenericUnoController::implDescribeSupportedFeature( const sal_Char* _pAsciiCommandURL, sal_uInt16 _nFeatureId, sal_Int16 _nCommandGroup ) { -#if OSL_DEBUG_LEVEL >= 2 - OSL_ENSURE( m_bDescribingSupportedFeatures, "OGenericUnoController::implDescribeSupportedFeature: bad timing for this call!" ); +#ifdef DBG_UTIL + DBG_ASSERT( m_bDescribingSupportedFeatures, "OGenericUnoController::implDescribeSupportedFeature: bad timing for this call!" ); #endif ControllerFeature aFeature; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
