1 files changed, 29 insertions, 16 deletions

diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 88659af6f74c..3b52ea360ead 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -52,7 +52,7 @@
 #include <objectformatter.hxx>
 // <--
 
-extern BOOL bObjsDirect;    //frmtool.cxx
+extern sal_Bool bObjsDirect;    //frmtool.cxx
 
 static SwTwips lcl_GetFrmMinHeight(const SwLayoutFrm & rFrm)
 {
@@ -80,7 +80,7 @@ static SwTwips lcl_CalcContentHeight(SwLayoutFrm & frm)
     SwFrm* pFrm = frm.Lower();
 
     SwTwips nRemaining = 0;
-    USHORT nNum = 0;
+    sal_uInt16 nNum = 0;
     pFrm = frm.Lower();
     while ( pFrm )
     {
@@ -119,20 +119,25 @@ static void lcl_LayoutFrmEnsureMinHeight(SwLayoutFrm & rFrm,
     }
 }
 
+<<<<<<< local
 SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, SwFrm* pSib, USHORT nTypeIn)
     : SwLayoutFrm( pFmt, pSib )
+=======
+SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, sal_uInt16 nTypeIn)
+    : SwLayoutFrm(pFmt)
+>>>>>>> other
 {
     nType = nTypeIn;
-    SetDerivedVert( FALSE );
+    SetDerivedVert( sal_False );
 
     const SwFmtCntnt &rCnt = pFmt->GetCntnt();
 
     ASSERT( rCnt.GetCntntIdx(), "Kein Inhalt fuer Header." );
 
     //Fuer Header Footer die Objekte gleich erzeugen lassen.
-    BOOL bOld = bObjsDirect;
-    bObjsDirect = TRUE;
-    ULONG nIndex = rCnt.GetCntntIdx()->GetIndex();
+    sal_Bool bOld = bObjsDirect;
+    bObjsDirect = sal_True;
+    sal_uLong nIndex = rCnt.GetCntntIdx()->GetIndex();
     ::_InsertCnt( this, pFmt->GetDoc(), ++nIndex );
     bObjsDirect = bOld;
 }
@@ -234,7 +239,7 @@ void SwHeadFootFrm::FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs)
 
     }
 
-    bValidPrtArea = TRUE;
+    bValidPrtArea = sal_True;
 }
 
 void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
@@ -243,7 +248,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
     {
         if( !IsColLocked() )
         {
-            bValidSize = bValidPrtArea = TRUE;
+            bValidSize = bValidPrtArea = sal_True;
 
             const SwTwips nBorder = nUL;
             SwTwips nMinHeight = lcl_GetFrmMinHeight(*this);
@@ -399,11 +404,11 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
                         Prt().SSize().Height() = Frm().Height() - nBorder;
                     }
                 }
-                bValidSize = bValidPrtArea = TRUE;
+                bValidSize = bValidPrtArea = sal_True;
             } while( nRemaining<=nMaxHeight && nOldHeight!=Prt().Height() );
             ColUnlock();
         }
-        bValidSize = bValidPrtArea = TRUE;
+        bValidSize = bValidPrtArea = sal_True;
     }
     else //if ( GetType() & 0x0018 )
     {
@@ -411,7 +416,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
         {
             if ( Frm().Height() != pAttrs->GetSize().Height() )
                 ChgSize( Size( Frm().Width(), pAttrs->GetSize().Height()));
-            bValidSize = TRUE;
+            bValidSize = sal_True;
             MakePos();
         } while ( !bValidSize );
     }
@@ -442,7 +447,7 @@ void SwHeadFootFrm::Format(const SwBorderAttrs * pAttrs)
     }
 }
 
-SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, BOOL bTst,  BOOL bInfo )
+SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst,  sal_Bool bInfo )
 {
     SwTwips nResult;
 
@@ -544,7 +549,7 @@ SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, BOOL bTst,  BOOL bInfo )
     return nResult;
 }
 
-SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
+SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
 {
     SwTwips nResult;
 
@@ -660,15 +665,15 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
     return nResult;
 }
 
-BOOL SwHeadFootFrm::GetEatSpacing() const
+sal_Bool SwHeadFootFrm::GetEatSpacing() const
 {
     const SwFrmFmt * pFmt = GetFmt();
     ASSERT(pFmt, "SwHeadFootFrm: no format?");
 
     if (pFmt->GetHeaderAndFooterEatSpacing().GetValue())
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -712,8 +717,12 @@ void SwPageFrm::PrepareHeader()
 
     const SwFmtHeader &rH = ((SwFrmFmt*)GetRegisteredIn())->GetHeader();
 
+<<<<<<< local
     const ViewShell *pSh = getRootFrm()->GetCurrShell();
     const BOOL bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
+=======
+    const sal_Bool bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
+>>>>>>> other
 
     if ( bOn && rH.IsActive() )
     {   //Header einsetzen, vorher entfernen falls vorhanden.
@@ -763,8 +772,12 @@ void SwPageFrm::PrepareFooter()
     while ( pLay->GetNext() )
         pLay = (SwLayoutFrm*)pLay->GetNext();
 
+<<<<<<< local
     const ViewShell *pSh = getRootFrm()->GetCurrShell();
     const BOOL bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
+=======
+    const sal_Bool bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
+>>>>>>> other
 
     if ( bOn && rF.IsActive() )
     {   //Footer einsetzen, vorher entfernen falls vorhanden.