[Libreoffice-commits] .: sw/source

Joseph Powers jpowers at kemper.freedesktop.org
Mon Dec 13 18:38:54 PST 2010


 sw/source/ui/index/cnttab.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit cff2b412bedbf4c4e27167e82351d6c28e7f3438
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Dec 13 18:34:55 2010 -0800

    Revert "revert removal patch"
    
    This reverts commit 03e13b100e3c4759547af06bd37fd10f87539ebc.

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 6745f7d..fbd65bb 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3359,16 +3359,15 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
         if(nMove)
         {
             // move the complete list
-            Control* pCtrl = aControlList.First();
-            do
+            for ( TOXControlList::iterator it = aControlList.begin(); it != aControlList.end(); ++it )
             {
                 Control* pCtrl = *it;
                 Point aPos = pCtrl->GetPosPixel();
                 aPos.X() += nMove;
                 pCtrl->SetPosPixel(aPos);
-            }while(0 != (pCtrl = aControlList.Next()));
-            aLeftScrollWin.Enable(aControlList.First()->GetPosPixel().X() < 0);
-            pCtrl = aControlList.Last();
+            }
+            aLeftScrollWin.Enable(aControlList.front()->GetPosPixel().X() < 0);
+            Control* pCtrl = aControlList.back();
             aRightScrollWin.Enable((pCtrl->GetPosPixel().X() + pCtrl->GetSizePixel().Width()) > nSpace);
 
 #if OSL_DEBUG_LEVEL > 1


More information about the Libreoffice-commits mailing list