"underflow" is one word

Change-Id: I31db021b916b64e9fc0c02f62bdfe7e7f6aa7b9e

13 files changed, 68 insertions, 68 deletions

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index a1c094938b4d..fcc2794446b8 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -203,7 +203,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
       m_bOnWin( rNew.OnWin() ),
       m_bNotEOL( rNew.NotEOL() ),
       m_bURLNotify( rNew.URLNotify() ),
-      m_bStopUnderFlow( rNew.StopUnderFlow() ),
+      m_bStopUnderflow( rNew.StopUnderflow() ),
       m_bFtnInside( rNew.IsFtnInside() ),
       m_bOtherThanFtnInside( rNew.IsOtherThanFtnInside() ),
       m_bMulti( rNew.IsMulti() ),
@@ -289,7 +289,7 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt,
     m_nIdx = nNewIdx;
     m_nLen = nNewLen;
     m_bNotEOL = false;
-    m_bStopUnderFlow = m_bFtnInside = m_bOtherThanFtnInside = false;
+    m_bStopUnderflow = m_bFtnInside = m_bOtherThanFtnInside = false;
     m_bMulti = m_bFirstMulti = m_bRuby = m_bHanging = m_bScriptSpace =
         m_bForbiddenChars = false;
 
@@ -314,7 +314,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const OUString* pTxt,
       m_bOnWin( rNew.OnWin() ),
       m_bNotEOL( rNew.NotEOL() ),
       m_bURLNotify( rNew.URLNotify() ),
-      m_bStopUnderFlow( rNew.StopUnderFlow() ),
+      m_bStopUnderflow( rNew.StopUnderflow() ),
       m_bFtnInside( rNew.IsFtnInside() ),
       m_bOtherThanFtnInside( rNew.IsOtherThanFtnInside() ),
       m_bMulti( rNew.IsMulti() ),
@@ -1409,7 +1409,7 @@ void SwTxtFormatInfo::Init()
     // Not initialized: pRest, nLeft, nRight, nFirst, nRealWidth
     X(0);
     bArrowDone = bFull = bFtnDone = bErgoDone = bNumDone = bNoEndHyph =
-        bNoMidHyph = bStop = bNewLine = bUnderFlow = bTabOverflow = false;
+        bNoMidHyph = bStop = bNewLine = bUnderflow = bTabOverflow = false;
 
     // generally we do not allow number portions in follows, except...
     if ( GetTxtFrm()->IsFollow() )
@@ -1429,7 +1429,7 @@ void SwTxtFormatInfo::Init()
     pFly = 0;
     pLastFld = 0;
     pLastTab = 0;
-    pUnderFlow = 0;
+    pUnderflow = 0;
     cTabDecimal = 0;
     nWidth = nRealWidth;
     nForcedLeftMargin = 0;
@@ -1458,7 +1458,7 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
     pLast = &rLay;
     pFly = NULL;
     pLastFld = NULL;
-    pUnderFlow = NULL;
+    pUnderflow = NULL;
     pRest = NULL;
     pLastTab = NULL;
 
@@ -1485,7 +1485,7 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
     bStop = false;
     bNewLine = true;
     bShift = false;
-    bUnderFlow = false;
+    bUnderflow = false;
     bInterHyph = false;
     bAutoHyph = false;
     bDropInit = false;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index cd1ac1007d10..5b133e88bda3 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -181,7 +181,7 @@ protected:
     bool m_bOnWin     : 1;
     bool m_bNotEOL    : 1;
     bool m_bURLNotify : 1;
-    bool m_bStopUnderFlow : 1; // Underflow was stopped e.g. by a FlyPortion
+    bool m_bStopUnderflow : 1; // Underflow was stopped e.g. by a FlyPortion
     bool m_bFtnInside : 1;     // the current line contains a footnote
     bool m_bOtherThanFtnInside : 1; // the current line contains another portion than a footnote portion.
                                       // needed for checking keep together of footnote portion with previous portion
@@ -217,7 +217,7 @@ protected:
         , m_bOnWin    (false)
         , m_bNotEOL   (false)
         , m_bURLNotify(false)
-        , m_bStopUnderFlow(false)
+        , m_bStopUnderflow(false)
         , m_bFtnInside(false)
         , m_bOtherThanFtnInside(false)
         , m_bMulti(false)
@@ -254,8 +254,8 @@ public:
     inline void SetNotEOL( const bool bNew ) { m_bNotEOL = bNew; }
     inline bool URLNotify() const { return m_bURLNotify; }
     inline void SetURLNotify( const bool bNew ) { m_bURLNotify = bNew; }
-    inline bool StopUnderFlow() const { return m_bStopUnderFlow; }
-    inline void SetStopUnderFlow( const bool bNew ) { m_bStopUnderFlow = bNew; }
+    inline bool StopUnderflow() const { return m_bStopUnderflow; }
+    inline void SetStopUnderflow( const bool bNew ) { m_bStopUnderflow = bNew; }
     inline bool IsFtnInside() const { return m_bFtnInside; }
     inline void SetFtnInside( const bool bNew ) { m_bFtnInside = bNew; }
     inline bool IsOtherThanFtnInside() const { return m_bOtherThanFtnInside; }
@@ -548,7 +548,7 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
     SwLinePortion   *pLast;       // The last Portion
     SwFlyPortion    *pFly;        // The following FlyPortion
     SwFldPortion    *pLastFld;    // Wrapped Field
-    SwLinePortion   *pUnderFlow;  // Underflow: Last Portion
+    SwLinePortion   *pUnderflow;  // Underflow: Last Portion
     SwLinePortion   *pRest;       // The Rest is the start of the next Line
 
     SwTabPortion    *pLastTab;     // The _last_ TabPortion
@@ -578,7 +578,7 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
     bool bStop : 1;             // Cancel immediately, discarding the line
     bool bNewLine : 1;          // Format another line
     bool bShift : 1;            // Position change: Repaint until further notice
-    bool bUnderFlow : 1;        // Context: UnderFlow() ?
+    bool bUnderflow : 1;        // Context: Underflow() ?
     bool bInterHyph : 1;        // Interactive hyphenation?
     bool bAutoHyph : 1;         // Automatic hyphenation?
     bool bDropInit : 1;         // Set DropWidth
@@ -663,8 +663,8 @@ public:
     inline void SetShift( const bool bNew ) { bShift = bNew; }
     inline bool IsInterHyph() const { return bInterHyph; }
     inline bool IsAutoHyph() const { return bAutoHyph; }
-    inline bool IsUnderFlow() const { return bUnderFlow; }
-    inline void ClrUnderFlow() { bUnderFlow = false; }
+    inline bool IsUnderflow() const { return bUnderflow; }
+    inline void ClrUnderflow() { bUnderflow = false; }
     inline bool IsDropInit() const { return bDropInit; }
     inline void SetDropInit( const bool bNew ) { bDropInit = bNew; }
     inline bool IsQuick() const { return bQuick; }
@@ -679,10 +679,10 @@ public:
     inline KSHORT GetLineNettoHeight() const { return nLineNettoHeight; }
     inline void SetLineNettoHeight( const KSHORT nNew ) { nLineNettoHeight = nNew; }
 
-    inline const SwLinePortion *GetUnderFlow() const { return pUnderFlow; }
-    inline SwLinePortion *GetUnderFlow() { return pUnderFlow; }
-    inline void SetUnderFlow( SwLinePortion *pNew )
-           { pUnderFlow = pNew; bUnderFlow = true; }
+    inline const SwLinePortion *GetUnderflow() const { return pUnderflow; }
+    inline SwLinePortion *GetUnderflow() { return pUnderflow; }
+    inline void SetUnderflow( SwLinePortion *pNew )
+           { pUnderflow = pNew; bUnderflow = true; }
     inline sal_Int32 GetSoftHyphPos() const { return nSoftHyphPos; }
     inline void SetSoftHyphPos( const sal_Int32 nNew ) { nSoftHyphPos = nNew; }
 
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 602e645d2b7f..63ea8f5a5135 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -167,14 +167,14 @@ KSHORT SwTxtFormatter::GetFrmRstHeight() const
 }
 
 /*************************************************************************
- *                  SwTxtFormatter::UnderFlow()
+ *                  SwTxtFormatter::Underflow()
  *************************************************************************/
 
-SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
+SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
 {
     // Save values and initialize rInf
-    SwLinePortion *pUnderFlow = rInf.GetUnderFlow();
-    if( !pUnderFlow )
+    SwLinePortion *pUnderflow = rInf.GetUnderflow();
+    if( !pUnderflow )
         return 0;
 
     // We format backwards, i.e. attribute changes can happen the next
@@ -191,23 +191,23 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
 
     FeedInf( rInf );
     rInf.SetLast( pCurr );
-    // pUnderFlow does not need to be deleted, because it will drown in the following
+    // pUnderflow does not need to be deleted, because it will drown in the following
     // Truncate()
-    rInf.SetUnderFlow(0);
+    rInf.SetUnderflow(0);
     rInf.SetSoftHyphPos( nSoftHyphPos );
     rInf.SetUnderScorePos( nUnderScorePos );
     rInf.SetPaintOfst( GetLeftMargin() );
 
     // We look for the portion with the under-flow position
     SwLinePortion *pPor = pCurr->GetFirstPortion();
-    if( pPor != pUnderFlow )
+    if( pPor != pUnderflow )
     {
-        // pPrev will be the last portion before pUnderFlow,
+        // pPrev will be the last portion before pUnderflow,
         // which still has a real width.
         // Exception: SoftHyphPortions must not be forgotten, of course!
         // Although they don't have a width.
         SwLinePortion *pTmpPrev = pPor;
-        while( pPor && pPor != pUnderFlow )
+        while( pPor && pPor != pUnderflow )
         {
             if( !pPor->IsKernPortion() &&
                 ( pPor->Width() || pPor->IsSoftHyphPortion() ) )
@@ -217,25 +217,25 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
                     pTmpPrev->Move( rInf );
                     rInf.SetLast( pTmpPrev );
                     pTmpPrev = pTmpPrev->GetPortion();
-                    OSL_ENSURE( pTmpPrev, "UnderFlow: Loosing control!" );
+                    OSL_ENSURE( pTmpPrev, "Underflow: Loosing control!" );
                 };
             }
             pPor = pPor->GetPortion();
         }
         pPor = pTmpPrev;
-        if( pPor && // Flies + Initialen werden nicht beim UnderFlow mitgenommen
+        if( pPor && // Flies + Initialen werden nicht beim Underflow mitgenommen
             ( pPor->IsFlyPortion() || pPor->IsDropPortion() ||
               pPor->IsFlyCntPortion() ) )
         {
             pPor->Move( rInf );
             rInf.SetLast( pPor );
-            rInf.SetStopUnderFlow( true );
-            pPor = pUnderFlow;
+            rInf.SetStopUnderflow( true );
+            pPor = pUnderflow;
         }
     }
 
     // What? The under-flow portion is not in the portion chain?
-    OSL_ENSURE( pPor, "SwTxtFormatter::UnderFlow: overflow but underflow" );
+    OSL_ENSURE( pPor, "SwTxtFormatter::Underflow: overflow but underflow" );
 
     // OD 2004-05-26 #i29529# - correction: no delete of footnotes
 //    if( rInf.IsFtnInside() && pPor && !rInf.IsQuick() )
@@ -617,10 +617,10 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
         if( pPor->IsFlyCntPortion() || ( pPor->IsMultiPortion() &&
             ((SwMultiPortion*)pPor)->HasFlyInCntnt() ) )
             SetFlyInCntBase();
