summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-08-13 15:39:54 +0300
committerCaolán McNamara <caolanm@redhat.com>2015-08-13 16:29:10 +0000
commitc22d7f440885d4370c583eba3778851194013f2f (patch)
tree8dda966191a3916c0d22a7689ba094db238b86a8 /sc
parent6a223ad5ac390881b54eeed7b39ea181962b1274 (diff)
Another GrabFocus during dispose
Change-Id: I89f8aa5e087e95c96d63695be0ec4e9b4fbe0a0c (cherry picked from commit 4622823a800804acf15c0f4a5adecce03ae65189) Reviewed-on: https://gerrit.libreoffice.org/17706 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/sidebar/CellLineStyleControl.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 309885809b2f..c250b903d350 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -96,14 +96,10 @@ void CellLineStyleControl::Initialize()
void CellLineStyleControl::GetFocus()
{
- if(!mbVSfocus)
- {
+ if (!mbVSfocus && maPushButtonMoreOptions)
maPushButtonMoreOptions->GrabFocus();
- }
- else
- {
+ else if (maCellLineStyleValueSet)
maCellLineStyleValueSet->GrabFocus();
- }
}
void CellLineStyleControl::SetAllNoSel()