From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Sep 2014 11:20:40 +0200 Subject: fdo#82577: Handle Window Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a --- svtools/source/inc/unoiface.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svtools/source/inc') diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index af95a045a405..36588b1b65c0 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -124,7 +124,7 @@ public: VCLXFileControl(); virtual ~VCLXFileControl(); - void SetWindow( Window* pWindow ) SAL_OVERRIDE; + void SetWindow( vcl::Window* pWindow ) SAL_OVERRIDE; // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -210,7 +210,7 @@ protected: void NotifyTextListeners(); ::com::sun::star::uno::Any convertEffectiveValue(const ::com::sun::star::uno::Any& rValue); - virtual void SetWindow(Window* _pWindow) SAL_OVERRIDE; + virtual void SetWindow(vcl::Window* _pWindow) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } -- cgit