diff options
Diffstat (limited to 'cui/source/options/optgdlg.cxx')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 0371321bc041..4c59db28ebe3 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -630,6 +630,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pAAPointLimitLabel, "aafrom"); get(m_pAAPointLimit, "aanf"); get(m_pMenuIconsLB, "menuicons"); + get(m_pContextMenuShortcutsLB, "contextmenushortcuts"); get(m_pFontShowCB, "showfontpreview"); get(m_pUseHardwareAccell, "useaccel"); get(m_pUseAntiAliase, "useaa"); @@ -711,6 +712,7 @@ void OfaViewTabPage::dispose() m_pAAPointLimitLabel.clear(); m_pAAPointLimit.clear(); m_pMenuIconsLB.clear(); + m_pContextMenuShortcutsLB.clear(); m_pFontShowCB.clear(); m_pUseHardwareAccell.clear(); m_pUseAntiAliase.clear(); @@ -867,6 +869,16 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) bAppearanceChanged = true; } + if(m_pContextMenuShortcutsLB->IsValueChangedFromSaved()) + { + aMenuOpt.SetContextMenuShortcuts(m_pContextMenuShortcutsLB->GetSelectEntryPos() == 0 ? + TRISTATE_INDET : + static_cast<TriState>(m_pContextMenuShortcutsLB->GetSelectEntryPos() - 1)); + bModified = true; + bMenuOptModified = true; + bAppearanceChanged = true; + } + // #i95644# if disabled, do not use value, see in ::Reset() if(m_pUseHardwareAccell->IsEnabled()) { @@ -994,6 +1006,11 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) m_pMenuIconsLB->SelectEntryPos(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1); m_pMenuIconsLB->SaveValue(); + TriState eContextMenuShortcuts = aMenuOpt.GetContextMenuShortcuts(); + bool bContextMenuShortcutsNonDefault = eContextMenuShortcuts == TRISTATE_FALSE || eContextMenuShortcuts == TRISTATE_TRUE; + m_pContextMenuShortcutsLB->SelectEntryPos(bContextMenuShortcutsNonDefault ? eContextMenuShortcuts + 1 : 0); + m_pContextMenuShortcutsLB->SaveValue(); + { // #i95644# HW accel (unified to disable mechanism) if(pCanvasSettings->IsHardwareAccelerationAvailable()) { |