svx/source/tbxctrls/colrctrl.cxx | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 14aa5c58b8529f81c6ca12a18cbb77f63e27ba62
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 15 16:26:59 2015 +0100
Resolves: tdf#92082 crash on closing color bar after redocking it
Change-Id: I015306a37abeaef17830ceab0f39cb2f3a98155c
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index dbd7f2f..4c6217c 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
