[PATCH] fdo#32347: reenable ADO URL helper UI

Lionel Elie Mamane lionel at mamane.lu
Thu Nov 24 10:01:22 PST 2011


cleanup obsolete DISABLE_ADO logic
---
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |    2 +-
 dbaccess/source/ui/dlg/makefile.mk          |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 3b70cbe..da2af7e 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -70,7 +70,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/docfilt.hxx>
-#if !defined(WINDOWS_VISTA_PSDK) && defined(WNT)
+#if defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
index 8fa615d..55f9027 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -128,11 +128,7 @@ SLOFILES=					\
         $(EXCEPTIONSFILES)			\
         $(SLO)$/optionalboolitem.obj 
 
-.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"==""
-DISABLE_ADO=TRUE
-.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"==""
-
-.IF "$(GUI)"=="WNT" && "$(DISABLE_ADO)"==""
+.IF "$(GUI)"=="WNT"
 SLOFILES+=		$(SLO)$/adodatalinks.obj
 .ENDIF
 
-- 
1.7.7.3


--h31gzZEtNLTqOjlF--


More information about the LibreOffice mailing list