cui/source/customize/cfg.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 25b66ffe5d4f0fab876972cc471fb82470ebae12 Author: Maxim Monastirsky <[email protected]> Date: Sun Dec 24 10:26:22 2017 +0200 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". (Backported from 1d55c1baed9977bad449691012807c6f09e2fca8) Change-Id: Iabcbbcff666eecc2e7534eb1533610f08ac28bf1 Reviewed-on: https://gerrit.libreoffice.org/47037 Tested-by: Jenkins <[email protected]> Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index c28e5f4528fb..5acf90caae7e 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -370,11 +370,11 @@ void 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; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
