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 /svx/source/tbxctrls/tbunocontroller.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 'svx/source/tbxctrls/tbunocontroller.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 981db9a86a00..8960b3b5e6f3 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -86,7 +86,7 @@ class FontHeightToolBoxControl : public svt::ToolboxController, class SvxFontSizeBox_Impl : public FontSizeBox { public: - SvxFontSizeBox_Impl( Window* pParent, + SvxFontSizeBox_Impl( vcl::Window* pParent, const uno::Reference< frame::XDispatchProvider >& rDispatchProvider, const uno::Reference< frame::XFrame >& _xFrame, FontHeightToolBoxControl& rCtrl ); @@ -114,7 +114,7 @@ private: }; SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( - Window* _pParent, + vcl::Window* _pParent, const uno::Reference< frame::XDispatchProvider >& _rDispatchProvider, const uno::Reference< frame::XFrame >& _xFrame, FontHeightToolBoxControl& _rCtrl ) : @@ -249,7 +249,7 @@ bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) } else if( EVENT_LOSEFOCUS == rNEvt.GetType() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if(!HasFocus() && GetSubEdit() != pFocusWin) SetText(GetSavedValue()); } @@ -405,7 +405,7 @@ uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWind 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; |