Header/Footer: Fixed a few separators rendering problems

Bugs fixed:
+ Some of the separators weren't hidden (zooming out and then zooming
in is an example)
+ The footer separator wasn't properly placed under footnotes
containers if there was no footer.

1 files changed, 3 insertions, 3 deletions

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index c443aceffc94..f3db9856493b 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2980,8 +2980,6 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
                 if ( bExtraData )
                     pPage->RefreshExtraData( aPaintRect );
 
-                pPage->PaintDecorators( );
-
                 if ( pSh->GetWin() )
                 {
                     pSubsLines->PaintSubsidiary( pSh->GetOut(), pLines );
@@ -3006,6 +3004,8 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
                     pSh->DLPostPaint2(true);
                 }
             }
+
+            pPage->PaintDecorators( );
         }
         else if ( bBookMode && pSh->GetWin() && !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() )
         {
@@ -3505,7 +3505,7 @@ void SwPageFrm::PaintDecorators( ) const
 
                 // Footer
                 const SwFrm* pFtnContFrm = Lower();
-                while ( pFtnContFrm->GetNext() )
+                while ( pFtnContFrm )
                 {
                     if ( pFtnContFrm->IsFtnContFrm() )
                         aBodyRect.AddBottom( pFtnContFrm->Frm().Bottom() - aBodyRect.Bottom() );