diff options
| author | Attila Bakos <bakos.attilakaroly@nisz.hu> | 2020-08-06 13:49:43 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-08-21 23:48:33 +0200 |
| commit | b6850bbe95418ecfde404be1696548f18d200c9b (patch) | |
| tree | b6804b1b292b06389d8b58df9fe425e22f184af4 /sw/source/core/draw | |
| parent | a6c2a87612a10d55fc59fa01e44d67d95505834f (diff) | |
tdf#106153 sw compatibility: fix textboxes exceeding the page
In compatibility mode DISABLE_OFF_PAGE_POSITIONING, textboxes
fell apart by exceeding the page. Now text content stay inside
the textboxes instead of the page area.
Main Developer: Dániel Arató (NISZ).
Commit a4dee94afed9ade6ac50237c8d99a6e49d3bebc1 (tdf#91260: allow
textboxes extending beyond the page bottom) is reverted partially,
according to this and the following commits:
Commit 8d62b79f168180c6992eb483ec864d473050635f
(tdf#112443 disable off-page content positioning) and
commit ee6cd34eb3a2bd1f1340063ee4b90a72ff0c9532
(tdf#123621 sw: fix textbox position according to DOCX).
Change-Id: Icb8fba161f7e8830cdb6bf6e299cccde09e7e008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100239
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/core/draw')
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 02d4cfe29c56..94d566d046f0 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -527,7 +527,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject( RestoreMapMode aRestoreMapModeIfNeeded( pShell ); // paint the FlyFrame (use standard VCL-Paint) - m_pFlyFrame->PaintSwFrame( *pShell->GetOut(), GetFlyFrame()->getFrameArea() ); + m_pFlyFrame->PaintSwFrame( *pShell->GetOut(), m_pFlyFrame->GetPageFrame()->getFrameArea()); } void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const |