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 /framework/source/uielement/dropdownboxtoolbarcontroller.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 'framework/source/uielement/dropdownboxtoolbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index dc64b4a77020..87bc1d53eb56 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -52,7 +52,7 @@ namespace framework class ListBoxControl : public ListBox { public: - ListBoxControl( Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ); + ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ); virtual ~ListBoxControl(); virtual void Select() SAL_OVERRIDE; @@ -65,7 +65,7 @@ class ListBoxControl : public ListBox IListBoxListener* m_pListBoxListener; }; -ListBoxControl::ListBoxControl( Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ) : +ListBoxControl::ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ) : ListBox( pParent, nStyle ) , m_pListBoxListener( pListBoxListener ) { @@ -172,7 +172,7 @@ void DropdownToolbarController::Select() { if ( m_pListBoxControl->GetEntryCount() > 0 ) { - Window::PointerState aState = m_pListBoxControl->GetPointerState(); + vcl::Window::PointerState aState = m_pListBoxControl->GetPointerState(); sal_uInt16 nKeyModifier = sal_uInt16( aState.mnState & KEY_MODTYPE ); execute( nKeyModifier ); |