[Libreoffice] [PATCH] [REVIEW-3-4] fdo#32347 reenable ADO URL helper UI

Attached patch is a partial backport of my commit
538190e0ea142d0a7da244809c66241379d4d91b in master.

It reenables the ADO URL helper UI on MS Windows, which makes it
*much* easier to connect to ADO databases. It is a regression compared
to any version compiled with Windows XP SDK, i.e. OO.org.

As I don't have a Windows build, I could not test it, but I tested my
master commit with a tinderbox daily build, and it works well.

The reason that it was disabled with a Vista SDK is that in *early*
versions of the SDK, the necessary headers were simply missing. This
has been fixed for *years* in the SDK: see
https://issues.apache.org/ooo/show_bug.cgi?id=77988#c4 of December
2007!

-- 
Lionel

From 1f9f4a4bcb36e2ec89c98f83586e7263d2401ae4 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Thu, 24 Nov 2011 19:01:22 +0100
Subject: [PATCH] fdo#32347: reenable ADO URL helper UI

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