Use officecfg instead of SvtTabAppearanceCfg

but we need to keep a small chunk of logic which is used by two
different classes

Change-Id: I57390144eae2ecdb49b5b2ca3f4ce1fbc3d69420
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148884
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 4 insertions, 5 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d2eb5f3e2a9b..5a35b5a745c2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1541,9 +1541,8 @@ int Desktop::Main()
 
     svtools::ApplyFontSubstitutionsToVcl();
 
-    SvtTabAppearanceCfg aAppearanceCfg;
     SvtTabAppearanceCfg::SetInitialized();
-    aAppearanceCfg.SetApplicationDefaults( this );
+    SvtTabAppearanceCfg::SetApplicationDefaults( this );
     SvtAccessibilityOptions aOptions;
     aOptions.SetVCLSettings();
     SetSplashScreenProgress(60);
@@ -1851,8 +1850,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
 
     DragFullOptions nDragFullOptions = hStyleSettings.GetDragFullOptions();
 
-    SvtTabAppearanceCfg aAppearanceCfg;
-    DragMode nDragMode = aAppearanceCfg.GetDragMode();
+    DragMode nDragMode = static_cast<DragMode>(officecfg::Office::Common::View::Window::Drag::get());
     switch ( nDragMode )
     {
     case DragMode::FullWindow:
@@ -1867,7 +1865,8 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
     }
 
     MouseFollowFlags nFollow = hMouseSettings.GetFollow();
-    hMouseSettings.SetFollow( aAppearanceCfg.IsMenuMouseFollow() ? (nFollow|MouseFollowFlags::Menu) : (nFollow&~MouseFollowFlags::Menu));
+    bool bMenuFollowMouse = officecfg::Office::Common::View::Menu::FollowMouse::get();
+    hMouseSettings.SetFollow( bMenuFollowMouse ? (nFollow|MouseFollowFlags::Menu) : (nFollow&~MouseFollowFlags::Menu));
     rSettings.SetMouseSettings(hMouseSettings);
 
     bool bMenuIcons = officecfg::Office::Common::View::Menu::ShowIconsInMenues::get();