summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2020-03-08 21:47:40 -0800
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2020-03-11 15:07:14 +0100
commit051edbc396f665e84e54ab82de1f683c221925e0 (patch)
tree022cc34ff0bf3449f950206df81d8b180e2a3506
parentd4104042dac31fc3f6a99dbe1d7d910a52ebd7bb (diff)
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/+/90266 Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org> (cherry picked from commit 5e503630895c7c213bef503cfed69e71e312ff88) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90272 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-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 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();