summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-04-17 11:43:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-04-17 13:07:42 +0200
commitf569507f3f0da7f69a2e808165612cbef4c15410 (patch)
tree7aad2540b2d5eaadd074d679f05fdc9ad524042d /svx
parent9a3b47afab1750eba0451d59a8bac53302d85b2f (diff)
Revert "[API CHANGE] remove some primitives rendering settings"
This reverts commit c71656f51a09e88ecae4f3423c96fee84778647d. Reason for revert: I give up Change-Id: I2a09c36c1f0d731f4d3f7d809364de7efa8d8a58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92426 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svddrgv.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 832ea61ca9de..7002f9447d0d 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -63,7 +63,7 @@ void SdrDragView::ImpClearVars()
mbCrookAtCenter=false;
// init using default
- mbSolidDragging = true;
+ mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate();
}
SdrDragView::SdrDragView(
@@ -917,8 +917,9 @@ void SdrDragView::SetSolidDragging(bool bOn)
bool SdrDragView::IsSolidDragging() const
{
- // allow each user to disable by having a local setting
- return mbSolidDragging;
+ // allow each user to disable by having a local setting, but using AND for
+ // checking allowance
+ return mbSolidDragging && getOptionsDrawinglayer().IsSolidDragCreate();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */