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

[Jan Holesovsky]

 vcl/source/window/window2.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit f8d738134d1cbbee775d68b33755239d750b5825
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu May 28 16:39:48 2015 +0200

    vcl: Do nothing when we don't have mpWindowImpl.
    
    Avoids a crash in Impress search.
    
    Change-Id: I07106e0185a1fe4cfa09a6783396c0d48b028f10

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 1e70a62..b8d822f 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1723,6 +1723,8 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
 
 void Window::set_height_request(sal_Int32 nHeightRequest)
 {
+    if (!mpWindowImpl)
+        return;
 
     WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
 
@@ -1735,6 +1737,8 @@ void Window::set_height_request(sal_Int32 nHeightRequest)
 
 void Window::set_width_request(sal_Int32 nWidthRequest)
 {
+    if (!mpWindowImpl)
+        return;
 
     WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;