User: ihi Date: 2007/04/16 09:23:50 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx
Log: INTEGRATION: CWS fwkdbdesign01 (1.31.40); FILE MERGED 2007/03/13 13:53:33 fs 1.31.40.2: lock mutex in getControllers 2007/02/28 10:32:07 oj 1.31.40.1: #i74952# impl XModel2 File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.31&r2=1.32 Delta lines: +35 -0 -------------------- --- databasedocument.cxx 1 Dec 2006 17:29:18 -0000 1.31 +++ databasedocument.cxx 16 Apr 2007 16:23:47 -0000 1.32 @@ -45,6 +45,7 @@ #include "dbastrings.hrc" #endif #include <comphelper/documentconstants.hxx> +#include <comphelper/enumhelper.hxx> #ifndef _COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include <com/sun/star/embed/XTransactedObject.hpp> #endif @@ -1186,6 +1187,40 @@ { return *this; } +// ----------------------------------------------------------------------------- +struct CreateAny : public ::std::unary_function< Reference<XController>, Any> + { + Any operator() (const Reference<XController>& lhs) const + { + return makeAny(lhs); + } + }; +// XModel2 +Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers( ) throw (RuntimeException) +{ + ModelMethodGuard aGuard( *this ); + uno::Sequence< Any> aController(m_pImpl->m_aControllers.size()); + ::std::transform(m_pImpl->m_aControllers.begin(),m_pImpl->m_aControllers.end(),aController.getArray(),CreateAny()); + return new ::comphelper::OAnyEnumeration(aController); +} +// ----------------------------------------------------------------------------- +Sequence< ::rtl::OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames( ) throw (RuntimeException) +{ + Sequence< ::rtl::OUString > aNames(1); + aNames[0] = SERVICE_SDB_APPLICATIONCONTROLLER; + return aNames; +} +// ----------------------------------------------------------------------------- +Reference< XController > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& /*Frame*/, Reference< ::com::sun::star::awt::XWindow >& /*ComponentWindow*/ ) throw (IllegalArgumentException, Exception, RuntimeException) +{ + return Reference< XController >(); +} +// ----------------------------------------------------------------------------- +Reference< XController > SAL_CALL ODatabaseDocument::createViewController( const ::rtl::OUString& /*ViewName*/, const Sequence< PropertyValue >& /*Arguments*/, const Reference< XFrame >& /*Frame*/, Reference< ::com::sun::star::awt::XWindow >& /*ComponentWindow*/ ) throw (IllegalArgumentException, Exception, RuntimeException) +{ + return Reference< XController >(); +} +// ----------------------------------------------------------------------------- //------------------------------------------------------------------ //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
