mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make CppunitTest_vcl_app_test compile again

Browse Source 
...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
This commit is contained in:
Stephan Bergmann 2016-11-14 15:57:03 +01:00
parent ada8a2123e
commit a796ca45e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcl/qa/cppunit/app/test_IconThemeSelector.cxx
View File

@ -108,7 +108,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme()
{ {
vcl::IconThemeSelector s; vcl::IconThemeSelector s;
OUString preferred("oxygen"); OUString preferred("oxygen");
s.SetPreferredIconTheme(preferred); s.SetPreferredIconTheme(preferred, false);
std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes(); std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gtk"); OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gtk");
CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is overridden by oxygen", preferred, selected); CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is overridden by oxygen", preferred, selected);
@ -133,7 +133,7 @@ void
IconThemeSelectorTest::NotInstalledThemeDoesNotOverride() IconThemeSelectorTest::NotInstalledThemeDoesNotOverride()
{ {
vcl::IconThemeSelector s; vcl::IconThemeSelector s;
s.SetPreferredIconTheme("oxygen_katze"); s.SetPreferredIconTheme("oxygen_katze", false);
std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes(); std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
OUString selected = s.SelectIconTheme(themes, "oxygen"); OUString selected = s.SelectIconTheme(themes, "oxygen");
CPPUNIT_ASSERT_EQUAL_MESSAGE("'oxygen' theme is not overridden by 'oxygen_katze'", OUString("oxygen"), selected); 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 s1;
vcl::IconThemeSelector s2; vcl::IconThemeSelector s2;
s1.SetPreferredIconTheme("oxygen"); s1.SetPreferredIconTheme("oxygen", false);
s2.SetUseHighContrastTheme(true); s2.SetUseHighContrastTheme(true);
bool equal = (s1 == s2); bool equal = (s1 == s2);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as inequal", false, equal); CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as inequal", false, equal);