Revert "Initial experiments with static linking of (some) ..."

Thist idea caused too intrusive changes to the code of call sites, I
think. Will do it another way that leaves call sites as is.

This reverts commit 25d114eec4d451acdda1ddff4c8ed9d47ba6275f.

18 files changed, 78 insertions, 92 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 8c8654aa0c59..4c66b382dbe0 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -2200,8 +2200,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedContentResultSetFactory,
-                         "com.sun.star.comp.ucb.CachedContentResultSetFactory",
-                         CACHED_CONTENT_RESULTSET_FACTORY_NAME );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                           "com.sun.star.comp.ucb.CachedContentResultSetFactory" )),
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         CACHED_CONTENT_RESULTSET_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 0ccca050baf6..b32a8b6b11ef 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -531,8 +531,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory,
-                     "com.sun.star.comp.ucb.CachedContentResultSetStubFactory",
-                     CACHED_CRS_STUB_FACTORY_NAME );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                     "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                     CACHED_CRS_STUB_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 7bc23a76fbe2..506c96f2e6dc 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -176,8 +176,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedDynamicResultSetFactory,
-                     "com.sun.star.comp.ucb.CachedDynamicResultSetFactory",
-                     CACHED_DRS_FACTORY_NAME );
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" )),
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         CACHED_DRS_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 4dc9469c5199..4bc18400f98c 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -166,8 +166,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedDynamicResultSetStubFactory,
-                     "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory",
-                     CACHED_DRS_STUB_FACTORY_NAME );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                     "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                     CACHED_DRS_STUB_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 1ba4384354fe..c73fe311e54b 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -87,8 +87,10 @@ XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory,
-                     "com.sun.star.comp.ucb.UcbContentProviderProxyFactory",
-                     PROVIDER_FACTORY_SERVICE_NAME );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         PROVIDER_FACTORY_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index e65322c660b7..cbe7b2ba7669 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -347,8 +347,10 @@ void SAL_CALL UniversalContentBroker::removeEventListener(
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( UniversalContentBroker,
-                     "com.sun.star.comp.ucb.UniversalContentBroker",
-                     UCB_SERVICE_NAME );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.UniversalContentBroker" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         UCB_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 0f4125974001..c778bf91b88a 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -357,8 +357,10 @@ XTYPEPROVIDER_IMPL_3( UcbPropertiesManager,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( UcbPropertiesManager,
-                     "com.sun.star.comp.ucb.UcbPropertiesManager",
-                     PROPERTIES_MANAGER_SERVICE_NAME );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.UcbPropertiesManager" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         PROPERTIES_MANAGER_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 5b7e26095822..38b498095507 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -244,8 +244,10 @@ XTYPEPROVIDER_IMPL_4( UcbStore,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( UcbStore,
-                     "com.sun.star.comp.ucb.UcbStore",
-                     STORE_SERVICE_NAME );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.UcbStore" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         STORE_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 3620688ae16f..1b6c57dea78e 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -511,8 +511,10 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( SortedDynamicResultSetFactory,
-                     "com.sun.star.comp.ucb.SortedDynamicResultSetFactory",
-                     DYNAMIC_RESULTSET_FACTORY_NAME );
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" )),
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         DYNAMIC_RESULTSET_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 0e68e0473a79..f733cf0ea22a 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -94,8 +94,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
                       com::sun::star::ucb::XContentProvider );
 
 XSERVICEINFO_IMPL_1( ContentProvider,
-                     "com.sun.star.comp.CmisContentProvider",
-                     "com.sun.star.ucb.CmisContentProvider" );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                       "com.sun.star.comp.CmisContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                       "com.sun.star.ucb.CmisContentProvider" )) );
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 67f118facc83..02da7ac7b859 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -174,12 +174,11 @@ XTYPEPROVIDER_IMPL_6( FTPContent,
 #undef XSERVICEINFO_CREATE_INSTANCE_IMPL
 #define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )
 
-#undef STATICALLY_LINKED_SERVICE
-#define STATICALLY_LINKED_SERVICE( Class, ImplName, Service, Num )
-
 XSERVICEINFO_IMPL_1( FTPContent,
-                     "com.sun.star.comp.FTPContent",
-                     "com.sun.star.ucb.FTPContent" );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.FTPContent")),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.ucb.FTPContent")));
 
 
 
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 5b50a41bfd7a..427527937a52 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -103,8 +103,8 @@ XTYPEPROVIDER_IMPL_3(FTPContentProvider,
 
 XSERVICEINFO_IMPL_1(
     FTPContentProvider,
-    "com.sun.star.comp.FTPContentProvider",
-    FTP_CONTENT_PROVIDER_SERVICE_NAME);
+    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.FTPContentProvider")),
+    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FTP_CONTENT_PROVIDER_SERVICE_NAME)));
 
 //=========================================================================
 //
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index f3a339e1e6f3..c5bf7c585968 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -100,8 +100,10 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( HierarchyContentProvider,
-                     "com.sun.star.comp.ucb.HierarchyContentProvider",
-                     HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.HierarchyContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index d9b6efde5523..fbaa9fdddb52 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -181,8 +181,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( ContentProvider,
-                    "com.sun.star.comp.ucb.PackageContentProvider",
-                    PACKAGE_CONTENT_PROVIDER_SERVICE_NAME );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.comp.ucb.PackageContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        PACKAGE_CONTENT_PROVIDER_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index fafea334e33b..be5a4f1920fb 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -105,8 +105,10 @@ XTYPEPROVIDER_IMPL_4( ContentProvider,
 
 XSERVICEINFO_IMPL_1(
     ContentProvider,
-    "com.sun.star.comp.ucb.TransientDocumentsContentProvider",
-    TDOC_CONTENT_PROVIDER_SERVICE_NAME );
+    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) ),
+    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+        TDOC_CONTENT_PROVIDER_SERVICE_NAME ) ) );
 
 //=========================================================================
 //
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 8dbca76ebb87..ba24d632c276 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -93,8 +93,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( ContentProvider,
-                     "com.sun.star.comp.WebDAVContentProvider",
-                     WEBDAV_CONTENT_PROVIDER_SERVICE_NAME );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.WebDAVContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         WEBDAV_CONTENT_PROVIDER_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx
index 445de8a05e26..302be2132f05 100644
--- a/ucbhelper/inc/ucbhelper/macros.hxx
+++ b/ucbhelper/inc/ucbhelper/macros.hxx
@@ -732,40 +732,19 @@ XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                                  \
 com::sun::star::uno::Sequence< rtl::OUString >                              \
 Class::getSupportedServiceNames_Static()
 
