Skip to content

C
core
Kaydet (Commit) 5252a1d8 authored tarafından Michael Meeks's avatar Michael Meeks
Dosyalara gözat
Seçenekler

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

Change-Id: I83bd24b9dfcd446969fc0ef657d81dd787c8ba2a
üst 4a33504d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
tools/source/ref/errinf.cxx
Dosyayı görüntüle @ 5252a1d8
...@@ -186,12 +186,11 @@ static void aDspFunc(const OUString &rErr, const OUString &rAction) ...@@ -186,12 +186,11 @@ static void aDspFunc(const OUString &rErr, const OUString &rAction)
OSL_FAIL(aErr.getStr()); OSL_FAIL(aErr.getStr());
} }
// FIXME: this is a truly horrible reverse dependency on VCL // FIXME: this is a horrible reverse dependency on VCL
#include <vcl/window.hxx>
struct ErrorContextImpl struct ErrorContextImpl
{ {
ErrorContext* pNext; ErrorContext *pNext;
VclPtr<vcl::Window> pWin; vcl::Window *pWin; // should be VclPtr for strong lifecyle
}; };
ErrorContext::ErrorContext(vcl::Window *pWinP) ErrorContext::ErrorContext(vcl::Window *pWinP)
...@@ -242,7 +241,7 @@ ErrorHandler::~ErrorHandler() ...@@ -242,7 +241,7 @@ ErrorHandler::~ErrorHandler()
vcl::Window* ErrorContext::GetParent() vcl::Window* ErrorContext::GetParent()
{ {
return pImpl ? pImpl->pWin.get() : NULL; return pImpl ? pImpl->pWin : NULL;
} }
void ErrorHandler::RegisterDisplay(WindowDisplayErrorFunc *aDsp) 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