svx/source/gallery2/GalleryControl.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit 9be6c22ebc225db4d1be7bb0100a2407e9a8eb0c Author: Julien Nabet <serval2...@yahoo.fr> Date: Sun May 24 16:18:32 2015 +0200 tdf#91534: Writer crash using Gallery icon in sidebar test mpBrowser1 if not NULL + reorder the disposeAndClear calls (must be reverse order compared to the order of Create calls) Change-Id: Ia5481430791d9ab73e63d49a0ef0d5e0a6016605 diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index 6f87d31..66440e7 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -74,9 +74,9 @@ GalleryControl::~GalleryControl() void GalleryControl::dispose() { - mpSplitter.disposeAndClear(); - mpBrowser1.disposeAndClear(); mpBrowser2.disposeAndClear(); + mpBrowser1.disposeAndClear(); + mpSplitter.disposeAndClear(); vcl::Window::dispose(); } @@ -217,7 +217,8 @@ bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* ) void GalleryControl::GetFocus() { Window::GetFocus(); - mpBrowser1->GrabFocus(); + if (mpBrowser1) + mpBrowser1->GrabFocus(); } void GalleryControl::ThemeSelectionHasChanged() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits