From 8e2ae4afca72cda9aab8cfe4a5852c4202eed5a7 Mon Sep 17 00:00:00 2001
From: "J. Graeme Lingard" <jgraeme+git@gmail.com>
Date: Tue, 5 Oct 2010 22:17:11 +0100
Subject: Remove redundant #include directives & comments

---
 connectivity/source/commontools/formattedcolumnvalue.cxx   | 1 -
 connectivity/source/drivers/calc/CTable.cxx                | 4 ----
 connectivity/source/drivers/dbase/DTable.cxx               | 2 --
 connectivity/source/drivers/evoab/LTable.cxx               | 3 ---
 connectivity/source/drivers/evoab2/NDriver.cxx             | 3 ---
 connectivity/source/drivers/file/FTables.cxx               | 3 ---
 connectivity/source/drivers/jdbc/Blob.cxx                  | 3 ---
 connectivity/source/drivers/jdbc/Reader.cxx                | 4 +---
 connectivity/source/inc/adabas/BDriver.hxx                 | 1 -
 connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 3 ---
 connectivity/source/inc/ado/AResultSet.hxx                 | 3 ---
 connectivity/source/inc/dbase/DIndexPage.hxx               | 9 ---------
 connectivity/source/inc/java/sql/SQLWarning.hxx            | 3 ---
 13 files changed, 1 insertion(+), 41 deletions(-)

(limited to 'connectivity/source')

diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 3707b7fdb65d..5a67b524296e 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/sdbc/DataType.hpp>
 /** === end UNO includes === **/
 
-//#include <unotools/syslocale.hxx>
 #include <tools/diagnose_ex.h>
 #include <i18npool/mslangid.hxx>
 #include <comphelper/numbers.hxx>
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index a4e5f35825f5..16c0685ad95a 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -30,9 +30,6 @@
 #include "calc/CTable.hxx"
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-//#ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_
-//#include <com/sun/star/ucb/XContentAccess.hpp>
-//#endif
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -79,7 +76,6 @@ using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::util;
 
-// -------------------------------------------------------------------------
 
 void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow )
 {
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 5efc5860e5e5..569473301168 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -39,7 +39,6 @@
 #include <tools/config.hxx>
 #include "dbase/DIndex.hxx"
 #include "dbase/DIndexes.hxx"
-//#include "file/FDriver.hxx"
 #include <comphelper/sequence.hxx>
 #include <svl/zforlist.hxx>
 #include <unotools/syslocale.hxx>
@@ -51,7 +50,6 @@
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/property.hxx>
-//#include <unotools/calendarwrapper.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index 6bb15e860b08..e3fecaafba6c 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -33,9 +33,6 @@
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
-#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_
-//#include <com/sun/star/sdbc/XRow.hpp>
-#endif
 #include <svl/converter.hxx>
 #include "LConnection.hxx"
 #include "LColumns.hxx"
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 37937f5bb57e..521902227ad1 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -31,9 +31,6 @@
 #include "NConnection.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include "connectivity/dbexception.hxx"
-//#ifndef _CONNECTIVITY_EVOAB_CONFIGACCESS_HXX_
-//#include "LConfigAccess.hxx"
-//#endif
 #include <osl/file.hxx>
 #include "osl/security.hxx"
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index 48e08af52e70..f70f20fbbd65 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -36,9 +36,6 @@
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include "file/FCatalog.hxx"
 #include "file/FConnection.hxx"
-//#ifndef _CONNECTIVITY_FILE_OEMPTYCOLLECTION_HXX_
-//#include "file/FEmptyCollection.hxx"
-//#endif
 
 using namespace connectivity;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index cd448754585f..cb8fcca90605 100644
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
@@ -30,9 +30,6 @@
 #include "java/sql/Blob.hxx"
 #include "java/tools.hxx"
 #include "java/io/InputStream.hxx"
-#ifndef _INC_MEMORY
-//#include <memory.h>
-#endif
 #include <connectivity/dbexception.hxx>
 
 #include <string.h>
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 4224929332fa..2feaf7aaf804 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -28,11 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
 #include "java/io/Reader.hxx"
-#ifndef _INC_MEMORY
-//#include <memory.h>
-#endif
 #include <string.h>
 using namespace connectivity;
+
 //**************************************************************
 //************ Class: java.io.Reader
 //**************************************************************
diff --git a/connectivity/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx
index 3b73da08cc6f..b435c6d1534f 100644
--- a/connectivity/source/inc/adabas/BDriver.hxx
+++ b/connectivity/source/inc/adabas/BDriver.hxx
@@ -36,7 +36,6 @@
 
 #include <com/sun/star/lang/XEventListener.hpp>
 
-//#include <unotools/tempfile.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include "odbc/OFunctiondefs.hxx"
 #include "odbc/ODriver.hxx"
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index ce422f7ce528..a84a43a07dee 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -40,9 +40,6 @@
 #include <cppuhelper/compbase7.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include "ado/AStatement.hxx"
-//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-//#include "connectivity/CommonTools.hxx"
-//#endif
 #include <comphelper/broadcasthelper.hxx>
 #include "connectivity/StdTypeDefs.hxx"
 
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index 01d7796c03d4..277a0a7b3968 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -42,9 +42,6 @@
 #include <cppuhelper/compbase12.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include "ado/AStatement.hxx"
-//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-//#include "connectivity/CommonTools.hxx"
-//#endif
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index ad67a7f7ee20..638fcdad51e9 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -28,20 +28,11 @@
 #ifndef _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
 #define _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
 
-//#ifndef _REF_HXX
-//#include <tools/ref.hxx>
-//#endif
 #include <vos/ref.hxx>
 #include <tools/stream.hxx>
 #ifndef _VECTOR_
 #include <vector>
 #endif
-//#ifndef _CONNECTIVITY_FILE_FCODE_HXX_
-//#include "file/fcode.hxx"
-//#endif
-//#ifndef _CONNECTIVITY_DBASE_INDEXNODE_HXX_
-//#include "dbase/dindexnode.hxx"
-//#endif
 
 #if 0
 namespace connectivity
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index 60b74c3a0151..01a2152339c8 100644
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
@@ -29,9 +29,6 @@
 #define _CONNECTIVITY_JAVA_SQL_SQLWARNING_HXX_
 
 #include "java/sql/SQLException.hxx"
-//#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_
-//#include <com/sun/star/sdbc/SQLWarning.hpp>
-//#endif
 
 namespace connectivity
 {
-- 
cgit