diff options
| author | Michaël Lefèvre <lefevre00@yahoo.fr> | 2014-11-16 12:13:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-18 10:34:54 +0000 |
| commit | 7ad6eb2c9b0b6e7f6d3993d293d8ee0cf3dcbc7f (patch) | |
| tree | 0f84ee406870106413db043b19583d35afaac1b0 | |
| parent | 612a5f54015eedf832ce1d0ff9062ba819976ea6 (diff) | |
Remove dead code
Change-Id: Ieac5dec327f5203221e31c50d679ef3ffa1ce8e4
Reviewed-on: https://gerrit.libreoffice.org/12479
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a5b5d7356354..b70bb6e03970 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; } } |