diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-12-21 12:50:42 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2018-01-01 04:28:28 +0100 |
| commit | 5bd8887e8def134ba59b9524f9d6c85dad14c693 (patch) | |
| tree | 6bf651804491629ada622b1549a2ef8fdfc32867 /cui | |
| parent | 1823d8d0f1a1f29db8cb4bfbfbf2b7b2c94dcbb7 (diff) | |
tdf#106784 Also handle automatic icon size
... like before b1426b5b502fd591402d666994e3f1fb3a8ad959
("tdf#95014 initial support for 32 px icons in toolbar").
The original code used SvtMiscOptions::AreCurrentSymbolsLarge()
which calls GetCurrentSymbolsSize() internally, thus properly
resolves the icon size, when the current setting is "automatic".
Change-Id: Iabcbbcff666eecc2e7534eb1533610f08ac28bf1
Reviewed-on: https://gerrit.libreoffice.org/46899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 1d55c1baed9977bad449691012807c6f09e2fca8)
Reviewed-on: https://gerrit.libreoffice.org/47027
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/SvxConfigPageHelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx index 0a182e13ec1b..05b801da9081 100644 --- a/cui/source/customize/SvxConfigPageHelper.cxx +++ b/cui/source/customize/SvxConfigPageHelper.cxx @@ -68,11 +68,11 @@ void SvxConfigPageHelper::InitImageType() css::ui::ImageType::COLOR_NORMAL | css::ui::ImageType::SIZE_DEFAULT; - if (SvtMiscOptions().GetSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE) + if (SvtMiscOptions().GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE) { theImageType |= css::ui::ImageType::SIZE_LARGE; } - else if (SvtMiscOptions().GetSymbolsSize() == SFX_SYMBOLS_SIZE_32) + else if (SvtMiscOptions().GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_32) { theImageType |= css::ui::ImageType::SIZE_32; } |