From cf1ae3562efb375a62bf7807bf310556c7dbca70 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Tue, 5 Oct 2010 15:55:12 +0200
Subject: more removed include guards using fixguard.py

---
 connectivity/source/inc/RowFunctionParser.hxx            |  2 --
 connectivity/source/inc/adabas/BStatement.hxx            |  2 --
 .../source/inc/dbase/DDatabaseMetaDataResultSet.hxx      |  2 --
 connectivity/source/inc/file/FResultSet.hxx              | 16 ----------------
 connectivity/source/inc/file/FTable.hxx                  |  2 --
 connectivity/source/inc/hsqldb/HStorageMap.hxx           |  2 --
 connectivity/source/inc/java/tools.hxx                   |  2 --
 7 files changed, 28 deletions(-)

(limited to 'connectivity/source/inc')

diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index 84d351e75c..e56f4190a0 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -29,9 +29,7 @@
 #define CONNECTIVITY_ROWFUNCTIONPARSER_HXX_INCLUDED
 
 #include <sal/config.h>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
 #include <boost/shared_ptr.hpp>
-#endif
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <vector>
 #include "connectivity/dbtoolsdllapi.hxx"
diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index 1d141a47ac..f2cc66f80d 100644
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
@@ -29,9 +29,7 @@
 
 #include "odbc/OStatement.hxx"
 #include "adabas/BConnection.hxx"
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
 #include "connectivity/commontools.hxx"
-#endif
 #include <vos/ref.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index 45b459202e..d7c56b3c5b 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
@@ -39,9 +39,7 @@
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <cppuhelper/compbase7.hxx>
 #include <comphelper/proparrhlp.hxx>
-#ifndef _CONNECTIVITY_FILE_ASTATEMENT_HXX_
 #include "file/FStatement.hxx"
-#endif
 #include "connectivity/CommonTools.hxx"
 #include <comphelper/propertycontainer.hxx>
 
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index ebd76a8f7d..9b21b42f3e 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -28,31 +28,15 @@
 #ifndef _CONNECTIVITY_FILE_FRESULTSET_HXX_
 #define _CONNECTIVITY_FILE_FRESULTSET_HXX_
 
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSET_HPP_
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSETMETADATASUPPLIER_HPP_
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XCLOSEABLE_HPP_
 #include <com/sun/star/sdbc/XCloseable.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XCOLUMNLOCATE_HPP_
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
-#endif
 #include <com/sun/star/util/XCancellable.hpp>
-#ifndef _COM_SUN_STAR_SQLC_XWARNINGSSUPPLIER_HPP_
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSETUPDATE_HPP_
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XROWUPDATE_HPP_
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
-#endif
 #include <cppuhelper/compbase12.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include "file/FStatement.hxx"
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index c58d540164..928f672944 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -31,9 +31,7 @@
 #include "connectivity/sdbcx/VTable.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _CONNECTIVITY_FILE_BCONNECTION_HXX_
 #include "file/FConnection.hxx"
-#endif
 #include "file/filedllapi.hxx"
 #include <tools/stream.hxx>
 #include "connectivity/FValue.hxx"
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index c54afce3e6..369e645dfd 100644
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
@@ -33,9 +33,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
 #include <boost/shared_ptr.hpp>
-#endif
 #include <comphelper/stl_types.hxx>
 #include <jni.h>
 //........................................................................
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index b917c0dd0c..9ed39ce93b 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.h>
 
-#ifndef JNI_H
 #include <jni.h>
-#endif
 #include "java/sql/SQLException.hxx"
 #include <comphelper/uno3.hxx>
 
-- 
cgit v1.2.3