diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/svtools/ehdl.hxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'include/svtools/ehdl.hxx')
| -rw-r--r-- | include/svtools/ehdl.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index d5038c7bd590..991e9e8033fd 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -26,17 +26,17 @@ #include <tools/errinf.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext { public: SfxErrorContext( - sal_uInt16 nCtxIdP, Window *pWin=0, + sal_uInt16 nCtxIdP, vcl::Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); SfxErrorContext( - sal_uInt16 nCtxIdP, const OUString &aArg1, Window *pWin=0, + sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); bool GetString(sal_uLong nErrId, OUString &rStr) SAL_OVERRIDE; |