summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorAndreas Martens <ama@openoffice.org>2000-10-13 07:59:05 +0000
committerAndreas Martens <ama@openoffice.org>2000-10-13 07:59:05 +0000
commit1255290a43ce9dd96bea2237a36b893175f1c7ff (patch)
tree1d707001bc4820a495ce037f944e571574b54e07 /sw/source
parentb915a811100ee814cca4666ebcd520d3c1f322c9 (diff)
Fix #69324#: Even a locked textframe must be invalidated, if a fly has arrived
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/text/txtfrm.cxx18
1 files changed, 12 insertions, 6 deletions
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index ee91f0e144bf..22a5f81e1070 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtfrm.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-19 00:08:26 $
+ * last change: $Author: ama $ $Date: 2000-10-13 08:59:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1337,10 +1337,16 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
case PREP_CLEAR:
default:
{
-#ifdef WARN_LOCK
- ASSERT(!IsLocked(), "+SwTxtFrm::Prepare: this is locked (warning)");
-#endif
- if( !IsLocked() )
+ if( IsLocked() )
+ {
+ if( PREP_FLY_ARRIVE == ePrep )
+ {
+ xub_StrLen nLen = ( GetFollow() ? GetFollow()->GetOfst() :
+ STRING_LEN ) - GetOfst();
+ InvalidateRange( SwCharRange( GetOfst(), nLen ), 0 );
+ }
+ }
+ else
{
if( pPara->GetRepaint()->HasArea() )
SetCompletePaint();