merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0273-vcl-better-fallback.diff
blob35a0fad1e22a3e3c41a800bbfa02d0579aba3378
1 --- vcl/unx/source/plugadapt/salplug.cxx 2005-06-21 09:49:05.563280678 +0200
2 +++ vcl/unx/source/plugadapt/salplug.cxx 2005-06-21 10:19:57.119254553 +0200
3 @@ -464,9 +464,11 @@ SalInstance *CreateSalInstance()
4 if( ! pInst && pUsePlugin && *pUsePlugin )
5 pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) );
7 - // fallback to gen
8 - if( ! pInst )
9 - pInst = tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "gen" ) ) );
10 + // fallback, try everything
11 + const char* pPlugin[] = { "gtk", "kde", "gen", 0 };
13 + for ( int i = 0; !pInst && pPlugin[ i ]; ++i )
14 + pInst = tryInstance( OUString::createFromAscii( pPlugin[ i ] ) );
16 if( ! pInst )