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

[Tor Lillqvist]

 dbaccess/Library_dbu.mk                 |    7 -------
 dbaccess/source/ui/dlg/adodatalinks.cxx |    6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 60b2a3d0d4d68a25cc4c30dd2919f86c9d370ebc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 22 14:58:37 2011 +0300

    Plug MinGW gaps

diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index f03a37a..6536220 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -47,6 +47,12 @@
 
 #include "adodatalinks.hxx"
 
+#ifdef __MINGW32__
+const IID IID_IDataSourceLocator = { 0x2206CCB2, 0x19C1, 0x11D1, { 0x89, 0xE0, 0x00, 0xC0, 0x4F, 0xD7, 0xA8, 0x29 } };
+const CLSID CLSID_DataLinks = { 0x2206CDB2, 0x19C1, 0x11D1, { 0x89, 0xE0, 0x00, 0xC0, 0x4F, 0xD7, 0xA8, 0x29 } };
+#endif
+
+
 BSTR PromptEdit(long hWnd,BSTR connstr);
 BSTR PromptNew(long hWnd);
 
commit a7e45a6611a038f06450d4bfde9a84d68e70549c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 22 14:56:08 2011 +0300

    Do compile adodatalinks.cxx always for Windows
    
    Don't test any bogus PROF_EDITION, and don't bother with
    WINDOWS_VISTA_PSDK either.

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 0490071..0e3d6c2 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -288,17 +288,10 @@ $(eval $(call gb_Library_add_noexception_objects,dbu,\
 ))
 
 ifeq ($(GUI),WNT)
-ifneq (,$(strip $(WINDOWS_VISTA_PSDK)))
-ifeq (,$(strip $(PROF_EDITION)))
-dbu_DISABLE_ADO := $(true)
-endif
-endif
-ifneq ($(dbu_DISABLE_ADO),$(true))
 $(eval $(call gb_Library_add_noexception_objects,dbu,\
     dbaccess/source/ui/dlg/adodatalinks \
 ))
 endif
-endif
 
 # workaround for issue http://qa.openoffice.org/issues/show_bug.cgi?id=102305 Linux specific
 ifeq ($(COM),GCC)