User: rt Date: 2008-01-29 14:06:50+0000 Modified: dba/dbaccess/source/core/dataaccess/intercept.cxx
Log: INTEGRATION: CWS reportdesign02 (1.8.166); FILE MERGED 2007/11/07 12:14:20 oj 1.8.166.1: #i78387# new menu entry for saveas for reports 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.8&r2=1.9 Delta lines: +41 -30 --------------------- --- intercept.cxx 2006-09-17 06:40:38+0000 1.8 +++ intercept.cxx 2008-01-29 14:06:47+0000 1.9 @@ -158,6 +158,12 @@ } else if( _URL.Complete == m_aInterceptedURL[DISPATCH_SAVEAS] ) { + if ( m_pContentHolder->isNewReport() ) + { + m_pContentHolder->saveAs(); + } + else + { Sequence< PropertyValue > aNewArgs = Arguments; sal_Int32 nInd = 0; @@ -183,6 +189,7 @@ if ( xDispatch.is() ) xDispatch->dispatch( _URL, aNewArgs ); } + } else if ( _URL.Complete == m_aInterceptedURL[DISPATCH_CLOSEDOC] || _URL.Complete == m_aInterceptedURL[DISPATCH_CLOSEWIN] || _URL.Complete == m_aInterceptedURL[DISPATCH_CLOSEFRAME] @@ -219,6 +226,9 @@ if ( m_pContentHolder && _URL.Complete == m_aInterceptedURL[DISPATCH_SAVEAS] ) { // SaveAs + + if ( !m_pContentHolder->isNewReport() ) + { FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[DISPATCH_SAVEAS]; aStateEvent.FeatureDescriptor = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo")); @@ -226,6 +236,7 @@ aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); Control->statusChanged(aStateEvent); + } { osl::MutexGuard aGuard(m_aMutex); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
