diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-01-10 18:28:34 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-01-11 01:35:50 +0100 |
| commit | cba1c400af98081abc63d282d6910c9f58403ae3 (patch) | |
| tree | 63deeca9fd3be375c5202ba48b7159437baf60f4 /sw/source/core/layout/flylay.cxx | |
| parent | effc05eecb1359239ca7a86103a6fd9fc8424015 (diff) | |
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/47721
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'sw/source/core/layout/flylay.cxx')
| -rw-r--r-- | sw/source/core/layout/flylay.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index b57b763d8e79..fb0544defc1d 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 |