User: vg Date: 05/02/16 08:00:03 Modified: /dba/dbaccess/source/core/dataaccess/ intercept.cxx
Log: INTEGRATION: CWS hsqldb2 (1.2.78); FILE MERGED 2005/01/28 12:19:40 oj 1.2.78.1: #i39922# fix for storeAsURL and merges from dba23 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.2&r2=1.3 Delta lines: +5 -31 -------------------- --- intercept.cxx 2 Aug 2004 15:10:59 -0000 1.2 +++ intercept.cxx 16 Feb 2005 15:59:59 -0000 1.3 @@ -100,8 +100,7 @@ #define DISPATCH_CLOSEDOC 2 #define DISPATCH_CLOSEWIN 3 #define DISPATCH_CLOSEFRAME 4 -#define DISPATCH_EDITDOC 5 -#define DISPATCH_RELOAD 6 +#define DISPATCH_RELOAD 5 // the OSL_ENSURE in CTOR has to be changed too, when adding new defines void OInterceptor::DisconnectContentHolder() @@ -164,14 +163,13 @@ ,m_aInterceptedURL(7) ,m_bAllowEditDoc(_bAllowEditDoc) { - OSL_ENSURE(DISPATCH_EDITDOC < m_aInterceptedURL.getLength(),"Illegal size."); + OSL_ENSURE(DISPATCH_RELOAD < m_aInterceptedURL.getLength(),"Illegal size."); m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); - m_aInterceptedURL[DISPATCH_EDITDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:EditDoc")); m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload")); } @@ -248,13 +246,6 @@ if ( xDispatch.is() ) xDispatch->dispatch( _URL, Arguments ); } - else if ( _URL.Complete == m_aInterceptedURL[DISPATCH_EDITDOC] ) - { - Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - _URL, ::rtl::OUString::createFromAscii( "_self" ), 0 ); - if ( xDispatch.is() ) - xDispatch->dispatch( _URL, Arguments ); - } } void SAL_CALL @@ -306,23 +297,6 @@ Reference< ::com::sun::star::document::XEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY); if ( xEvtB.is() ) xEvtB->addEventListener(this); - } - else if ( m_pContentHolder && _URL.Complete == m_aInterceptedURL[DISPATCH_EDITDOC] ) - { // EditDoc - FeatureStateEvent aStateEvent; - aStateEvent.FeatureURL.Complete = m_aInterceptedURL[DISPATCH_EDITDOC]; - aStateEvent.FeatureDescriptor = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Update")); - aStateEvent.IsEnabled = m_bAllowEditDoc; - aStateEvent.Requery = sal_False; - - Control->statusChanged(aStateEvent); - { - osl::MutexGuard aGuard(m_aMutex); - if(!m_pStatCL) - m_pStatCL = new PropertyChangeListenerContainer(m_aMutex); - } - - m_pStatCL->addInterface(_URL.Complete,Control); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
