1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
---
sc/source/ui/attrdlg/scabstdlg.cxx | 3 ++-
sc/source/ui/docshell/impex.cxx | 3 ++-
sd/source/filter/sdfilter.cxx | 3 ++-
sd/source/ui/dlg/sdabstdlg.cxx | 3 ++-
sw/source/filter/basflt/fltini.cxx | 3 ++-
sw/source/ui/dialog/swabstdlg.cxx | 3 ++-
vcl/source/window/abstdlg.cxx | 3 ++-
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git sc/source/ui/attrdlg/scabstdlg.cxx sc/source/ui/attrdlg/scabstdlg.cxx
index 0f0ec34..2d32560 100644
--- sc/source/ui/attrdlg/scabstdlg.cxx
+++ sc/source/ui/attrdlg/scabstdlg.cxx
@@ -47,7 +47,8 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
OUStringBuffer aStrBuf;
aStrBuf.appendAscii( SVLIBRARY("scui") );
- if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear() ) )
+ if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(),
+ SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( ScAbstractDialogFactory* (__LOADONCALLAPI*)() )
aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
if ( fp )
diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx
index 9c839f5..01542c2 100644
--- sc/source/ui/docshell/impex.cxx
+++ sc/source/ui/docshell/impex.cxx
@@ -2102,7 +2102,8 @@ ScFormatFilterPlugin &ScFormatFilter::Get()
static ::osl::Module aModule;
if ( aModule.loadRelative( &thisModule,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "scfilt" ) ) ) ) )
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "scfilt" ) ) ),
+ SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
{
oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( "ScFilterCreate" ) );
if (fn != NULL)
diff --git sd/source/filter/sdfilter.cxx sd/source/filter/sdfilter.cxx
index 62ac970..b2852b9 100644
--- sd/source/filter/sdfilter.cxx
+++ sd/source/filter/sdfilter.cxx
@@ -92,7 +92,8 @@ extern "C" { static void SAL_CALL thisModule() {} }
::osl::Module* SdFilter::OpenLibrary( const ::rtl::OUString& rLibraryName ) const
{
std::auto_ptr< osl::Module > mod(new osl::Module);
- return mod->loadRelative(&thisModule, ImplGetFullLibraryName(rLibraryName))
+ return mod->loadRelative(&thisModule, ImplGetFullLibraryName(rLibraryName),
+ SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY)
? mod.release() : 0;
}
diff --git sd/source/ui/dlg/sdabstdlg.cxx sd/source/ui/dlg/sdabstdlg.cxx
index f0c6d81..1044826 100644
--- sd/source/ui/dlg/sdabstdlg.cxx
+++ sd/source/ui/dlg/sdabstdlg.cxx
@@ -42,7 +42,8 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
{
SdFuncPtrCreateDialogFactory fp = 0;
static ::osl::Module aDialogLibrary;
- if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+ if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ),
+ SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() )
aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
if ( fp )
diff --git sw/source/filter/basflt/fltini.cxx sw/source/filter/basflt/fltini.cxx
index e1b341a..8076abd 100644
--- sw/source/filter/basflt/fltini.cxx
+++ sw/source/filter/basflt/fltini.cxx
@@ -969,7 +969,7 @@ static oslGenericFunction GetMswordLibSy
static sal_Bool bLoaded = sal_False;
static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "msword" ) ) );
if (!bLoaded)
- bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule );
+ bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
if (bLoaded)
return aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) );
return NULL;
diff --git sw/source/ui/dialog/swabstdlg.cxx sw/source/ui/dialog/swabstdlg.cxx
index 2214dc5..32a7a2d 100644
--- sw/source/ui/dialog/swabstdlg.cxx
+++ sw/source/ui/dialog/swabstdlg.cxx
@@ -42,7 +42,8 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
{
SwFuncPtrCreateDialogFactory fp = 0;
static ::osl::Module aDialogLibrary;
- if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+ if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ),
+ SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( SwAbstractDialogFactory* (__LOADONCALLAPI*)() )
aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")));
if ( fp )
diff --git vcl/source/window/abstdlg.cxx vcl/source/window/abstdlg.cxx
index d032393..f47f70b 100644
--- vcl/source/window/abstdlg.cxx
+++ vcl/source/window/abstdlg.cxx
@@ -42,7 +42,8 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
{
FuncPtrCreateDialogFactory fp = 0;
static ::osl::Module aDialogLibrary;
- if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+ if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ),
+ SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() )
aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") );
if ( fp )
--
1.7.0.1
|
