Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:35:09 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: RESYNC: (1.35-1.36); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.29.4.3&r2=1.29.4.4 Delta lines: +12 -19 --------------------- --- documentdefinition.cxx 20 Mar 2006 13:50:08 -0000 1.29.4.3 +++ documentdefinition.cxx 4 Jul 2006 07:35:06 -0000 1.29.4.4 @@ -301,7 +301,7 @@ m_pDefinition = NULL; } //------------------------------------------------------------------ - void SAL_CALL OEmbedObjectHolder::changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException) + void SAL_CALL OEmbedObjectHolder::changingState( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------ @@ -320,7 +320,7 @@ } } //------------------------------------------------------------------ - void SAL_CALL OEmbedObjectHolder::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL OEmbedObjectHolder::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException) { m_xBroadCaster = NULL; } @@ -339,7 +339,7 @@ virtual void SAL_CALL saveObject( ) throw (ObjectSaveVetoException, Exception, RuntimeException) { } - virtual void SAL_CALL onShowWindow( sal_Bool bVisible ) throw (RuntimeException) + virtual void SAL_CALL onShowWindow( sal_Bool /*bVisible*/ ) throw (RuntimeException) { } // XComponentSupplier @@ -349,7 +349,7 @@ } // XEmbeddedClient - virtual void SAL_CALL visibilityChanged( ::sal_Bool bVisible ) throw (WrongStateException, RuntimeException) + virtual void SAL_CALL visibilityChanged( ::sal_Bool /*bVisible*/ ) throw (WrongStateException, RuntimeException) { } inline void resetClient(ODocumentDefinition* _pClient) { m_pClient = _pClient; } @@ -400,7 +400,7 @@ }; //------------------------------------------------------------------ - void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& Source ) throw (RuntimeException) + void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException) { m_xClient.clear(); } @@ -489,10 +489,10 @@ :OContentHelper(_xORB,_rxContainer,_pImpl) ,OPropertyStateContainer(m_aBHelper) ,m_pInterceptor(NULL) - ,m_pClientHelper(NULL) ,m_bForm(_bForm) ,m_bOpenInDesign(sal_False) ,m_bInExecute(sal_False) + ,m_pClientHelper(NULL) { DBG_CTOR(ODocumentDefinition, NULL); registerProperties(); @@ -604,9 +604,9 @@ _rMode = aOpenCommand.Mode; else { - OpenCommandArgument2 aOpenCommand; - if ( _rValue >>= aOpenCommand ) - _rMode = aOpenCommand.Mode; + OpenCommandArgument2 aOpenCommand2; + if ( _rValue >>= aOpenCommand2 ) + _rMode = aOpenCommand2.Mode; else return false; } @@ -790,16 +790,9 @@ Reference< XModifiable > xModifiable( _rxController->getModel(), UNO_QUERY_THROW ); xModifiable->setModified( sal_False ); } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "ODocumentDefinition::impl_initObjectEditView: caught an exception!\n" ); - sMessage += "message:\n"; - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() ); - OSL_ENSURE( false, sMessage ); - #else - e; // make compiler happy - #endif + DBG_UNHANDLED_EXCEPTION(); } } @@ -1363,7 +1356,7 @@ } } // ----------------------------------------------------------------------------- -Any ODocumentDefinition::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const +Any ODocumentDefinition::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/ ) const { return Any(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
