From 7a9fb40cb07de8c2ea33f92735be5008d30d6704 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Fri, 1 Sep 2017 11:04:03 -0400 Subject: 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 Reviewed-by: Justin Luth --- sw/source/core/layout/tabfrm.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/source/core/layout/tabfrm.cxx') 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 ) -- cgit