Kaydet (Commit) 538190e0 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane

fdo#32347: reenable ADO URL helper UI

cleanup obsolete DISABLE_ADO/WINDOWS_VISTA_PSDK logic
üst e5b5d6dc
......@@ -50,12 +50,6 @@ $(eval $(call gb_Library_add_defs,dbu,\
$(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \
))
ifeq (,$(strip $(PROF_EDITION)))
$(eval $(call gb_Library_add_defs,dbu,\
-DWINDOWS_VISTA_PSDK \
))
endif
ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h
$(eval $(call gb_Library_add_cxxflags,dbu,\
-fpermissive \
......
......@@ -51,34 +51,17 @@ $(eval $(call gb_Library_add_cflags,dbui,\
))
endif
ifneq ($(WINDOWS_VISTA_PSDK),)
ifeq ($(PROF_EDITION),)
$(eval $(call gb_Library_add_defs,dbui,\
-DDBACCESS_DLLIMPLEMENTATION\
-DWINDOWS_VISTA_PSDK \
))
endif
endif
ifeq ($(GUI)$(COM),WNTGCC)
$(eval $(call gb_Library_add_cflags,dbui,\
-fpermissive \
))
endif
ifeq ($(PROF_EDITION),)
ifneq ($(WINDOWS_VISTA_PSDK),)
DISABLE_ADO=TRUE
endif
endif
ifeq ($(OS),WNT)
ifeq ($(DISABLE_ADO),)
$(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/dlg/adodatalinks \
))
endif
endif
$(eval $(call gb_Library_add_defs,dbui,\
-DDBACCESS_DLLIMPLEMENTATION\
......
......@@ -71,6 +71,10 @@
#include <tools/diagnose_ex.h>
#include <sfx2/docfilt.hxx>
#if defined(WNT)
#define _ADO_DATALINK_BROWSE_
#endif
#ifdef _ADO_DATALINK_BROWSE_
#include <vcl/sysdata.hxx>
#include "adodatalinks.hxx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment