drop worthless _VECTOR_/_MAP_ header guards

Change-Id: I54be19847b8fb609f0b08a528cc06dbae9f579d5

18 files changed, 1 insertions, 39 deletions

diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 2b690d1793e0..efcc7b46df5d 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -19,6 +19,7 @@
 
 #include "dbase/DIndexIter.hxx"
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
+#include <tools/string.hxx>
 
 using namespace ::com::sun::star::sdb;
 using namespace connectivity;
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index a50fcda95dd4..e94094859776 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -22,9 +22,7 @@
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase1.hxx>
-#ifndef _VECTOR_
 #include <vector>
-#endif
 #include "FDatabaseMetaDataResultSet.hxx"
 #include "OColumn.hxx"
 #include "connectivity/StdTypeDefs.hxx"
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 790b3cdc1db8..759cdf4bd7ff 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
@@ -21,10 +21,7 @@
 #define _CONNECTIVITY_ADO_ADATABASEMETADATA_HXX_
 
 #include "TDatabaseMetaDataBase.hxx"
-#ifndef _MAP_
 #include <map>
-#endif
-
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index 7e09c6c60d81..5519bea4fc4a 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -22,9 +22,7 @@
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase1.hxx>
-#ifndef _VECTOR_
 #include <vector>
-#endif
 #include "ado/Awrapado.hxx"
 #include "ado/ADatabaseMetaDataResultSet.hxx"
 #include "OColumn.hxx"
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 4c12b166f6e1..4f12c24ef115 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -22,9 +22,7 @@
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase1.hxx>
-#ifndef _VECTOR_
 #include <vector>
-#endif
 #include "ado/Awrapado.hxx"
 #include "ado/AResultSet.hxx"
 #include "OColumn.hxx"
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index cc8f5d1d1d0d..1e92886227d0 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -32,9 +32,7 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include "ado/AConnection.hxx"
-#ifndef _LIST_
 #include <list>
-#endif
 #include "ado/Awrapado.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index b18eb0d444be..a9483b902fcb 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -34,9 +34,7 @@
 #include "connectivity/CommonTools.hxx"
 #include "file/FConnection.hxx"
 #include "file/filedllapi.hxx"
-#ifndef _LIST_
 #include <list>
-#endif
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/propertycontainer.hxx>
 #include "file/fanalyzer.hxx"
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 1bffe4f569f9..91cba8de82f1 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -21,9 +21,7 @@
 
 #include "file/fcode.hxx"
 #include "file/filedllapi.hxx"
-#ifndef _LIST_
 #include <list>
-#endif
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index e87ad175c389..bc7582bbc3ce 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -24,9 +24,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include "odbc/OFunctions.hxx"
 #include "odbc/odbcbasedllapi.hxx"
-#ifndef _VECTOR_
 #include <vector>
-#endif
 #include "odbc/OConnection.hxx"
 
 namespace connectivity
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index d2b7d38180ed..150cb3f01341 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -22,9 +22,7 @@
 // this define has to be set to split the names into different dll's or so's
 // every dll has his own set of property names
 #include <rtl/ustring.hxx>
-#ifndef _MAP_
 #include <map>
-#endif
 #include "connectivity/dbtoolsdllapi.hxx"
 
 namespace dbtools
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index 4578cc57dc07..eafb6dfd5eda 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -21,9 +21,7 @@
 #define DBAUI_JOINDESIGNVIEW_HXX
 
 #include <dbaccess/dataview.hxx>
-#ifndef _VECTOR_
 #include <vector>
-#endif
 #include "QEnumTypes.hxx"
 
 #include <memory>
diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx
index 0d106bf584bf..7c6dc92102dd 100644
--- a/dbaccess/source/ui/inc/RelationDesignView.hxx
+++ b/dbaccess/source/ui/inc/RelationDesignView.hxx
@@ -21,9 +21,7 @@
 #define DBAUI_RELATIONDESIGNVIEW_HXX
 
 #include "JoinDesignView.hxx"
-#ifndef _VECTOR_
 #include <vector>
-#endif
 #include "QEnumTypes.hxx"
 #include "RelationTableView.hxx"
 
diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx
index 61f2a5e27139..ac008a1063b7 100644
--- a/dbaccess/source/ui/inc/RtfReader.hxx
+++ b/dbaccess/source/ui/inc/RtfReader.hxx
@@ -19,9 +19,7 @@
 #ifndef DBAUI_RTFREADER_HXX
 #define DBAUI_RTFREADER_HXX
 
-#ifndef _VECTOR_
 #include <vector>
-#endif
 #include <svtools/parrtf.hxx>
 #include "DExport.hxx"
 #include <tools/stream.hxx>
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index b9bbe02b4f8c..78ac95cc09e8 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -21,15 +21,9 @@
 #include "OfficeFilePicker.hxx"
 #include "iodlg.hxx"
 
-#ifndef _LIST_
 #include <list>
-#endif
-#ifndef _FUNCTIONAL_
 #include <functional>
-#endif
-#ifndef _ALGORITHM_
 #include <algorithm>
-#endif
 #include <tools/urlobj.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index 46ced87c8931..617cd9421ab6 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -25,9 +25,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#ifndef _VECTOR_
 #include <vector>
-#endif
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 827d5c8379b2..43135a427f18 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -20,9 +20,7 @@
 #ifndef _UCBHELPER_PROVIDERHELPER_HXX
 #define _UCBHELPER_PROVIDERHELPER_HXX
 
-#ifndef __LIST__
 #include <list>
-#endif
 #include <com/sun/star/ucb/XContentProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
index c10aa5dc7db6..95b9275954c9 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
@@ -39,9 +39,7 @@
 // this define has to be set to split the names into different dll's or so's
 // every dll has his own set of property names
 #include <rtl/ustring.hxx>
-#ifndef _MAP_
 #include <map>
-#endif
 
 namespace connectivity
 {
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 3d8186f6a278..5e7172e1bbd3 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -24,9 +24,7 @@
 
  *************************************************************************/
 
-#ifndef __VECTOR__
 #include <vector>
-#endif
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>