Tag: cws_src680_oj14 User: oj Date: 2007-06-04 17:27:27+0000 Log: merge conflict resolved
File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: documentcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/documentcontroller.hxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +5 -4 ------------------- --- documentcontroller.hxx 2006-07-04 07:13:55+0000 1.1.2.3 +++ documentcontroller.hxx 2007-06-04 17:27:24+0000 1.1.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: documentcontroller.hxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: oj $ $Date: 2006/07/04 07:13:55 $ + * last change: $Author: oj $ $Date: 2007/06/04 17:27:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,6 +44,7 @@ #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> #endif +#include <cppuhelper/weakref.hxx> /** === end UNO includes === **/ #ifndef INCLUDED_DBACCESSDLLAPI_H @@ -69,7 +70,7 @@ class DBACCESS_DLLPUBLIC 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; @@ -94,7 +95,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]
