commit e33d74ff2ef2493b9de558b033c2d05b6ce97069
author Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 19:16:08 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 19:33:34 2015 +0100
tree 93c2a06f55fbda5f5050f71e3554f233430f44bd
parent ece63f8914367a16fda83a32986bd4a5e4270f2d

Make ErrorContext includers happier.

Unclear that it's a great plan to have a circular tools <-> vcl
dependency like this, but it pre-dates history apparently.

Change-Id: I7a666dbde9ec7cc29a4e260e2012cca4a26b0b29

include/tools/errinf.hxx

diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index ae6e140..4a9f07a 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -27,11 +27,12 @@
#include <tools/rtti.hxx>
#include <tools/errcode.hxx>
#include <tools/toolsdllapi.h>
#include <vcl/vclptr.hxx>

// FIXME: horrible legacy dependency on VCL from tools.
namespace vcl { class Window; }

class EDcr_Impl;
class ErrHdl_Impl;
namespace vcl { class Window; }

class ErrorInfo
{
@@ -116,20 +117,20 @@ private:
    OUString           aArg;
};

struct ErrorContextImpl;
class TOOLS_DLLPUBLIC ErrorContext
{
    friend class ErrorHandler;

private:
    ErrorContext*           pNext;
    VclPtr<vcl::Window>     pWin;
    ErrorContextImpl *pImpl;

public:
                            ErrorContext(vcl::Window *pWin=0);
    virtual                 ~ErrorContext();

    virtual bool            GetString( sal_uIntPtr nErrId, OUString& rCtxStr ) = 0;
    vcl::Window*            GetParent() { return pWin; }
    vcl::Window*            GetParent();

    static ErrorContext*    GetContext();
};

tools/source/ref/errinf.cxx

diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index babe0ac..688cd93 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -186,22 +186,32 @@ 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>
struct ErrorContextImpl
{
    ErrorContext*       pNext;
    VclPtr<vcl::Window> pWin;
};

ErrorContext::ErrorContext(vcl::Window *pWinP)
{
    pImpl = new ErrorContextImpl();
    EDcrData *pData=EDcrData::GetData();
    ErrorContext *&pHdl=pData->pFirstCtx;
    pWin=pWinP;
    pNext=pHdl;
    pHdl=this;
    ErrorContext *&pHdl = pData->pFirstCtx;
    pImpl->pWin = pWinP;
    pImpl->pNext = pHdl;
    pHdl = this;
}

ErrorContext::~ErrorContext()
{
    ErrorContext **ppCtx=&(EDcrData::GetData()->pFirstCtx);
    while(*ppCtx && *ppCtx!=this)
        ppCtx=&((*ppCtx)->pNext);
        ppCtx=&((*ppCtx)->pImpl->pNext);
    if(*ppCtx)
        *ppCtx=(*ppCtx)->pNext;
        *ppCtx=(*ppCtx)->pImpl->pNext;
    delete pImpl;
}

ErrorContext *ErrorContext::GetContext()
@@ -230,6 +240,11 @@ ErrorHandler::~ErrorHandler()
    delete pImpl;
}

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

void ErrorHandler::RegisterDisplay(WindowDisplayErrorFunc *aDsp)
{
    EDcrData *pData=EDcrData::GetData();
@@ -276,7 +291,7 @@ sal_uInt16 ErrorHandler::HandleError_Impl(
        pCtx->GetString(pInfo->GetErrorCode(), aAction);
    vcl::Window *pParent=0;
    // Remove parent from context
    for(;pCtx;pCtx=pCtx->pNext)
    for(;pCtx;pCtx=pCtx->pImpl->pNext)
        if(pCtx->GetParent())
        {
            pParent=pCtx->GetParent();