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

1 files changed, 6 insertions, 5 deletions

diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index ae6e14015e9c..4a9f07a69d62 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();
 };