Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:48:56 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: RESYNC: (1.66-1.69); 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.4.2&r2=1.66.4.3 Delta lines: +24 -28 --------------------- --- genericcontroller.cxx 20 Mar 2006 07:48:11 -0000 1.66.4.2 +++ genericcontroller.cxx 4 Jul 2006 07:48:54 -0000 1.66.4.3 @@ -56,6 +56,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif @@ -154,17 +157,17 @@ // ------------------------------------------------------------------------- OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFactory >& _rM) :OGenericUnoController_COMPBASE(m_aMutex) +#ifdef DBG_UTIL + ,m_bDescribingSupportedFeatures( false ) +#endif ,m_aAsyncInvalidateAll(LINK(this, OGenericUnoController, OnAsyncInvalidateAll)) ,m_aAsyncCloseTask(LINK(this, OGenericUnoController, OnAsyncCloseTask)) ,m_xServiceFactory(_rM) - ,m_bCurrentlyModified(sal_False) - ,m_bFrameUiActive(sal_False) ,m_pView(NULL) ,m_bPreview(sal_False) ,m_bReadOnly(sal_False) -#if OSL_DEBUG_LEVEL >= 2 - ,m_bDescribingSupportedFeatures( false ) -#endif + ,m_bFrameUiActive(sal_False) + ,m_bCurrentlyModified(sal_False) { DBG_CTOR(OGenericUnoController,NULL); @@ -185,7 +188,7 @@ } // ----------------------------------------------------------------------------- -sal_Bool OGenericUnoController::Construct(Window* pParent) +sal_Bool OGenericUnoController::Construct(Window* /*pParent*/) { OSL_ENSURE( getView(), "the view is NULL!" ); @@ -228,7 +231,7 @@ return VCLUnoHelper::GetInterface( getView() ); } // ----------------------------------------------------------------------------- -void OGenericUnoController::impl_initialize(const Sequence< Any >& aArguments) +void OGenericUnoController::impl_initialize(const Sequence< Any >& /*aArguments*/) { } // ------------------------------------------------------------------------- @@ -717,7 +720,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); } // ----------------------------------------------------------------------- @@ -828,8 +831,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; @@ -874,17 +877,9 @@ break; } } - catch(Exception& e) + catch( const Exception& ) { -#if DBG_UTIL - String sMessage("OGenericUnoController::GetState(", RTL_TEXTENCODING_ASCII_US); - sMessage += String::CreateFromInt32(nId); - sMessage.AppendAscii("): caught an exception ! message : "); - sMessage += (const sal_Unicode*)e.Message; - DBG_ERROR(ByteString(sMessage, gsl_getSystemTextEncoding()).GetBuffer()); -#else - e; // make compiler happy -#endif + DBG_UNHANDLED_EXCEPTION(); } return aReturn; @@ -1024,7 +1019,7 @@ } // ----------------------------------------------------------------------------- -void OGenericUnoController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) +void OGenericUnoController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& /*_xLayoutManager*/) { // not interested in } @@ -1072,11 +1067,11 @@ return Any(); } // ----------------------------------------------------------------------------- -void SAL_CALL OGenericUnoController::restoreViewData(const Any& Data) throw( RuntimeException ) +void SAL_CALL OGenericUnoController::restoreViewData(const Any& /*Data*/) throw( RuntimeException ) { } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & xModel) throw( RuntimeException ) +sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) throw( RuntimeException ) { return sal_False; } @@ -1145,6 +1140,7 @@ for ( sal_Int32 i=0; i<sServiceNames.getLength(); ++i, ++pLoop ) { sal_Int32 nDummy = 0; + (void)nDummy; } #endif @@ -1357,11 +1353,11 @@ // ----------------------------------------------------------------------------- void OGenericUnoController::fillSupportedFeatures() { -#if OSL_DEBUG_LEVEL >= 2 +#if DBG_UTIL m_bDescribingSupportedFeatures = true; #endif describeSupportedFeatures(); -#if OSL_DEBUG_LEVEL >= 2 +#if DBG_UTIL m_bDescribingSupportedFeatures = false; #endif } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
