diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-22 09:26:33 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-22 09:43:44 +0300 |
| commit | e15223582710e9e2e31fad2f557df6ee99501fd0 (patch) | |
| tree | 84dfa0f72c9a8a813d0b09b5f4e3954e105cdbfe /svx | |
| parent | cf8946d10226272e8a0e6f1b1043b54d4b63db8d (diff) | |
More hacking on --disable-database-connectivity
Work in progress, still lots of undefineds when attempting to link
TiledLibreOffice.
Change-Id: I80fa330768d9f9fa9ef65e3693f1d777c0713210
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Library_svx.mk | 4 | ||||
| -rw-r--r-- | svx/Library_svxcore.mk | 3 | ||||
| -rw-r--r-- | svx/source/form/fmobjfac.cxx | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 2f0e9a49a89d..3f9ded6faf37 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -247,12 +247,11 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/unogallery/unogalthemeprovider \ )) -ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/fmcomp/dbaobjectex \ svx/source/form/databaselocationinput \ svx/source/form/dbcharsethelper \ - svx/source/form/filtnav \ + $(call gb_Helper_optional,DBCONNECTIVITY,svx/source/form/filtnav) \ svx/source/form/fmobjfac \ svx/source/form/fmPropBrw \ svx/source/form/fmsrccfg \ @@ -260,7 +259,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/form/tabwin \ svx/source/form/tbxform \ )) -endif ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 2b2d1945df64..ccb48edba450 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -390,8 +390,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/xoutdev/xtablend \ )) -ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) - $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/fmcomp/dbaexchange \ svx/source/fmcomp/fmgridcl \ @@ -445,7 +443,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/form/typemap \ svx/source/form/xfm_addcondition \ )) -endif $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 8c00e5e0899f..f1bad877aa97 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <tools/diagnose_ex.h> #include <svx/svdobj.hxx> #include "svx/fmtools.hxx" @@ -79,8 +81,9 @@ FmFormObjFactory::FmFormObjFactory() FmPropBrwMgr::RegisterChildWindow(); NavigatorFrameManager::RegisterChildWindow(); DataNavigatorManager::RegisterChildWindow(); +#if HAVE_FEATURE_DBCONNECTIVITY FmFilterNavigatorWinMgr::RegisterChildWindow(); - +#endif // Interface fuer die Formshell registrieren FmFormShell::RegisterInterface(0); |