Revert "Use SVLIBRARY instead of gb_Library_get_runtime_filename"

$(call gb_Library__get_name,foo) returns "libmerged" if library foo is merged.

This reverts commit ee567a63.

Change-Id: I6ab9b7f0b01262a6f9d5a6834a6cffdd6ffc6f8a

sd/Library_sd.mk

@@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\
 
 $(eval $(call gb_Library_add_defs,sd,\
 	-DSD_DLLIMPLEMENTATION \
+	-DSDUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,sdui))\" \
 ))
 
 ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)

sd/source/ui/dlg/sdabstdlg.cxx

@@ -42,7 +42,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
-    static const OUString sLibName(SVLIBRARY("sdui"));
+    static const OUString sLibName(SDUI_DLL_NAME);
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
         fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
             aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" );

svx/Library_svxcore.mk

@@ -47,6 +47,7 @@ $(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
 $(eval $(call gb_Library_add_defs,svxcore,\
     -DSVX_DLLIMPLEMENTATION \
     -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+    -DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,dbtools))\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,svxcore,\

svx/source/form/dbtoolsclient.cxx

@@ -116,7 +116,7 @@ namespace svxform
 
             // load the dbtools library
             s_hDbtoolsModule = osl_loadModuleRelative(
-                &thisModule, OUString(SVLIBRARY("dbtools")).pData, 0);
+                &thisModule, OUString(DBTOOLS_DLL_NAME).pData, 0);
             OSL_ENSURE(NULL != s_hDbtoolsModule, "ODbtoolsClient::registerClient: could not load the dbtools library!");
             if (NULL != s_hDbtoolsModule)
             {

sw/Library_sw.mk

@@ -43,6 +43,8 @@ $(eval $(call gb_Library_use_sdk_api,sw))
 
 $(eval $(call gb_Library_add_defs,sw,\
     -DSW_DLLIMPLEMENTATION \
+	-DSWUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,swui))\" \
+	-DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,dbtools))\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,sw,\

sw/source/uibase/dbui/swdbtoolsclient.cxx

@@ -102,7 +102,7 @@ void SwDbtoolsClient::registerClient()
 
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
-        const OUString sModuleName(SVLIBRARY("dbtools"));
+        const OUString sModuleName(DBTOOLS_DLL_NAME);
 
         // load the dbtools library
         getDbToolsClientModule() = osl_loadModuleRelative(

sw/source/uibase/dialog/swabstdlg.cxx

@@ -41,7 +41,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
-    static const OUString sLibName(SVLIBRARY("swui"));
+    static const OUString sLibName(SWUI_DLL_NAME);
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName,
                                                              SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
         fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )

toolkit/Library_tk.mk

@@ -31,6 +31,7 @@ $(eval $(call gb_Library_set_include,tk,\
 
 $(eval $(call gb_Library_add_defs,tk,\
     -DTOOLKIT_DLLIMPLEMENTATION \
+	-DSVT_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,svt))\" \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,tk))

toolkit/source/awt/vclxtoolkit.cxx

@@ -1206,7 +1206,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
          )
     {
 #ifndef DISABLE_DYNLOADING
-        OUString aLibName(SVLIBRARY("svt"));
+        OUString aLibName(SVT_DLL_NAME);
         hSvToolsLib = osl_loadModuleRelative(
             &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
         if ( hSvToolsLib )

vcl/Library_vcl.mk

@@ -46,6 +46,10 @@ $(eval $(call gb_Library_set_include,vcl,\
 $(eval $(call gb_Library_add_defs,vcl,\
     -DVCL_DLLIMPLEMENTATION \
     -DVCLOPENGL_DLLIMPLEMENTATION \
+	-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \
+	-DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \
+	-DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \
+	-DVCLPLUG_SVP_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,vclplug_svp))\" \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,vcl))

vcl/source/app/svapp.cxx

@@ -1389,7 +1389,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist )
     {
 #ifndef DISABLE_DYNLOADING
         osl::Module aTkLib;
-        OUString aLibName(SVLIBRARY("tk"));
+        OUString aLibName(TK_DLL_NAME);
         aTkLib.loadRelative(&thisModule, aLibName, SAL_LOADMODULE_DEFAULT);
         if (aTkLib.is())
         {

vcl/source/window/abstdlg.cxx

@@ -21,7 +21,6 @@
 
 #include <rtl/ustring.hxx>
 #include <osl/module.hxx>
-#include <tools/solar.h>
 #include <vcl/abstdlg.hxx>
 
 typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)();
@@ -39,7 +38,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
     if (aDialogLibrary.is() ||
-        aDialogLibrary.loadRelative(&thisModule, SVLIBRARY("cui"),
+        aDialogLibrary.loadRelative(&thisModule, CUI_DLL_NAME,
                 SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY))
     {
         fp = ( VclAbstractDialogFactory* (SAL_CALL*)() )

vcl/unx/generic/plugadapt/salplug.cxx

@@ -79,7 +79,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
             "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION );
     // vclplug_svp is in libmerged
     if (rModuleBase == "svp")
-        aModule = SVLIBRARY("vclplug_svp");
+        aModule = VCLPLUG_SVP_DLL_NAME;
 
     oslModule aMod = osl_loadModuleRelative(
         reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
@@ -141,7 +141,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
 
 static DesktopType get_desktop_environment()
 {
-    OUString aModule(SVLIBRARY("desktop_detector"));
+    OUString aModule(DESKTOP_DETECTOR_DLL_NAME);
     oslModule aMod = osl_loadModuleRelative(
         reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
         SAL_LOADMODULE_DEFAULT );