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 /vcl/source/window/menuitemlist.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 'vcl/source/window/menuitemlist.cxx')
| -rw-r--r-- | vcl/source/window/menuitemlist.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index 4fe0a0a23922..6699259e830f 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -198,7 +198,7 @@ MenuItemData* MenuItemList::SearchItem( { KeyCode mnKeyCode; sal_Unicode mnUnicode = pData->aText[n+1]; - Window* pDefWindow = ImplGetDefaultWindow(); + vcl::Window* pDefWindow = ImplGetDefaultWindow(); if( ( pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode, Application::GetSettings().GetUILanguageTag().getLanguageType(), mnKeyCode ) @@ -259,7 +259,7 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const KeyCode mnKeyCode; // if MapUnicodeToKeyCode fails or is unsupported we try the pure ascii mapping of the keycodes // so we have working shortcuts when ascii mnemonics are used - Window* pDefWindow = ImplGetDefaultWindow(); + vcl::Window* pDefWindow = ImplGetDefaultWindow(); if( ( pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( pData->aText[n+1], Application::GetSettings().GetUILanguageTag().getLanguageType(), mnKeyCode ) |