vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a796ca45e7cd26b5fd9c3e99ae9ceed41a3d9adf
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Nov 14 15:57:03 2016 +0100
Make CppunitTest_vcl_app_test compile again
...after 6e32e575829160b3c51ebbb67231baec7135afd3 "Resolves: tdf#103915 when
global dark theme is set fall back to breeze_dark". No idea whether
bDarkIconTheme=false is the right choice in all three cases, but at least
the
test succeeds that way.
Change-Id: I633c4ebff19a1d441baa8270d681a73c8f6c4aa0
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 8863f10..e8b4aff 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -108,7 +108,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme()
{
vcl::IconThemeSelector s;
OUString preferred("oxygen");
- s.SetPreferredIconTheme(preferred);
+ s.SetPreferredIconTheme(preferred, false);
std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gtk");
CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is overridden by oxygen",
preferred, selected);
@@ -133,7 +133,7 @@ void
IconThemeSelectorTest::NotInstalledThemeDoesNotOverride()
{
vcl::IconThemeSelector s;
- s.SetPreferredIconTheme("oxygen_katze");
+ s.SetPreferredIconTheme("oxygen_katze", false);
std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
OUString selected = s.SelectIconTheme(themes, "oxygen");
CPPUNIT_ASSERT_EQUAL_MESSAGE("'oxygen' theme is not overridden by
'oxygen_katze'", OUString("oxygen"), selected);
@@ -182,7 +182,7 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal()
{
vcl::IconThemeSelector s1;
vcl::IconThemeSelector s2;
- s1.SetPreferredIconTheme("oxygen");
+ s1.SetPreferredIconTheme("oxygen", false);
s2.SetUseHighContrastTheme(true);
bool equal = (s1 == s2);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as
inequal", false, equal);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
