From 90a3ecb8aa0a2c07d7c3b0a2c64bca502e12bf0f Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 16 Sep 2015 09:17:37 +0100 Subject: GL paint-flushing guard re-work. Unfortunately, since we can have 2x SalGraphics' on a OutputDevice, and one of these can be a printer - things got very confused around which context to glFlush. This de-tangles the various reference-counts. Conflicts: vcl/inc/generic/genpspgraphics.h vcl/win/source/gdi/salgdi.cxx Change-Id: I1062be0b02a91fc9009deaa3ec29c5dbb227df20 Reviewed-on: https://gerrit.libreoffice.org/18611 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- vcl/win/source/gdi/salgdi.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'vcl/win/source/gdi/salgdi.cxx') diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 99cebeee5fbf..3ed0c073c05c 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -1210,14 +1210,9 @@ css::uno::Any WinSalGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rS return css::uno::Any( args ); } -void WinSalGraphics::BeginPaint() +OpenGLContext *WinSalGraphics::BeginPaint() { return mpImpl->beginPaint(); } -void WinSalGraphics::EndPaint() -{ - return mpImpl->endPaint(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit