diff options
| author | Justin Luth <justin_luth@sil.org> | 2017-09-01 11:04:03 -0400 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2017-09-02 19:35:09 +0200 |
| commit | 7a9fb40cb07de8c2ea33f92735be5008d30d6704 (patch) | |
| tree | 279eb686cfe57a8440a1d2ed9bd2a1fff33bda3e /sw/source/core/layout/tabfrm.cxx | |
| parent | 5fdec960fa2f85d53c05cf509c91168043368ad5 (diff) | |
tdf#37153 ConsiderWrapOnObjPos: also affect wrap-thru objs
MSO doesn't make a distinction when the wrapping is THROUGH.
Both DOC and DOCX enable this compatibility setting.
Change-Id: I123801fc83b5f4ac6a26a5ea77ba6dba2c60ec39
Reviewed-on: https://gerrit.libreoffice.org/41795
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source/core/layout/tabfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 02dcbffa9dcd..df0a1e0bc1bb 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4979,7 +4979,7 @@ void SwCellFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder const SwFrameFormat& rAnchoredObjFrameFormat = pAnchoredObj->GetFrameFormat(); const SwFormatSurround &rSur = rAnchoredObjFrameFormat.GetSurround(); - if ( css::text::WrapTextMode_THROUGH != rSur.GetSurround() ) + if ( bConsiderWrapOnObjPos || css::text::WrapTextMode_THROUGH != rSur.GetSurround() ) { // frames, which the cell is a lower of, aren't relevant if ( dynamic_cast< const SwFlyFrame *>( pAnchoredObj ) != nullptr ) |