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

sc/source/ui/attrdlg/scabstdlg.cxx

@@ -50,7 +50,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(),
                                                              SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
         fp = ( ScAbstractDialogFactory* (SAL_CALL*)() )
-            aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") );
+            aDialogLibrary.getFunctionSymbol( OUString("ScCreateDialogFactory") );
 #else
     fp = ScCreateDialogFactory();
 #endif

sc/source/ui/attrdlg/scuiexp.cxx

@@ -36,13 +36,9 @@ namespace scui
     }
 }
 
-#ifdef DISABLE_DYNLOADING
-#define CreateDialogFactory ScCreateDialogFactory
-#endif
-
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT ScAbstractDialogFactory* CreateDialogFactory()
+    SAL_DLLPUBLIC_EXPORT ScAbstractDialogFactory* ScCreateDialogFactory()
     {
         return ::scui::GetFactory();
     }

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

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;

sw/source/ui/dialog/swabstdlg.cxx

@@ -46,7 +46,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName,
                                                              SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
         fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )
-            aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory"));
+            aDialogLibrary.getFunctionSymbol( OUString("SwCreateDialogFactory"));
 #else
     fp = SwCreateDialogFactory();
 #endif

sw/source/ui/dialog/swuiexp.cxx

@@ -33,13 +33,9 @@ namespace swui
     }
 }
 
-#ifdef DISABLE_DYNLOADING
-#define CreateDialogFactory SwCreateDialogFactory
-#endif
-
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT SwAbstractDialogFactory* CreateDialogFactory()
+    SAL_DLLPUBLIC_EXPORT SwAbstractDialogFactory* SwCreateDialogFactory()
     {
         return ::swui::GetFactory();
     }