[Libreoffice-commits] core.git: vcl/source

Caolán McNamara caolanm at redhat.com
Fri Jun 3 20:09:51 UTC 2016


 vcl/source/window/brdwin.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a779d979b9dd87589f00cfcb245f70c6b26d8c2c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 3 21:08:45 2016 +0100

    accidentially reverted fix for tdf#96745
    
    Change-Id: I52380248002f6c41f0c6f154f913b05ef32b93d3

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index dd8a8ae..28583f5 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -957,9 +957,9 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
                 {
                     // dispatch to correct window type (why is Close() not virtual ??? )
                     // TODO: make Close() virtual
-                    vcl::Window *pWin = pBorderWindow->ImplGetClientWindow()->ImplGetWindow();
-                    SystemWindow  *pSysWin  = dynamic_cast<SystemWindow* >(pWin);
-                    DockingWindow *pDockWin = dynamic_cast<DockingWindow*>(pWin);
+                    VclPtr<vcl::Window> pWin = pBorderWindow->ImplGetClientWindow()->ImplGetWindow();
+                    SystemWindow  *pSysWin  = dynamic_cast<SystemWindow* >(pWin.get());
+                    DockingWindow *pDockWin = dynamic_cast<DockingWindow*>(pWin.get());
                     if ( pSysWin )
                         pSysWin->Close();
                     else if ( pDockWin )


More information about the Libreoffice-commits mailing list