diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-20 09:40:11 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-20 11:24:21 +0100 |
| commit | 52e99e9e957a228d95d55935acc96175ee494f30 (patch) | |
| tree | 4da3b22df5b287d6df28262105f2094eb44fbcbe /sd | |
| parent | 193d15277cfa23e6bd03cf723095c00de3c630b1 (diff) | |
Rename functions to avoid name collisions more generally.
Luckily, in this case it's easy to find the only place where we load the symbol.
Change-Id: I224fd1e08f268095f8be58b089a643d434bc7a98
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/sdabstdlg.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sduiexp.cxx | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index 34b737aa9c94..0fc9320534e1 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -46,7 +46,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() static const OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) ) fp = ( SdAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" ); + aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" ); #else fp = SdCreateDialogFactory(); #endif diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx index d1a64e596486..3c526380a538 100644 --- a/sd/source/ui/dlg/sduiexp.cxx +++ b/sd/source/ui/dlg/sduiexp.cxx @@ -20,13 +20,9 @@ #include "sddlgfact.hxx" #include "sal/types.h" -#ifdef DISABLE_DYNLOADING -#define CreateDialogFactory SdCreateDialogFactory -#endif - extern "C" { - SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* CreateDialogFactory() + SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* SdCreateDialogFactory() { static SdAbstractDialogFactory_Impl aFactory; return &aFactory; |