From c89f73a6033b28484f5e10054b542fa69a9fe475 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 7 Mar 2016 11:20:52 +0200
Subject: loplugin:unuseddefaultparams

Change-Id: Id895d61c0bbea99379bb6e9b4e6d6c54da4c98db
---
 svtools/source/contnr/imivctl.hxx  |  3 +--
 svtools/source/contnr/imivctl1.cxx | 24 +-----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'svtools')

diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index e14761ffe188..eea834df2c0d 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -358,8 +358,7 @@ public:
 
     void                SetEntryPos(
                             SvxIconChoiceCtrlEntry* pEntry,
-                            const Point& rPos,
-                            bool bAdjustRow = false
+                            const Point& rPos
                         );
 
     void                InvalidateEntry( SvxIconChoiceCtrlEntry* );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index c8f25367cf89..4da1d8a02a8a 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -1687,8 +1687,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
         rRenderContext.SetClipRegion();
 }
 
-void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos,
-    bool bAdjustAtGrid )
+void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos )
 {
     ShowCursor( false );
     Rectangle aBoundRect( GetEntryBoundRect( pEntry ));
@@ -1708,27 +1707,6 @@ void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const
             pEntry->aGridRect.SetPos( rPos + aGridOffs );
             bAdjustVirtSize = true;
         }
-        if( bAdjustAtGrid )
-        {
-            if( bAdjustVirtSize )
-            {
-                // By aligning the (in some cases newly positioned) entry, it
-                // can become completely visible again, so that maybe we don't
-                // need a scrollbar after all. To avoid suddenly turning the
-                // scrollbar(s) on and then off again, we use the aligned
-                // bounding rectangle of the entry to enlarge the virtual
-                // output size. The virtual size has to be adapted, because
-                // AdjustEntryAtGrid depends on it.
-                const Rectangle& rBoundRect = GetEntryBoundRect( pEntry );
-                Rectangle aCenterRect( CalcBmpRect( pEntry ));
-                Point aNewPos( AdjustAtGrid( aCenterRect, rBoundRect ) );
-                Rectangle aNewBoundRect( aNewPos, pEntry->aRect.GetSize());
-                AdjustVirtSize( aNewBoundRect );
-                bAdjustVirtSize = false;
-            }
-            AdjustEntryAtGrid( pEntry );
-            ToTop( pEntry );
-        }
         if( bAdjustVirtSize )
             AdjustVirtSize( pEntry->aRect );
 
-- 
cgit