summaryrefslogtreecommitdiff
path: root/sw/source/core/text
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-02-10 13:56:39 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-02-10 13:56:39 +0000
commit0a947a40bbeb2c493265c91b013ef26add3b3e7f (patch)
treeedee1e260965b38e1bac41cbfd0a50bdf3ab209e /sw/source/core/text
parent011036385974672e403d0462e870f09d3d13665b (diff)
INTEGRATION: CWS swq02 (1.80.8); FILE MERGED
2003/12/16 11:38:45 fme 1.80.8.1: #i16354# Use CTL font for all characters inside a RTL run - Consider footnote portions
Diffstat (limited to 'sw/source/core/text')
-rw-r--r--sw/source/core/text/itrform2.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index b220852e9940..993182621351 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: itrform2.cxx,v $
*
- * $Revision: 1.80 $
+ * $Revision: 1.81 $
*
- * last change: $Author: rt $ $Date: 2003-12-01 09:40:58 $
+ * last change: $Author: rt $ $Date: 2004-02-10 14:56:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -535,7 +535,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
// We have to check the script for fields in order to set the
// correct nActual value for the font.
- if( pPor->InFldGrp() && ! pPor->IsFtnPortion() )
+ if( pPor->InFldGrp() )
((SwFldPortion*)pPor)->CheckScript( rInf );
if( ! bHasGrid && rInf.HasScriptSpace() &&
@@ -1490,7 +1490,7 @@ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStart )
SwLinePortion* pFld = GetInfo().GetRest();
SwFldPortion* pSaveFld = 0;
- if ( pFld && pFld->InFldGrp() && ! pFld->IsFtnPortion() )
+ if ( pFld && pFld->InFldGrp() && !pFld->IsFtnPortion() )
pSaveFld = new SwFldPortion( *((SwFldPortion*)pFld) );
// for an optimal repaint rectangle, we want to compare fly portions