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

[Michael Meeks]

 sd/source/ui/framework/factories/FullScreenPane.cxx |    7 +++----
 sd/source/ui/presenter/PresenterHelper.cxx          |    6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 7079f691a31caffff380610b3c77a2faa0bcf0b3
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Jul 7 22:35:46 2015 +0100

    tdf#91574 - fix slideshow presenter console lifecycle.
    
    Change-Id: I9748579fed8fd4dcf505bc79e48e40c1255bd22e
    Reviewed-on: https://gerrit.libreoffice.org/16836
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 746be66..b1540bc 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -42,8 +42,7 @@ FullScreenPane::FullScreenPane (
     const Reference<XResourceId>& rxPaneId,
     const vcl::Window* pViewShellWindow)
     : FrameWindowPane(rxPaneId,NULL),
-      mxComponentContext(rxComponentContext),
-      mpWorkWindow(NULL)
+      mxComponentContext(rxComponentContext)
 {
     vcl::Window* pParent = NULL;
     mpWorkWindow.reset(VclPtr<WorkWindow>::Create(
@@ -110,7 +109,7 @@ void SAL_CALL FullScreenPane::disposing()
     {
         Link<> aWindowEventHandler (LINK(this, FullScreenPane, WindowEventHandler));
         mpWorkWindow->RemoveEventListener(aWindowEventHandler);
-        mpWorkWindow.reset();
+        mpWorkWindow.disposeAndClear();
     }
 
     FrameWindowPane::disposing();
@@ -186,7 +185,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent)
             break;
 
         case VCLEVENT_OBJECT_DYING:
-            mpWorkWindow.reset();
+            mpWorkWindow.disposeAndClear();
             break;
     }
     return 1;
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 60b7bcb..8b99c0b 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -73,10 +73,10 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow (
     sal_Bool bEnableParentClip)
     throw (css::uno::RuntimeException, std::exception)
 {
-    vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow);
+    VclPtr<vcl::Window> pParentWindow(VCLUnoHelper::GetWindow(rxParentWindow));
 
     // Create a new window.
-    vcl::Window* pWindow = NULL;
+    VclPtr<vcl::Window> pWindow;
     if (bCreateSystemChildWindow)
     {
         pWindow = VclPtr<WorkWindow>::Create(pParentWindow, WB_SYSTEMCHILDWINDOW);
@@ -91,7 +91,7 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow (
     {
         // Make the frame window transparent and make the parent able to
         // draw behind it.
-        if (pParentWindow != NULL)
+        if (pParentWindow.get() != NULL)
             pParentWindow->EnableChildTransparentMode(true);
     }