Header/Footer: revert objects ghosting to keep writer WYSIWYG

This reverts commits:
* 7d700ecf81c00981df9780da07408192dfa4a4b3
* 523ff0444022c9f435c93140c7c89fa2c657bb50
* f7da7938c53f0ce185760e01e7de91cdf5268078
* 28d1c25092ddefdf90d0554532b7611698b2d18e

6 files changed, 25 insertions, 139 deletions

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 77f99dbdf225..21f6d4405b1a 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -248,10 +248,6 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         return;
 
     const ViewShell* pSh = getRootFrm()->GetCurrShell();
-    OutputDevice *pOut = pSh->GetOut();
-
-    sal_uInt64 nOldDrawMode = SetHeaderFooterEditMask( pOut );
-
     if( !pSh->GetViewOptions()->IsGraphic() )
     {
         StopAnimation();
@@ -266,7 +262,6 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                 aTxt = FindFlyFrm()->GetFmt()->GetName();
             lcl_PaintReplacement( Frm(), aTxt, *pSh, this, sal_False );
         }
-        pOut->SetDrawMode( nOldDrawMode );
         return;
     }
 
@@ -277,6 +272,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 
     SfxProgress::EnterLock(); //Keine Progress-Reschedules im Paint (SwapIn)
 
+    OutputDevice *pOut = pSh->GetOut();
     pOut->Push();
     sal_Bool bClip = sal_True;
     PolyPolygon aPoly;
@@ -333,7 +329,6 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         pGrfNd->SetFrameInPaint( sal_False );
 
     pOut->Pop();
-    pOut->SetDrawMode( nOldDrawMode );
     SfxProgress::LeaveLock();
 }
 
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index b4e445315c88..e0dfeecd6919 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -526,8 +526,7 @@ public:
                           const sal_Bool bLowerMode = sal_False,
                           const sal_Bool bLowerBorder = sal_False ) const;
     void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*,
-                          const Color *pColor, const editeng::SvxBorderStyle = editeng::SOLID,
-                          sal_Bool bGhosted = sal_False ) const;
+                          const Color *pColor, const editeng::SvxBorderStyle = editeng::SOLID ) const;
 
     drawinglayer::processor2d::BaseProcessor2D * CreateProcessor2D( ) const;
     void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const;
@@ -912,8 +911,6 @@ public:
     virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer);
     void dumpChildrenAsXml(xmlTextWriterPtr writer);
     bool IsCollapse() const;
-
-    sal_uInt64 SetHeaderFooterEditMask( OutputDevice* pOut ) const;
 };
 
 inline sal_Bool SwFrm::IsInDocBody() const
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 3428219fb139..62825b489c66 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -87,10 +87,6 @@
 #include <svx/svdogrp.hxx>
 #include <sortedobjs.hxx>
 #include <EnhancedPDFExportHelper.hxx>
-#include <fesh.hxx>
-#include <svx/svdpage.hxx>
-#include <hffrm.hxx>
-#include <fmtpdsc.hxx>
 // <--
 // --> OD #i76669#
 #include <svx/sdr/contact/viewobjectcontactredirector.hxx>
@@ -174,14 +170,13 @@ class SwLineRect : public SwRect
 {
     Color aColor;
     SvxBorderStyle  nStyle;
-    sal_Bool bGhosted;
     const SwTabFrm *pTab;
           sal_uInt8     nSubColor;  //Hilfslinien einfaerben
           sal_Bool      bPainted;   //schon gepaintet?
           sal_uInt8     nLock;      //Um die Linien zum Hell-Layer abzugrenzen.
 public:
     SwLineRect( const SwRect &rRect, const Color *pCol, const SvxBorderStyle nStyle,
-                const SwTabFrm *pT , const sal_uInt8 nSCol, sal_Bool bGhost );
+                const SwTabFrm *pT , const sal_uInt8 nSCol );
 
     const Color         *GetColor() const { return &aColor;}
     SvxBorderStyle       GetStyle() const { return nStyle; }
@@ -194,8 +189,7 @@ public:
                                           }
     sal_Bool  IsPainted()               const { return bPainted; }
     sal_Bool  IsLocked()                const { return nLock != 0;  }
-    sal_uInt8  GetSubColor()            const { return nSubColor;}
-    sal_Bool  IsGhosted()               const { return bGhosted; }
+    sal_uInt8  GetSubColor()                const { return nSubColor;}
 
     sal_Bool MakeUnion( const SwRect &rRect );
 };
