summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/colrctrl.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-06-15 16:26:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-06-15 16:27:28 +0100
commit14aa5c58b8529f81c6ca12a18cbb77f63e27ba62 (patch)
tree117e94bdb89615709a742ae005992b8ddfd4624a /svx/source/tbxctrls/colrctrl.cxx
parent1c3eb9550dd0cb77e1f99c110d4e6626a00ba285 (diff)
Resolves: tdf#92082 crash on closing color bar after redocking it
Change-Id: I015306a37abeaef17830ceab0f39cb2f3a98155c
Diffstat (limited to 'svx/source/tbxctrls/colrctrl.cxx')
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index dbd7f2f3e103..4c6217c865f6 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -487,14 +487,15 @@ void SvxColorDockingWindow::Resize()
SfxDockingWindow::Resize();
}
-
-
void SvxColorDockingWindow::GetFocus()
{
SfxDockingWindow::GetFocus();
- // Grab the focus to the color value set so that it can be controlled
- // with the keyboard.
- aColorSet->GrabFocus();
+ if (aColorSet)
+ {
+ // Grab the focus to the color value set so that it can be controlled
+ // with the keyboard.
+ aColorSet->GrabFocus();
+ }
}
bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )