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 /dbaccess/source/ui/querydesign/limitboxcontroller.cxx | |
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 'dbaccess/source/ui/querydesign/limitboxcontroller.cxx')
-rw-r--r-- | dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 4978043ef2ff..ed2768b958bc 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -32,7 +32,7 @@ namespace dbaui class LimitBoxImpl: public LimitBox { public: - LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl ); + LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ); virtual ~LimitBoxImpl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -41,7 +41,7 @@ class LimitBoxImpl: public LimitBox LimitBoxController* m_pControl; }; -LimitBoxImpl::LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl ) +LimitBoxImpl::LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ) : LimitBox( pParent, WinBits( WB_DROPDOWN | WB_VSCROLL) ) , m_pControl( pCtrl ) { @@ -199,7 +199,7 @@ uno::Reference< awt::XWindow > SAL_CALL LimitBoxController::createItemWindow( uno::Reference< awt::XWindow > xItemWindow; uno::Reference< awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { SolarMutexGuard aSolarMutexGuard; |