diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
commit | 6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch) | |
tree | d00d2024213e09b8eba4704b8b6660eb42c3921c /accessibility/source/standard/accessiblemenuitemcomponent.cxx | |
parent | 7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff) | |
parent | eee3dbc7af039669d447d2e55abd896ea3383df1 (diff) |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
automation/source/communi/communi.cxx
automation/source/server/recorder.cxx
automation/source/server/server.cxx
basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'accessibility/source/standard/accessiblemenuitemcomponent.cxx')
-rw-r--r-- | accessibility/source/standard/accessiblemenuitemcomponent.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 0b34e2efa800..2348198a7a1e 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -158,7 +158,7 @@ void OAccessibleMenuItemComponent::Click() // that the popup menus are executed synchronously. AllSettings aSettings = pWindow->GetSettings(); MouseSettings aMouseSettings = aSettings.GetMouseSettings(); - ULONG nDelay = aMouseSettings.GetMenuDelay(); + sal_uLong nDelay = aMouseSettings.GetMenuDelay(); aMouseSettings.SetMenuDelay( 0 ); aSettings.SetMouseSettings( aMouseSettings ); pWindow->SetSettings( aSettings ); |