Tag: cws_src680_dba30 User: fs Date: 05/04/06 00:23:33 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx
Log: OSL_DEBUG_LEVEL condition corrected 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&r2=1.63.14.1 Delta lines: +11 -14 --------------------- --- genericcontroller.cxx 10 Mar 2005 16:45:35 -0000 1.63 +++ genericcontroller.cxx 6 Apr 2005 07:23:30 -0000 1.63.14.1 @@ -2,9 +2,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.63.14.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:45:35 $ + * last change: $Author: fs $ $Date: 2005/04/06 07:23:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -187,7 +187,7 @@ ,m_pView(NULL) ,m_bPreview(sal_False) ,m_bReadOnly(sal_False) -#if OSL_DEBUG_LEVEL >= 2 +#if OSL_DEBUG_LEVEL > 0 ,m_bDescribingSupportedFeatures( false ) #endif { @@ -216,12 +216,12 @@ getView()->Show(); } -#if OSL_DEBUG_LEVEL >= 2 +#if OSL_DEBUG_LEVEL > 0 m_bDescribingSupportedFeatures = true; #endif m_aSupportedFeatures.clear(); describeSupportedFeatures(); -#if OSL_DEBUG_LEVEL >= 2 +#if OSL_DEBUG_LEVEL > 0 m_bDescribingSupportedFeatures = false; #endif @@ -825,7 +825,7 @@ void OGenericUnoController::implDescribeSupportedFeature( const sal_Char* _pAsciiCommandURL, sal_uInt16 _nFeatureId, sal_Int16 _nCommandGroup ) { -#if OSL_DEBUG_LEVEL >= 2 +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE( m_bDescribingSupportedFeatures, "OGenericUnoController::implDescribeSupportedFeature: bad timing for this call!" ); #endif @@ -1004,10 +1004,7 @@ // ----------------------------------------------------------------------------- void OGenericUnoController::loadMenu(const Reference< XFrame >& _xFrame) { - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); - - if ( xLayoutManager.is() ) { xLayoutManager->lock(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
