libreoffice/help-images-mdv64789.patch

36 lines
1.7 KiB
Diff
Raw Normal View History

2014-06-20 17:27:14 +04:00
--- libreoffice-4.2.0/xmlhelp/source/cxxhelp/provider/databases.cxx.0002~ 2013-12-26 21:26:49.437106220 +0100
+++ libreoffice-4.2.0/xmlhelp/source/cxxhelp/provider/databases.cxx 2013-12-26 21:50:44.007125053 +0100
@@ -274,7 +274,7 @@ OString Databases::getImagesZipFileURL()
2013-09-05 22:06:18 +04:00
2014-06-20 17:27:14 +04:00
if ( !aSymbolsStyleName.isEmpty() )
{
- if ( aSymbolsStyleName.equalsAscii("auto") )
+ if ( aSymbolsStyleName.equalsAscii("auto") || aSymbolsStyleName.equalsAscii("default") )
{
OUString const & env = Application::GetDesktopEnvironment();
if ( env.equalsIgnoreAsciiCase("tde") ||
@@ -290,10 +290,23 @@ OString Databases::getImagesZipFileURL()
2013-03-04 13:55:29 +04:00
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
}
2014-06-20 17:27:14 +04:00
+ // Fallbacks in case the configured style file was not found
+ if ( ! bFound )
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_oxygen.zip" ), aImageZip );
+
+ if ( ! bFound )
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_crystal.zip" ), aImageZip );
2013-03-04 13:55:29 +04:00
+
if ( ! bFound )
2013-09-05 22:06:18 +04:00
bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
2013-03-04 13:55:29 +04:00
if ( ! bFound )
2014-06-20 17:27:14 +04:00
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_tango.zip" ), aImageZip );
+
+ if ( ! bFound )
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_hicontrast.zip" ), aImageZip );
+
+ if ( ! bFound )
aImageZip = "";
2013-03-04 13:55:29 +04:00
2013-09-05 22:06:18 +04:00
m_aImagesZipFileURL = OUStringToOString(