summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-20 14:46:54 +0200
committerJan Holesovsky <kendy@collabora.com>2015-05-29 20:16:52 +0200
commit50726ceac9916caf8df0c51eecb17a01b036d970 (patch)
tree68b8268810001b3843cb24c0fbff0d9c44434d4e /desktop
parent118da1a52a74c602ecacec9ffb163b93589cf6e1 (diff)
convert constants in include/vcl/settings.hxx to scoped enums
Change-Id: I2a110c017f13eca6ddbd70ef3ed195d24adef0a3 Reviewed-on: https://gerrit.libreoffice.org/15828 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com> Signed-off-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8a86c5416ccc..504275222dd4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1836,25 +1836,25 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
StyleSettings hStyleSettings = rSettings.GetStyleSettings();
MouseSettings hMouseSettings = rSettings.GetMouseSettings();
- sal_uLong nDragFullOptions = hStyleSettings.GetDragFullOptions();
+ DragFullOptions nDragFullOptions = hStyleSettings.GetDragFullOptions();
SvtTabAppearanceCfg aAppearanceCfg;
sal_uInt16 nDragMode = aAppearanceCfg.GetDragMode();
switch ( nDragMode )
{
case DragFullWindow:
- nDragFullOptions |= DRAGFULL_OPTION_ALL;
+ nDragFullOptions |= DragFullOptions::All;
break;
case DragFrame:
- nDragFullOptions &= ~DRAGFULL_OPTION_ALL;
+ nDragFullOptions &= ~DragFullOptions::All;
break;
case DragSystemDep:
default:
break;
}
- sal_uInt32 nFollow = hMouseSettings.GetFollow();
- hMouseSettings.SetFollow( aAppearanceCfg.IsMenuMouseFollow() ? (nFollow|MOUSE_FOLLOW_MENU) : (nFollow&~MOUSE_FOLLOW_MENU));
+ MouseFollowFlags nFollow = hMouseSettings.GetFollow();
+ hMouseSettings.SetFollow( aAppearanceCfg.IsMenuMouseFollow() ? (nFollow|MouseFollowFlags::Menu) : (nFollow&~MouseFollowFlags::Menu));
rSettings.SetMouseSettings(hMouseSettings);
SvtMenuOptions aMenuOpt;