Tag: cws_src680_dba30 User: oj Date: 06/04/19 23:48:22 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx
Log: RESYNC: (1.66-1.67); FILE MERGED 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.63.14.5&r2=1.63.14.6 Delta lines: +8 -8 ------------------- --- genericcontroller.cxx 15 Dec 2005 08:56:52 -0000 1.63.14.5 +++ genericcontroller.cxx 20 Apr 2006 06:48:20 -0000 1.63.14.6 @@ -165,7 +165,7 @@ ,m_pView(NULL) ,m_bPreview(sal_False) ,m_bReadOnly(sal_False) -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL ,m_bDescribingSupportedFeatures( false ) #endif { @@ -198,12 +198,12 @@ getView()->Show(); } -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL m_bDescribingSupportedFeatures = true; #endif m_aSupportedFeatures.clear(); describeSupportedFeatures(); -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL m_bDescribingSupportedFeatures = false; #endif @@ -842,8 +842,8 @@ void OGenericUnoController::implDescribeSupportedFeature( const sal_Char* _pAsciiCommandURL, sal_uInt16 _nFeatureId, sal_Int16 _nCommandGroup ) { -#if OSL_DEBUG_LEVEL > 0 - 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]
