INTEGRATION: CWS oj14 (1.8.54); FILE MERGED

2007/04/18 09:12:47 oj 1.8.54.2: RESYNC: (1.8-1.9); FILE MERGED
2007/01/25 07:55:11 oj 1.8.54.1: memory leak fixed
This commit is contained in:
Rüdiger Timm
2007-07-06 08:57:09 +00:00
parent 98f8b561a2
commit 25f81f7312

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: richtextmodel.hxx,v $ * $RCSfile: richtextmodel.hxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: obo $ $Date: 2007-03-09 13:36:42 $ * last change: $Author: rt $ $Date: 2007-07-06 09:57:09 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -71,6 +71,7 @@
#ifndef _LINK_HXX #ifndef _LINK_HXX
#include <tools/link.hxx> #include <tools/link.hxx>
#endif #endif
#include <memory>
class EditEngine; class EditEngine;
//........................................................................ //........................................................................
@@ -125,7 +126,8 @@ namespace frm
sal_Bool m_bMultiLine; sal_Bool m_bMultiLine;
// </properties_for_awt_edit_compatibility> // </properties_for_awt_edit_compatibility>
RichTextEngine* m_pEngine; ::std::auto_ptr<RichTextEngine>
m_pEngine;
bool m_bSettingEngineText; bool m_bSettingEngineText;
::cppu::OInterfaceContainerHelper ::cppu::OInterfaceContainerHelper