Bugzilla – Attachment 53811 Details for
Bug 32347
Unable to configure Ado connection parameters [FILEOPEN]
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch as described in comment 13
0001-fdo-32347-reenable-ADO-URL-helper-UI.patch (text/plain), 2.27 KB, created by
Lionel Elie Mamane
on 2011-11-23 05:35:25 UTC
(
hide
)
Description:
patch as described in comment 13
Filename:
MIME Type:
Creator:
Lionel Elie Mamane
Created:
2011-11-23 05:35:25 UTC
Size:
2.27 KB
patch
obsolete
>From d62df1ec0221969a0968243ac9e7cd65547bee69 Mon Sep 17 00:00:00 2001 >From: Lionel Elie Mamane <lionel@mamane.lu> >Date: Wed, 23 Nov 2011 14:34:24 +0100 >Subject: [PATCH] fdo#32347: reenable ADO URL helper UI > >cleanup obsolete DISABLE_ADO/WINDOWS_VISTA_PSDK logic >--- > dbaccess/Library_dbu.mk | 6 ------ > dbaccess/Library_dbui.mk | 17 ----------------- > dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4 ++++ > 3 files changed, 4 insertions(+), 23 deletions(-) > >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" >-- >1.7.7.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 32347
:
41057
|
41058
| 53811