commit 5bd8887e8def134ba59b9524f9d6c85dad14c693
author Maxim Monastirsky <momonasmon@gmail.com> Thu Dec 21 12:50:42 2017 +0200
committer Adolfo Jayme Barrientos <fitojb@ubuntu.com> Mon Jan 01 04:28:28 2018 +0100
tree 6bf651804491629ada622b1549a2ef8fdfc32867
parent 1823d8d0f1a1f29db8cb4bfbfbf2b7b2c94dcbb7

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>

cui/source/customize/SvxConfigPageHelper.cxx

diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx
index 0a182e1..05b801da 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;
    }