[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/uiview/viewmdi.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 5aadc1cf65841ce8737ec6602dcc3751e368c395
Author: Winfried Donkers <osc at dci-electronics.nl>
Date:   Mon Jan 14 19:53:10 2013 +0100

    fdo#40465 solve regression when zooming with cursor not visible
    
    Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
    (cherry picked from commit fa058a4cd6580d5538c49d565499fb5cc4ecfe53)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index f600461..ac68198 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -73,10 +73,11 @@ using namespace ::com::sun::star::frame;
 
 void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly )
 {
+    bool const bCrsrIsVisible(pWrtShell->IsCrsrVisible());
     _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly );
-
-    //fdo40465 force the cursor to stay in view whilst zooming
-    pWrtShell->ShowCrsr();
+    // fdo#40465 force the cursor to stay in view whilst zooming
+    if (bCrsrIsVisible)
+        pWrtShell->ShowCrsr();
 }
 
 void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,