sw/source/core/layout/flylay.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+)
New commits: commit 353a736b719167ce1caac9cb20a607e3aeda6dca Author: Armin Le Grand <[email protected]> Date: Wed Jan 10 18:28:34 2018 +0100 RotateFlyFrameFix: Disable AutoContour for rotated Flys As long as it is not clear when, how and why we should offer this feature and if ODF needs to be adapted to it, disable the feature for now. Discussion about how to support is ongoing. Change-Id: I8ecd91ef9aefb6f49840a4f6108f5d5a17072af0 Reviewed-on: https://gerrit.libreoffice.org/47731 Tested-by: Jenkins <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> Reviewed-by: Armin Le Grand <[email protected]> diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index 8a3af6c27006..51d798888c88 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -299,6 +299,17 @@ void SwFlyFreeFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) bool SwFlyFreeFrame::supportsAutoContour() const { + static bool bOverrideHandleContourToAlwaysOff(true); + + // RotateFlyFrameFix: For LO6.0 we need to deactivate the AutoContour feature again, it is simply + // not clear how/if to use and save/load it in ODF. This has to be discussed. + // The reason not to remove is that this may be used as-is now, using a new switch. + // Even when not, the detection if it is possible will be needed in any case later. + if(bOverrideHandleContourToAlwaysOff) + { + return false; + } + if(!isTransformableSwFrame()) { // support only when transformed, else there is no free space _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
