mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 10:32:59 +00:00
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
--- 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()
|
|
|
|
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()
|
|
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
|
|
}
|
|
|
|
+ // 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 );
|
|
+
|
|
if ( ! bFound )
|
|
bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
|
|
|
|
if ( ! bFound )
|
|
+ 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 = "";
|
|
|
|
m_aImagesZipFileURL = OUStringToOString(
|