mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 18:43:00 +00:00
930bb2a10f
Drop disable-test patches Re-diff help-images and desktop-categories patches Drop merged tubes patch
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
diff -urN libreoffice-5.0.3-orig/xmlhelp/source/cxxhelp/provider/databases.cxx libreoffice-5.0.3-patched/xmlhelp/source/cxxhelp/provider/databases.cxx
|
|
--- libreoffice-5.0.3-orig/xmlhelp/source/cxxhelp/provider/databases.cxx 2015-10-25 01:21:49.000000000 +1000
|
|
+++ libreoffice-5.0.3-patched/xmlhelp/source/cxxhelp/provider/databases.cxx 2015-12-16 15:54:02.804841364 +1000
|
|
@@ -289,6 +289,19 @@
|
|
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_tango.zip" ), aImageZip );
|
|
+
|
|
+ if ( ! bFound )
|
|
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_hicontrast.zip" ), aImageZip );
|
|
+
|
|
if ( ! bFound )
|
|
bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
|
|
|