Tag: cws_src680_odbmacros2 User: fs Date: 2007-12-18 21:25:13+0000 Modified: dba/dbaccess/source/ui/misc/singledoccontroller.cxx
Log: #i49133# some re-factoring File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: singledoccontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/singledoccontroller.cxx?r1=1.22.98.1&r2=1.22.98.2 Delta lines: +16 -33 --------------------- --- singledoccontroller.cxx 2007-12-13 11:21:27+0000 1.22.98.1 +++ singledoccontroller.cxx 2007-12-18 21:25:10+0000 1.22.98.2 @@ -4,9 +4,9 @@ * * $RCSfile: singledoccontroller.cxx,v $ * - * $Revision: 1.22.98.1 $ + * $Revision: 1.22.98.2 $ * - * last change: $Author: fs $ $Date: 2007/12/13 11:21:27 $ + * last change: $Author: fs $ $Date: 2007/12/18 21:25:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -129,6 +129,7 @@ using ::com::sun::star::awt::XWindow; using ::com::sun::star::sdbc::XDatabaseMetaData; using ::com::sun::star::sdb::XDocumentDataSource; + using ::com::sun::star::document::XEmbeddedScripts; /** === end UNO using === **/ class DataSourceHolder @@ -197,7 +198,7 @@ //==================================================================== //-------------------------------------------------------------------- OSingleDocumentController::OSingleDocumentController(const Reference< XMultiServiceFactory >& _rxORB) - :OSingleDocumentController_CBASE( _rxORB ) + :OSingleDocumentController_Base( _rxORB ) ,m_pImpl(new OSingleDocumentControllerImpl()) { } @@ -205,28 +206,8 @@ OSingleDocumentController::~OSingleDocumentController() { } - //-------------------------------------------------------------------- - Sequence<sal_Int8> SAL_CALL OSingleDocumentController::getImplementationId( ) throw(RuntimeException) - { - static ::cppu::OImplementationId * pId = 0; - if (! pId) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if (! pId) - { - static ::cppu::OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); - } //-------------------------------------------------------------------- - Sequence< Type > SAL_CALL OSingleDocumentController::getTypes( ) throw (RuntimeException) - { - return OSingleDocumentController_CBASE::getTypes(); - } - //-------------------------------------------------------------------- void OSingleDocumentController::initializeConnection( const Reference< XConnection >& _rxForeignConn ) { DBG_ASSERT( !isConnected(), "OSingleDocumentController::initializeConnection: not to be called when already connected!" ); @@ -322,7 +303,7 @@ //-------------------------------------------------------------------- void SAL_CALL OSingleDocumentController::disposing() { - OSingleDocumentController_CBASE::disposing(); + OSingleDocumentController_Base::disposing(); m_aUndoManager.Clear(); disconnect(); @@ -339,7 +320,7 @@ if ( getView() ) getView()->enableSeparator( ); - return OSingleDocumentController_CBASE::Construct( _pParent ); + return OSingleDocumentController_Base::Construct( _pParent ); } //-------------------------------------------------------------------- @@ -363,7 +344,7 @@ } } else - OSingleDocumentController_CBASE::disposing( _rSource ); + OSingleDocumentController_Base::disposing( _rSource ); } //-------------------------------------------------------------------- namespace @@ -460,7 +441,7 @@ } break; default: - aReturn = OSingleDocumentController_CBASE::GetState(_nId); + aReturn = OSingleDocumentController_Base::GetState(_nId); } return aReturn; } @@ -510,12 +491,6 @@ } // ----------------------------------------------------------------------------- - Reference< XModel > OSingleDocumentController::getAssociatedModel() const - { - return Reference< XModel >( m_pImpl->m_aDataSource.getDatabaseDocument(), UNO_QUERY ); - } - - // ----------------------------------------------------------------------------- ::rtl::OUString OSingleDocumentController::getDataSourceName() const { ::rtl::OUString sName; @@ -609,6 +584,14 @@ return m_pImpl->m_xFormatter; } + // ----------------------------------------------------------------------------- + Reference< XEmbeddedScripts > SAL_CALL OSingleDocumentController::getScriptContainer() throw (RuntimeException) + { + Reference< XEmbeddedScripts > xScripts( m_pImpl->m_aDataSource.getDatabaseDocument(), UNO_QUERY ); + OSL_ENSURE( xScripts.is(), "OSingleDocumentController::getScriptContainer: no document with scripts!" ); + return xScripts; + } + //........................................................................ } // namespace dbaui //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
