SvResizeHelper::ValidateRect, simplify logic

Change-Id: Ie1c9891e8095172f53efc027eec9a68bde39ed1f

SvResizeHelper::ValidateRect, simplify logic
Change-Id: Ie1c9891e8095172f53efc027eec9a68bde39ed1f
b3705c21 · Noel Grandin · 3b479413 · b3705c21
Kaydet (Commit) b3705c21 authored Agu 20, 2015 tarafından Noel Grandin
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 30 deletions

ipwin.cxx svtools/source/hatchwindow/ipwin.cxx +8 -30

No files found.
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -347,73 +347,51 @@ void SvResizeHelper::ValidateRect( Rectangle & rValidate ) const
    {
        case 0:
            if( rValidate.Top() > rValidate.Bottom() )
-            {
                rValidate.Top() = rValidate.Bottom();
-                rValidate.Bottom() = RECT_EMPTY;
-            }
            if( rValidate.Left() > rValidate.Right() )
-            {
                rValidate.Left() = rValidate.Right();
-                rValidate.Right() = RECT_EMPTY;
-            }
            break;
        case 1:
            if( rValidate.Top() > rValidate.Bottom() )
-            {
                rValidate.Top() = rValidate.Bottom();
-                rValidate.Bottom() = RECT_EMPTY;
-            }
            break;
        case 2:
            if( rValidate.Top() > rValidate.Bottom() )
-            {
                rValidate.Top() = rValidate.Bottom();
-                rValidate.Bottom() = RECT_EMPTY;
-            }
            if( rValidate.Left() > rValidate.Right() )
-                rValidate.Right() = RECT_EMPTY;
+                rValidate.Right() = rValidate.Left();
            break;
        case 3:
            if( rValidate.Left() > rValidate.Right() )
-                rValidate.Right() = RECT_EMPTY;
+                rValidate.Right() = rValidate.Left();
            break;
        case 4:
            if( rValidate.Top() > rValidate.Bottom() )
-                rValidate.Bottom() = RECT_EMPTY;
+                rValidate.Bottom() = rValidate.Top();
            if( rValidate.Left() > rValidate.Right() )
-                rValidate.Right() = RECT_EMPTY;
+                rValidate.Right() = rValidate.Left();
            break;
        case 5:
            if( rValidate.Top() > rValidate.Bottom() )
-                rValidate.Bottom() = RECT_EMPTY;
+                rValidate.Bottom() = rValidate.Top();
            break;
        case 6:
            if( rValidate.Top() > rValidate.Bottom() )
-                rValidate.Bottom() = RECT_EMPTY;
+                rValidate.Bottom() = rValidate.Top();
            if( rValidate.Left() > rValidate.Right() )
-            {
                rValidate.Left() = rValidate.Right();
-                rValidate.Right() = RECT_EMPTY;
-            }
            break;
        case 7:
            if( rValidate.Left() > rValidate.Right() )
-            {
                rValidate.Left() = rValidate.Right();
-                rValidate.Right() = RECT_EMPTY;
-            }
            break;
    }
-    if( rValidate.Right() == RECT_EMPTY )
-        rValidate.Right() = rValidate.Left();
-    if( rValidate.Bottom() == RECT_EMPTY )
-        rValidate.Bottom() = rValidate.Top();
    // Mindestgr"osse 5 x 5
    if( rValidate.Left() + 5 > rValidate.Right() )
-        rValidate.Right() = rValidate.Left() +5;
+        rValidate.Right() = rValidate.Left() + 5;
    if( rValidate.Top() + 5 > rValidate.Bottom() )
-        rValidate.Bottom() = rValidate.Top() +5;
+        rValidate.Bottom() = rValidate.Top() + 5;
 }
 /*************************************************************************