[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source

[Jim Raykowski (via logerrit)]

 sd/source/ui/view/drtxtob1.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5d2f65b299f849f4ca12c744945433569095cc1f
Author:     Jim Raykowski <raykowj at gmail..com>
AuthorDate: Sat Dec 28 21:20:05 2019 -0900
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Fri Jan 17 11:29:20 2020 +0100

    tdf#129680 Make text edit outliner view show cursor
    
    Better placement of tdf#50530 fix
    80f18e7e028e9ca431aef281ab98bea99ad19fa3
    
    Change-Id: If6a83d94ebd52ada34d800f8270fa82b4260fdbf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86099
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>
    (cherry picked from commit 1840ed1ede481d28c1a75e2767357866f6f1c55a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86956
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 0b06a88c267b..6f6f84a3f753 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -815,16 +815,16 @@ void TextObjectBar::Execute( SfxRequest &rReq )
 
             // to refresh preview (in outline mode), slot has to be invalidated:
             mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true );
-
-            if ( pOLV )
-            {
-                pOLV->ShowCursor();
-                pOLV->GetWindow()->GrabFocus();
-            }
         }
         break;
     }
 
+    if ( pOLV )
+    {
+        pOLV->ShowCursor();
+        pOLV->GetWindow()->GrabFocus();
+    }
+
     Invalidate( SID_OUTLINE_LEFT );
     Invalidate( SID_OUTLINE_RIGHT );
     Invalidate( SID_OUTLINE_UP );