From 52e99e9e957a228d95d55935acc96175ee494f30 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@collabora.com>
Date: Thu, 20 Feb 2014 09:40:11 +0100
Subject: 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
---
 sd/source/ui/dlg/sdabstdlg.cxx | 2 +-
 sd/source/ui/dlg/sduiexp.cxx   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'sd')

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;
-- 
cgit