desktop/source/app/app.cxx | 8 ++++---- include/svtools/apearcfg.hxx | 14 -------------- svtools/source/config/apearcfg.cxx | 8 ++++---- 3 files changed, 8 insertions(+), 22 deletions(-)
New commits: commit ea0e9c0d4de19ac3f8fdfe91bdb085ad9e2b1757 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Jul 5 14:22:20 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Jul 5 18:55:23 2023 +0200 these enums are unnecessary Change-Id: I29bf28202e11db836764276f773b134356d93e0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154057 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c0b30c2ae2fd..e4058bfe8932 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1827,16 +1827,16 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings ) DragFullOptions nDragFullOptions = hStyleSettings.GetDragFullOptions(); - DragMode nDragMode = static_cast<DragMode>(officecfg::Office::Common::View::Window::Drag::get()); + sal_uInt16 nDragMode = officecfg::Office::Common::View::Window::Drag::get(); switch ( nDragMode ) { - case DragMode::FullWindow: + case 0: //FullWindow: nDragFullOptions |= DragFullOptions::All; break; - case DragMode::Frame: + case 1: // Frame: nDragFullOptions &= ~DragFullOptions::All; break; - case DragMode::SystemDep: + case 2: // SystemDep default: break; } diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index 85a521862ba7..fe2bc61df7de 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.hxx @@ -21,20 +21,6 @@ #include <svtools/svtdllapi.h> class Application; -enum class MouseMiddleButtonAction; - -enum class SnapType { - ToButton = 0, - ToMiddle, - NONE -}; - -enum class DragMode { - FullWindow, - Frame, - SystemDep -}; - namespace SvtTabAppearanceCfg { diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index fec538b62a71..4e8a0215043b 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -64,16 +64,16 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp ) nMouseOptions &= ~ MouseSettingsOptions(MouseSettingsOptions::AutoCenterPos | MouseSettingsOptions::AutoDefBtnPos); - SnapType nSnapMode = static_cast<SnapType>(officecfg::Office::Common::View::Dialog::MousePositioning::get()); + sal_uInt16 nSnapMode = officecfg::Office::Common::View::Dialog::MousePositioning::get(); switch ( nSnapMode ) { - case SnapType::ToButton: + case 0: // ToButton nMouseOptions |= MouseSettingsOptions::AutoDefBtnPos; break; - case SnapType::ToMiddle: + case 1: // ToMiddle nMouseOptions |= MouseSettingsOptions::AutoCenterPos; break; - case SnapType::NONE: + case 2: // NONE default: break; }