@@ -208,7 +202,7 @@ class SwLineRects : public SwLRects
 public:
     SwLineRects() : nLastCount( 0 ) {}
     void AddLineRect( const SwRect& rRect,  const Color *pColor, const SvxBorderStyle nStyle,
-                      const SwTabFrm *pTab, const sal_uInt8 nSCol, sal_Bool bGhosted );
+                      const SwTabFrm *pTab, const sal_uInt8 nSCol );
     void ConnectEdges( OutputDevice *pOut );
     void PaintLines  ( OutputDevice *pOut );
     void LockLines( sal_Bool bLock );
@@ -423,10 +417,9 @@ SwSavePaintStatics::~SwSavePaintStatics()
 SV_IMPL_VARARR( SwLRects, SwLineRect );
 
 SwLineRect::SwLineRect( const SwRect &rRect, const Color *pCol, const SvxBorderStyle nStyl,
-                        const SwTabFrm *pT, const sal_uInt8 nSCol, sal_Bool bGhost ) :
+                        const SwTabFrm *pT, const sal_uInt8 nSCol ) :
     SwRect( rRect ),
     nStyle( nStyl ),
-    bGhosted( bGhost ),
     pTab( pT ),
     nSubColor( nSCol ),
     bPainted( sal_False ),
@@ -474,7 +467,7 @@ sal_Bool SwLineRect::MakeUnion( const SwRect &rRect )
 }
 
 void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol, const SvxBorderStyle nStyle,
-                               const SwTabFrm *pTab, const sal_uInt8 nSCol, sal_Bool bGhosted )
+                               const SwTabFrm *pTab, const sal_uInt8 nSCol )
 {
     //Rueckwaerts durch, weil Linien die zusammengefasst werden koennen i.d.R.
     //im gleichen Kontext gepaintet werden.
@@ -492,7 +485,7 @@ void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol, const Svx
                 return;
         }
     }
-    Insert( SwLineRect( rRect, pCol, nStyle, pTab, nSCol, bGhosted ), Count() );
+    Insert( SwLineRect( rRect, pCol, nStyle, pTab, nSCol ), Count() );
 }
 
 void SwLineRects::ConnectEdges( OutputDevice *pOut )
@@ -600,7 +593,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
                                 continue;
                             const sal_uInt16 nTmpFree = Free();
                             Insert( SwLineRect( aIns, rL1.GetColor(), SOLID,
-                                        rL1.GetTab(), SUBCOL_TAB, sal_False ), Count() );
+                                        rL1.GetTab(), SUBCOL_TAB ), Count() );
                             if ( !nTmpFree )
                             {
                                 --i;
@@ -641,7 +634,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
                                 continue;
                             const sal_uInt16 nTmpFree = Free();
                             Insert( SwLineRect( aIns, rL1.GetColor(), SOLID,
-                                        rL1.GetTab(), SUBCOL_TAB, sal_False ), Count() );
+                                        rL1.GetTab(), SUBCOL_TAB ), Count() );
                             if ( !nTmpFree )
                             {
                                 --i;
@@ -669,7 +662,7 @@ inline void SwSubsRects::Ins( const SwRect &rRect, const sal_uInt8 nSCol )
 {
     // Lines that are shorted than the largest line width won't be inserted
     if ( rRect.Height() > DEF_LINE_WIDTH_4 || rRect.Width() > DEF_LINE_WIDTH_4 )
-        Insert( SwLineRect( rRect, 0, SOLID, 0, nSCol, sal_False ), Count());
+        Insert( SwLineRect( rRect, 0, SOLID, 0, nSCol ), Count());
 }
 
 void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
@@ -724,7 +717,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
                             SwRect aNewSubsRect( aSubsLineRect );
                             aNewSubsRect.Bottom( nTmp );
                             Insert( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
-                                                aSubsLineRect.GetSubColor(), sal_False ), Count());
+                                                aSubsLineRect.GetSubColor() ), Count());
                         }
                         nTmp = rLine.Bottom()+nPixelSzH+1;
                         if ( aSubsLineRect.Bottom() > nTmp )
@@ -732,7 +725,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
                             SwRect aNewSubsRect( aSubsLineRect );
                             aNewSubsRect.Top( nTmp );
                             Insert( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
-                                                aSubsLineRect.GetSubColor(), sal_False ), Count());
+                                                aSubsLineRect.GetSubColor() ), Count());
                         }
                         Remove( i, 1 );
                         --i;
@@ -750,7 +743,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
                             SwRect aNewSubsRect( aSubsLineRect );
                             aNewSubsRect.Right( nTmp );
                             Insert( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
-                                                aSubsLineRect.GetSubColor(), sal_False ), Count());
+                                                aSubsLineRect.GetSubColor() ), Count());
                         }
                         nTmp = rLine.Right()+nPixelSzW+1;
                         if ( aSubsLineRect.Right() > nTmp )
