diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 14:30:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 14:30:09 +0000 |
| commit | 52cd091b31f994e9c5f259e5d02911fedbd0fbcc (patch) | |
| tree | 1033df05fc42ff770cc53ae092989895de749ba6 /sw/inc/unoobj.hxx | |
| parent | 17fe2bc5941b03dfdbe0d72c9311eca98bac1b1c (diff) | |
INTEGRATION: CWS swqbf57 (1.40.44); FILE MERGED
2006/03/08 09:12:23 fme 1.40.44.1: #126177# Crash if RemoveCursor_Impl user event is posted if an other thread is waiting in the SwXTextCursor destructor
Diffstat (limited to 'sw/inc/unoobj.hxx')
| -rw-r--r-- | sw/inc/unoobj.hxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx index 8f06f13472b6..bf0f967468cc 100644 --- a/sw/inc/unoobj.hxx +++ b/sw/inc/unoobj.hxx @@ -4,9 +4,9 @@ * * $RCSfile: unoobj.hxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: kz $ $Date: 2006-01-31 18:33:02 $ + * last change: $Author: obo $ $Date: 2006-03-21 15:30:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -423,6 +423,13 @@ class SwXTextCursor : public SwXTextCursor_Base, CursorType eType; + // --> FME 2006-03-07 #126177# We need to track if the RemoveCursor_Impl + // user event has been posted. In this case we have to remove the user + // event in ~SwXTextCursor(). + ULONG mnUserEventId; + bool mbRemoveUserEvent; + // <-- + void DeleteAndInsert(const String& rText); DECL_STATIC_LINK( SwXTextCursor, RemoveCursor_Impl, @@ -570,6 +577,10 @@ public: static sal_Bool convertSortProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor, SwSortOptions& rSortOpt); + + // --> FME 2006-03-07 #126177# + void DoNotRemoveUserEvent() { mbRemoveUserEvent = false; } + // <-- }; /*-----------------20.03.98 07:47------------------- |