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 /include | |
| 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 'include')
| -rw-r--r-- | include/svtools/menuoptions.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/settings.hxx | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 97c950220118..12291879a92a 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -21,6 +21,7 @@ #include <svtools/svtdllapi.h> #include <sal/types.h> +#include <tools/gen.hxx> #include <osl/mutex.hxx> #include <unotools/options.hxx> @@ -87,8 +88,8 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options *//*-*****************************************************************************************************/ sal_Bool IsEntryHidingEnabled() const; - sal_Int16 GetMenuIconsState() const; - void SetMenuIconsState( sal_Int16 bState ); + TriState GetMenuIconsState() const; + void SetMenuIconsState(TriState eState); private: diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 9651d4ddb997..15123c089550 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -338,7 +338,7 @@ private: bool mbHighContrast; bool mbUseSystemUIFonts; sal_uInt16 mnAutoMnemonic; - TriState mnUseImagesInMenus; + TriState meUseImagesInMenus; bool mnUseFlatBorders; bool mbPreferredUseImagesInMenus; long mnMinThumbSize; @@ -648,18 +648,18 @@ public: { CopyData(); mpData->mnUseFlatMenus = bUseFlatMenus; } bool GetUseFlatMenus() const { return mpData->mnUseFlatMenus; } - void SetUseImagesInMenus( bool bUseImagesInMenus ) - { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus ? TRISTATE_TRUE : TRISTATE_FALSE; } + void SetUseImagesInMenus( TriState eUseImagesInMenus ) + { CopyData(); mpData->meUseImagesInMenus = eUseImagesInMenus; } bool GetUseImagesInMenus() const; - void SetPreferredUseImagesInMenus( bool bPreferredUseImagesInMenus ) + void SetPreferredUseImagesInMenus( bool bPreferredUseImagesInMenus ) { CopyData(); mpData->mbPreferredUseImagesInMenus = bPreferredUseImagesInMenus; } - bool GetPreferredUseImagesInMenus() const + bool GetPreferredUseImagesInMenus() const { return mpData->mbPreferredUseImagesInMenus; } - void SetSkipDisabledInMenus( bool bSkipDisabledInMenus ) + void SetSkipDisabledInMenus( bool bSkipDisabledInMenus ) { CopyData(); mpData->mbSkipDisabledInMenus = bSkipDisabledInMenus; } bool GetSkipDisabledInMenus() const { return mpData->mbSkipDisabledInMenus; } - void SetHideDisabledMenuItems( bool bHideDisabledMenuItems ) + void SetHideDisabledMenuItems( bool bHideDisabledMenuItems ) { CopyData(); mpData->mbHideDisabledMenuItems = bHideDisabledMenuItems; } bool GetHideDisabledMenuItems() const { return mpData->mbHideDisabledMenuItems; } |