summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbaccess/source/ui/dlg/adodatalinks.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index bbc296477237..f56b2cdbb201 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -24,6 +24,9 @@
#pragma warning(push, 1)
#pragma warning(disable: 4917)
#endif
+// LO/windows.h conflict
+#undef WB_LEFT
+#undef WB_RIGHT
#include "msdasc.h" // OLE DB Service Component header
#if defined _MSC_VER
#pragma warning(push, 1)
> 2014-05-02extensions: sal_Bool->boolNoel Grandin 2014-04-19fixincludeguards.sh: extensionsThomas Arnhold 2014-04-01Explicitly mark overriding destructors as "virtual"Stephan Bergmann 2014-03-26First batch of adding SAL_OVERRRIDE to overriding function declarationsStephan Bergmann 2012-06-21re-base on ALv2 code.Michael Meeks 2011-03-09Merge commit 'ooo/DEV300_m101' into integration/dev300_m101Norbert Thiebaud 2011-01-14removetooltypes01: #i112600# remove tooltypes from extensionsMikhail Voytenko 2010-10-28add modelines to .hxx files as wellCaolán McNamara 2010-10-05more removed include guards using fixguard.pyPetr Mladek 2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun Mi...Jens-Heiner Rechtien 2008-05-20INTEGRATION: CWS mba30patches01 (1.4.214); FILE MERGEDKurt Zenker 2008-04-11INTEGRATION: CWS changefileheader (1.4.222); FILE MERGEDRüdiger Timm 2006-12-12INTEGRATION: CWS aw037 (1.3.256); FILE MERGEDKurt Zenker