diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-20 14:46:54 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-05-29 20:16:52 +0200 |
| commit | 50726ceac9916caf8df0c51eecb17a01b036d970 (patch) | |
| tree | 68b8268810001b3843cb24c0fbff0d9c44434d4e /cui | |
| parent | 118da1a52a74c602ecacec9ffb163b93589cf6e1 (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 'cui')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index fa0bb0e98676..893ab5338d86 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -826,14 +826,14 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) } // Middle Mouse Button - short eOldMiddleMouse = pAppearanceCfg->GetMiddleMouseButton(); + MouseMiddleButtonAction eOldMiddleMouse = pAppearanceCfg->GetMiddleMouseButton(); short eNewMiddleMouse = m_pMouseMiddleLB->GetSelectEntryPos(); if(eNewMiddleMouse > 2) eNewMiddleMouse = 2; - if ( eNewMiddleMouse != eOldMiddleMouse ) + if ( eNewMiddleMouse != static_cast<short>(eOldMiddleMouse) ) { - pAppearanceCfg->SetMiddleMouseButton( eNewMiddleMouse ); + pAppearanceCfg->SetMiddleMouseButton( static_cast<MouseMiddleButtonAction>(eNewMiddleMouse) ); bAppearanceChanged = true; } @@ -982,7 +982,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) m_pMousePosLB->SaveValue(); // Mouse Snap - m_pMouseMiddleLB->SelectEntryPos(pAppearanceCfg->GetMiddleMouseButton()); + m_pMouseMiddleLB->SelectEntryPos(static_cast<short>(pAppearanceCfg->GetMiddleMouseButton())); m_pMouseMiddleLB->SaveValue(); #if defined( UNX ) |