@@ -758,7 +751,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
                             SwRect aNewSubsRect( aSubsLineRect );
                             aNewSubsRect.Left( nTmp );
                             Insert( SwLineRect( aNewSubsRect, 0, aSubsLineRect.GetStyle(), 0,
-                                                aSubsLineRect.GetSubColor(), sal_False ), Count());
+                                                aSubsLineRect.GetSubColor() ), Count());
                         }
                         Remove( i, 1 );
                         --i;
@@ -836,14 +829,6 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
         for ( i = 0; i < Count(); ++i )
         {
             SwLineRect &rLRect = operator[](i);
-            sal_uLong nDrawMode = pOut->GetDrawMode();
-
-            if ( rLRect.IsGhosted() )
-            {
-                pOut->SetDrawMode( DRAWMODE_GHOSTEDLINE | DRAWMODE_GHOSTEDFILL |
-                        DRAWMODE_GHOSTEDTEXT | DRAWMODE_GHOSTEDBITMAP |
-                        DRAWMODE_GHOSTEDGRADIENT );
-            }
 
             if ( rLRect.IsPainted() )
                 continue;
@@ -903,8 +888,6 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
             }
             else
                 bPaint2nd = sal_True;
-
-            pOut->SetDrawMode( nDrawMode );
         }
         if ( bPaint2nd )
             for ( i = 0; i < Count(); ++i )