-        // bUnderFlow needs to be reset or we wrap again at the next softhyphen
+        // bUnderflow needs to be reset or we wrap again at the next softhyphen
         if ( !bFull )
         {
-            rInf.ClrUnderFlow();
+            rInf.ClrUnderflow();
             if( ! bHasGrid && rInf.HasScriptSpace() && pPor->InTxtGrp() &&
                 pPor->GetLen() && !pPor->InFldGrp() )
             {
@@ -666,7 +666,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
             // be careful when handling an underflow event: the gridkernportion
             // could have been deleted
             if ( nRestWidth > 0 && SW_CJK != nCurrScript &&
-                ! rInf.IsUnderFlow() && ( bFull || SW_CJK == nNextScript ) )
+                ! rInf.IsUnderflow() && ( bFull || SW_CJK == nNextScript ) )
             {
                 OSL_ENSURE( pGridKernPortion, "No GridKernPortion available" );
 
@@ -1175,14 +1175,14 @@ static bool lcl_OldFieldRest( const SwLineLayout* pCurr )
 SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
 {
     // Underflow takes precedence
-    rInf.SetStopUnderFlow( false );
-    if( rInf.GetUnderFlow() )
+    rInf.SetStopUnderflow( false );
+    if( rInf.GetUnderflow() )
     {
         OSL_ENSURE( rInf.IsFull(), "SwTxtFormatter::NewPortion: underflow but not full" );
-        return UnderFlow( rInf );
+        return Underflow( rInf );
     }
 
-    // If the line is full, flys and UnderFlow portions could be waiting ...
+    // If the line is full, flys and Underflow portions could be waiting ...
     if( rInf.IsFull() )
     {
         // LineBreaks and Flys (bug05.sdw)
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index d8a2010a17f9..38a3eac6b2a7 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -94,7 +94,7 @@ class SwTxtFormatter : public SwTxtPainter
     void FeedInf( SwTxtFormatInfo &rInf ) const;
 
     // Treats underflow situations
-    SwLinePortion *UnderFlow( SwTxtFormatInfo &rInf );
+    SwLinePortion *Underflow( SwTxtFormatInfo &rInf );
 
     // Calculates the ascent and the height from the fontmetric
     void CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor );
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index cfcbd8cd687c..9e909f1e4a6c 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -128,7 +128,7 @@ void SwExpandPortion::Paint( const SwTxtPaintInfo &rInf ) const
 SwLinePortion *SwBlankPortion::Compress() { return this; }
 
 /*************************************************************************
- *                 SwBlankPortion::MayUnderFlow()
+ *                 SwBlankPortion::MayUnderflow()
  *************************************************************************/
 
 // 5497: Es gibt schon Gemeinheiten auf der Welt...
@@ -136,10 +136,10 @@ SwLinePortion *SwBlankPortion::Compress() { return this; }
 // dann duerfen keine Underflows generiert werden!
 // Komplikationen bei Flys...
 
-MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
-    sal_Int32 nIdx, bool bUnderFlow ) const
+MSHORT SwBlankPortion::MayUnderflow( const SwTxtFormatInfo &rInf,
+    sal_Int32 nIdx, bool bUnderflow ) const
 {
-    if( rInf.StopUnderFlow() )
+    if( rInf.StopUnderflow() )
         return 0;
     const SwLinePortion *pPos = rInf.GetRoot();
     if( pPos->GetPortion() )
@@ -150,7 +150,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
         return 0; // Nur noch BlankPortions unterwegs
     // Wenn vor uns ein Blank ist, brauchen wir kein Underflow ausloesen,
     // wenn hinter uns ein Blank ist, brauchen wir kein Underflow weiterreichen
-    if (bUnderFlow && nIdx + 1 < rInf.GetTxt().getLength() && CH_BLANK == rInf.GetTxt()[nIdx + 1])
+    if (bUnderflow && nIdx + 1 < rInf.GetTxt().getLength() && CH_BLANK == rInf.GetTxt()[nIdx + 1])
         return 0;
     if( nIdx && !((SwTxtFormatInfo&)rInf).GetFly() )
     {
@@ -189,7 +189,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
 
 void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
 {
-    MSHORT nMay = MayUnderFlow( rInf, rInf.GetIdx() - nLineLength, true );
+    MSHORT nMay = MayUnderflow( rInf, rInf.GetIdx() - nLineLength, true );
     if( nMay )
     {
         if( nMay > 1 )
@@ -200,9 +200,9 @@ void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
             rInf.SetIdx( rInf.GetIdx() - GetLen() );
         }
         Truncate();
-        rInf.SetUnderFlow( this );
+        rInf.SetUnderflow( this );
         if( rInf.GetLast()->IsKernPortion() )
-            rInf.SetUnderFlow( rInf.GetLast() );
+            rInf.SetUnderflow( rInf.GetLast() );
     }
 }
 
@@ -210,16 +210,16 @@ void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
  *                 virtual SwBlankPortion::Format()
  *************************************************************************/
 
-// 7771: UnderFlows weiterreichen und selbst ausloesen!
+// 7771: Underflows weiterreichen und selbst ausloesen!
 bool SwBlankPortion::Format( SwTxtFormatInfo &rInf )
 {
-    const bool bFull = rInf.IsUnderFlow() || SwExpandPortion::Format( rInf );
-    if( bFull && MayUnderFlow( rInf, rInf.GetIdx(), rInf.IsUnderFlow() ) )
+    const bool bFull = rInf.IsUnderflow() || SwExpandPortion::Format( rInf );
+    if( bFull && MayUnderflow( rInf, rInf.GetIdx(), rInf.IsUnderflow() ) )
     {
         Truncate();
-        rInf.SetUnderFlow( this );
+        rInf.SetUnderflow( this );
         if( rInf.GetLast()->IsKernPortion() )
-            rInf.SetUnderFlow( rInf.GetLast() );
+            rInf.SetUnderflow( rInf.GetLast() );
     }
     return bFull;
 }
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index be6334421f49..39422ec97f9b 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -63,8 +63,8 @@ public:
     virtual void FormatEOL( SwTxtFormatInfo &rInf );
     virtual bool Format( SwTxtFormatInfo &rInf );
     virtual void Paint( const SwTxtPaintInfo &rInf ) const;
-    MSHORT MayUnderFlow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
-        bool bUnderFlow ) const;
+    MSHORT MayUnderflow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
+        bool bUnderflow ) const;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index c424dc82c174..0277a0aea067 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -416,7 +416,7 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
         }
     }
 
