[Libreoffice-commits] core.git: include/vcl vcl/source

[Maxim Monastirsky]

 include/vcl/settings.hxx    |    1 +
 vcl/source/app/settings.cxx |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 38b051ad4e21127e34ce3865ed4374be0b5cae6d
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Feb 26 18:22:54 2017 +0200

    Restore the GetPreferredContextMenuShortcuts method
    
    Because of a typo in GetContextMenuShortcuts
    it was actually unused and removed later in
    7419057e3ec4365748fa6456e207f40fd9e09c62
    ("loplugin:unusedmethods in chart2..svx").
    
    Change-Id: Iab3d8e39ef19e7c6dd7df63db5d2dcfc57007a5f

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 53bb153..ef18359 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -431,6 +431,7 @@ public:
     bool                            GetContextMenuShortcuts() const;
 
     void                            SetPreferredContextMenuShortcuts( bool bContextMenuShortcuts );
+    bool                            GetPreferredContextMenuShortcuts() const;
 
     void                            SetPrimaryButtonWarpsSlider( bool bPrimaryButtonWarpsSlider );
     bool                            GetPrimaryButtonWarpsSlider() const;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 3222dcf..69971b5 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1527,7 +1527,7 @@ StyleSettings::GetContextMenuShortcuts() const
     case TRISTATE_TRUE:
         return true;
     default: // TRISTATE_INDET:
-        return GetPreferredUseImagesInMenus();
+        return GetPreferredContextMenuShortcuts();
     }
 }
 
@@ -1538,6 +1538,12 @@ StyleSettings::SetPreferredContextMenuShortcuts( bool bContextMenuShortcuts )
     mxData->mbPreferredContextMenuShortcuts = bContextMenuShortcuts;
 }
 
+bool
+StyleSettings::GetPreferredContextMenuShortcuts() const
+{
+    return mxData->mbPreferredContextMenuShortcuts;
+}
+
 void
 StyleSettings::SetPrimaryButtonWarpsSlider( bool bPrimaryButtonWarpsSlider )
 {