[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

[Ivan Timofeev]

 sw/source/ui/docvw/SidebarWin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2da3517dd289e00b98f7f8616a4faa9b00fb8403
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Tue Sep 17 18:34:17 2013 +0400

    fdo#41833: fix visual cursor position after resizing
    
    SetOutputArea updates a cursor position, SetVisArea doesn't => call SetOutputArea
    after SetVisArea.
    
    Change-Id: Ie8f079cb3d567f759c84587a8072b98fab43588b
    (cherry picked from commit ddbcb6687722314b37cfda3170596ac7a4f69602)
    Reviewed-on: https://gerrit.libreoffice.org/5978
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index 17c0aea..ca7326b 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -596,11 +596,11 @@ void SwSidebarWin::DoResize()
     }
 
     mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ;
-    mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) );
     if (!mpVScrollbar->IsVisible())
     {   // if we do not have a scrollbar anymore, we want to see the complete text
         mpOutlinerView->SetVisArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) );
     }
+    mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) );
 
     if (!Application::GetSettings().GetLayoutRTL())
     {