-Wunused-macros

Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed

8 files changed, 0 insertions, 26 deletions

diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index 64eb897e3df9..173c669c3f0b 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -25,13 +25,10 @@
 #ifndef DISABLE_DBCONNECTIVITY
 #ifndef YYBISON
 #ifndef FLEX_SCANNER
-#ifndef BISON_INCLUDED
-#define BISON_INCLUDED
 #include "sqlbison.hxx"
 #endif
 #endif
 #endif
-#endif
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XLocaleData4.hpp>
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index b59042e1bde9..9e00758c66b6 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -63,9 +63,6 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 
-// Maximal number of Rows, that can be processed being sorted with ORDER BY:
-#define MAX_KEYSET_SIZE 0x40000 // 256K
-
 namespace
 {
     void lcl_throwError(sal_uInt16 _nErrorId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext)
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 22fe2a3e8780..b7309b852cbc 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -40,10 +40,6 @@ namespace connectivity
         using namespace ::com::sun::star::embed;
         using namespace ::com::sun::star::io;
 
-#define ThrowException(env, type, msg) { \
-    env->ThrowNew(env->FindClass(type), msg); }
-
-
         StreamHelper::StreamHelper(const Reference< XStream>& _xStream)
             : m_xStream(_xStream)
         {
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 38f43765e41b..05c5556814ba 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -35,12 +35,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::connectivity::hsqldb;
 
-/*****************************************************************************/
-/* exception macros */
-
-#define ThrowException(env, type, msg) { \
-    env->ThrowNew(env->FindClass(type), msg); }
-
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
  * Method:    isStreamElement
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 64e60933ad31..351099937dfd 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-#define NULLABLE_UNDEFINED  99
 //**************************************************************
 //************ Class: java.sql.ResultSetMetaData
 //**************************************************************
diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
index 9c7521cafb37..e517f4eae494 100644
--- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
@@ -20,9 +20,6 @@
 
 #include "MNSProfileDiscover.hxx"
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
 #include <MNSFolders.hxx>
 #include <MNSINIParser.hxx>
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index f2727ba669a5..8640ba11bd41 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -78,9 +78,6 @@
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 #endif
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
 #include <MNSFolders.hxx>
 #include <MNSINIParser.hxx>
 
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index cca574d25532..5dc857643463 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -24,10 +24,7 @@
 #include <connectivity/sqlerror.hxx>
 #include <internalnode.hxx>
 #define YYBISON   1
-#ifndef BISON_INCLUDED
-#define BISON_INCLUDED
 #include <sqlbison.hxx>
-#endif
 #include <connectivity/sqlparse.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>