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/vcl/stdtext.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/vcl/stdtext.hxx')
| -rw-r--r-- | include/vcl/stdtext.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index cfd865c748c0..205b008a8b2d 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } #define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE #define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) @@ -31,7 +31,7 @@ class Window; OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText); -void VCL_DLLPUBLIC ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError); +void VCL_DLLPUBLIC ShowServiceNotAvailableError(vcl::Window* pParent, const OUString& rServiceName, bool bError); #endif // INCLUDED_VCL_STDTEXT_HXX |