diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:07:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:07:27 +0000 |
| commit | e9c6ff8f19354fde00244ad266315a7de1afa1f4 (patch) | |
| tree | 6c242a4e3eb4c45b1b9957844a40d583062e35cd /vcl/source/window/abstdlg.cxx | |
| parent | 6942743e97380f29c1728585a10e3c826a6a3f80 (diff) | |
INTEGRATION: CWS sb71 (1.7.26); FILE MERGED
2007/10/11 15:05:40 sb 1.7.26.1: osl::Module::load without path no longer works on Mac OS X.
Diffstat (limited to 'vcl/source/window/abstdlg.cxx')
| -rw-r--r-- | vcl/source/window/abstdlg.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 5d98f03b0648..18d229b6da41 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: abstdlg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2007-06-27 20:27:32 $ + * last change: $Author: vg $ $Date: 2007-10-15 13:07:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,11 +44,13 @@ typedef VclAbstractDialogFactory* (__LOADONCALLAPI *FuncPtrCreateDialogFactory)(); +extern "C" { static void SAL_CALL thisModule() {} } + VclAbstractDialogFactory* VclAbstractDialogFactory::Create() { FuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - if ( aDialogLibrary.is() || aDialogLibrary.load( String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) ) + if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) ) fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") ); if ( fp ) |