drop worthless _VECTOR_/_MAP_ header guards

Change-Id: I54be19847b8fb609f0b08a528cc06dbae9f579d5

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;

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"

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
 {

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"

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"

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>
 

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"

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
 {

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

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

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>

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"
 

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>

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>

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>

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>

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
 {

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>