commit 5252a1d81eb69d3de443d2988367359c9174e36d
author Michael Meeks <michael.meeks@collabora.com> Thu Apr 16 21:59:00 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 16 21:59:00 2015 +0100
tree 06c5ebd5fda984797af855e0845cb75e8d9994f5
parent 4a33504d31a24fead3191b9aa6602bde86ef3d17

tools: leave ErrorContext with a vcl::Window * for now.

Change-Id: I83bd24b9dfcd446969fc0ef657d81dd787c8ba2a

tools/source/ref/errinf.cxx

diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 688cd93..d97c91d 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -186,12 +186,11 @@ static void aDspFunc(const OUString &rErr, const OUString &rAction)
    OSL_FAIL(aErr.getStr());
}

// FIXME: this is a truly horrible reverse dependency on VCL
#include <vcl/window.hxx>
// FIXME: this is a horrible reverse dependency on VCL
struct ErrorContextImpl
{
    ErrorContext*       pNext;
    VclPtr<vcl::Window> pWin;
    ErrorContext *pNext;
    vcl::Window  *pWin; // should be VclPtr for strong lifecyle
};

ErrorContext::ErrorContext(vcl::Window *pWinP)
@@ -242,7 +241,7 @@ ErrorHandler::~ErrorHandler()

vcl::Window* ErrorContext::GetParent()
{
    return pImpl ? pImpl->pWin.get() : NULL;
    return pImpl ? pImpl->pWin : NULL;
}

void ErrorHandler::RegisterDisplay(WindowDisplayErrorFunc *aDsp)