[Libreoffice-commits] core.git: sw/source

[Michaël Lefèvre]

 sw/source/core/layout/paintfrm.cxx |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 7ad6eb2c9b0b6e7f6d3993d293d8ee0cf3dcbc7f
Author: Michaël Lefèvre <lefevre00 at yahoo.fr>
Date:   Sun Nov 16 12:13:23 2014 +0100

    Remove dead code
    
    Change-Id: Ieac5dec327f5203221e31c50d679ef3ffa1ce8e4
    Reviewed-on: https://gerrit.libreoffice.org/12479
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index a5b5d73..b70bb6e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -265,9 +265,6 @@ static SfxProgress *pProgress = 0;
 
 static SwFlyFrm *pFlyOnlyDraw = 0;
 
-//So the flys can also be painted right for the hack.
-static bool bTableHack = false;
-
 //To optimize the expensive RetouchColor determination
 Color aGlobalRetoucheColor;
 
@@ -4016,18 +4013,9 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
             //HACK: exception: printing of frames in tables, those can overlap
             //a page once in a while when dealing with oversized tables (HTML).
             SwPageFrm *pPage = pFly->FindPageFrm();
-            if ( pPage )
+            if ( pPage && pPage->Frm().IsOver( pFly->Frm() ) )
             {
-                if ( pPage->Frm().IsOver( pFly->Frm() ) )
-                    pAnch = pFly->AnchorFrm();
-                else if ( bTableHack &&
-                          pFly->Frm().Top() >= pFly->GetAnchorFrm()->Frm().Top() &&
-                          pFly->Frm().Top() < pFly->GetAnchorFrm()->Frm().Bottom() &&
-                          sal_IntPtr(pSh->GetOut()) ==
-                          sal_IntPtr(pSh->getIDocumentDeviceAccess()->getPrinter( false ) ) )
-                {
                     pAnch = pFly->AnchorFrm();
-                }
             }
 
         }
@@ -4049,8 +4037,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
                     //right now. Afterwards they must not be printed if the
                     //page over which they float position wise gets printed.
                     const SwPageFrm *pPage = pAnch->FindPageFrm();
-                    if ( !bTableHack &&
-                         !pPage->Frm().IsOver( pObj->GetCurrentBoundRect() ) )
+                    if ( !pPage->Frm().IsOver( pObj->GetCurrentBoundRect() ) )
                         pAnch = 0;
                 }
             }