Tag: cws_src680_warnings01 User: sb Date: 06/05/23 16:48:46 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx
Log: RESYNC: (1.66-1.68); 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.66.72.1&r2=1.66.72.2 Delta lines: +9 -9 ------------------- --- genericcontroller.cxx 24 Mar 2006 15:36:03 -0000 1.66.72.1 +++ genericcontroller.cxx 23 May 2006 23:48:42 -0000 1.66.72.2 @@ -165,7 +165,7 @@ ,m_bReadOnly(sal_False) ,m_bFrameUiActive(sal_False) ,m_bCurrentlyModified(sal_False) -#if OSL_DEBUG_LEVEL >= 2 +#ifdef DBG_UTIL ,m_bDescribingSupportedFeatures( false ) #endif { @@ -198,12 +198,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 @@ -724,7 +724,7 @@ // for locking in the proper order (SolarMutex and m_aMutex), and b) this would be too many places // for the time frame of the fix. // #i52602# / [EMAIL PROTECTED] / 2005-07-29 - executeUnChecked(_aURL,aArgs); + executeChecked(_aURL,aArgs); } // ----------------------------------------------------------------------- @@ -833,8 +833,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]
