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 /vcl/source/app/settings.cxx | |
| parent | a8fad94ef2f3a1e30518d1f8c1f7712b5fa67ae6 (diff) | |
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 'vcl/source/app/settings.cxx')
| -rw-r--r-- | vcl/source/app/settings.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index dd2fe1aeffd6..727b5d61b6f4 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -207,7 +207,7 @@ ImplStyleData::ImplStyleData() : mnOptions = 0; mnAutoMnemonic = 1; mnToolbarIconSize = STYLE_TOOLBAR_ICONSIZE_UNKNOWN; - mnUseImagesInMenus = TRISTATE_INDET; + meUseImagesInMenus = TRISTATE_INDET; mpFontOptions = NULL; mnEdgeBlending = 35; maEdgeBlendingTopLeftColor = RGB_COLORDATA(0xC0, 0xC0, 0xC0); @@ -323,7 +323,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : mnUseFlatBorders = rData.mnUseFlatBorders; mnUseFlatMenus = rData.mnUseFlatMenus; mnAutoMnemonic = rData.mnAutoMnemonic; - mnUseImagesInMenus = rData.mnUseImagesInMenus; + meUseImagesInMenus = rData.meUseImagesInMenus; mbPreferredUseImagesInMenus = rData.mbPreferredUseImagesInMenus; mbSkipDisabledInMenus = rData.mbSkipDisabledInMenus; mbHideDisabledMenuItems = rData.mbHideDisabledMenuItems; @@ -519,7 +519,7 @@ void StyleSettings::SetCheckedColorSpecialCase( ) bool StyleSettings::GetUseImagesInMenus() const { // icon mode selected in Tools -> Options... -> OpenOffice.org -> View - switch (mpData->mnUseImagesInMenus) { + switch (mpData->meUseImagesInMenus) { case TRISTATE_FALSE: return false; case TRISTATE_TRUE: @@ -774,7 +774,7 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const (mpData->maPushButtonFont == rSet.mpData->maPushButtonFont) && (mpData->maFieldFont == rSet.mpData->maFieldFont) && (mpData->maIconFont == rSet.mpData->maIconFont) && - (mpData->mnUseImagesInMenus == rSet.mpData->mnUseImagesInMenus) && + (mpData->meUseImagesInMenus == rSet.mpData->meUseImagesInMenus) && (mpData->mbPreferredUseImagesInMenus == rSet.mpData->mbPreferredUseImagesInMenus) && (mpData->mbSkipDisabledInMenus == rSet.mpData->mbSkipDisabledInMenus) && (mpData->mbHideDisabledMenuItems == rSet.mpData->mbHideDisabledMenuItems) && |