User: ihi Date: 2007/04/16 09:27:56 Modified: dba/dbaccess/source/ui/inc/documentcontroller.hxx
Log: INTEGRATION: CWS fwkdbdesign01 (1.4.166); FILE MERGED 2007/03/01 21:33:58 fs 1.4.166.2: #i10000# make compile in non-pro build 2007/02/28 10:34:29 oj 1.4.166.1: #i74541# do not connect the sub controller to the db model File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: documentcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/documentcontroller.hxx?r1=1.4&r2=1.5 Delta lines: +3 -2 ------------------- --- documentcontroller.hxx 29 Mar 2006 12:39:23 -0000 1.4 +++ documentcontroller.hxx 16 Apr 2007 16:27:53 -0000 1.5 @@ -44,6 +44,7 @@ #include <com/sun/star/frame/XModel.hpp> #endif /** === end UNO includes === **/ +#include <cppuhelper/weakref.hxx> //........................................................................ namespace dbaui @@ -65,7 +66,7 @@ class ModelControllerConnector { private: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > Model; + typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > Model; typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > Controller; Model m_xModel; @@ -90,7 +91,7 @@ /** determines whether the object is empty */ - inline bool empty() const { return !m_xModel.is(); } + inline bool empty() const { return !m_xController.is(); } /** exchanges the content of <code>this</code> and the given ->ModelControllerConnector instance */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
