summaryrefslogtreecommitdiff
path: root/svx/source/dialog/svxruler.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/dialog/svxruler.cxx')
-rw-r--r--svx/source/dialog/svxruler.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 712b66b86da1..a07cf1f254d2 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -37,11 +37,11 @@
#include <limits.h>
#include <tools/shl.hxx>
#include <vcl/image.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/rectitem.hxx>
#include <sfx2/dispatch.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
@@ -2761,8 +2761,9 @@ void SvxRuler::EvalModifier()
case KEY_MOD1: {
const RulerType eType = GetDragType();
nDragType = DRAG_OBJECT_SIZE_PROPORTIONAL;
- if(RULER_TYPE_BORDER == eType || RULER_TYPE_TAB == eType||
- RULER_TYPE_MARGIN1&&pColumnItem)
+ if( RULER_TYPE_TAB == eType ||
+ ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ) &&
+ pColumnItem ) )
PrepareProportional_Impl(eType);
break;
}