vcl/workben/vcldemo.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 24703d7a98768cbb976b59455dd75f20c380b89c
Author: Michael Meeks <michael.me...@collabora.com>
Date: Wed Sep 2 23:12:40 2015 +0100
Resolve merge failure: an OutputDevice parameter not WorkWindow.
Change-Id: I366fcab22550f5d386af7ed3be0ad25456317b7d
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 043c062..b6c96e2 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1660,7 +1660,7 @@ class OpenGLTests
OpenGLContext *mpA;
OpenGLContext *mpB;
- static OpenGLSalGraphicsImpl *getImpl(const VclPtr<WorkWindow> &xOut)
+ static OpenGLSalGraphicsImpl *getImpl(const VclPtr<OutputDevice> &xOut)
{
SalGraphics *pGraphics = xOut->GetGraphics();
return dynamic_cast<OpenGLSalGraphicsImpl *>(pGraphics->GetImpl());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
