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

[Jim Raykowski (via logerrit)]

 sd/source/ui/view/drtxtob1.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 051edbc396f665e84e54ab82de1f683c221925e0
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sun Mar 8 21:47:40 2020 -0800
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Mar 11 15:07:14 2020 +0100

    tdf#131208 Don't try to set cursor focus after style apply
    
    It seems after a style is applied, the outliner view pointer points to
    an OutlinerView that has been removed. This results in a crash when
    trying to access OutlinerView functions to set cursor focus to the
    document. Avoid this by checking if a style has just been applied.
    
    Change-Id: Idda11567506fcc60a830dce70b86e12e2079c7a8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90198
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>
    (cherry picked from commit b39c08773db9bea776001c6ccf043684c2dfe08d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90266
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 5e503630895c7c213bef503cfed69e71e312ff88)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90272
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index f41a6a91a544..3d0367e6b2b9 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -827,7 +827,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
         break;
     }
 
-    if ( pOLV )
+    if ( nSlot != SID_STYLE_APPLY && pOLV )
     {
         pOLV->ShowCursor();
         pOLV->GetWindow()->GrabFocus();