-#ifdef DISABLE_DYNLOADING
-
-#define STATICALLY_LINKED_SERVICE( Class, ImplName, Service, Num )          \
-extern com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > service##Num( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rSMgr ) \
-    __asm("SSF:" Service);                                                  \
+// 1 service name
+#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 )                    \
+XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
+XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                                  \
                                                                             \
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > service##Num( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rSMgr ) \
+com::sun::star::uno::Sequence< rtl::OUString >                              \
+Class::getSupportedServiceNames_Static()                                    \
 {                                                                           \
-    com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory( Class::createServiceFactory( rSMgr ) ); \
-    xFactory->acquire();                                                    \
-    return xFactory;                                                        \
+    com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 );               \
+    aSNS.getArray()[ 0 ] = Service1;                                        \
+    return aSNS;                                                            \
 }
 
-#else
-
-#define STATICALLY_LINKED_SERVICE( Class, ImplName, Service, Num ) // empty
-
-#endif
-
-// 1 service name
-#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 )                                \
-XSERVICEINFO_COMMOM_IMPL( Class, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ImplName )) ) \
-XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                                              \
-                                                                                        \
-com::sun::star::uno::Sequence< rtl::OUString >                                          \
-Class::getSupportedServiceNames_Static()                                                \
-{                                                                                       \
-    com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 );                           \
-    aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Service1 ));      \
-    return aSNS;                                                                        \
-}                                                                                       \
-                                                                                        \
-STATICALLY_LINKED_SERVICE( Class, ImplName, Service1, 1 )
-
 #endif /* !_UCBHELPER_MACROS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index b38b421c4370..d1eb179b5b78 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.cxx
@@ -34,7 +34,6 @@
  *************************************************************************/
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
@@ -49,30 +48,6 @@
 #include <ucbhelper/configurationkeys.hxx>
 #endif
 
-#ifdef DISABLE_DYNLOADING
-
-#define MSF_CREATEINSTANCE(Msf, Service)                                \
-({                                                                      \
-    extern com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > service( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rSMgr ) __asm("SSF:" Service); \
-    com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory( service( Msf ) ); \
-    xFactory->createInstance();                                          \
-})
-
-#define MSF_CREATEINSTANCE_WITHARGUMENTS(Msf, Service, Args)            \
-({                                                                      \
-    extern com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > service( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rSMgr ) __asm("SSF:" Service); \
-    com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory( service( Msf ) ); \
-    xFactory->createInstanceWithArguments( Args );                       \
-})
-
-#else
-
-#define MSF_CREATEINSTANCE(Msf, Service) Msf->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Service )) )
-
-#define MSF_CREATEINSTANCE_WITHARGUMENTS(Msf, Service, Args) Msf->createInstanceWithArguments( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Service )), Args )
-
-#endif
-
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::uno;
@@ -311,7 +286,9 @@ bool ContentBroker_Impl::initialize()
             {
                 try
                 {
-                    xIfc = MSF_CREATEINSTANCE( m_xSMgr, "com.sun.star.ucb.UniversalContentBroker" );
+                    xIfc = m_xSMgr->createInstance(
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.ucb.UniversalContentBroker" )) );
                 }
                 catch ( Exception const & )
                 {
@@ -343,7 +320,10 @@ bool ContentBroker_Impl::initialize()
             {
                 try
                 {
-                    xIfc = MSF_CREATEINSTANCE_WITHARGUMENTS( m_xSMgr, "com.sun.star.ucb.UniversalContentBroker", m_aArguments );
+                    xIfc = m_xSMgr->createInstanceWithArguments(
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.ucb.UniversalContentBroker" )),
+                            m_aArguments );
                 }
                 catch ( Exception const & )
                 {