vcl/inc/svdata.hxx | 4 ++--
vcl/source/gdi/print.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 326b420b8a31e4c3db49ca7e437829bde10e1fa4
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Jan 19 19:41:20 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jan 20 08:13:29 2021 +0100
OutputDevice*->Printer* for mpFirstPrnGraphics
make it obvious what these are pointing to.
Change-Id: I034697d33c24cc0c618c380f76d366369381df1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109652
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a99801218b5d..822b15b378ee 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -213,8 +213,8 @@ struct ImplSVGDIData
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
- VclPtr<OutputDevice> mpLastPrnGraphics; // Last
OutputDevice with an InfoPrinter Graphics
+ VclPtr<Printer> mpFirstPrnGraphics; // First
OutputDevice with an InfoPrinter Graphics
+ VclPtr<Printer> mpLastPrnGraphics; // Last
OutputDevice with an InfoPrinter Graphics
VclPtr<VirtualDevice> mpFirstVirDev; // First
VirtualDevice
OpenGLContext* mpLastContext = nullptr; // Last
OpenGLContext
VclPtr<Printer> mpFirstPrinter; // First Printer
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 267d23ad626b..41548a91c60c 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -695,11 +695,11 @@ void Printer::ReleaseGraphics( bool bRelease )
if ( mpPrevGraphics )
mpPrevGraphics->mpNextGraphics = mpNextGraphics;
else
- pSVData->maGDIData.mpFirstPrnGraphics = mpNextGraphics;
+ pSVData->maGDIData.mpFirstPrnGraphics =
static_cast<Printer*>(mpNextGraphics.get());
if ( mpNextGraphics )
mpNextGraphics->mpPrevGraphics = mpPrevGraphics;
else
- pSVData->maGDIData.mpLastPrnGraphics = mpPrevGraphics;
+ pSVData->maGDIData.mpLastPrnGraphics =
static_cast<Printer*>(mpPrevGraphics.get());
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
