Kaydet (Commit) 9be6c22e authored tarafından Julien Nabet's avatar Julien Nabet

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
üst 891304bb
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment