commit 24703d7a98768cbb976b59455dd75f20c380b89c
author Michael Meeks <michael.meeks@collabora.com> Wed Sep 02 23:12:40 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Wed Sep 02 23:13:46 2015 +0100
tree 0254858f0b294ee67e21a99199c1d64b54e46e7a
parent ebcde8e4e17584665414bd89ebf6d81a43ac823b

Resolve merge failure: an OutputDevice parameter not WorkWindow.

Change-Id: I366fcab22550f5d386af7ed3be0ad25456317b7d

vcl/workben/vcldemo.cxx

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());