@@ -2957,30 +2940,6 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
 
                 if ( pSh->Imp()->HasDrawView() )
                 {
-                    // Loop over the drawing object to mark them as in or outside a group
-                    if ( !pGlobalShell->GetViewOptions()->IsPDFExport() &&
-                         !pGlobalShell->GetViewOptions()->IsPrinting() &&
-                         !pGlobalShell->IsPreView() )
-                    {
-                        SdrObjList* pObjs = pSh->Imp()->GetPageView()->GetObjList();
-                        for ( sal_uInt32 i = 0; pObjs && i < pObjs->GetObjCount(); i++ )
-                        {
-                            SdrObject* pDrawObj = pObjs->GetObj( i );
-                            const SwContact* pContact = ::GetUserCall( pDrawObj );
-                            const SwAnchoredObject* pObj = pContact->GetAnchoredObj( pDrawObj );
-
-                            const SwFrm* pAnchorFrm = pObj ? pObj->GetAnchorFrm() : NULL;
-                            bool bInHeaderFooter = false;
-
-                            // Handle all non anchored as character objects... others are handled elsewere
-                            if ( pAnchorFrm )
-                                bInHeaderFooter = pAnchorFrm->FindFooterOrHeader() != NULL;
-                            bool bHeaderFooterEdit = pSh->IsHeaderFooterEdit();
-
-                            pDrawObj->SetGhosted( bHeaderFooterEdit ^ bInHeaderFooter );
-                        }
-                    }
-
                     pLines->LockLines( sal_True );
                     const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess();
                     pSh->Imp()->PaintLayer( pIDDMA->GetHellId(),
@@ -3615,8 +3574,6 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     aRect._Intersection( Frm() );
 
     OutputDevice* pOut = pGlobalShell->GetOut();
-    sal_uInt64 nOldDrawMode = SetHeaderFooterEditMask( pOut );
-
     pOut->Push( PUSH_CLIPREGION );
     pOut->SetClipRegion();
     const SwPageFrm* pPage = FindPageFrm();
@@ -3824,8 +3781,6 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 
     pOut->Pop();
 
-    pOut->SetDrawMode( nOldDrawMode );
-
     if ( pProgress && pNoTxt )
         pProgress->Reschedule();
 }
@@ -3837,7 +3792,6 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 
 void SwTabFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 {
-    sal_uInt64 nOldDrawMode = SetHeaderFooterEditMask( pGlobalShell->GetOut() );
     if ( pGlobalShell->GetViewOptions()->IsTable() )
     {
         // #i29550#
@@ -3874,8 +3828,6 @@ void SwTabFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                 DrawRect( pGlobalShell->GetOut(), aTabOutRect, COL_LIGHTGRAY );
     }
     ((SwTabFrm*)this)->ResetComplete();
-
-    pGlobalShell->GetOut()->SetDrawMode( nOldDrawMode );
 }
 
 /*************************************************************************
@@ -4099,8 +4051,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect,
                              const SwRect& rOutRect,
                              const SwPageFrm *pPage,
                              const Color *pColor,
-                             const SvxBorderStyle nStyle,
-                             sal_Bool bGhosted ) const
+                             const SvxBorderStyle nStyle ) const
 {
     if ( !rOutRect.IsOver( rRect ) )
         return;
@@ -4123,10 +4074,10 @@ void SwFrm::PaintBorderLine( const SwRect& rRect,
         SwRegionRects aRegion( aOut, 4, 1 );
         ::lcl_SubtractFlys( this, pPage, aOut, aRegion );
         for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i )
-            pLines->AddLineRect( aRegion[i], pColor, nStyle, pTab, nSubCol, bGhosted );
+            pLines->AddLineRect( aRegion[i], pColor, nStyle, pTab, nSubCol );
     }
     else
-        pLines->AddLineRect( aOut, pColor, nStyle, pTab, nSubCol, bGhosted );
+        pLines->AddLineRect( aOut, pColor, nStyle, pTab, nSubCol );
 }
 
 /*************************************************************************
@@ -4940,22 +4891,8 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect,
             : SwRect( Point( nX, Frm().Pos().Y() + rInf.GetTopDist() ),
                             Size( nWidth, rInf.GetLineWidth()));
     if ( aLineRect.HasArea() )
-    {
-        ViewShell* pShell = getRootFrm()->GetCurrShell();
-
-        sal_Bool bGhosted = sal_False;
-        if ( !pShell->IsPreView() &&
-             !pShell->GetViewOptions()->IsPDFExport() &&
-             !pShell->GetViewOptions()->IsPrinting() )
-        {
-            bool bInHdrFtr = FindFooterOrHeader( ) != NULL;
-            bool bEditHdrFtr = pShell->IsHeaderFooterEdit();
-            bGhosted = ( bInHdrFtr && !bEditHdrFtr ) || ( !bInHdrFtr && bEditHdrFtr );
-        }
-
         PaintBorderLine( rRect, aLineRect , pPage, &rInf.GetLineColor(),
-                rInf.GetLineStyle(), bGhosted );
-    }
+                rInf.GetLineStyle() );
 }
 
 /*************************************************************************
@@ -5009,26 +4946,13 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
     (aRect.*fnRect->fnSubLeft)( nPenHalf + nPixelSzW );
     (aRect.*fnRect->fnAddRight)( nPenHalf + nPixelSzW );
     SwRectGet fnGetX = IsRightToLeft() ? fnRect->fnGetLeft : fnRect->fnGetRight;
-
-    sal_Bool bGhosted = sal_False;
-
-    ViewShell* pShell = getRootFrm()->GetCurrShell();
-    if ( !pShell->IsPreView() &&
-         !pShell->GetViewOptions()->IsPDFExport() &&
-         !pShell->GetViewOptions()->IsPrinting() )
-    {
-        bool bInHdrFtr = FindFooterOrHeader( ) != NULL;
-        bool bEditHdrFtr = pShell->IsHeaderFooterEdit();
-        bGhosted = ( bInHdrFtr && !bEditHdrFtr ) || ( !bInHdrFtr && bEditHdrFtr );
-    }
-
     while ( pCol->GetNext() )
     {
         (aLineRect.*fnRect->fnSetPosX)
             ( (pCol->Frm().*fnGetX)() - nPenHalf );
         if ( aRect.IsOver( aLineRect ) )
             PaintBorderLine( aRect, aLineRect , pPage, &rFmtCol.GetLineColor(),
-                   rFmtCol.GetLineStyle(), bGhosted );
+                   rFmtCol.GetLineStyle() );
         pCol = pCol->GetNext();
     }
 }
@@ -5927,9 +5851,6 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
             aRect.Intersection( rRect );
 
             OutputDevice *pOut = pSh->GetOut();
-            sal_uInt64 nOldDrawMode = pOut->GetDrawMode();
-            if ( !IsPageFrm() && !IsRootFrm() )
-                SetHeaderFooterEditMask( pOut );
 
             if ( aRect.HasArea() )
             {
@@ -5968,7 +5889,6 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
                 if( pCol )
                     delete pNewItem;
             }
-            pOut->SetDrawMode( nOldDrawMode );
         }
         else
             bLowMode = bLowerMode ? sal_True : sal_False;
@@ -6239,7 +6159,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay,
             SwRect aRect( aP1, aP2 );
             // OD 18.11.2002 #99672# - use parameter <_pSubsLines> instead of
             // global variable <pSubsLines>.
-            _pSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor, sal_False );
+            _pSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor );
         }
         aP1 = aP2;
         aP1.*pDirPt += 1;
@@ -6378,14 +6298,14 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
             if ( aOriginal.Left() == aOut.Left() )
             {
                 const SwRect aRect( aOut.Pos(), aLB );
-                pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor, sal_False );
+                pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor );
             }
             // OD 14.11.2002 #104821# - in vertical layout set page/column break at right
             if ( aOriginal.Right() == nRight )
             {
                 const SwRect aRect( aRT, aRB );
                 pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0,
-                        (bBreak && bVert) ? SUBCOL_BREAK : nSubColor, sal_False );
+                        (bBreak && bVert) ? SUBCOL_BREAK : nSubColor );
             }
         }
         // OD 14.11.2002 #104822# - adjust control for drawing top and bottom lines
@@ -6396,12 +6316,12 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
                 // OD 14.11.2002 #104821# - in horizontal layout set page/column break at top
                 const SwRect aRect( aOut.Pos(), aRT );
                 pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0,
-                        (bBreak && !bVert) ? SUBCOL_BREAK : nSubColor, sal_False );
+                        (bBreak && !bVert) ? SUBCOL_BREAK : nSubColor );
             }
             if ( aOriginal.Bottom() == nBottom )
             {
                 const SwRect aRect( aLB, aRB );
-                pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor, sal_False );
+                pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor );
             }
         }
     }
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index b7f5f97e4687..dc3e131838a2 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -132,25 +132,6 @@ void SwFrm::RegisterToFormat( SwFmt& rFmt )
     rFmt.Add( this );
 }
 
-sal_uInt64 SwFrm::SetHeaderFooterEditMask( OutputDevice* pOut ) const
-{
-    sal_uInt64 nOldDrawMode = pOut->GetDrawMode();
-    ViewShell* pShell = getRootFrm()->GetCurrShell();
-    if ( !pShell->IsPreView() &&
-         !pShell->GetViewOptions()->IsPDFExport() &&
-         !pShell->GetViewOptions()->IsPrinting() )
-    {
-        bool bInHdrFtr = FindFooterOrHeader( ) != NULL;
-        bool bEditHdrFtr = pShell->IsHeaderFooterEdit();
-        if ( ( bInHdrFtr && !bEditHdrFtr ) || ( !bInHdrFtr && bEditHdrFtr ) )
-            pOut->SetDrawMode( DRAWMODE_GHOSTEDLINE | DRAWMODE_GHOSTEDFILL |
-                    DRAWMODE_GHOSTEDTEXT | DRAWMODE_GHOSTEDBITMAP |
-                    DRAWMODE_GHOSTEDGRADIENT );
-    }
-
-    return nOldDrawMode;
-}
-
 void SwFrm::CheckDir( sal_uInt16 nDir, sal_Bool bVert, sal_Bool bOnlyBiDi, sal_Bool bBrowse )
 {
     if( FRMDIR_ENVIRONMENT == nDir || ( bVert && bOnlyBiDi ) )
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index eb1eaaa7b3e0..ccae7856dc20 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -567,7 +567,6 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const
                 // Don't show the paragraph mark for collapsed paragraphs, when they are hidden
                 if ( EmptyHeight( ) > 1 )
                 {
-                    sal_uInt64 nOldDrawMode = SetHeaderFooterEditMask( pSh->GetOut() );
                     const XubString aTmp( CH_PAR );
                     SwDrawTextInfo aDrawInf( pSh, *pSh->GetOut(), 0, aTmp, 0, 1 );
                     aDrawInf.SetLeft( rRect.Left() );
@@ -583,7 +582,6 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const
                     aDrawInf.SetSnapToGrid( sal_False );
 
                     pFnt->_DrawText( aDrawInf );
-                    pSh->GetOut()->SetDrawMode( nOldDrawMode );
                 }
                 delete pClip;
             }
@@ -699,8 +697,6 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         OutputDevice* pOut = aInf.GetOut();
         const sal_Bool bOnWin = pSh->GetWin() != 0;
 
-        sal_uInt64 nOldDrawMode = SetHeaderFooterEditMask( pOut );
-
         SwSaveClip aClip( bOnWin || IsUndersized() ? pOut : 0 );
 
         // Ausgabeschleife: Fuer jede Zeile ... (die noch zu sehen ist) ...
@@ -732,8 +728,6 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         if( rRepaint.HasArea() )
             rRepaint.Clear();
 
-        pOut->SetDrawMode( nOldDrawMode );
-
         UNDO_SWAP( this )
         (SwRect&)rRect = aOldRect;
 
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 92481ed8de10..912a327e6d06 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -77,7 +77,6 @@
 #include "../../ui/inc/view.hxx"
 #include <PostItMgr.hxx>
 #include <vcl/virdev.hxx>
-#include <rootfrm.hxx>
 
 #include <vcl/svapp.hxx>