[Libreoffice-commits] .: sw/source

[Cédric Bosdonnat]

 sw/source/core/layout/paintfrm.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 132e32ff131b6d91459dbe8e57e18c85dfae0322
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Fri Jul 1 12:12:01 2011 +0200

    n#702506: anchored as char objects don't need ghosting from SwRootFrm

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2f64c8c..9273491 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2982,7 +2982,12 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
                             const SwContact* pContact = ::GetUserCall( pDrawObj );
                             const SwAnchoredObject* pObj = pContact->GetAnchoredObj( pDrawObj );
 
-                            bool bInHeaderFooter = pObj->GetAnchorFrm()->FindFooterOrHeader() != NULL;
+                            const SwFrm* pAnchorFrm = pObj->GetAnchorFrm();
+                            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 );