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

[Noel Grandin (via logerrit)]

 vcl/inc/svdata.hxx           |    4 ++--
 vcl/source/window/window.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit af4e865140c9f9d8658e6f174d175e54f8d9bf6c
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Tue Jan 19 19:32:21 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 20 07:44:03 2021 +0100

    OutputDevice->Window for mpFirstWinGraphics
    
    make it obvious what these are pointing to.
    
    Change-Id: Ia617b98ec3914918402d30f894e0d9ab05d79ff7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109651
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index defa97bd5168..a99801218b5d 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -209,8 +209,8 @@ struct ImplSVGDIData
 {
     ~ImplSVGDIData();
 
-    VclPtr<OutputDevice>    mpFirstWinGraphics;             // First OutputDevice with a Frame Graphics
-    VclPtr<OutputDevice>    mpLastWinGraphics;              // Last OutputDevice with a Frame Graphics
+    VclPtr<vcl::Window>     mpFirstWinGraphics;             // First OutputDevice with a Frame Graphics
+    VclPtr<vcl::Window>     mpLastWinGraphics;              // Last OutputDevice with a Frame Graphics
     VclPtr<OutputDevice>    mpFirstVirGraphics;             // First OutputDevice with a VirtualDevice Graphics
     VclPtr<OutputDevice>    mpLastVirGraphics;              // Last OutputDevice with a VirtualDevice Graphics
     VclPtr<OutputDevice>    mpFirstPrnGraphics;             // First OutputDevice with an InfoPrinter Graphics
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 789e31e4034f..6b43b4793c43 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -902,11 +902,11 @@ void Window::ReleaseGraphics( bool bRelease )
     if ( mpPrevGraphics )
         mpPrevGraphics->mpNextGraphics = mpNextGraphics;
     else
-        pSVData->maGDIData.mpFirstWinGraphics = mpNextGraphics;
+        pSVData->maGDIData.mpFirstWinGraphics = static_cast<vcl::Window*>(mpNextGraphics.get());
     if ( mpNextGraphics )
         mpNextGraphics->mpPrevGraphics = mpPrevGraphics;
     else
-        pSVData->maGDIData.mpLastWinGraphics = mpPrevGraphics;
+        pSVData->maGDIData.mpLastWinGraphics = static_cast<vcl::Window*>(mpPrevGraphics.get());
 
     mpGraphics      = nullptr;
     mpPrevGraphics  = nullptr;