INTEGRATION: CWS swqbugfixes25 (1.10.14); FILE MERGED

2005/04/12 08:14:54 od 1.10.14.1: #i43255# <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()>
	 - forbid format of follow of anchor text frame, only if
	   anchor text frame is in a table.

1 files changed, 13 insertions, 4 deletions

diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index 0bbfe8af2c97..1021859ac75b 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objectformattertxtfrm.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: rt $ $Date: 2005-04-01 16:35:59 $
+ *  last change: $Author: obo $ $Date: 2005-04-18 11:29:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -765,6 +765,15 @@ void SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()
     // <--
 
     // format anchor frame - format of its follow not needed
-    SwForbidFollowFormat aForbidFollowFormat( mrAnchorTxtFrm );
-    mrAnchorTxtFrm.Calc();
+    // --> OD 2005-04-08 #i43255# - forbid follow format, only if anchor text
+    // frame is in table
+    if ( mrAnchorTxtFrm.IsInTab() )
+    {
+        SwForbidFollowFormat aForbidFollowFormat( mrAnchorTxtFrm );
+        mrAnchorTxtFrm.Calc();
+    }
+    else
+    {
+        mrAnchorTxtFrm.Calc();
+    }
 }