Group a common test to avoid unnecessary calculations

svtools/source/control/valueset.cxx

@@ -1033,25 +1033,24 @@ sal_Bool ValueSet::ImplScroll( const Point& rPos )
 
 size_t ValueSet::ImplGetItem( const Point& rPos, sal_Bool bMove ) const
 {
-    if ( mpNoneItem )
+    if ( mpNoneItem && mpNoneItem->maRect.IsInside( rPos ) )
     {
-        if ( mpNoneItem->maRect.IsInside( rPos ) )
         return VALUESET_ITEM_NONEITEM;
     }
 
-    Point     aDefPos;
-    Rectangle aWinRect( aDefPos, maVirDev.GetOutputSizePixel() );
+    const Rectangle aWinRect( Point(), maVirDev.GetOutputSizePixel() );
 
-    size_t nItemCount = mpImpl->mpItemList->size();
-    for ( size_t i = 0; i < nItemCount; i++ )
+    if ( aWinRect.IsInside( rPos ) )
     {
-        ValueSetItem* pItem = (*mpImpl->mpItemList)[ i ];
+        // The point is inside the ValueSet window,
+        // let's find the containing item.
+        const size_t nItemCount = mpImpl->mpItemList->size();
+        for ( size_t i = 0; i < nItemCount; ++i )
+        {
+            ValueSetItem *const pItem = (*mpImpl->mpItemList)[ i ];
             if ( pItem->maRect.IsInside( rPos ) )
             {
-            if ( aWinRect.IsInside( rPos ) )
                 return i;
-            else
-                return VALUESET_ITEM_NOTFOUND;
             }
         }
 
@@ -1060,9 +1059,9 @@ size_t ValueSet::ImplGetItem( const Point& rPos, sal_Bool bMove ) const
         // verlassen hat
         if ( bMove && mnSpacing && mnHighItemId )
         {
-        if ( aWinRect.IsInside( rPos ) )
             return GetItemPos( mnHighItemId );
         }
+    }
 
     return VALUESET_ITEM_NOTFOUND;
 }