Kaydet (Commit) 5252a1d8 authored tarafından Michael Meeks's avatar Michael Meeks

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

Change-Id: I83bd24b9dfcd446969fc0ef657d81dd787c8ba2a
üst 4a33504d
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment