User: rt Date: 2008-06-06 14:04:15+0000 Modified: dba/dbaccess/source/core/dataaccess/intercept.cxx
Log: INTEGRATION: CWS dba30c (1.10.8); FILE MERGED 2008/05/05 06:16:03 oj 1.10.8.1: #154597# check slave interceptor File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: intercept.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/intercept.cxx?r1=1.10&r2=1.11 Delta lines: +2 -2 ------------------- --- intercept.cxx 2008-04-10 12:46:55+0000 1.10 +++ intercept.cxx 2008-06-06 14:04:12+0000 1.11 @@ -157,7 +157,7 @@ { m_pContentHolder->saveAs(); } - else + else if ( m_xSlaveDispatchProvider.is() ) { Sequence< PropertyValue > aNewArgs = Arguments; sal_Int32 nInd = 0; @@ -190,7 +190,7 @@ || _URL.Complete == m_aInterceptedURL[DISPATCH_CLOSEFRAME] ) { - if ( m_pContentHolder->prepareClose() ) + if ( m_pContentHolder->prepareClose() && m_xSlaveDispatchProvider.is() ) { Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( _URL, ::rtl::OUString::createFromAscii( "_self" ), 0 ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
