summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2020-03-08 21:47:40 -0800
committerXisco FaulĂ­ <xiscofauli@libreoffice.org>2020-03-11 15:11:16 +0100
commitcdc438e60ffb96ca85e9dd7060ba2b68db3821d4 (patch)
treebad69157d2e84d57c2814ade7211d8ea3e22c469 /sd
parenttdf#131088 Automatic Control Focus not working (diff)
downloadcore-cdc438e60ffb96ca85e9dd7060ba2b68db3821d4.tar.gz
core-cdc438e60ffb96ca85e9dd7060ba2b68db3821d4.zip
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@gmail.com> (cherry picked from commit b39c08773db9bea776001c6ccf043684c2dfe08d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90267 Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/drtxtob1.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 01b30cbe35ff..dee90a13098c 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -759,7 +759,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
}
- if ( pOLV )
+ if ( nSlot != SID_STYLE_APPLY && pOLV )
{
pOLV->ShowCursor();
pOLV->GetWindow()->GrabFocus();