summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/filter/xml/xmlHelper.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.cxx6
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx4
-rw-r--r--dbaccess/source/ui/control/marktree.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx3
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.cxx6
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx13
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx1
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx3
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx10
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx1
-rw-r--r--dbaccess/source/ui/uno/unoadmin.cxx2
12 files changed, 0 insertions, 53 deletions
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index bff3bd53a1aa..1ff824764f26 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -71,8 +71,6 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
return pHandler;
}
// -----------------------------------------------------------------------------
-#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010}
// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper()
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index b1a27920e7c0..78ad06b680ea 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -36,12 +36,6 @@
#include "xmlfilter.hxx"
#include "xmlHelper.hxx"
-
-#define XML_LINE_LEFT 0
-#define XML_LINE_RIGHT 1
-#define XML_LINE_TOP 2
-#define XML_LINE_BOTTOM 3
-
namespace dbaxml
{
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index ed88d8d7dbd4..abe5d59f40e3 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -74,10 +74,6 @@ using namespace ::com::sun::star::util;
#define CONTROL_WIDTH_3 250
#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5)
-#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem
-#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format
-#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem
-
#define HSCROLL_STEP 20
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index a99ef1c9a3fa..f72a43cf82d3 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -26,8 +26,6 @@ namespace dbaui
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-#define SPACEBETWEENENTRIES 4
-
DBG_NAME(OMarkableTreeListBox)
OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle )
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 5b1ba07979b0..a273fbd301a6 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -110,9 +110,6 @@ using namespace ::com::sun::star::document;
using namespace ::comphelper;
using namespace ::cppu;
-#define START_PAGE 0
-#define CONNECTION_PAGE 1
-
DBG_NAME(ODbTypeWizDialogSetup)
//=========================================================================
//= ODbTypeWizDialogSetup
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 12c6d9c5d272..e4a589e8e5b0 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -39,17 +39,13 @@
#if defined WNT
#define ODBC_LIBRARY "ODBC32.DLL"
-#define ODBC_UI_LIBRARY "ODBCCP32.DLL"
#endif
#ifdef UNX
#ifdef MACOSX
#define ODBC_LIBRARY "libiodbc.dylib"
-#define ODBC_UI_LIBRARY "libiodbcinst.dylib"
#else
#define ODBC_LIBRARY_1 "libodbc.so.1"
-#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1"
#define ODBC_LIBRARY "libodbc.so"
-#define ODBC_UI_LIBRARY "libodbcinst.so"
#endif
#endif
@@ -86,7 +82,6 @@
#else
#define ODBC_LIBRARY ""
-#define ODBC_UI_LIBRARY ""
#endif // HAVE_ODBC_SUPPORT
@@ -104,7 +99,6 @@ typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEG
typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName,
SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr);
-#define NSQLManageDataSource(a) (*(TSQLManageDataSource)(m_pSQLManageDataSource))(a)
#define NSQLAllocHandle(a,b,c) (*(TSQLAllocHandle)(m_pAllocHandle))(a,b,c)
#define NSQLFreeHandle(a,b) (*(TSQLFreeHandle)(m_pFreeHandle))(a,b)
#define NSQLSetEnvAttr(a,b,c,d) (*(TSQLSetEnvAttr)(m_pSetEnvAttr))(a,b,c,d)
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 3cb6690fcb32..c2854e884ea1 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -65,19 +65,6 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::awt;
#define DBAUI_HTML_FONTSIZES 8 // like export, HTML-Options
-#define HTML_META_NONE 0
-#define HTML_META_AUTHOR 1
-#define HTML_META_DESCRIPTION 2
-#define HTML_META_KEYWORDS 3
-#define HTML_META_REFRESH 4
-#define HTML_META_CLASSIFICATION 5
-#define HTML_META_CREATED 6
-#define HTML_META_CHANGEDBY 7
-#define HTML_META_CHANGED 8
-#define HTML_META_GENERATOR 9
-#define HTML_META_SDFOOTNOTE 10
-#define HTML_META_SDENDNOTE 11
-#define HTML_META_CONTENT_TYPE 12
// ==========================================================================
DBG_NAME(OHTMLReader)
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 20d8e8d94717..92aa6bd5fe15 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -663,7 +663,6 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\
//========================================================================
#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag )
#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, sal_False )
-#define OUT_STR( str ) HTMLOutFuncs::Out_String( (*m_pStream), str )
#define OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine << GetIndentStr()
#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr())
#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr())
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 03f57e2b37f9..dee5ef4dc6b0 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -57,9 +57,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
#define TABWIN_SIZING_AREA 4
-#define LISTBOX_SCROLLING_AREA 6
-#define SCROLLING_TIMESPAN 500
-
#define TABWIN_WIDTH_MIN 90
#define TABWIN_HEIGHT_MIN 80
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index f1ab891036dd..fe569292ccb7 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -82,16 +82,6 @@ DBG_NAME(OTableEditorCtrl)
// Maximum length in description field
#define MAX_DESCR_LEN 256
-
-#define CONTROL_SPACING_X 18 // 6
-#define CONTROL_SPACING_Y 5
-#define CONTROL_HEIGHT 20
-#define CONTROL_WIDTH_1 140 // 100
-#define CONTROL_WIDTH_2 100 // 60
-#define CONTROL_WIDTH_3 250
-#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5)
-
-
//==================================================================
DBG_NAME(ClipboardInvalidator)
//------------------------------------------------------------------
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 1556161a555b..36b53f5e69b4 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -34,7 +34,6 @@
#define CONTROL_SPACING_Y 5
#define CONTROL_HEIGHT 20
#define CONTROL_WIDTH_1 140 // 100
-#define CONTROL_WIDTH_2 100 // 60
#define CONTROL_WIDTH_3 250
#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5)
#define DETAILS_OPT_PAGE_WIDTH (CONTROL_WIDTH_1 + CONTROL_SPACING_X + CONTROL_WIDTH_4 + 50)
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index 4fb61913e609..115b7c88cef0 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -37,8 +37,6 @@
#include <vcl/svapp.hxx>
// ---
-#define THISREF() static_cast< XServiceInfo* >(this)
-
//.........................................................................
namespace dbaui
{