diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:59 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:59 +0200 |
| commit | 31d2ec14ca3790748cf0c724f14f494cce7dff4f (patch) | |
| tree | 074e3fcfbb3609f15c6f3dbb82f98d2bf35839df /sw/source/filter/basflt/fltini.cxx | |
| parent | 6803462fb620eb350923148a2c10c3223266e97f (diff) | |
| parent | c8deddfb2e3aa3d00c2b3321e41de79b526b7c2f (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
sw/inc/viewsh.hxx
sw/source/core/layout/paintfrm.cxx
sw/source/ui/index/cnttab.cxx
sw/source/ui/ribbar/inputwin.cxx
Diffstat (limited to 'sw/source/filter/basflt/fltini.cxx')
| -rw-r--r-- | sw/source/filter/basflt/fltini.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 17440ac5684d..ac3cb757e71d 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -819,11 +819,11 @@ extern "C" { static void SAL_CALL thisModule() {} } static oslGenericFunction GetMswordLibSymbol( const char *pSymbol ) { static ::osl::Module aModule; - static sal_Bool bLoaded = sal_False; + static sal_Bool bLoaded = sal_False; static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "msword" ) ) ); - if (!bLoaded) - bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule ); - if (bLoaded) + if (!bLoaded) + bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ); + if (bLoaded) return aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) ); return NULL; } |