[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

[Julien Nabet]

 svx/source/gallery2/GalleryControl.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c37448c13c343d96a5902d3746203573faafa731
Author: Julien Nabet <serval2412 at 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)
    
    Cherry-picked from 9be6c22ebc225db4d1be7bb0100a2407e9a8eb0c
    
    Change-Id: Ia5481430791d9ab73e63d49a0ef0d5e0a6016605
    Reviewed-on: https://gerrit.libreoffice.org/15885
    Reviewed-by: Joren De Cuyper <jorendc at libreoffice.org>
    Tested-by: Joren De Cuyper <jorendc at libreoffice.org>

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()