[Libreoffice-commits] .: Branch 'libreoffice-3-3' - svx/source

[Cédric Bosdonnat]

 svx/source/dialog/svxruler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f7df6cf55618d2dcb6778666990e38816b6c5c22
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon Nov 22 10:53:22 2010 +0100

    Fix for i#115681
    
    Some missing condition before actually draggging the border.

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 9f3cb23..c1fc788 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2780,7 +2780,8 @@ void SvxRuler::EvalModifier()
          const RulerType eType = GetDragType();
          nDragType = DRAG_OBJECT_SIZE_PROPORTIONAL;
          if( RULER_TYPE_TAB == eType ||
-             ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ) &&
+             ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ||
+                 RULER_TYPE_MARGIN2 == eType ) &&
                pColumnItem ) )  
              PrepareProportional_Impl(eType);
          break;