[Libreoffice-commits] .: 2 commits - sw/source

[Ivan Timofeev]

 sw/source/ui/index/cnttab.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 33619919036457e3a37c4c47a8cef274d55253a8
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Wed Apr 4 19:22:52 2012 +0400

    reuse existent function

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index bdcf6da..63248e7 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3430,18 +3430,10 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
     if(nMove)
     {
         // move the complete list
+        MoveControls(nMove);
 
         Control *pCtrl = 0;
 
-        for (ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it)
-        {
-            pCtrl = *it;
-
-            Point aPos = pCtrl->GetPosPixel();
-            aPos.X() += nMove;
-            pCtrl->SetPosPixel(aPos);
-        }
-
         pCtrl = *(aControlList.begin());
         aLeftScrollWin.Enable(pCtrl->GetPosPixel().X() < 0);
 
commit b49f69aee6f48fb9367a2a9548182dcd84eb5296
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Wed Apr 4 18:38:07 2012 +0400

    fdo#40948: TOC dialog, Entries tab: the right arrow button does not work
    
    regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cd.

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 0d41a0b..bdcf6da 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3415,7 +3415,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
                 {
                     //move the right neighbor  to the right edge right aligned
                     ctrl_reverse_iterator itRight = it;
-                    --it;
+                    --itRight;
                     Control *pRight = *itRight;
                     nMove = nSpace - pRight->GetPosPixel().X() - pRight->GetSizePixel().Width();
                 }