[Libreoffice-commits] .: dbaccess/Library_dbu.mk dbaccess/Library_dbui.mk dbaccess/source

[Lionel Elie Mamane]

 dbaccess/Library_dbu.mk                     |    6 ------
 dbaccess/Library_dbui.mk                    |   17 -----------------
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |    4 ++++
 3 files changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 538190e0ea142d0a7da244809c66241379d4d91b
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Nov 23 14:34:24 2011 +0100

    fdo#32347: reenable ADO URL helper UI
    
    cleanup obsolete DISABLE_ADO/WINDOWS_VISTA_PSDK logic

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 0419c29..6c645c9 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -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 \
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 3c6bfb2..0808896 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -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\
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index bc03951..7ec94ad 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -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"