configure.ac | 4 ++-- xmlhelp/source/cxxhelp/provider/databases.cxx | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-)
New commits: commit 3de1e67e06a2ca43badf55e9d4b7aa3a21ef4edc Author: Jan Holesovsky <ke...@collabora.com> Date: Thu Dec 4 10:13:36 2014 +0100 images: Remove 'Crystal' from the default image sets. Change-Id: I90f10ea437fba65aced8a53f7b81d450a6ebd447 diff --git a/configure.ac b/configure.ac index 17d0de4..b6ae6db 100644 --- a/configure.ac +++ b/configure.ac @@ -1474,7 +1474,7 @@ AC_ARG_WITH(galleries, AC_ARG_WITH(theme, AS_HELP_STRING([--with-theme="theme1 theme2..."], [Choose which themes to include. By default those themes with an '*' are included. - Possible choices: *breeze, *crystal, *galaxy, *hicontrast, human, industrial, *oxygen, *sifr, *tango, *tango_testing.]), + Possible choices: *breeze, crystal, *galaxy, *hicontrast, human, industrial, *oxygen, *sifr, *tango, *tango_testing.]), ,) AC_ARG_WITH(helppack-integration, @@ -11375,7 +11375,7 @@ dnl =================================================================== AC_MSG_CHECKING([which themes to include]) # if none given use default subset of available themes if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then - with_theme="breeze crystal galaxy hicontrast oxygen sifr tango" + with_theme="breeze galaxy hicontrast oxygen sifr tango" test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing" fi commit 8c2e25b3768013a19ef2371e5d7867a86226df0d Author: Jan Holesovsky <ke...@collabora.com> Date: Thu Dec 4 10:13:14 2014 +0100 images: Tango is the most complete theme. Change-Id: I211d21b09223dfacac18e879993b0f0943b94741 diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index b7c2014..a6c8d3e 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -276,14 +276,13 @@ OString Databases::getImagesZipFileURL() { if ( aSymbolsStyleName.equalsAscii("auto") ) { - OUString const & env = Application::GetDesktopEnvironment(); - if ( env.equalsIgnoreAsciiCase("tde") || - env.equalsIgnoreAsciiCase("kde") ) - aSymbolsStyleName = "crystal"; - else if ( env.equalsIgnoreAsciiCase("kde4") ) - aSymbolsStyleName = "oxygen"; - else - aSymbolsStyleName = "tango"; + // with the layered images*.zip, tango is the most + // complete theme, so show that one + // FIXME instead of using a general vnd.sun.star.zip:// + // for imgrepos, we should have some vnd.sun.star.image:// + // so that we don't have to re-open the stream for every + // image in the help + aSymbolsStyleName = "tango"; } OUString aZipName = "images_" + aSymbolsStyleName + ".zip"; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits