1 files changed, 15 insertions, 15 deletions

diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 3b7f4046d8dd..548ae8849bba 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -394,16 +394,16 @@ bool SwHeaderFooterWin::IsEmptyHeaderFooter( )
     const SwPageDesc* pDesc = GetPageFrame()->GetPageDesc();
 
     bool const bFirst(GetPageFrame()->OnFirstPage());
-    const SwFrmFmt *const pFmt = (GetPageFrame()->OnRightPage())
-        ? pDesc->GetRightFmt(bFirst)
-        : pDesc->GetLeftFmt(bFirst);
+    const SwFrameFormat *const pFormat = (GetPageFrame()->OnRightPage())
+        ? pDesc->GetRightFormat(bFirst)
+        : pDesc->GetLeftFormat(bFirst);
 
-    if ( pFmt )
+    if ( pFormat )
     {
         if ( m_bIsHeader )
-            bResult = !pFmt->GetHeader().IsActive();
+            bResult = !pFormat->GetHeader().IsActive();
         else
-            bResult = !pFmt->GetFooter().IsActive();
+            bResult = !pFormat->GetFooter().IsActive();
     }
 
     return bResult;
@@ -426,24 +426,24 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot )
         case FN_HEADERFOOTER_BORDERBACK:
             {
                 const SwPageDesc* pDesc = GetPageFrame()->GetPageDesc();
-                const SwFrmFmt& rMaster = pDesc->GetMaster();
-                SwFrmFmt* pHFFmt = const_cast< SwFrmFmt* >( rMaster.GetFooter().GetFooterFmt() );
+                const SwFrameFormat& rMaster = pDesc->GetMaster();
+                SwFrameFormat* pHFFormat = const_cast< SwFrameFormat* >( rMaster.GetFooter().GetFooterFormat() );
                 if ( m_bIsHeader )
-                    pHFFmt = const_cast< SwFrmFmt* >( rMaster.GetHeader().GetHeaderFmt() );
+                    pHFFormat = const_cast< SwFrameFormat* >( rMaster.GetHeader().GetHeaderFormat() );
 
-                SfxItemPool* pPool = pHFFmt->GetAttrSet().GetPool();
+                SfxItemPool* pPool = pHFFormat->GetAttrSet().GetPool();
                 SfxItemSet aSet( *pPool,
                        RES_BACKGROUND, RES_BACKGROUND,
                        RES_BOX, RES_BOX,
                        SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
                        RES_SHADOW, RES_SHADOW, 0 );
 
-            aSet.Put( pHFFmt->GetAttrSet() );
+            aSet.Put( pHFFormat->GetAttrSet() );
 
             // Create a box info item... needed by the dialog
             SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
             const SfxPoolItem *pBoxInfo;
-            if ( SfxItemState::SET == pHFFmt->GetAttrSet().GetItemState( SID_ATTR_BORDER_INNER,
+            if ( SfxItemState::SET == pHFFormat->GetAttrSet().GetItemState( SID_ATTR_BORDER_INNER,
                                                     true, &pBoxInfo) )
                 aBoxInfo = *static_cast<const SvxBoxInfoItem*>(pBoxInfo);
 
@@ -458,17 +458,17 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot )
             {
                 const SfxPoolItem* pItem;
                 if ( SfxItemState::SET == aSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) {
-                    pHFFmt->SetFmtAttr( *pItem );
+                    pHFFormat->SetFormatAttr( *pItem );
                     rView.GetDocShell()->SetModified(true);
                 }
 
                 if ( SfxItemState::SET == aSet.GetItemState( RES_BOX, false, &pItem ) ) {
-                    pHFFmt->SetFmtAttr( *pItem );
+                    pHFFormat->SetFormatAttr( *pItem );
                     rView.GetDocShell()->SetModified(true);
                 }
 
                 if ( SfxItemState::SET == aSet.GetItemState( RES_SHADOW, false, &pItem ) ) {
-                    pHFFmt->SetFmtAttr( *pItem );
+                    pHFFormat->SetFormatAttr( *pItem );
                     rView.GetDocShell()->SetModified(true);
                 }
             }