-    if( bEOL && rInf.GetLast() && !rInf.GetUnderFlow() )
+    if( bEOL && rInf.GetLast() && !rInf.GetUnderflow() )
         rInf.GetLast()->FormatEOL( rInf );
     return bFull;
 }
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 2215b9dfc18c..af2a166410e8 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -292,7 +292,7 @@ bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
     if( rInf.X() > rInf.Width() )
     {
         Truncate();
-        rInf.SetUnderFlow( this );
+        rInf.SetUnderflow( this );
         return true;
     }
 
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 1b11d3b32db4..422d9d6b1e75 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -282,7 +282,7 @@ void SwTxtPortion::BreakUnderflow( SwTxtFormatInfo &rInf )
     Width( 0 );
     SetLen( 0 );
     SetAscent( 0 );
-    rInf.SetUnderFlow( this );
+    rInf.SetUnderflow( this );
 }
 
  /*************************************************************************
@@ -299,7 +299,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
 {
     // 5744: If only the hypen does not fit anymore, we still need to wrap
     // the word, or else return true!
-    if( rInf.IsUnderFlow() && rInf.GetSoftHyphPos() )
+    if( rInf.IsUnderflow() && rInf.GetSoftHyphPos() )
     {
         // soft hyphen portion has triggered an underflow event because
         // of an alternative spelling position
@@ -441,7 +441,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
             ( !bFirstPor || rInf.GetFly() || rInf.GetLast()->IsFlyPortion() ||
               rInf.IsFirstMulti() ) &&
             ( !rInf.GetLast()->IsBlankPortion() ||  ((SwBlankPortion*)
-              rInf.GetLast())->MayUnderFlow( rInf, rInf.GetIdx()-1, true )))
+              rInf.GetLast())->MayUnderflow( rInf, rInf.GetIdx()-1, true )))
         {       // case C1 (former BreakUnderflow())
             BreakUnderflow( rInf );
         }
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 2652f54c39c6..bd39b625a50f 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -376,7 +376,7 @@ bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
         return false;
 
     // looks like shit, but what can we do?
-    rInf.SetUnderFlow( 0 );
+    rInf.SetUnderflow( 0 );
     Truncate();
     SetLen( nOldLen );
     rInf.SetLen( nOldInfLen );
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index cc12ca9536e5..40be65f212a3 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -320,7 +320,7 @@ static SwFldPortion * lcl_NewMetaPortion(SwTxtAttr & rHint, const bool bPrefix)
     (where there is no CH_TXTATR). Because there may be multiple hint ends at a
     given index, m_nHintEndIndex is used to keep track of the already created
     portions. But the portions created here may actually be deleted again,
-    due to UnderFlow. In that case, m_nHintEndIndex must be decremented,
+    due to Underflow. In that case, m_nHintEndIndex must be decremented,
     so the portion will be created again on the next line.
  */
 SwExpandPortion *
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 8a404055fe05..67584bc9c59a 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -396,9 +396,9 @@ bool SwHyphPortion::Format( SwTxtFormatInfo &rInf )
 
     PrtWidth( rInf.GetTxtSize( aTxt ).Width() );
     const bool bFull = rInf.Width() <= rInf.X() + PrtWidth();
-    if( bFull && !rInf.IsUnderFlow() ) {
+    if( bFull && !rInf.IsUnderflow() ) {
         Truncate();
-        rInf.SetUnderFlow( this );
+        rInf.SetUnderflow( this );
     }
 
     return bFull;
@@ -494,7 +494,7 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
     bool bFull = true;
 
     // special case for old german spelling
-    if( rInf.IsUnderFlow()  )
+    if( rInf.IsUnderflow()  )
     {
         if( rInf.GetSoftHyphPos() )
             return true;
@@ -526,7 +526,7 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
         {
             rInf.SetSoftHyphPos( rInf.GetIdx() );
             Truncate();
-            rInf.SetUnderFlow( this );
+            rInf.SetUnderflow( this );
         }
         return true;
     }
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index bb69a6d0857f..ee2b095ad0b8 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -384,7 +384,7 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
     // Break tab stop to next line if:
     // 1. Minmal width does not fit to line anymore.
     // 2. An underflow event was called for the tab portion.
-    bool bFull = ( bTabCompat && rInf.IsUnderFlow() ) ||
+    bool bFull = ( bTabCompat && rInf.IsUnderflow() ) ||
                      ( rInf.Width() <= rInf.X() + PrtWidth() && rInf.X() <= rInf.Width() ) ;
 
     // #95477# Rotated tab stops get the width of one blank