User: hr Date: 06/06/19 19:58:09 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx
Log: INTEGRATION: CWS warnings01 (1.66.72); FILE MERGED 2006/05/29 11:19:11 sb 1.66.72.3: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170. 2006/05/23 23:48:42 sb 1.66.72.2: RESYNC: (1.66-1.68); FILE MERGED 2006/03/24 15:36:03 fs 1.66.72.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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&r2=1.69 Delta lines: +16 -20 --------------------- --- genericcontroller.cxx 19 Apr 2006 13:19:44 -0000 1.68 +++ genericcontroller.cxx 20 Jun 2006 02:58:07 -0000 1.69 @@ -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!" ); @@ -234,7 +237,7 @@ return VCLUnoHelper::GetInterface( getView() ); } // ----------------------------------------------------------------------------- -void OGenericUnoController::impl_initialize(const Sequence< Any >& aArguments) +void OGenericUnoController::impl_initialize(const Sequence< Any >& /*aArguments*/) { } // ------------------------------------------------------------------------- @@ -876,17 +879,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; @@ -1026,7 +1021,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 } @@ -1074,11 +1069,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; } @@ -1138,6 +1133,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]
