Kaydet (Commit) 7ad6eb2c authored tarafından Michaël Lefèvre's avatar Michaël Lefèvre Kaydeden (comit) Caolán McNamara

Remove dead code

Change-Id: Ieac5dec327f5203221e31c50d679ef3ffa1ce8e4
Reviewed-on: https://gerrit.libreoffice.org/12479Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 612a5f54
...@@ -265,9 +265,6 @@ static SfxProgress *pProgress = 0; ...@@ -265,9 +265,6 @@ static SfxProgress *pProgress = 0;
static SwFlyFrm *pFlyOnlyDraw = 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 //To optimize the expensive RetouchColor determination
Color aGlobalRetoucheColor; Color aGlobalRetoucheColor;
...@@ -4016,18 +4013,9 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) ...@@ -4016,18 +4013,9 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
//HACK: exception: printing of frames in tables, those can overlap //HACK: exception: printing of frames in tables, those can overlap
//a page once in a while when dealing with oversized tables (HTML). //a page once in a while when dealing with oversized tables (HTML).
SwPageFrm *pPage = pFly->FindPageFrm(); 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(); pAnch = pFly->AnchorFrm();
}
} }
} }
...@@ -4049,8 +4037,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) ...@@ -4049,8 +4037,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
//right now. Afterwards they must not be printed if the //right now. Afterwards they must not be printed if the
//page over which they float position wise gets printed. //page over which they float position wise gets printed.
const SwPageFrm *pPage = pAnch->FindPageFrm(); const SwPageFrm *pPage = pAnch->FindPageFrm();
if ( !bTableHack && if ( !pPage->Frm().IsOver( pObj->GetCurrentBoundRect() ) )
!pPage->Frm().IsOver( pObj->GetCurrentBoundRect() ) )
pAnch = 0; pAnch = 0;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment