diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-24 11:57:23 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-24 12:53:14 +0000 |
commit | 6e0bdf04add338b7d5b29fc7b3fc9f08cfd5e96f (patch) | |
tree | 8743f3db5f57a65e24ce0b0ab21273fe66ea7ab4 /cui/source/options/optgdlg.cxx | |
parent | coverity#737422 Uncaught exception (diff) | |
download | core-6e0bdf04add338b7d5b29fc7b3fc9f08cfd5e96f.tar.gz core-6e0bdf04add338b7d5b29fc7b3fc9f08cfd5e96f.zip |
sal_Bool arg of SetUseImagesInMenus was abused to squeeze '2' through it
which means that icons suddenly reappeared in the menus when the gtk
theme had disabled them
ref e8f8f24c8415898c787bbfb629247ed62e73a2b9
Change-Id: Ia9aef5ca39bda2ddf6d7c4ebc2bddc01d470d09b
Diffstat (limited to 'cui/source/options/optgdlg.cxx')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 47f83734bebc..dc1ebbe552d4 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -752,7 +752,9 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(m_pMenuIconsLB->GetSelectEntryPos() != m_pMenuIconsLB->GetSavedValue()) { - aMenuOpt.SetMenuIconsState( m_pMenuIconsLB->GetSelectEntryPos() == 0 ? 2 : m_pMenuIconsLB->GetSelectEntryPos() - 1); + aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectEntryPos() == 0 ? + TRISTATE_INDET : + static_cast<TriState>(m_pMenuIconsLB->GetSelectEntryPos() - 1)); bModified = sal_True; bMenuOptModified = sal_True; bAppearanceChanged = sal_True; |