Kaydet (Commit) cba1c400 authored tarafından Armin Le Grand's avatar Armin Le Grand

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/47721Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarArmin Le Grand <Armin.Le.Grand@cib.de>
üst effc05ee
...@@ -299,6 +299,17 @@ void SwFlyFreeFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) ...@@ -299,6 +299,17 @@ void SwFlyFreeFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/)
bool SwFlyFreeFrame::supportsAutoContour() const 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()) if(!isTransformableSwFrame())
{ {
// support only when transformed, else there is no free space // support only when transformed, else there is no free space
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment