[Libreoffice-commits] core.git: sw/Library_sw.mk sw/source

[Tor Lillqvist]

 sw/Library_sw.mk                      |    2 +-
 sw/source/core/uibase/uno/unofreg.cxx |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 81272fdb1e093d44e2e67eba65c79a490832f320
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 29 09:44:37 2014 +0300

    Less intrusive --disable-database-connectivity change for sw
    
    Do compile in the SwDBFieldType class. Still bypass mail merge stuff.
    
    Results in about 1.8MB reduction in text segment size for
    TiledLibreOffice.
    
    Change-Id: Iec900bd451d1b4154f3bf03f604783e548b8e7af

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 62b864f..af465ca 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -258,6 +258,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
     sw/source/core/fields/authfld \
     sw/source/core/fields/cellfml \
     sw/source/core/fields/chpfld \
+    sw/source/core/fields/dbfld \
     sw/source/core/fields/ddefld \
     sw/source/core/fields/ddetbl \
     sw/source/core/fields/docufld \
@@ -744,7 +745,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 
 ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 $(eval $(call gb_Library_add_exception_objects,sw,\
-    sw/source/core/fields/dbfld \
     sw/source/core/uibase/dbui/dbmgr \
     sw/source/core/uibase/dbui/dbtree \
     sw/source/core/uibase/dbui/dbui \
diff --git a/sw/source/core/uibase/uno/unofreg.cxx b/sw/source/core/uibase/uno/unofreg.cxx
index 77b6f90..985e3ee 100644
--- a/sw/source/core/uibase/uno/unofreg.cxx
+++ b/sw/source/core/uibase/uno/unofreg.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "SwXFilterOptions.hxx"
 #include "unofreg.hxx"
 #include <sal/types.h>
@@ -204,6 +206,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory(
                 SwXModule_createInstance,
                 SwXModule_getSupportedServiceNames() );
         }
+#if HAVE_FEATURE_DBCONNECTIVITY
         else if( SwXMailMerge_getImplementationName().equalsAsciiL(
                                                     pImplName, nImplNameLen ) )
         {
@@ -212,6 +215,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory(
                 SwXMailMerge_createInstance,
                 SwXMailMerge_getSupportedServiceNames() );
         }
+#endif
         else if( SwXFilterOptions::getImplementationName_Static().equalsAsciiL(
                                                     pImplName, nImplNameLen ) )
         {