Tag: cws_src680_qiq User: fs Date: 2006/06/27 05:16:53 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: RESYNC: (1.68-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.68.10.3&r2=1.68.10.4 Delta lines: +18 -22 --------------------- --- genericcontroller.cxx 19 Jun 2006 10:10:33 -0000 1.68.10.3 +++ genericcontroller.cxx 27 Jun 2006 12:16:50 -0000 1.68.10.4 @@ -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_xMultiServiceFacatory(_rM) - ,m_bCurrentlyModified(sal_False) - ,m_bFrameUiActive(sal_False) ,m_pView(NULL) ,m_bPreview(sal_False) ,m_bReadOnly(sal_False) -#ifdef DBG_UTIL - ,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!" ); @@ -889,17 +892,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; @@ -1039,7 +1034,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 } @@ -1087,11 +1082,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; } @@ -1151,6 +1146,7 @@ for ( sal_Int32 i=0; i<sServiceNames.getLength(); ++i, ++pLoop ) { sal_Int32 nDummy = 0; + (void)nDummy; } #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
