[Libreoffice-commits] .: sw/source

[Cédric Bosdonnat]

 sw/source/core/crsr/crsrsh.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b7d6bff10a85986e5e6ebfa961f29fa8b3815b40
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Thu Jan 5 16:59:22 2012 +0100

    Header/Footer: fix some bad indicators updates due to wrong call order

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 049a867..36fe86d 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1315,22 +1315,22 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
         return;             // wenn nicht, dann kein Update !!
     }
 
-    if ( IsInHeaderFooter() != IsHeaderFooterEdit() )
-        ToggleHeaderFooterEdit();
     sal_Bool bInHeader= sal_True;
     if ( IsInHeaderFooter( &bInHeader ) )
     {
-        if ( IsShowHeaderFooterSeparator( Header ) && !bInHeader )
+        if ( !bInHeader )
         {
             SetShowHeaderFooterSeparator( Footer, true );
             SetShowHeaderFooterSeparator( Header, false );
         }
-        else if ( IsShowHeaderFooterSeparator( Footer ) && bInHeader )
+        else
         {
             SetShowHeaderFooterSeparator( Header, true );
             SetShowHeaderFooterSeparator( Footer, false );
         }
     }
+    if ( IsInHeaderFooter() != IsHeaderFooterEdit() )
+        ToggleHeaderFooterEdit();
 
 
     // #i27301#