summaryrefslogtreecommitdiff
path: root/connectivity/source/inc/odbc/OFunctiondefs.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/inc/odbc/OFunctiondefs.hxx')
-rw-r--r--connectivity/source/inc/odbc/OFunctiondefs.hxx14
1 files changed, 3 insertions, 11 deletions
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 25884342bf89..a53f07209349 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,14 +61,6 @@
//--------------------------------------------------------------------------
-#ifdef OS2
-#define ALLREADY_HAVE_OS2_TYPES
-#define DONT_TD_VOID
-#include <svpm.h>
-#include <odbc/sqlext.h>
-#define SDB_ODBC_CHAR UCHAR
-#endif // OS2
-
#ifdef OS2__00
#ifdef ODBCIMP
@@ -106,13 +99,11 @@
#define SQL_FETCH_PRIOR SQL_FETCH_PREV
#define SQL_NO_TOTAL (-4)
-// #include "odbc3defs.hxx"
-
#endif
// In der ODBC.H von Watcom werden Strings als char * erwartet
// (nicht, wie sonst bei ODBC ueblich, als UCHAR *).
-#if defined( ICC ) || defined( WTC )
+#if defined( ICC )
#define SDB_ODBC_CHAR unsigned char
#else
#define SDB_ODBC_CHAR char
@@ -173,3 +164,4 @@
#endif // _CONNECTIVITY_OFUNCTIONDEFS_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
xx?h=distro/collabora/co-24.04.5&id=fe04156def447076e56a78fe1722c64ca7fcda4f'>Remove duplicated includeAndrea Gelmini 2023-03-01send theme info when changing color (in the picker) via UNO commandTomaž Vajngerl 2022-12-07Resolves: tdf#152301 allow using an existing ColorListBox to speed initCaolán McNamara 2022-10-11Deduplicate O(U)StringConcatenationMike Kaganski 2022-09-22use more string_view in svxNoel Grandin 2022-03-07do not pass XComponentContext to officecfg::...::get() callsLuboš Luňák 2021-12-22sd theme: allow setting color effects in the sidebarMiklos Vajna 2021-12-21sd theme: allow setting color effects in the chardlgMiklos Vajna 2021-12-20sd theme: allow setting the color's theme index in the chardlgMiklos Vajna 2021-12-17sd theme: add a "theme" palette to the color pickerMiklos Vajna 2021-10-31Prepare for removal of non-const operator[] from Sequence in svxMike Kaganski 2021-10-16Simplify vector initialization in svxJulien Nabet 2021-08-19Make Custom Color Picker dialog asyncSzymon Kłos 2021-01-16make the Color constructors explicitly specify transparencyNoel 2020-11-17Reuse ColorSelectFunction from colorwindow.hxx in PaletteManager.hxxStephan Bergmann 2020-10-26switching long to a 64-bit type on 64-bit windowsNoel 2020-08-06loplugin:flatten in svx/tbxctrlsNoel Grandin 2020-07-06move headers inside modulesNoel Grandin 2020-04-25rename ColorValueSet back to SvxColorValueSetCaolán McNamara 2020-04-24loplugin:unusedmethodsNoel Grandin 2020-03-10tdf#42949 Fix IWYU warnings in svx/source/[t-x]*/*cxxGabor Kelemen 2020-01-06weld AreaPropertyPanelCaolán McNamara 2019-09-03loplugin:constmethod in svxNoel Grandin