summaryrefslogtreecommitdiff
path: root/svx
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:28:16 +0100
commit957c3e3d68f3824115162c85040c1a7c0251fc7f (patch)
tree2fa8a47fba121482540e44d9ee5d479dcd33d09f /svx
parentbbcdd7b981e034cfa41937fa0d76dc9a9afb3893 (diff)
Resolves: tdf#92082 crash on closing color bar after redocking it
Change-Id: I015306a37abeaef17830ceab0f39cb2f3a98155c (cherry picked from commit 14aa5c58b8529f81c6ca12a18cbb77f63e27ba62)
Diffstat (limited to 'svx')
-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 54f7260d9af0..37ad939e584a 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -492,14 +492,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 )