diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-05 15:53:38 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 17:58:28 +0200 |
| commit | 65e8a6aeebce899b1c2d0217c608af37607f205e (patch) | |
| tree | c7c1ffc93e1fc894adbf7aba0efde7792f86bcc7 | |
| parent | 06052e404ffd12c291ba9b0acb6a0cb3dd7a7e37 (diff) | |
more removed include guards using fixguard.py
257 files changed, 0 insertions, 2776 deletions
diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 43357406d..affea408f 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -28,15 +28,9 @@ #ifndef DBAUI_ICONTROLLER_HXX #define DBAUI_ICONTROLLER_HXX -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef DBAUI_IREFERENCE_HXX #include "IReference.hxx" -#endif #include "dbaccessdllapi.h" namespace com { namespace sun { namespace star { diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index db1c5b282..8b4537144 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.hxx @@ -28,18 +28,10 @@ #ifndef DBAUI_TOOLBOXHELPER_HXX #define DBAUI_TOOLBOXHELPER_HXX -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif -#ifndef _LINK_HXX #include <tools/link.hxx> -#endif -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif -#ifndef _SV_IMAGE_HXX #include <vcl/image.hxx> -#endif #include "dbaccessdllapi.h" class SvtMiscOptions; diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx index 0251e04b2..fa3e366d0 100644 --- a/dbaccess/inc/dataview.hxx +++ b/dbaccess/inc/dataview.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_DATAVIEW_HXX #define DBAUI_DATAVIEW_HXX -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX #include <svtools/acceleratorexecute.hxx> -#endif #include <memory> #include "dbaccessdllapi.h" diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index 18df82653..faa806263 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -28,12 +28,8 @@ #ifndef DBACCESS_CORE_API_BOOKMARKSET_HXX #define DBACCESS_CORE_API_BOOKMARKSET_HXX -#ifndef DBACCESS_CORE_API_CACHESET_HXX #include "CacheSet.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include <com/sun/star/sdbc/XRowUpdate.hpp> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/CIndexColumn.hxx b/dbaccess/source/core/api/CIndexColumn.hxx index 81a3302b3..80bc09dc8 100644 --- a/dbaccess/source/core/api/CIndexColumn.hxx +++ b/dbaccess/source/core/api/CIndexColumn.hxx @@ -28,9 +28,7 @@ #ifndef DBACCESS_INDEXCOLUMN_HXX_ #define DBACCESS_INDEXCOLUMN_HXX_ -#ifndef _CONNECTIVITY_ADABAS_COLUMN_HXX_ #include "adabas/BColumn.hxx" -#endif namespace connectivity { diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx index 784e2ba80..eee1d4814 100644 --- a/dbaccess/source/core/api/CIndexes.hxx +++ b/dbaccess/source/core/api/CIndexes.hxx @@ -28,9 +28,7 @@ #ifndef DBACCESS_INDEXES_HXX_ #define DBACCESS_INDEXES_HXX_ -#ifndef CONNECTIVITY_INDEXESHELPER_HXX #include "connectivity/TIndexes.hxx" -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index 3b16166da..f82d806c5 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -27,18 +27,10 @@ #ifndef DBACCESS_CORE_API_CROWSETCOLUMN_HXX #define DBACCESS_CORE_API_CROWSETCOLUMN_HXX -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef DBACCESS_CORE_API_CROWSETDATACOLUMN_HXX #include "CRowSetDataColumn.hxx" -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 59601137b..f34602f01 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -27,39 +27,17 @@ #ifndef DBACCESS_CORE_API_CACHESET_HXX #define DBACCESS_CORE_API_CACHESET_HXX -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HPP_ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include <com/sun/star/sdbc/XResultSet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include <com/sun/star/sdbcx/XRowLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_ #include <com/sun/star/sdbcx/XDeleteRows.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_COMPAREBOOKMARK_HPP_ #include <com/sun/star/sdbcx/CompareBookmark.hpp> -#endif -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include <list> namespace rtl diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index 049f2c000..fa91dfd78 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -27,21 +27,11 @@ #ifndef DBA_HELPERCOLLECTIONS_HXX #define DBA_HELPERCOLLECTIONS_HXX -#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_ #include "connectivity/sdbcx/VCollection.hxx" -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> -#endif -#ifndef _DBHELPER_DBCONVERSION_HXX_ #include <connectivity/dbconversion.hxx> -#endif -#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_ #include <connectivity/PColumn.hxx> -#endif -#ifndef _VOS_REF_HXX_ #include <vos/ref.hxx> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 5403a56d6..5d2ef8bfe 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -28,24 +28,16 @@ #ifndef DBACCESS_CORE_API_KEYSET_HXX #define DBACCESS_CORE_API_KEYSET_HXX -#ifndef DBACCESS_CORE_API_CACHESET_HXX #include "CacheSet.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include <memory> #include <map> -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 863248725..f653d3b3f 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -27,69 +27,27 @@ #ifndef DBACCESS_CORE_API_ROWSETBASE_HXX #define DBACCESS_CORE_API_ROWSETBASE_HXX -#ifndef _CPPUHELPER_IMPLBASE10_HXX_ #include <cppuhelper/implbase10.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include <com/sun/star/sdbc/XColumnLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include <com/sun/star/sdbc/XCloseable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include <com/sun/star/sdbcx/XRowLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_H_ #include <cppuhelper/interfacecontainer.h> -#endif -#ifndef CONNECTIVITY_SQLERROR_HXX #include <connectivity/sqlerror.hxx> -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include <comphelper/propertystatecontainer.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include <com/sun/star/sdbc/XRowSet.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTYPES_HPP_ #include <com/sun/star/util/XNumberFormatTypes.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef DBACCESS_ROWSETCACHEITERATOR_HXX #include "RowSetCacheIterator.hxx" -#endif #include "core_resource.hxx" #include <comphelper/componentcontext.hxx> diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index d7823a90a..24d09dfb0 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -27,78 +27,30 @@ #ifndef DBACCESS_CORE_API_ROWSETCACHE_HXX #define DBACCESS_CORE_API_ROWSETCACHE_HXX -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XPREPAREDSTATEMENT_HPP_ #include <com/sun/star/sdbc/XPreparedStatement.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYANALYZER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYANALYZER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XRESULTSETACCESS_HPP_ #include <com/sun/star/sdb/XResultSetAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include <com/sun/star/sdbc/XColumnLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include <com/sun/star/sdbcx/XRowLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include <com/sun/star/sdbc/XRowUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XROWSETAPPROVEBROADCASTER_HPP_ #include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_RESULTSETTYPE_HPP_ #include <com/sun/star/sdbc/ResultSetType.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_ #include <com/sun/star/sdbcx/XDeleteRows.hpp> -#endif -#ifndef _CPPUHELPER_COMPBASE11_HXX_ #include <cppuhelper/compbase11.hxx> -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include <comphelper/propertycontainer.hxx> -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include <comphelper/componentcontext.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef DBACCESS_ROWSETCACHEITERATOR_HXX #include "RowSetCacheIterator.hxx" -#endif namespace connectivity { diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index 641e0309d..c7ea4bd2f 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -27,12 +27,8 @@ #ifndef DBACCESS_ROWSETCACHEITERATOR_HXX #define DBACCESS_ROWSETCACHEITERATOR_HXX -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index e7ccd399d..ec7786e70 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -27,18 +27,10 @@ #ifndef DBACCESS_CORE_API_ROWSETROW_HXX #define DBACCESS_CORE_API_ROWSETROW_HXX -#ifndef _VOS_REF_HXX_ #include <vos/ref.hxx> -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _CONNECTIVITY_FILE_VALUE_HXX_ #include "connectivity/FValue.hxx" -#endif -#ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx index 794623c07..b6d41d4f3 100644 --- a/dbaccess/source/core/api/StaticSet.hxx +++ b/dbaccess/source/core/api/StaticSet.hxx @@ -28,9 +28,7 @@ #ifndef DBACCESS_CORE_API_STATICSET_HXX #define DBACCESS_CORE_API_STATICSET_HXX -#ifndef DBACCESS_CORE_API_CACHESET_HXX #include "CacheSet.hxx" -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index e78e45a14..df4353042 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -31,9 +31,7 @@ #ifndef DBACCESS_CORE_API_WRAPPEDRESULTSET_HXX #define DBACCESS_CORE_API_WRAPPEDRESULTSET_HXX -#ifndef DBACCESS_CORE_API_CACHESET_HXX #include "CacheSet.hxx" -#endif #include <com/sun/star/sdbc/XRowUpdate.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index c55c9e77c..6e772a5c5 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -28,24 +28,12 @@ #ifndef _DBACORE_DATACOLUMN_HXX_ #define _DBACORE_DATACOLUMN_HXX_ -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include <com/sun/star/sdbc/XRowUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HDL_ #include <com/sun/star/sdbc/XResultSetMetaData.hdl> -#endif -#ifndef _COM_SUN_STAR_SDB_XCOLUMN_HPP_ #include <com/sun/star/sdb/XColumn.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XCOLUMNUPDATE_HPP_ #include <com/sun/star/sdb/XColumnUpdate.hpp> -#endif -#ifndef _DBA_COREAPI_RESULTCOLUMN_HXX_ #include <resultcolumn.hxx> -#endif namespace dbaccess { //************************************************************ diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index d04f78276..449e2dbb7 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -28,27 +28,13 @@ #ifndef _DBA_COREAPI_QUERY_HXX_ #define _DBA_COREAPI_QUERY_HXX_ -#ifndef _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ #include "querydescriptor.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase3.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include <com/sun/star/sdbcx/XRename.hpp> -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif #include <map> diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 61395e59e..53d75bc2c 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -28,44 +28,20 @@ #ifndef _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ #define _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase3.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include "column.hxx" -#endif -#ifndef _DBA_CORE_DATASETTINGS_HXX_ #include "datasettings.hxx" -#endif -#ifndef _DBA_CORE_COMMANDBASE_HXX_ #include "commandbase.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 76f856615..b11c78bd0 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -28,12 +28,8 @@ #ifndef _DBACORE_RESULTCOLUMN_HXX_ #define _DBACORE_RESULTCOLUMN_HXX_ -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HDL_ #include <com/sun/star/sdbc/XResultSetMetaData.hdl> -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include <column.hxx> -#endif #include <boost/optional.hpp> namespace dbaccess { diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index f95e5c2be..6fc8f3121 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -27,68 +27,28 @@ #ifndef _DBA_COREAPI_RESULTSET_HXX_ #define _DBA_COREAPI_RESULTSET_HXX_ -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include "column.hxx" -#endif -#ifndef DBTOOLS_WARNINGSCONTAINER_HXX #include <connectivity/warningscontainer.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XSTATEMENT_HPP_ #include <com/sun/star/sdbc/XStatement.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include <com/sun/star/sdbc/XCloseable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include <com/sun/star/sdbc/XResultSet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include <com/sun/star/sdbc/XColumnLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include <com/sun/star/sdbcx/XRowLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include <com/sun/star/sdbc/XRowUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_RESULTSETCONCURRENCY_HPP_ #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> -#endif -#ifndef _CPPUHELPER_PROPSHLP_HXX #include <cppuhelper/propshlp.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _CPPUHELPER_COMPBASE11_HXX_ #include <cppuhelper/compbase11.hxx> -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 3a535c5c0..cd679a685 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -28,45 +28,19 @@ #ifndef DBA_COREDATAACESS_COMPONENTDEFINITION_HXX #define DBA_COREDATAACESS_COMPONENTDEFINITION_HXX -#ifndef _DBA_CORE_COMMANDBASE_HXX_ #include "commandbase.hxx" -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include <comphelper/propertycontainer.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include <com/sun/star/sdbcx/XRename.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _DBA_CORE_DATASETTINGS_HXX_ #include "datasettings.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include <column.hxx> -#endif #include <comphelper/implementationreference.hxx> #include <memory> diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index e90ea054c..8f7ca35b2 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -27,48 +27,20 @@ #ifndef DBA_CORE_SHARED_CONNECTION_HXX #define DBA_CORE_SHARED_CONNECTION_HXX -#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_ #include "connectivity/ConnectionWrapper.hxx" -#endif -#ifndef _CPPUHELPER_COMPONENT_HXX_ #include <cppuhelper/component.hxx> -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _CPPUHELPER_COMPBASE1_HXX_ #include <cppuhelper/compbase1.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ #include <com/sun/star/sdbc/SQLWarning.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSERFACTORY_HPP_ #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XCOMMANDPREPARATION_HPP_ #include <com/sun/star/sdb/XCommandPreparation.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XViewsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_ #include <com/sun/star/sdb/XQueriesSupplier.hpp> -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> -#endif namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 04a446f22..69a9bff1c 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -28,45 +28,19 @@ #ifndef _DBA_CORE_BOOKMARKCONTAINER_HXX_ #define _DBA_CORE_BOOKMARKCONTAINER_HXX_ -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include <cppuhelper/interfacecontainer.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE6_HXX_ #include <cppuhelper/implbase6.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include <com/sun/star/container/XEnumerationAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include <com/sun/star/container/XIndexAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index 69f50ce43..74a3d5abf 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -28,17 +28,11 @@ #ifndef _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_ #define _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_ -#ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #include "definitioncontainer.hxx" -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 27dd4bb86..0aee88c3e 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -28,39 +28,17 @@ #ifndef _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_ #define _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_ -#ifndef _DBA_CORE_COMMANDBASE_HXX_ #include "commandbase.hxx" -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include <comphelper/propertycontainer.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include <com/sun/star/sdbcx/XRename.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _DBA_CORE_DATASETTINGS_HXX_ #include "datasettings.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef DBA_COREDATAACESS_COMPONENTDEFINITION_HXX #include "ComponentDefinition.hxx" -#endif //........................................................................ diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index 6a94fa66d..305cf584b 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -28,102 +28,38 @@ #ifndef _DBA_COREDATAACCESS_DATASOURCE_HXX_ #define _DBA_COREDATAACCESS_DATASOURCE_HXX_ -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include <com/sun/star/sdbc/XDataSource.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XBOOKMARKSSUPPLIER_HPP_ #include <com/sun/star/sdb/XBookmarksSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XQUERYDEFINITIONSSUPPLIER_HPP_ #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XISOLATEDCONNECTION_HPP_ #include <com/sun/star/sdbc/XIsolatedConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include <com/sun/star/util/XNumberFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTLISTENER_HPP_ #include <com/sun/star/document/XEventListener.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XFLUSHABLE_HPP_ #include <com/sun/star/util/XFlushable.hpp> -#endif -#ifndef _CPPUHELPER_PROPSHLP_HXX #include <cppuhelper/propshlp.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _CPPUHELPER_WEAKREF_HXX_ #include <cppuhelper/weakref.hxx> -#endif -#ifndef _CPPUHELPER_COMPBASE11_HXX_ #include <cppuhelper/compbase11.hxx> -#endif -#ifndef _COM_SUN_STAR_EMBED_XTRANSACTIONLISTENER_HPP_ #include <com/sun/star/embed/XTransactionListener.hpp> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBA_CORE_BOOKMARKCONTAINER_HXX_ #include "bookmarkcontainer.hxx" -#endif -#ifndef _VOS_REF_HXX_ #include <vos/ref.hxx> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XCOMPLETEDCONNECTION_HPP_ #include <com/sun/star/sdb/XCompletedConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include <com/sun/star/embed/XStorage.hpp> -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XSTORAGEBASEDDOCUMENT_HPP_ #include <com/sun/star/document/XStorageBasedDocument.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include <com/sun/star/util/XRefreshable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XDOCUMENTDATASOURCE_HPP_ #include <com/sun/star/sdb/XDocumentDataSource.hpp> -#endif -#ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_ #include "ModelImpl.hxx" -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index f401d68b6..0998a8209 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -28,36 +28,16 @@ #ifndef _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ #define _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ -#ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #include "definitioncontainer.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include <com/sun/star/frame/XComponentLoader.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMECONTAINER_HPP_ #include <com/sun/star/container/XHierarchicalNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAME_HPP_ #include <com/sun/star/container/XHierarchicalName.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include <com/sun/star/embed/XTransactedObject.hpp> -#endif -#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include <comphelper/propertystatecontainer.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index b011728a6..a17d40a9e 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -28,39 +28,17 @@ #ifndef _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ #define _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ -#ifndef _CPPUHELPER_PROPSHLP_HXX #include <cppuhelper/propshlp.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include <cppuhelper/implbase4.hxx> -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include <comphelper/propertystatecontainer.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include <com/sun/star/frame/XComponentLoader.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include <com/sun/star/frame/XController.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_XSTATECHANGELISTENER_HPP_ #include <com/sun/star/embed/XStateChangeListener.hpp> -#endif #include <com/sun/star/sdb/XSubDocument.hpp> #include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/container/XHierarchicalName.hpp> diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index e7bacfc63..ca9a6d634 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -28,30 +28,14 @@ #ifndef DBA_INTERCEPT_HXX #define DBA_INTERCEPT_HXX -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include <cppuhelper/implbase4.hxx> -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include <cppuhelper/interfacecontainer.hxx> -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HPP_ #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XINTERCEPTORINFO_HPP_ #include <com/sun/star/frame/XInterceptorInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTLISTENER_HPP_ #include <com/sun/star/document/XEventListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include <com/sun/star/frame/XDispatch.hpp> -#endif -#ifndef _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ #include "documentdefinition.hxx" -#endif #include <vcl/svapp.hxx> namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 3b4ceb8ef..a9e7f0bdd 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -28,15 +28,9 @@ #ifndef DBA_DATASUPPLIER_HXX #define DBA_DATASUPPLIER_HXX -#ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> -#endif -#ifndef _UCBHELPER_RESULTSET_HXX #include <ucbhelper/resultset.hxx> -#endif -#ifndef _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ #include "documentcontainer.hxx" -#endif #include <memory> namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.hxx b/dbaccess/source/core/dataaccess/myucp_resultset.hxx index 24caf5c32..2008dc6f2 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.hxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.hxx @@ -28,15 +28,9 @@ #ifndef DBA_UCPRESULTSET_HXX #define DBA_UCPRESULTSET_HXX -#ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> -#endif -#ifndef _UCBHELPER_RESULTSETHELPER_HXX #include <ucbhelper/resultsethelper.hxx> -#endif -#ifndef _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ #include "documentcontainer.hxx" -#endif // @@@ Adjust namespace name. diff --git a/dbaccess/source/core/inc/ContainerListener.hxx b/dbaccess/source/core/inc/ContainerListener.hxx index 749e3df9b..2c9fc6995 100644 --- a/dbaccess/source/core/inc/ContainerListener.hxx +++ b/dbaccess/source/core/inc/ContainerListener.hxx @@ -27,19 +27,11 @@ #ifndef DBA_CONTAINERLISTENER_HXX #define DBA_CONTAINERLISTENER_HXX -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase2.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERAPPROVELISTENER_HPP_ #include <com/sun/star/container/XContainerApproveListener.hpp> -#endif -#ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index a4bb8d44a..a05522a4d 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -27,34 +27,16 @@ #ifndef DBA_CONTAINERMEDIATOR_HXX #define DBA_CONTAINERMEDIATOR_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> -#endif #include <map> diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 65bd10489..fd86bdd63 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -27,72 +27,28 @@ #ifndef DBA_CONTENTHELPER_HXX #define DBA_CONTENTHELPER_HXX -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include <com/sun/star/ucb/XContent.hpp> -#endif -#ifndef _COM_SUN_STAR_UCB_XCOMMANDPROCESSOR_HPP_ #include <com/sun/star/ucb/XCommandProcessor.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTIESCHANGENOTIFIER_HPP_ #include <com/sun/star/beans/XPropertiesChangeNotifier.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HPP_ #include <com/sun/star/beans/XPropertyContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include <com/sun/star/embed/XStorage.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_ #include <com/sun/star/embed/XEmbeddedObject.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif -#ifndef _CPPUHELPER_COMPBASE9_HXX_ #include <cppuhelper/compbase9.hxx> -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include <comphelper/componentcontext.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTY_HPP_ #include <com/sun/star/beans/Property.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include <com/sun/star/sdbcx/XRename.hpp> -#endif -#ifndef CONNECTIVITY_SQLERROR_HXX #include <connectivity/sqlerror.hxx> -#endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index dcdb81746..5334e59e1 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -27,24 +27,12 @@ #ifndef DBA_PROPERTYSETFORWARD_HXX #define DBA_PROPERTYSETFORWARD_HXX -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HPP_ #include <com/sun/star/beans/XPropertySetInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif #include <vector> diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx index 6b53f2bc5..b7a7330f2 100644 --- a/dbaccess/source/core/inc/RefreshListener.hxx +++ b/dbaccess/source/core/inc/RefreshListener.hxx @@ -28,9 +28,7 @@ #ifndef DBA_CORE_REFRESHLISTENER_HXX #define DBA_CORE_REFRESHLISTENER_HXX -#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> -#endif namespace com { namespace sun { namespace star { namespace container { diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 5ba9a6329..21dfa7e5e 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -27,51 +27,21 @@ #ifndef DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX #define DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX -#ifndef _COM_SUN_STAR_SDB_XPARAMETERSSUPPLIER_HPP_ #include <com/sun/star/sdb/XParametersSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_SCRIPT_XTYPECONVERTER_HPP_ #include <com/sun/star/script/XTypeConverter.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #include <connectivity/sqliterator.hxx> -#endif -#ifndef _CONNECTIVITY_SQLPARSE_HXX #include <connectivity/sqlparse.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include <comphelper/propertycontainer.hxx> -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include <comphelper/componentcontext.hxx> -#endif #include <memory> diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 3ba43e6a1..455a071aa 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -28,61 +28,25 @@ #ifndef _DBA_CORE_TABLEDECORATOR_HXX_ #define _DBA_CORE_TABLEDECORATOR_HXX_ -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XINDEXESSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XKEYSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XKeysSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include <com/sun/star/sdbcx/XRename.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XALTERTABLE_HPP_ #include <com/sun/star/sdbcx/XAlterTable.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _CPPUHELPER_COMPBASE9_HXX_ #include <cppuhelper/compbase9.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBA_CORE_DATASETTINGS_HXX_ #include "datasettings.hxx" -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include "column.hxx" -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_ #include <connectivity/sdbcx/IRefreshable.hxx> -#endif -#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX #include <comphelper/IdPropArrayHelper.hxx> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx index 45a405bfc..3e3874d91 100644 --- a/dbaccess/source/core/inc/callablestatement.hxx +++ b/dbaccess/source/core/inc/callablestatement.hxx @@ -27,15 +27,9 @@ #ifndef _DBA_COREAPI_CALLABLESTATEMENT_HXX_ #define _DBA_COREAPI_CALLABLESTATEMENT_HXX_ -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XOUTPARAMETERS_HPP_ #include <com/sun/star/sdbc/XOutParameters.hpp> -#endif -#ifndef _DBA_COREAPI_PREPAREDSTATEMENT_HXX_ #include <preparedstatement.hxx> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 8a4bd018a..3d12602f1 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -28,12 +28,8 @@ #ifndef _DBA_CORE_COMMANDBASE_HXX_ #define _DBA_CORE_COMMANDBASE_HXX_ -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index d98ff23e4..2d6257d1e 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -31,9 +31,7 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> -#endif #include <functional> diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx index 7aa84323b..9ecfe1c98 100644 --- a/dbaccess/source/core/inc/containerapprove.hxx +++ b/dbaccess/source/core/inc/containerapprove.hxx @@ -29,9 +29,7 @@ #define DBACCESS_CONTAINERAPPROVE_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HPP_ #include <com/sun/star/uno/XInterface.hpp> -#endif /** === end UNO includes === **/ #include <boost/shared_ptr.hpp> diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx index b97efa0c2..a45473303 100644 --- a/dbaccess/source/core/inc/core_resource.hxx +++ b/dbaccess/source/core/inc/core_resource.hxx @@ -28,9 +28,7 @@ #ifndef _DBA_CORE_RESOURCE_HXX_ #define _DBA_CORE_RESOURCE_HXX_ -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <osl/mutex.hxx> class ResMgr; diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index ada830b60..795dc22d9 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -28,24 +28,12 @@ #ifndef _DBA_CORE_DATASETTINGS_HXX_ #define _DBA_CORE_DATASETTINGS_HXX_ -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTY_HPP_ #include <com/sun/star/beans/Property.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_ #include <com/sun/star/awt/FontDescriptor.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include <comphelper/propertystatecontainer.hxx> -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 4b87250e7..0112cfa6a 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -28,63 +28,25 @@ #ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #define _DBA_CORE_DEFINITIONCONTAINER_HXX_ -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include <cppuhelper/interfacecontainer.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE7_HXX_ #include <cppuhelper/implbase7.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include <com/sun/star/container/XEnumerationAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include <com/sun/star/container/XIndexAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HPP_ #include <com/sun/star/beans/XVetoableChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERAPPROVEBROADCASTER_HPP_ #include <com/sun/star/container/XContainerApproveBroadcaster.hpp> -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef DBACCESS_CONTAINERAPPROVE_HXX #include "containerapprove.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif //........................................................................ namespace dbaccess { diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index cf37ed62e..31cd7c369 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -28,14 +28,10 @@ #ifndef DBACCESS_OBJECTNAMEAPPROVAL_HXX #define DBACCESS_OBJECTNAMEAPPROVAL_HXX -#ifndef DBACCESS_CONTAINERAPPROVE_HXX #include "containerapprove.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif /** === end UNO includes === **/ //........................................................................ diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index 63840b22b..2823a4f4e 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -27,30 +27,14 @@ #ifndef _DBA_COREAPI_PREPAREDSTATEMENT_HXX_ #define _DBA_COREAPI_PREPAREDSTATEMENT_HXX_ -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XPREPAREDSTATEMENT_HPP_ #include <com/sun/star/sdbc/XPreparedStatement.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include <com/sun/star/sdbc/XParameters.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include <com/sun/star/sdbc/XParameters.hpp> -#endif -#ifndef _DBA_COREAPI_STATEMENT_HXX_ #include <statement.hxx> -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include <column.hxx> -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 38f2dc46a..9bc59155a 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -27,45 +27,19 @@ #ifndef DBACCESS_CORE_API_QUERYCOMPOSER_HXX #define DBACCESS_CORE_API_QUERYCOMPOSER_HXX -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSQLQueryComposer.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XPARAMETERSSUPPLIER_HPP_ #include <com/sun/star/sdb/XParametersSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_SCRIPT_XTYPECONVERTER_HPP_ #include <com/sun/star/script/XTypeConverter.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #include <connectivity/sqliterator.hxx> -#endif -#ifndef _CONNECTIVITY_SQLPARSE_HXX #include <connectivity/sqlparse.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#endif diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index 2f370fa5e..54dd2b819 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -28,76 +28,32 @@ #ifndef _DBA_CORE_QUERYCONTAINER_HXX_ #define _DBA_CORE_QUERYCONTAINER_HXX_ -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include <cppuhelper/interfacecontainer.hxx> -#endif /** === begin UNO includes == **/ -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include <com/sun/star/container/XEnumerationAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include <com/sun/star/container/XIndexAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include <com/sun/star/util/XRefreshable.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_ #include <com/sun/star/sdbcx/XAppend.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDROP_HPP_ #include <com/sun/star/sdbcx/XDrop.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERAPPROVELISTENER_HPP_ #include <com/sun/star/container/XContainerApproveListener.hpp> -#endif /** === end UNO includes === **/ -#ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #include "definitioncontainer.hxx" -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif namespace dbtools { diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index 7f9da9560..f841554ce 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -27,49 +27,21 @@ #ifndef _DBA_COREAPI_STATEMENT_HXX_ #define _DBA_COREAPI_STATEMENT_HXX_ -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XSTATEMENT_HPP_ #include <com/sun/star/sdbc/XStatement.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCANCELLABLE_HPP_ #include <com/sun/star/util/XCancellable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include <com/sun/star/sdbc/XCloseable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XMULTIPLERESULTS_HDL_ #include <com/sun/star/sdbc/XMultipleResults.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XPREPAREDBATCHEXECUTION_HDL_ #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> -#endif #include <com/sun/star/sdbc/XBatchExecution.hpp> -#ifndef _COM_SUN_STAR_SDBC_XGENERATEDRESULTSET_HPP_ #include <com/sun/star/sdbc/XGeneratedResultSet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#endif -#ifndef _CPPUHELPER_PROPSHLP_HXX #include <cppuhelper/propshlp.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif #include <cppuhelper/implbase3.hxx> diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 4503edd5d..592f1e946 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -28,54 +28,22 @@ #ifndef _DBA_CORE_TABLECONTAINER_HXX_ #define _DBA_CORE_TABLECONTAINER_HXX_ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include <com/sun/star/container/XEnumerationAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include <com/sun/star/container/XIndexAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include <com/sun/star/util/XRefreshable.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef DBACCESS_CORE_FILTERED_CONTAINER_HXX #include "FilteredContainer.hxx" -#endif -#ifndef DBTOOLS_WARNINGSCONTAINER_HXX #include <connectivity/warningscontainer.hxx> -#endif -#ifndef DBA_CORE_REFRESHLISTENER_HXX #include "RefreshListener.hxx" -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx index a2dcbcf39..313995506 100644 --- a/dbaccess/source/core/inc/userinformation.hxx +++ b/dbaccess/source/core/inc/userinformation.hxx @@ -28,13 +28,9 @@ #ifndef _DBA_CORE_USERINFORMATION_HXX_ #define _DBA_CORE_USERINFORMATION_HXX_ -#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_ #include <com/sun/star/lang/Locale.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif class UserInformation { diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx index ccf2349be..d87d9d0bb 100644 --- a/dbaccess/source/core/inc/veto.hxx +++ b/dbaccess/source/core/inc/veto.hxx @@ -29,14 +29,10 @@ #define DBACCESS_VETO_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_UTIL_XVETO_HPP_ #include <com/sun/star/util/XVeto.hpp> -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index dc19dd8cd..cb2c6bd8e 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -28,47 +28,21 @@ #ifndef _DBA_CORE_VIEWCONTAINER_HXX_ #define _DBA_CORE_VIEWCONTAINER_HXX_ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include <com/sun/star/container/XEnumerationAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include <com/sun/star/container/XIndexAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include <com/sun/star/util/XRefreshable.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ #include <com/sun/star/sdbc/SQLWarning.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_ #include <com/sun/star/sdb/SQLContext.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef DBACCESS_CORE_FILTERED_CONTAINER_HXX #include "FilteredContainer.hxx" -#endif namespace dbtools { diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx index 6af12e564..9461f4858 100644 --- a/dbaccess/source/ext/adabas/ANewDb.hxx +++ b/dbaccess/source/ext/adabas/ANewDb.hxx @@ -29,15 +29,9 @@ #ifndef ADABASUI_NEWDB_HXX #define ADABASUI_NEWDB_HXX -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include <svtools/genericunodialog.hxx> -#endif -#ifndef _EXTENSIONS_COMPONENT_MODULE_HXX_ #include "Acomponentmodule.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCREATECATALOG_HPP_ #include <com/sun/star/sdbcx/XCreateCatalog.hpp> -#endif diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx index d010f8a6d..5029debf5 100644 --- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx +++ b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx @@ -28,12 +28,8 @@ #ifndef ADABASUI_SQLNAMEEDIT_HXX #define ADABASUI_SQLNAMEEDIT_HXX -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _SV_COMBOBOX_HXX #include <vcl/combobox.hxx> -#endif namespace adabasui { diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx index a9211527f..741903e50 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx @@ -36,30 +36,14 @@ which should be used as namespace for the classes defined herein.</p> */ -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _TOOLS_RESID_HXX #include <tools/resid.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include <com/sun/star/registry/XRegistryKey.hpp> -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif -#ifndef _RTL_STRING_HXX_ #include <rtl/string.hxx> -#endif class ResMgr; diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx index b8f4e65c0..37f03a4c0 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx @@ -29,31 +29,15 @@ #define ADABASUI_ADABAS_CREATEDB_HXX -#ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCREATECATALOG_HPP_ #include <com/sun/star/sdbcx/XCreateCatalog.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> -#endif #include <memory> #include "ASQLNameEdit.hxx" diff --git a/dbaccess/source/filter/migration/cfgimport.hxx b/dbaccess/source/filter/migration/cfgimport.hxx index 658991fc8..e0335abfe 100644 --- a/dbaccess/source/filter/migration/cfgimport.hxx +++ b/dbaccess/source/filter/migration/cfgimport.hxx @@ -28,42 +28,18 @@ #ifndef CFG_CFGIMPORT_HXX #define CFG_CFGIMPORT_HXX -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> -#endif -#ifndef _COM_SUN_STAR_TASK_XJOB_HPP_ #include <com/sun/star/task/XJob.hpp> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include <cppuhelper/implbase4.hxx> -#endif -#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERHANDLER_HPP_ #include <com/sun/star/configuration/backend/XLayerHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYER_HPP_ #include <com/sun/star/configuration/backend/XLayer.hpp> -#endif #include <memory> #include <stack> diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx index 3c6427ef0..1f7d6137c 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx @@ -26,18 +26,10 @@ ************************************************************************/ #ifndef DBA_XMLAUTOSTYLE_HXX #define DBA_XMLAUTOSTYLE_HXX -#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX #include <xmloff/maptype.hxx> -#endif -#ifndef _XMLOFF_XMLASTPLP_HXX #include <xmloff/xmlaustp.hxx> -#endif -#ifndef _XMLOFF_XMLTYPES_HXX #include <xmloff/xmltypes.hxx> -#endif -#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX #include <xmloff/xmlprmap.hxx> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 8e3237cef..418dbc8f6 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLCOMPONENT_HXX #define DBA_XMLCOMPONENT_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 8b1a959db..0b3430060 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLCONNECTIONDATA_HXX_INCLUDED #define DBA_XMLCONNECTIONDATA_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index f95cbb00d..8fde11e68 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED #define DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index f92e1476f..a96434379 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLDATASOURCE_HXX #define DBA_XMLDATASOURCE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index e09214058..f4b60d1bf 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLDATASOURCEINFO_HXX #define DBA_XMLDATASOURCEINFO_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index c6515e503..a26180c86 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -27,15 +27,9 @@ #ifndef DBA_XMLDATASOURCESETTING_HXX #define DBA_XMLDATASOURCESETTING_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index 3855ef182..9ce21a39c 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLDATASOURCESETTINGS_HXX #define DBA_XMLDATASOURCESETTINGS_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index b599f2769..46a7b38c1 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLDATABASE_HXX #define DBA_XMLDATABASE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 42e5bc53f..b36ee87be 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED #define DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 486d7d3d3..db1bb43ee 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -27,15 +27,9 @@ #ifndef DBA_XMLDOCUMENTS_HXX #define DBA_XMLDOCUMENTS_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 112ae856c..ea6121023 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -28,70 +28,28 @@ #ifndef DBA_XMLEXPORT_HXX #define DBA_XMLEXPORT_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_ #include <com/sun/star/document/XFilter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_ #include <com/sun/star/document/XImporter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_ #include <com/sun/star/document/XExporter.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include <com/sun/star/lang/XComponent.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _UNOTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> -#endif -#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif -#ifndef _XMLOFF_XMLEXP_HXX #include <xmloff/xmlexp.hxx> -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif #include "dsntypes.hxx" -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif #include <memory> diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index a4c8a1b68..48e375165 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED #define DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index e7a9e4cd5..05c798e37 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -27,15 +27,9 @@ #ifndef DBA_XMLHELPER_HXX #define DBA_XMLHELPER_HXX -#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX #include <xmloff/xmlprmap.hxx> -#endif -#ifndef _XMLOFF_CONTEXTID_HXX_ #include <xmloff/contextid.hxx> -#endif -#ifndef _XMLOFF_FORMS_CONTROLPROPERTYHDL_HXX_ #include <xmloff/controlpropertyhdl.hxx> -#endif #include <memory> diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index db2276966..3391c304e 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLLOGIN_HXX #define DBA_XMLLOGIN_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index 3e2c03c4d..ca36f7a3b 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLQUERY_HXX #define DBA_XMLQUERY_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef DBA_XMLTABLE_HXX #include "xmlTable.hxx" -#endif namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index e0fa99062..67fbdb62e 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLSERVERDATABASE_HXX_INCLUDED #define DBA_XMLSERVERDATABASE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 323ac3066..545de41f1 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -28,36 +28,16 @@ #ifndef DBA_XMLSTYLEIMPORT_HXX #define DBA_XMLSTYLEIMPORT_HXX -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX #include <xmloff/maptype.hxx> -#endif -#ifndef _XMLOFF_PRSTYLEI_HXX_ #include <xmloff/prstylei.hxx> -#endif -#ifndef _XMLOFF_XMLIMPPR_HXX #include <xmloff/xmlimppr.hxx> -#endif -#ifndef _XMLTEXTMASTERPAGECONTEXT_HXX #include <xmloff/XMLTextMasterPageContext.hxx> -#endif -#ifndef _XMLTEXTMASTERSTYLESCONTEXT_HXX #include <xmloff/XMLTextMasterStylesContext.hxx> -#endif -#ifndef _XMLOFF_CONTEXTID_HXX_ #include <xmloff/contextid.hxx> -#endif -#ifndef _XMLOFF_FORMS_CONTROLPROPERTYHDL_HXX_ #include <xmloff/controlpropertyhdl.hxx> -#endif #include <vector> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index 02cf49db3..11f5538ff 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -27,15 +27,9 @@ #ifndef DBA_XMLTABLE_HXX #define DBA_XMLTABLE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index 6b284fa10..d3a026268 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLTABLEFILTERLIST_HXX #define DBA_XMLTABLEFILTERLIST_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif #include <vector> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index 7c027d558..b4b916042 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLTABLEFILTERPATTERN_HXX #define DBA_XMLTABLEFILTERPATTERN_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index b9513852f..faf99e7cb 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -28,63 +28,25 @@ #ifndef DBA_XMLFILTER_HXX #define DBA_XMLFILTER_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_ #include <com/sun/star/document/XFilter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_ #include <com/sun/star/document/XImporter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_ #include <com/sun/star/document/XExporter.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include <com/sun/star/lang/XComponent.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _UNOTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> -#endif -#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif #include <memory> diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx index 8f44097e4..8f44097e4 100755..100644 --- a/dbaccess/source/inc/OAuthenticationContinuation.hxx +++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index cd4bbaf2f..fd8a8550a 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -28,27 +28,13 @@ #ifndef _DBASHARED_APITOOLS_HXX_ #define _DBASHARED_APITOOLS_HXX_ -#ifndef _CPPUHELPER_COMPONENT_HXX_ #include <cppuhelper/component.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include <cppuhelper/interfacecontainer.hxx> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> -#endif //================================================================================== //= various typedefs diff --git a/dbaccess/source/inc/cfg_reghelper.hxx b/dbaccess/source/inc/cfg_reghelper.hxx index 039bdd82c..0c5b20291 100644 --- a/dbaccess/source/inc/cfg_reghelper.hxx +++ b/dbaccess/source/inc/cfg_reghelper.hxx @@ -28,24 +28,12 @@ #ifndef CFG_REGHELPER_HXX #define CFG_REGHELPER_HXX -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include <com/sun/star/registry/XRegistryKey.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif namespace dbacfg { diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx index 16fca9fd4..9ff116df1 100644 --- a/dbaccess/source/inc/dbu_reghelper.hxx +++ b/dbaccess/source/inc/dbu_reghelper.hxx @@ -28,24 +28,12 @@ #ifndef _DBU_REGHELPER_HXX_ #define _DBU_REGHELPER_HXX_ -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include <com/sun/star/registry/XRegistryKey.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx index 25acdfead..0211e4275 100644 --- a/dbaccess/source/inc/flt_reghelper.hxx +++ b/dbaccess/source/inc/flt_reghelper.hxx @@ -28,24 +28,12 @@ #ifndef _FLT_REGHELPER_HXX_ #define _FLT_REGHELPER_HXX_ -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include <com/sun/star/registry/XRegistryKey.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif namespace dbaxml { diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index 9e24c8e56..83982ac86 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx @@ -28,36 +28,20 @@ #ifndef DBACCESS_CONNECTIONTOOLS_HXX #define DBACCESS_CONNECTIONTOOLS_HXX -#ifndef DBACCESS_MODULE_SDBT_HXX #include "module_sdbt.hxx" -#endif -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XCONNECTIONTOOLS_HPP_ #include <com/sun/star/sdb/tools/XConnectionTools.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase3.hxx> -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include <comphelper/componentcontext.hxx> -#endif //........................................................................ namespace sdbtools diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index 2361d502e..ae95cc920 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx @@ -28,19 +28,13 @@ #ifndef DBACCESS_DATASOURCEMETADATA_HXX #define DBACCESS_DATASOURCEMETADATA_HXX -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XDATASOURCEMETADATA_HPP_ #include <com/sun/star/sdb/tools/XDataSourceMetaData.hpp> -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include <memory> diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index 980f61091..7ff92b344 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -28,19 +28,13 @@ #ifndef DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX #define DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XTABLENAME_HPP_ #include <com/sun/star/sdb/tools/XTableName.hpp> -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include <memory> diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx index 4c2f17874..0d7529962 100644 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ b/dbaccess/source/sdbtools/inc/module_sdbt.hxx @@ -28,9 +28,7 @@ #ifndef DBACCESS_MODULE_SDBT_HXX #define DBACCESS_MODULE_SDBT_HXX -#ifndef UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX #include <unotools/componentresmodule.hxx> -#endif //........................................................................ namespace sdbtools diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index d483d597a..6d98cc604 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -29,42 +29,18 @@ #include <vector> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp> -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include <com/sun/star/ucb/XContent.hpp> -#endif -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif -#ifndef _SVTREEBOX_HXX #include <svtools/svtreebx.hxx> -#endif -#ifndef SVTOOLS_DOCUMENTINFOPREVIEW_HXX #include <svtools/DocumentInfoPreview.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_TOOLBOX_HXX #include <vcl/toolbox.hxx> -#endif -#ifndef _SV_CVTGRF_HXX #include <vcl/cvtgrf.hxx> -#endif -#ifndef _SV_GRAPH_HXX #include <vcl/graph.hxx> -#endif -#ifndef _GRFMGR_HXX #include <svtools/grfmgr.hxx> -#endif #include "callbacks.hxx" #include <memory> diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 38d1dfc54..04163532b 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -27,45 +27,19 @@ #ifndef DBAUI_APPDETAILVIEW_HXX #define DBAUI_APPDETAILVIEW_HXX -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include <com/sun/star/frame/XController.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include <com/sun/star/ucb/XContent.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp> -#endif -#ifndef _SV_SPLIT_HXX #include <vcl/split.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_MNEMONIC_HXX #include <vcl/mnemonic.hxx> -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif -#ifndef DBAUI_TITLE_WINDOW_HXX #include "AppTitleWindow.hxx" -#endif -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif -#ifndef _SVTREEBOX_HXX #include <svtools/svtreebx.hxx> -#endif -#ifndef DBAUI_VERTSPLITVIEW_HXX #include "VertSplitView.hxx" -#endif #include <vector> diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index cc27014e5..a43efd465 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_APPICONCONTROL_HXX #define DBAUI_APPICONCONTROL_HXX -#ifndef _ICNVW_HXX #include <svtools/ivctrl.hxx> -#endif -#ifndef _TRANSFER_HXX #include <svtools/transfer.hxx> -#endif namespace dbaui diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 038161280..41f79804b 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_APPSWAPWINDOW_HXX #define DBAUI_APPSWAPWINDOW_HXX -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef DBAUI_APPICONCONTROL_HXX #include "AppIconControl.hxx" -#endif -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 3e59dab0d..a83603167 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_TITLE_WINDOW_HXX #define DBAUI_TITLE_WINDOW_HXX -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 085672c07..d852867a7 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -27,33 +27,15 @@ #ifndef DBAUI_APPVIEW_HXX #define DBAUI_APPVIEW_HXX -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include <com/sun/star/ucb/XContent.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_ #include <unotools/eventlisteneradapter.hxx> -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif namespace com{ namespace sun { namespace star { namespace beans { class XPropertySet; } } } } diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx index c2f5f9aaa..8ba756bbd 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.hxx +++ b/dbaccess/source/ui/browser/dbtreemodel.hxx @@ -28,21 +28,11 @@ #ifndef DBAUI_DBTREEMODEL_HXX #define DBAUI_DBTREEMODEL_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _SVLBOX_HXX #include <svtools/svlbox.hxx> -#endif -#ifndef _SVLBOXITM_HXX #include <svtools/svlbitm.hxx> -#endif -#ifndef _SBA_UNODATBR_HXX_ #include "unodatbr.hxx" -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif // syntax of the tree userdata // datasource holds the connection diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index fe0ec4ae8..ae50526ac 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -28,13 +28,9 @@ #ifndef DBACCESS_UI_DBTREEVIEW_HXX #define DBACCESS_UI_DBTREEVIEW_HXX -#ifndef _SV_WINDOW_HXX //autogen #include <vcl/window.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif class SvTreeListBox; class SvLBoxTreeList; diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 2eb129a52..3bb48cdff 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -34,9 +34,7 @@ #include "listviewitems.hxx" #include "callbacks.hxx" -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGGESTURELISTENER_HDL_ #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hdl> -#endif #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx index b9e7bcdb1..fcce0a6d7 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ b/dbaccess/source/ui/dlg/AdabasStat.hxx @@ -27,27 +27,13 @@ #ifndef _DBAUI_ADASTAT_HXX_ #define _DBAUI_ADASTAT_HXX_ -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef DBAUI_FIELDCONTROLS_HXX #include "FieldControls.hxx" -#endif -#ifndef _PRGSBAR_HXX #include <svtools/prgsbar.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif namespace dbaui diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index f843dabef..44677259a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -28,18 +28,10 @@ #ifndef DBAUI_CONNECTIONHELPER_HXX #define DBAUI_CONNECTIONHELPER_HXX -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> -#endif -#ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" -#endif -#ifndef _SFX_FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> -#endif #define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 945454284..e83ff35bd 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -28,18 +28,10 @@ #ifndef DBAUI_CONNECTIONPAGE_HXX #define DBAUI_CONNECTIONPAGE_HXX -#ifndef DBAUI_CONNECTIONHELPER_HXX #include "ConnectionHelper.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> -#endif -#ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 487015ade..aea5062a7 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -28,23 +28,13 @@ #ifndef DBAUI_CONNECTIONPAGESETUP_HXX #define DBAUI_CONNECTIONPAGESETUP_HXX -#ifndef DBAUI_CONNECTIONHELPER_HXX #include "ConnectionHelper.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> -#endif -#ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif //......................................................................... diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 943fd93a3..94d04d4d2 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -28,9 +28,7 @@ #ifndef DBAUI_DBSETUPCONNECTIONPAGES_HXX #define DBAUI_DBSETUPCONNECTIONPAGES_HXX -#ifndef DBAUI_CONNECTIONPAGESETUP_HXX #include "ConnectionPageSetup.hxx" -#endif #include "adminpages.hxx" #include "admincontrols.hxx" diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index f470bd5c1..9d9cdbbf3 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -28,39 +28,17 @@ #ifndef _DBAUI_DBADMINIMPL_HXX_ #define _DBAUI_DBADMINIMPL_HXX_ -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XNAMINGSERVICE_HPP_ #include <com/sun/star/uno/XNamingService.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XDRIVER_HPP_ #include <com/sun/star/sdbc/XDriver.hpp> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef _SFXITEMSET_HXX #include <svl/itemset.hxx> -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> -#endif #include <svl/poolitem.hxx> class Window; diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 61d4f1c9a..b494e449b 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_DRIVERSETTINGS_HXX #define DBAUI_DRIVERSETTINGS_HXX -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif #include <svl/poolitem.hxx> #include <vector> diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index f4c6bff6f..2697c62f3 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -28,33 +28,15 @@ #ifndef DBAUI_TEXTCONNECTIONHELPER_HXX #define DBAUI_TEXTCONNECTIONHELPER_HXX -#ifndef DBAUI_CONNECTIONPAGESETUP_HXX #include "ConnectionPageSetup.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef CHARSETLISTBOX_HXX #include "charsetlistbox.hxx" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> -#endif -#ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" -#endif -#ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX #include <svtools/roadmapwizard.hxx> -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif //......................................................................... diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index c205cbe49..06172e341 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -27,33 +27,15 @@ #ifndef DBAUI_USERADMIN_HXX #define DBAUI_USERADMIN_HXX -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _SV_GROUP_HXX #include <vcl/group.hxx> -#endif -#ifndef DBAUI_TABLEGRANTCONTROL_HXX #include "TableGrantCtrl.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif FORWARD_DECLARE_INTERFACE(beans,XPropertySet) FORWARD_DECLARE_INTERFACE(sdbc,XConnection) diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index c7d1b0407..c7d1b0407 100755..100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 4b38685ac..89324050a 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -28,24 +28,12 @@ #ifndef _DBAUI_ADMINPAGES_HXX_ #define _DBAUI_ADMINPAGES_HXX_ -#ifndef _SFXTABDLG_HXX #include <sfx2/tabdlg.hxx> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif -#ifndef _SVTOOLS_WIZARDMACHINE_HXX_ #include <svtools/wizardmachine.hxx> -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif class NumericField; diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index b236eebba..ba2feeafe 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_ADO_DATALINK_HXX_ #define _DBAUI_ADO_DATALINK_HXX_ -#ifndef _OSL_MODULE_H_ #include <osl/module.h> -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif ::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink); #endif
\ No newline at end of file diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 3f1a3b9fe..434aee032 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -28,27 +28,15 @@ #ifndef _DBAUI_DBFINDEX_HXX_ #define _DBAUI_DBFINDEX_HXX_ -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif #ifndef __SGI_STL_LIST #include <list> #endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 42eb45122..73faade58 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -28,33 +28,15 @@ #ifndef _DBAUI_DETAILPAGES_HXX_ #define _DBAUI_DETAILPAGES_HXX_ -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _DBAUI_CHARSETS_HXX_ #include "charsets.hxx" -#endif -#ifndef CHARSETLISTBOX_HXX #include "charsetlistbox.hxx" -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef DBAUI_TEXTCONNECTIONHELPER_HXX #include "TextConnectionHelper.hxx" -#endif #include "admincontrols.hxx" #include <svtools/dialogcontrolling.hxx> diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index 94156b51e..62a009c03 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -28,12 +28,8 @@ #ifndef DBAUI_FILEPICKER_INTERACTION_HXX #define DBAUI_FILEPICKER_INTERACTION_HXX -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_ #include <com/sun/star/task/XInteractionHandler.hpp> -#endif //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 0a2ae9c49..3d2ed40e6 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -28,21 +28,11 @@ #ifndef _DBAUI_GENERALPAGE_HXX_ #define _DBAUI_GENERALPAGE_HXX_ -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX #include "opendoccontrols.hxx" -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif #include <svtools/dialogcontrolling.hxx> #include <memory> diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 7b9f33dd8..6a3b141c0 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -28,27 +28,13 @@ #ifndef _DBAUI_TABLESPAGE_HXX_ #define _DBAUI_TABLESPAGE_HXX_ -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _COM_SUN_STAR_I18N_XCOLLATOR_HPP_ #include <com/sun/star/i18n/XCollator.hpp> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _DBAUI_TABLETREE_HXX_ #include "tabletree.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif //......................................................................... diff --git a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx index 0ec25a73f..634b54bb4 100644 --- a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx +++ b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_ACCESSIBLE_HELPER_IFACE_HXX #define DBAUI_ACCESSIBLE_HELPER_IFACE_HXX -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index cf265e2fe..3cb351741 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -28,24 +28,12 @@ #ifndef DBAUI_COLLECTIONVIEW_HXX #define DBAUI_COLLECTIONVIEW_HXX -#ifndef _SVT_FILEVIEW_HXX #include <svtools/fileview.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include <com/sun/star/ucb/XContent.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index de21329c1..a2ebdda9b 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_COLUMNCONTROLWINDOW_HXX #define DBAUI_COLUMNCONTROLWINDOW_HXX -#ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX #include "FieldDescControl.hxx" -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include <com/sun/star/util/XNumberFormatter.hpp> -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index 28a3d4a6e..11c6d2646 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_CONNECTIONLINE_HXX #define DBAUI_CONNECTIONLINE_HXX -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef DBAUI_CONNECTIONLINEDATA_HXX #include "ConnectionLineData.hxx" -#endif #include <functional> class OutputDevice; diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 3b6ba52e0..eed2f966e 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -27,15 +27,9 @@ #ifndef DBACCESS_CONNECTIONLINEACCESS_HXX #define DBACCESS_CONNECTIONLINEACCESS_HXX -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLERELATIONSET_HPP_ #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase2.hxx> -#endif -#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_ #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index 995359c1d..c0e5eb499 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -27,24 +27,14 @@ #ifndef DBAUI_CONNECTIONLINEDATA_HXX #define DBAUI_CONNECTIONLINEDATA_HXX -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _VOS_REFERNCE_HXX_ #include <vos/refernce.hxx> -#endif #include <vector> -#ifndef _VOS_REF_HXX_ #include <vos/ref.hxx> -#endif -#ifndef DBAUI_REFFUNCTOR_HXX #include "RefFunctor.hxx" -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx index f332941db..c5236b935 100644 --- a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx +++ b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx @@ -27,27 +27,13 @@ #ifndef DBU_EXTENSIONNOTPRESENT_HXX #define DBU_EXTENSIONNOTPRESENT_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _COM_SUN_STAR_REPORT_XREPORTDEFINITION_HPP_ #include <com/sun/star/report/XReportDefinition.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_ #include <com/sun/star/lang/Locale.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/system/XSystemShellExecute.hpp> diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index efb73aaca..454922ceb 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_FIELDCONTROLS_HXX #define DBAUI_FIELDCONTROLS_HXX -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef DBAUI_SQLNAMEEDIT_HXX #include "SqlNameEdit.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index af7204fc8..10fa3029f 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX #define DBAUI_FIELDDESCRIPTIONCONTROL_HXX -#ifndef _SV_TABPAGE_HXX #include <vcl/tabpage.hxx> -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include <com/sun/star/util/XNumberFormatter.hpp> -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif //------------------------------------------------------------------ // die Spalten einer Feld-Beschreibung einer Tabelle diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 13ff8e7e9..bc65a1e85 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_FIELDDESCRIPTIONS_HXX #define DBAUI_FIELDDESCRIPTIONS_HXX -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _SVX_SVXENUM_HXX #include <editeng/svxenum.hxx> -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HPP_ #include <com/sun/star/beans/XPropertySetInfo.hpp> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 130505a64..e76a3d572 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_GENERALUNDO_HXX #define DBAUI_GENERALUNDO_HXX -#ifndef _UNDO_HXX #include <svl/undo.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index ad0241bfb..3c1edf4da 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_HTMLREADER_HXX #define DBAUI_HTMLREADER_HXX -#ifndef DBAUI_DATABASEEXPORT_HXX #include "DExport.hxx" -#endif -#ifndef _PARHTML_HXX //autogen #include <svtools/parhtml.hxx> -#endif -#ifndef _SVX_SVXENUM_HXX #include <editeng/svxenum.hxx> -#endif -#ifndef _STREAM_HXX #include <tools/stream.hxx> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_ #include <com/sun/star/awt/FontDescriptor.hpp> -#endif namespace dbaui diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx index 6a8646d20..93c603621 100644 --- a/dbaccess/source/ui/inc/IClipBoardTest.hxx +++ b/dbaccess/source/ui/inc/IClipBoardTest.hxx @@ -26,9 +26,7 @@ ************************************************************************/ #ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #define DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index ef83a9d43..3a49bf278 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -28,15 +28,9 @@ #ifndef DBAUI_ITEMSETHELPER_HXX #define DBAUI_ITEMSETHELPER_HXX -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif FORWARD_DECLARE_INTERFACE(beans,XPropertySet) FORWARD_DECLARE_INTERFACE(sdbc,XConnection) diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index fc83f5913..b4b4ce9ff 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -27,12 +27,8 @@ #ifndef DBACCESS_JACCESS_HXX #define DBACCESS_JACCESS_HXX -#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_ #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index b21a81561..edf56fea8 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_JOINCONTROLLER_HXX #define DBAUI_JOINCONTROLLER_HXX -#ifndef DBAUI_SINGLEDOCCONTROLLER_HXX #include "singledoccontroller.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif -#ifndef DBAUI_JOINDESIGNVIEW_HXX #include "JoinDesignView.hxx" -#endif #include "TableConnectionData.hxx" #include "TableWindowData.hxx" #ifndef _MEMORY_ diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index b8d290013..4823f52ad 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -28,18 +28,12 @@ #ifndef DBAUI_JOINDESIGNVIEW_HXX #define DBAUI_JOINDESIGNVIEW_HXX -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif #ifndef _VECTOR_ #include <vector> #endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif #include <memory> diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 0860aad00..c360a1f03 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -27,22 +27,12 @@ #ifndef DBAUI_JOINEXCHANGE_HXX #define DBAUI_JOINEXCHANGE_HXX -#ifndef DBAUI_DBEXCHANGE_HXX #include "dbexchange.hxx" -#endif -#ifndef DBAUI_TABLEWINDOWLISTBOX_HXX #include "TableWindowListBox.hxx" -#endif -#ifndef _TRANSFER_HXX #include <svtools/transfer.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 23ac8c220..df32834d8 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -27,28 +27,14 @@ #ifndef DBAUI_JOINTABLEVIEW_HXX #define DBAUI_JOINTABLEVIEW_HXX -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif -#ifndef _SV_TIMER_HXX #include <vcl/timer.hxx> -#endif -#ifndef _SV_SCRBAR_HXX #include <vcl/scrbar.hxx> -#endif -#ifndef _RTTI_HXX #include <tools/rtti.hxx> -#endif -#ifndef _TRANSFER_HXX #include <svtools/transfer.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _DBACCESS_UI_CALLBACKS_HXX_ #include "callbacks.hxx" -#endif #include "TableConnectionData.hxx" #include "TableWindowData.hxx" #include <memory> diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 7c68d552a..1cba8468b 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -27,27 +27,13 @@ #ifndef DBAUI_QUERYDESIGNVIEW_HXX #define DBAUI_QUERYDESIGNVIEW_HXX -#ifndef DBAUI_QUERYVIEW_HXX #include "queryview.hxx" -#endif -#ifndef _SV_SPLIT_HXX #include <vcl/split.hxx> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef DBAUI_QUERYCONTROLLER_HXX #include "querycontroller.hxx" -#endif -#ifndef DBAUI_CONNECTIONLINEDATA_HXX #include "ConnectionLineData.hxx" -#endif namespace connectivity { diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index db354e9f4..3248e42c0 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_QUERYTABLEVIEW_HXX #define DBAUI_QUERYTABLEVIEW_HXX -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef DBAUI_QUERYCONTROLLER_HXX #include "querycontroller.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index 9570d3be0..2da003de3 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_QUERYVIEW_TEXT_HXX #define DBAUI_QUERYVIEW_TEXT_HXX -#ifndef DBAUI_QUERYVIEW_HXX #include "queryview.hxx" -#endif -#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX #include "querycontainerwindow.hxx" -#endif class Splitter; namespace dbaui diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 34282557a..f65f75c96 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_RTABLECONNECTIONDATA_HXX #define DBAUI_RTABLECONNECTIONDATA_HXX -#ifndef DBAUI_TABLECONNECTIONDATA_HXX #include "TableConnectionData.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx index 9fc9ab193..664597641 100644 --- a/dbaccess/source/ui/inc/RefFunctor.hxx +++ b/dbaccess/source/ui/inc/RefFunctor.hxx @@ -28,9 +28,7 @@ #ifndef DBAUI_REFFUNCTOR_HXX #define DBAUI_REFFUNCTOR_HXX -#ifndef _VOS_REF_HXX_ #include <vos/ref.hxx> -#endif #ifndef INCLUDED_FUNCTIONAL #define INCLUDED_FUNCTIONAL #include <functional> diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index e8698931b..ce628227e 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_RELCONTROLIFACE_HXX #define DBAUI_RELCONTROLIFACE_HXX -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif #include "TableConnectionData.hxx" namespace dbaui diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index c14a6b64c..55506a1e6 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_RELATIONCONTROL_HXX #define DBAUI_RELATIONCONTROL_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 34817abbc..0a4629342 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_RELATIONCONTROLLER_HXX #define DBAUI_RELATIONCONTROLLER_HXX -#ifndef DBAUI_JOINCONTROLLER_HXX #include "JoinController.hxx" -#endif -#ifndef DBAUI_RELATIONDESIGNVIEW_HXX #include "RelationDesignView.hxx" -#endif class VCLXWindow; class WaitObject; diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index 5ce5b1e0f..87e3bab91 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -28,21 +28,13 @@ #ifndef DBAUI_RELATIONDESIGNVIEW_HXX #define DBAUI_RELATIONDESIGNVIEW_HXX -#ifndef DBAUI_JOINDESIGNVIEW_HXX #include "JoinDesignView.hxx" -#endif #ifndef _VECTOR_ #include <vector> #endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef DBAUI_RELATION_TABLEVIEW_HXX #include "RelationTableView.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index e3a129ef9..bf049bb97 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -27,28 +27,14 @@ #ifndef DBAUI_RELATIONDIALOG_HXX #define DBAUI_RELATIONDIALOG_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif -#ifndef DBAUI_RELCONTROLIFACE_HXX #include "RelControliFace.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index d18ba34d2..f0a1d34cd 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -30,15 +30,9 @@ #ifndef _VECTOR_ #include <vector> #endif -#ifndef _PARRTF_HXX //autogen #include <svtools/parrtf.hxx> -#endif -#ifndef DBAUI_DATABASEEXPORT_HXX #include "DExport.hxx" -#endif -#ifndef _STREAM_HXX #include <tools/stream.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx index 13f923fa0..2108e69da 100644 --- a/dbaccess/source/ui/inc/ScrollHelper.hxx +++ b/dbaccess/source/ui/inc/ScrollHelper.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_SCROLLHELPER_HXX #define DBAUI_SCROLLHELPER_HXX -#ifndef _LINK_HXX #include <tools/link.hxx> -#endif -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif -#ifndef _SV_TIMER_HXX #include <vcl/timer.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 09024c3b7..ddfb490de 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_SQLNAMEEDIT_HXX #define DBAUI_SQLNAMEEDIT_HXX -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _SV_COMBOBOX_HXX #include <vcl/combobox.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 792397511..13d5bc1fc 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -28,18 +28,10 @@ #define DBAUI_TABLECONNECTION_HXX #include <vector> -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif -#ifndef _RTTI_HXX #include <tools/rtti.hxx> -#endif -#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> -#endif #include "TableConnectionData.hxx" class Point; diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index b4e1f50c4..f91b6e5c0 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -27,17 +27,11 @@ #ifndef DBAUI_TABLECONNECTIONDATA_HXX #define DBAUI_TABLECONNECTIONDATA_HXX -#ifndef DBAUI_CONNECTIONLINEDATA_HXX #include "ConnectionLineData.hxx" -#endif #include "TableWindowData.hxx" #include <vector> -#ifndef _RTTI_HXX #include <tools/rtti.hxx> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif #include <boost/shared_ptr.hpp> namespace dbaui diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 6aeb1415e..c7c99da0b 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -27,36 +27,16 @@ #ifndef DBUI_TABLECONTROLLER_HXX #define DBUI_TABLECONTROLLER_HXX -#ifndef DBAUI_SINGLEDOCCONTROLLER_HXX #include "singledoccontroller.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XOBJECTOUTPUTSTREAM_HPP_ #include <com/sun/star/io/XObjectOutputStream.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XOBJECTINPUTSTREAM_HPP_ #include <com/sun/star/io/XObjectInputStream.hpp> -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XKEYSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XKeysSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif class FixedText; namespace dbaui diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index abcbdd7e8..90a8ad866 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -27,27 +27,13 @@ #ifndef DBUI_TABLECOPYHELPER_HXX #define DBUI_TABLECOPYHELPER_HXX -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif -#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include <svx/dataaccessdescriptor.hxx> -#endif -#ifndef _SOT_STORAGE_HXX #include <sot/storage.hxx> -#endif -#ifndef _TRANSFER_HXX #include <svtools/transfer.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include <com/sun/star/sdbc/XResultSet.hpp> -#endif #include <functional> class SvLBoxEntry; diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index e14ee4772..4a5f5d526 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -27,19 +27,11 @@ #ifndef DBAUI_TABLEDESIGNCONTROL_HXX #define DBAUI_TABLEDESIGNCONTROL_HXX -#ifndef _TABBAR_HXX //autogen #include <svtools/tabbar.hxx> -#endif -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ #include <svtools/editbrowsebox.hxx> -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif #define TABPAGESIZE 70 namespace dbaui diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index 013303d8d..e39c81884 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_TABLEDESIGNHELPBAR_HXX #define DBAUI_TABLEDESIGNHELPBAR_HXX -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef _SV_TABCTRL_HXX #include <vcl/tabctrl.hxx> -#endif -#ifndef _SV_TABPAGE_HXX #include <vcl/tabpage.hxx> -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif class MultiLineEdit; namespace dbaui diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 80bf6dc48..886cf8824 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_TABLEDESIGNVIEW_HXX #define DBAUI_TABLEDESIGNVIEW_HXX -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include <com/sun/star/frame/XController.hpp> -#endif -#ifndef _SV_SPLIT_HXX #include <vcl/split.hxx> -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index d930f489b..b5320a2b7 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -31,18 +31,10 @@ #define INCLUDED_VECTOR #include <vector> #endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _VOS_REF_HXX_ #include <vos/ref.hxx> -#endif namespace comphelper { diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 8591c7043..c16ee4f89 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_TABLEGRANTCONTROL_HXX #define DBAUI_TABLEGRANTCONTROL_HXX -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ #include <svtools/editbrowsebox.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XAUTHORIZABLE_HPP_ #include <com/sun/star/sdbcx/XAuthorizable.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif class Edit; namespace dbaui diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index c77995573..655fd0772 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_TABLEROW_HXX #define DBAUI_TABLEROW_HXX -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef _STREAM_HXX #include <tools/stream.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index eb2706dd2..863a9b6b8 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_TABLEROW_EXCHANGE_HXX #define DBAUI_TABLEROW_EXCHANGE_HXX -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase2.hxx> -#endif -#ifndef _TRANSFER_HXX #include <svtools/transfer.hxx> -#endif #include <boost/shared_ptr.hpp> namespace dbaui diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index 0ba2d0360..d217abcdb 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -27,15 +27,9 @@ #ifndef DBACCESS_TABLEWINDOWACCESS_HXX #define DBACCESS_TABLEWINDOWACCESS_HXX -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLERELATIONSET_HPP_ #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase2.hxx> -#endif -#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_ #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 5299a6cee..2de938eaa 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_TABLEWINDOWDATA_HXX #define DBAUI_TABLEWINDOWDATA_HXX -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index 25897fc5e..5be22b735 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_TABLEWINDOWTITLE_HXX #define DBAUI_TABLEWINDOWTITLE_HXX -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index a1a761153..30797dd16 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_TABLESSINGLEDLG_HXX_ #define _DBAUI_TABLESSINGLEDLG_HXX_ -#ifndef _BASEDLGS_HXX #include <sfx2/basedlgs.hxx> -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <memory> diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 3be393403..ca02c69bb 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -28,18 +28,10 @@ #define DBAUI_TYPEINFO_HXX -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_ #include <com/sun/star/sdbc/DataType.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_COLUMNSEARCH_HPP_ #include <com/sun/star/sdbc/ColumnSearch.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_ #include <com/sun/star/sdbc/ColumnValue.hpp> -#endif #include <boost/shared_ptr.hpp> #include <map> diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 313c3b51e..503525c10 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_TOOLS_HXX #define DBAUI_TOOLS_HXX -#ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif -#ifndef _SVX_SVXENUM_HXX #include <editeng/svxenum.hxx> -#endif -#ifndef _SV_TASKPANELIST_HXX #include <vcl/taskpanelist.hxx> -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> -#endif #define RET_ALL 10 diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index f11306f02..cbf28f5e0 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -28,21 +28,11 @@ #ifndef DBAUI_USERADMINDLG_HXX #define DBAUI_USERADMINDLG_HXX -#ifndef _SFXTABDLG_HXX #include <sfx2/tabdlg.hxx> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif #include <memory> FORWARD_DECLARE_INTERFACE(beans,XPropertySet) diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index da8b1a26d..5c7541644 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_VERTSPLITVIEW_HXX #define DBAUI_VERTSPLITVIEW_HXX -#ifndef _SV_SPLIT_HXX #include <vcl/split.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index d19620437..2da3a12be 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -29,24 +29,12 @@ #include "WTabPage.hxx" -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_GROUP_HXX #include <vcl/group.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 31e957642..48f3a15e3 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -30,15 +30,9 @@ #include "WTabPage.hxx" #include "WCopyTable.hxx" -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <comphelper/stl_types.hxx> namespace dbaui diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index 729f4f859..f3856a561 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_WIZ_EXTENDPAGES_HXX #define DBAUI_WIZ_EXTENDPAGES_HXX -#ifndef DBAUI_WIZ_TYPESELECT_HXX #include "WTypeSelect.hxx" -#endif class SvStream; namespace dbaui diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 542b1d53e..5a79265e3 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_WIZ_NAMEMATCHING_HXX #define DBAUI_WIZ_NAMEMATCHING_HXX -#ifndef DBAUI_WIZ_TABBPAGE_HXX #include "WTabPage.hxx" -#endif -#ifndef _DBAUI_MARKTREE_HXX_ #include "marktree.hxx" -#endif -#ifndef DBAUI_DATABASEEXPORT_HXX #include "DExport.hxx" -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef DBAUI_WIZ_COPYTABLEDIALOG_HXX #include "WCopyTable.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index df0af4855..300253933 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -28,9 +28,7 @@ #ifndef DBAUI_WIZ_TABBPAGE_HXX #define DBAUI_WIZ_TABBPAGE_HXX -#ifndef _SV_TABPAGE_HXX #include <vcl/tabpage.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 18138a6ca..6aa4777f5 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -27,35 +27,19 @@ #ifndef DBAUI_QYDLGTAB_HXX #define DBAUI_QYDLGTAB_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _STRING_HXX //autogen #include <tools/string.hxx> -#endif -#ifndef _DBAUI_TABLETREE_HXX_ #include "tabletree.hxx" -#endif #include <memory> diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx index 8202fcc2a..a915351a7 100644 --- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx +++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx @@ -29,9 +29,7 @@ #define DBACCESS_ASYNCMODALDIALOG_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXECUTABLEDIALOG_HPP_ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#endif /** === end UNO includes === **/ //........................................................................ diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx index 3c53bd592..02c5d8dcf 100644 --- a/dbaccess/source/ui/inc/browserids.hxx +++ b/dbaccess/source/ui/inc/browserids.hxx @@ -27,12 +27,8 @@ #ifndef DBACCESS_UI_BROWSER_ID_HXX #define DBACCESS_UI_BROWSER_ID_HXX -#ifndef _SBASLTID_HRC #include <svx/svxids.hrc> -#endif -#ifndef _DBACCESS_SLOTID_HRC_ #include "dbaccess_slotid.hrc" -#endif #define ID_BROWSER_COPY SID_COPY #define ID_BROWSER_CUT SID_CUT diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 455edd48a..9e754d5d1 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -28,23 +28,13 @@ #ifndef _SBX_BRWVIEW_HXX #define _SBX_BRWVIEW_HXX -#ifndef _SV_WINDOW_HXX //autogen #include <vcl/window.hxx> -#endif -#ifndef _TOOLS_RESID_HXX //autogen wg. ResId #include <tools/resid.hxx> -#endif -#ifndef _COM_SUN_STAR_AWT_POSSIZE_HPP_ #include <com/sun/star/awt/PosSize.hpp> -#endif -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif -#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_ #include <unotools/eventlisteneradapter.hxx> -#endif namespace com { namespace sun { namespace star { namespace awt { diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index 791809572..66761e782 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -28,15 +28,9 @@ #ifndef _DBACCESS_UI_CALLBACKS_HXX_ #define _DBACCESS_UI_CALLBACKS_HXX_ -#ifndef _SOT_EXCHANGE_HXX #include <sot/exchange.hxx> -#endif -#ifndef _SOT_FORMATS_HXX #include <sot/formats.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> -#endif class CommandEvent; class SvLBoxEntry; diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 10caf9268..6aa5b9b59 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_CHARSETS_HXX_ #define _DBAUI_CHARSETS_HXX_ -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef _TOOLS_RC_HXX #include <tools/rc.hxx> -#endif -#ifndef _DBHELPER_DBCHARSET_HXX_ #include <connectivity/dbcharset.hxx> -#endif -#ifndef _SVX_TXENCTAB_HXX #include <svx/txenctab.hxx> -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index f5742c2d9..b2eacdafd 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_COMMON_TYPES_HXX_ #define _DBAUI_COMMON_TYPES_HXX_ -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX #include <unotools/sharedunocomponent.hxx> -#endif namespace com { namespace sun { namespace star { namespace sdbc { diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 1cf52da8c..ddfff2b2a 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -28,15 +28,9 @@ #ifndef _DBAUI_CURLEDIT_HXX_ #define _DBAUI_CURLEDIT_HXX_ -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif #include <memory> //......................................................................... diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index 949edefaf..8327c240d 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -28,42 +28,18 @@ #ifndef DBACCESS_DATABASE_OBJECT_VIEW_HXX #define DBACCESS_DATABASE_OBJECT_VIEW_HXX -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include <com/sun/star/sdbc/XDataSource.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include <com/sun/star/frame/XDispatch.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include <com/sun/star/lang/XComponent.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include <com/sun/star/frame/XComponentLoader.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXECUTABLEDIALOG_HPP_ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_XDATABASEDOCUMENTUI_HPP_ #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif #include <comphelper/namedvaluecollection.hxx> #include <boost/shared_ptr.hpp> diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index dc973c894..48902eb96 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_DATASOURCECONNECTOR_HXX_ #define _DBAUI_DATASOURCECONNECTOR_HXX_ -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include <com/sun/star/sdbc/XDataSource.hpp> -#endif namespace dbtools { diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx index db488b266..25df7ae66 100644 --- a/dbaccess/source/ui/inc/datasourcemap.hxx +++ b/dbaccess/source/ui/inc/datasourcemap.hxx @@ -28,21 +28,11 @@ #ifndef DBAUI_DATASOURCEMAP_HXX #define DBAUI_DATASOURCEMAP_HXX -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif class SfxItemPool; class SfxItemSet; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 58443f8a8..c1d66c32e 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_DBADMIN_HXX_ #define _DBAUI_DBADMIN_HXX_ -#ifndef _SFXTABDLG_HXX #include <sfx2/tabdlg.hxx> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif #include <memory> FORWARD_DECLARE_INTERFACE(beans,XPropertySet) diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index bc4834b0f..7170ec360 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -27,30 +27,14 @@ #ifndef DBAUI_DBEXCHANGE_HXX #define DBAUI_DBEXCHANGE_HXX -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include <com/sun/star/util/XNumberFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_ #include <com/sun/star/lang/XEventListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _SVX_DBAEXCHANGE_HXX_ #include <svx/dbaexchange.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif #include <vector> #include <rtl/ref.hxx> diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 3bd8fc666..bcea952ca 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -28,24 +28,12 @@ #ifndef DBAUI_DBWIZ_HXX #define DBAUI_DBWIZ_HXX -#ifndef _SFXTABDLG_HXX #include <sfx2/tabdlg.hxx> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _SVTOOLS_WIZARDMACHINE_HXX_ #include <svtools/wizardmachine.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif #include <memory> FORWARD_DECLARE_INTERFACE(beans,XPropertySet) diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 25899e158..34370591f 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -28,31 +28,15 @@ #ifndef DBAUI_DBWIZ2_HXX #define DBAUI_DBWIZ2_HXX -#ifndef _SFXTABDLG_HXX #include <sfx2/tabdlg.hxx> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> -#endif #include <memory> -#ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX #include <svtools/roadmapwizard.hxx> -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif FORWARD_DECLARE_INTERFACE(beans,XPropertySet) FORWARD_DECLARE_INTERFACE(sdbc,XConnection) diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index ce353703d..95fcd7f50 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -28,20 +28,12 @@ #ifndef DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX #define DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX -#ifndef DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX #include "objectnamecheck.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HPP_ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif /** === end UNO includes === **/ #include <memory> diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 0b28615c2..04fdac839 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -28,38 +28,18 @@ #ifndef _DBACCESS_UI_DIRECTSQL_HXX_ #define _DBACCESS_UI_DIRECTSQL_HXX_ -#ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _SVEDIT_HXX #include <svtools/editsyntaxhighlighter.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif #include <deque> -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_ #include <unotools/eventlisteneradapter.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index f1ef24c28..0f0da5102 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -28,16 +28,10 @@ #define DBAUI_SBATTRDLG_HXX -#ifndef DBAUI_SBATTRDLG_HRC #include "dlgattr.hrc" -#endif -#ifndef _SFXTABDLG_HXX //autogen #include <sfx2/tabdlg.hxx> -#endif -#ifndef _SOLAR_H #include <tools/solar.h> -#endif diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 256a79831..a52d2db25 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -28,18 +28,10 @@ #ifndef DBAUI_DLGSAVE_HXX #define DBAUI_DLGSAVE_HXX -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif namespace com { namespace sun { namespace star { namespace container { diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 099476a6d..88cac2e49 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -27,21 +27,13 @@ #ifndef _DBAUI_DLGSIZE_HXX #define _DBAUI_DLGSIZE_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index 89a14648e..9cd50322d 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -28,121 +28,45 @@ #ifndef _SBA_FORMADAPTER_HXX #define _SBA_FORMADAPTER_HXX -#ifndef _SBA_MULTIPLEX_HXX #include "sbamultiplex.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include <com/sun/star/sdbc/XParameters.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include <com/sun/star/sdbc/XColumnLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include <com/sun/star/sdbc/XCloseable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include <com/sun/star/sdbcx/XRowLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include <com/sun/star/sdbc/XRowUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include <com/sun/star/sdbc/XRowSet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_ #include <com/sun/star/sdbcx/XDeleteRows.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XSQLERRORBROADCASTER_HPP_ #include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XROWSETAPPROVEBROADCASTER_HPP_ #include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XLOADABLE_HPP_ #include <com/sun/star/form/XLoadable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XRESULTSETACCESS_HPP_ #include <com/sun/star/sdb/XResultSetAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XFORM_HPP_ #include <com/sun/star/form/XForm.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XMULTIPROPERTYSET_HPP_ #include <com/sun/star/beans/XMultiPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XFASTPROPERTYSET_HPP_ #include <com/sun/star/beans/XFastPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXCONTAINER_HPP_ #include <com/sun/star/container/XIndexContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XRESET_HPP_ #include <com/sun/star/form/XReset.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XSUBMIT_HPP_ #include <com/sun/star/form/XSubmit.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XDATABASEPARAMETERBROADCASTER_HPP_ #include <com/sun/star/form/XDatabaseParameterBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include <com/sun/star/container/XEnumerationAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_ #include <com/sun/star/beans/XPropertyState.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XTABCONTROLLERMODEL_HPP_ #include <com/sun/star/awt/XTabControllerModel.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XPERSISTOBJECT_HPP_ #include <com/sun/star/io/XPersistObject.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCANCELLABLE_HPP_ #include <com/sun/star/util/XCancellable.hpp> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE12_HXX_ #include <cppuhelper/implbase12.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE10_HXX_ #include <cppuhelper/implbase10.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index f1a14b04a..26aff4d44 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -28,17 +28,11 @@ #ifndef DBACCESS_IMAGEPROVIDER_HXX #define DBACCESS_IMAGEPROVIDER_HXX -#ifndef _SV_IMAGE_HXX #include <vcl/image.hxx> -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECT_HPP_ #include <com/sun/star/sdb/application/DatabaseObject.hpp> -#endif /** === end UNO includes === **/ #include <boost/shared_ptr.hpp> diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index 46ce56c1a..42fee7e29 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_INDEXCOLLECTION_HXX_ #define _DBAUI_INDEXCOLLECTION_HXX_ -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_SQLEXCEPTION_HPP_ #include <com/sun/star/sdbc/SQLException.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _DBAUI_INDEXES_HXX_ #include "indexes.hxx" -#endif //...................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 3410a1829..f6418008c 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -28,45 +28,19 @@ #ifndef _DBAUI_INDEXDIALOG_HXX_ #define _DBAUI_INDEXDIALOG_HXX_ -#ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _SV_TOOLBOX_HXX #include <vcl/toolbox.hxx> -#endif -#ifndef _SVTREEBOX_HXX #include <svtools/svtreebx.hxx> -#endif -#ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX #include <unotools/viewoptions.hxx> -#endif -#ifndef _DBAUI_INDEXES_HXX_ #include "indexes.hxx" -#endif -#ifndef DBAUI_TOOLBOXHELPER_HXX #include "ToolBoxHelper.hxx" -#endif //...................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index e6f926285..915d23d28 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_INDEXES_HXX_ #define _DBAUI_INDEXES_HXX_ -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif //...................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 93fddf107..2da1eeece 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_INDEXFIELDSCONTROL_HXX_ #define _DBAUI_INDEXFIELDSCONTROL_HXX_ -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ #include <svtools/editbrowsebox.hxx> -#endif -#ifndef _DBAUI_INDEXCOLLECTION_HXX_ #include "indexcollection.hxx" -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif //...................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index a17fea929..6d288ce82 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -30,38 +30,18 @@ #include "AppElementType.hxx" -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include <com/sun/star/lang/XComponent.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif #include <com/sun/star/frame/XFrame.hpp> -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include <com/sun/star/frame/XComponentLoader.hpp> -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include <com/sun/star/ucb/XContent.hpp> -#endif #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> -#ifndef _LINK_HXX #include <tools/link.hxx> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX #include <comphelper/namedvaluecollection.hxx> -#endif class Window; //...................................................................... diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index b076b3c4f..5232c2014 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -28,9 +28,7 @@ #ifndef _DBAUI_LISTVIEWITEMS_HXX_ #define _DBAUI_LISTVIEWITEMS_HXX_ -#ifndef _SVLBOXITM_HXX #include <svtools/svlbitm.hxx> -#endif //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx index dc6c30651..af06f4557 100644 --- a/dbaccess/source/ui/inc/localresaccess.hxx +++ b/dbaccess/source/ui/inc/localresaccess.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_LOCALRESACCESS_HXX_ #define _DBAUI_LOCALRESACCESS_HXX_ -#ifndef _SVTOOLS_LOCALRESACCESS_HXX_ #include <svtools/localresaccess.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index 7ad084162..b8c1df21e 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -28,9 +28,7 @@ #ifndef _DBAUI_MARKTREE_HXX_ #define _DBAUI_MARKTREE_HXX_ -#ifndef DBAUI_DBTREELISTBOX_HXX #include "dbtreelistbox.hxx" -#endif diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx index 5b646d002..fd872c8f5 100644 --- a/dbaccess/source/ui/inc/moduledbu.hxx +++ b/dbaccess/source/ui/inc/moduledbu.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_MODULE_DBU_HXX_ #define _DBAUI_MODULE_DBU_HXX_ -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _TOOLS_RESID_HXX #include <tools/resid.hxx> -#endif class ResMgr; diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 4444ea509..fdc42f63c 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -28,15 +28,9 @@ #ifndef DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX #define DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <map> //........................................................................ diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index a500e07b3..4e6482df1 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -28,50 +28,22 @@ #ifndef _DBAUI_PARAMDIALOG_HXX_ #define _DBAUI_PARAMDIALOG_HXX_ -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif -#ifndef _DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _SV_GROUP_HXX #include <vcl/group.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include <com/sun/star/util/XNumberFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include <com/sun/star/container/XIndexAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef CONNECTIVITY_PREDICATEINPUT_HXX #include <connectivity/predicateinput.hxx> -#endif -#ifndef SVX_QUERYDESIGNCONTEXT_HXX #include "svx/ParseContext.hxx" -#endif namespace connectivity { diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 33bc340ed..9311698ce 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_PROPERTYSETITEM_HXX_ #define _DBAUI_PROPERTYSETITEM_HXX_ -#ifndef _SFXPOOLITEM_HXX #include <svl/poolitem.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index a6d677c24..064c53698 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -28,24 +28,12 @@ #ifndef DBAUI_QUERYCONTAINERWINDOW_HXX #define DBAUI_QUERYCONTAINERWINDOW_HXX -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif -#ifndef _SV_SPLIT_HXX #include <vcl/split.hxx> -#endif -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> -#endif -#ifndef DBAUI_QUERYVIEWSWITCH_HXX #include "QueryViewSwitch.hxx" -#endif -#ifndef _SV_DOCKWIN_HXX #include <vcl/dockwin.hxx> -#endif class FixedLine; //......................................................................... diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 26a69cd1b..15ee4b05b 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -28,35 +28,19 @@ #ifndef DBAUI_QUERYFILTER_HXX #define DBAUI_QUERYFILTER_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #include <connectivity/sqliterator.hxx> -#endif -#ifndef CONNECTIVITY_PREDICATEINPUT_HXX #include <connectivity/predicateinput.hxx> -#endif -#ifndef SVX_QUERYDESIGNCONTEXT_HXX #include "svx/ParseContext.hxx" -#endif namespace rtl { diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 248fef99c..cc4d88629 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -27,25 +27,15 @@ #ifndef DBAUI_QUERYORDER_HXX #define DBAUI_QUERYORDER_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #define DOG_ROWS 3 diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 270421025..02a013089 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYVIEW_HXX #define DBAUI_QUERYVIEW_HXX -#ifndef DBAUI_JOINDESIGNVIEW_HXX #include "JoinDesignView.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index d7ce4a671..c33945d43 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -30,35 +30,17 @@ // #include <sdb/tools.hxx> -#ifndef _SVX_FMGRIDCL_HXX #include <svx/fmgridcl.hxx> -#endif -#ifndef _SVX_FMGRIDIF_HXX #include <svx/fmgridif.hxx> -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSQLQueryComposer.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include <com/sun/star/frame/XDispatch.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_URL_HPP_ #include <com/sun/star/util/URL.hpp> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _SBA_MULTIPLEX_HXX #include "sbamultiplex.hxx" -#endif -#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include <svx/dataaccessdescriptor.hxx> -#endif #include <queue> class SvNumberFormatter; diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 9aa3036eb..e280e3c75 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -28,78 +28,30 @@ #ifndef _SBA_MULTIPLEX_HXX #define _SBA_MULTIPLEX_HXX -#ifndef _COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HPP_ #include <com/sun/star/beans/XVetoableChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XUPDATELISTENER_HPP_ #include <com/sun/star/form/XUpdateListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XERRORLISTENER_HPP_ #include <com/sun/star/form/XErrorListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XRESTORELISTENER_HPP_ #include <com/sun/star/form/XRestoreListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XINSERTLISTENER_HPP_ #include <com/sun/star/form/XInsertListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XDELETELISTENER_HPP_ #include <com/sun/star/form/XDeleteListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XPOSITIONINGLISTENER_HPP_ #include <com/sun/star/form/XPositioningListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XDATABASEPARAMETERLISTENER_HPP_ #include <com/sun/star/form/XDatabaseParameterListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XLOADLISTENER_HPP_ #include <com/sun/star/form/XLoadListener.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATECHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyStateChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTIESCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertiesChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XSUBMITLISTENER_HPP_ #include <com/sun/star/form/XSubmitListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XRESETLISTENER_HPP_ #include <com/sun/star/form/XResetListener.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHLISTENER_HPP_ #include <com/sun/star/util/XRefreshListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XSQLERRORLISTENER_HPP_ #include <com/sun/star/sdb/XSQLErrorListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XROWSETAPPROVELISTENER_HPP_ #include <com/sun/star/sdb/XRowSetApproveListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSETLISTENER_HPP_ #include <com/sun/star/sdbc/XRowSetListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #include <com/sun/star/frame/XStatusListener.hpp> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include <cppuhelper/interfacecontainer.hxx> -#endif -#ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #include <cppuhelper/queryinterface.hxx> -#endif -#ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 71a6cb293..fd845f371 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -28,19 +28,11 @@ #ifndef _DBAUI_SQLMESSAGE_HXX_ #define _DBAUI_SQLMESSAGE_HXX_ -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_BTNDLG_HXX #include <vcl/btndlg.hxx> -#endif -#ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> -#endif #include <memory> diff --git a/dbaccess/source/ui/inc/statusbarontroller.hxx b/dbaccess/source/ui/inc/statusbarontroller.hxx index f959fe404..0ca9185a7 100644 --- a/dbaccess/source/ui/inc/statusbarontroller.hxx +++ b/dbaccess/source/ui/inc/statusbarontroller.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_STATUSBARCONTROLLER_HXX #define DBAUI_STATUSBARCONTROLLER_HXX -#ifndef _SVTOOLS_STATUSBARCONTROLLER_HXX #include <svtools/statusbarcontroller.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index ccac85a1a..628136402 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -28,16 +28,10 @@ #ifndef _DBAUI_STRINGLISTITEM_HXX_ #define _DBAUI_STRINGLISTITEM_HXX_ -#ifndef _SFXPOOLITEM_HXX #include <svl/poolitem.hxx> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 7594309f6..bbae1f889 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -28,28 +28,14 @@ #ifndef _DBAUI_TABLETREE_HXX_ #define _DBAUI_TABLETREE_HXX_ -#ifndef _DBAUI_MARKTREE_HXX_ #include "marktree.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XDRIVER_HPP_ #include <com/sun/star/sdbc/XDriver.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp> -#endif #include <memory> diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index ce036b5a3..b0f090720 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -27,24 +27,12 @@ #ifndef DBACCESS_TOOLBOXCONTROLLER_HXX #define DBACCESS_TOOLBOXCONTROLLER_HXX -#ifndef _SVTOOLS_TOOLBOXCONTROLLER_HXX #include <svtools/toolboxcontroller.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif #include <memory> class PopupMenu; diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index ce64012e9..e4ac6f25b 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_UNDOSQLEDIT_HXX #define DBAUI_UNDOSQLEDIT_HXX -#ifndef DBAUI_GENERALUNDO_HXX #include "GeneralUndo.hxx" -#endif -#ifndef _DBU_CONTROL_HRC_ #include "dbu_control.hrc" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 1f77a518b..bb1b76860 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_UNOADMIN_ #define _DBAUI_UNOADMIN_ -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include <svtools/genericunodialog.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif class SfxItemSet; class SfxItemPool; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index e87f1caf1..66d16bf4f 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -28,72 +28,28 @@ #ifndef _SBA_UNODATBR_HXX_ #define _SBA_UNODATBR_HXX_ -#ifndef _SBA_BWRCTRLR_HXX #include "brwctrlr.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #include <com/sun/star/frame/XStatusListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include <com/sun/star/frame/XDispatch.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> -#endif -#ifndef _COM_SUN_STAR_I18N_XCOLLATOR_HPP_ #include <com/sun/star/i18n/XCollator.hpp> -#endif -#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_ #include <com/sun/star/view/XSelectionSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XSCRIPTINVOCATIONCONTEXT_HPP_ #include <com/sun/star/document/XScriptInvocationContext.hpp> -#endif -#ifndef _COM_SUN_STAR_UI_XCONTEXTMENUINTERCEPTION_HPP_ #include <com/sun/star/ui/XContextMenuInterception.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECT_HPP_ #include <com/sun/star/sdb/application/DatabaseObject.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECTCONTAINER_HPP_ #include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_DATABASEOBJECTCONTAINER_HPP_ #include <com/sun/star/sdb/XDatabaseRegistrationsListener.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _DBACCESS_UI_CALLBACKS_HXX_ #include "callbacks.hxx" -#endif -#ifndef _SV_TIMER_HXX #include <vcl/timer.hxx> -#endif -#ifndef _TRANSFER_HXX #include <svtools/transfer.hxx> -#endif -#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include <svx/dataaccessdescriptor.hxx> -#endif -#ifndef _SOT_STORAGE_HXX #include <sot/storage.hxx> -#endif -#ifndef DBUI_TABLECOPYHELPER_HXX #include "TableCopyHelper.hxx" -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif // ========================================================================= class SvLBoxEntry; diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 92d009bc3..3dc0ed817 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_UNOSQLMESSAGE_HXX_ #define _DBAUI_UNOSQLMESSAGE_HXX_ -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include <svtools/genericunodialog.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif //......................................................................... namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx index 63c72e14e..89306426e 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_QUERYTABLECONNECTION_HXX #define DBAUI_QUERYTABLECONNECTION_HXX -#ifndef DBAUI_TABLECONNECTION_HXX #include "TableConnection.hxx" -#endif -#ifndef DBAUI_QTABLECONNECTIONDATA_HXX #include "QTableConnectionData.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index fe5c5d534..b1d67e280 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_QTABLECONNECTIONDATA_HXX #define DBAUI_QTABLECONNECTIONDATA_HXX -#ifndef DBAUI_TABLECONNECTIONDATA_HXX #include "TableConnectionData.hxx" -#endif -#ifndef DBAUI_TABLEFIELDDESC_HXX #include "TableFieldDescription.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _RTTI_HXX #include <tools/rtti.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index 12853e04a..bc079e3d8 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_QUERY_TABLEWINDOW_HXX #define DBAUI_QUERY_TABLEWINDOW_HXX -#ifndef DBAUI_TABLEWINDOW_HXX #include "TableWindow.hxx" -#endif -#ifndef DBAUI_QUERY_TABLEWINDOWDATA_HXX #include "QTableWindowData.hxx" -#endif -#ifndef DBAUI_TABLEFIELDDESC_HXX #include "TableFieldDescription.hxx" -#endif -#ifndef _RTTI_HXX #include <tools/rtti.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index 26b8dd3c8..c698bbb5c 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -27,19 +27,13 @@ #ifndef DBAUI_QUERY_TABLEWINDOWDATA_HXX #define DBAUI_QUERY_TABLEWINDOWDATA_HXX -#ifndef DBAUI_TABLEWINDOWDATA_HXX #include "TableWindowData.hxx" -#endif #ifndef INCLUDED_VECTOR #define INCLUDED_VECTOR #include <vector> #endif -#ifndef _COM_SUN_STAR_IO_XOBJECTOUTPUTSTREAM_HPP_ #include <com/sun/star/io/XObjectOutputStream.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XOBJECTINPUTSTREAM_HPP_ #include <com/sun/star/io/XObjectInputStream.hpp> -#endif namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx index 6c3b5d9d1..e7906f1ec 100644 --- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYADDTABCONNUNDOACTION_HXX #define DBAUI_QUERYADDTABCONNUNDOACTION_HXX -#ifndef DBAUI_QUERYTABCONNUNDOACTION_HXX #include "QueryTabConnUndoAction.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index a1efc958f..e1a901dfd 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_QUERYDESIGNFIELDUNDOACT_HXX #define DBAUI_QUERYDESIGNFIELDUNDOACT_HXX -#ifndef DBAUI_GENERALUNDO_HXX #include "GeneralUndo.hxx" -#endif -#ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" -#endif -#ifndef DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX #include "SelectionBrowseBox.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx index e23d82fc8..22f25b02f 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #define DBAUI_QUERYDESIGNUNDOACTION_HXX -#ifndef DBAUI_GENERALUNDO_HXX #include "GeneralUndo.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index 1f6d16630..87c1079a7 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_OQUERYMOVETABWINUNDOACT_HXX #define DBAUI_OQUERYMOVETABWINUNDOACT_HXX -#ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" -#endif -#ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" -#endif -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index 83907451e..8861a3fb1 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_QUERYSIZETABWINUNDOACT_HXX #define DBAUI_QUERYSIZETABWINUNDOACT_HXX -#ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" -#endif -#ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index 86d903184..4afebcf2c 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYTABCONNUNDOACTION_HXX #define DBAUI_QUERYTABCONNUNDOACTION_HXX -#ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx index e8abb5240..6b7b367d3 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx @@ -28,9 +28,7 @@ #ifndef DBAUI_QUERYTABWINSHOWUNDOACT_HXX #define DBAUI_QUERYTABWINSHOWUNDOACT_HXX -#ifndef DBAUI_QUERYTABWINUNDOACT_HXX #include "QueryTabWinUndoAct.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index 4154d36cf..e61ae8200 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYTABWINUNDOACT_HXX #define DBAUI_QUERYTABWINUNDOACT_HXX -#ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" -#endif #ifndef INCLUDED_VECTOR #define INCLUDED_VECTOR #include <vector> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 725f800cc..bcdab8b86 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -27,27 +27,13 @@ #ifndef DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX #define DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ #include <svtools/editbrowsebox.hxx> -#endif -#ifndef DBAUI_TABLEFIELDDESC_HXX #include "TableFieldDescription.hxx" -#endif -#ifndef DBAUI_JOINEXCHANGE_HXX #include "JoinExchange.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include <com/sun/star/util/XNumberFormatter.hpp> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef _TRANSFER_HXX #include <svtools/transfer.hxx> -#endif namespace connectivity { diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx index f1b9e47d0..de61c4bab 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_TABLEFIELDINFO_HXX #define DBAUI_TABLEFIELDINFO_HXX -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 4323a5ec8..9b686c7a3 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -26,31 +26,17 @@ ************************************************************************/ #ifndef DBAUI_QUERYDLG_HXX #define DBAUI_QUERYDLG_HXX -#ifndef _SV_DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _SV_FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef DBAUI_RELCONTROLIFACE_HXX #include "RelControliFace.hxx" -#endif -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx index 7d6ca2c78..0d9929515 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_RTABLECONNECTION_HXX #define DBAUI_RTABLECONNECTION_HXX -#ifndef DBAUI_TABLECONNECTION_HXX #include "TableConnection.hxx" -#endif -#ifndef DBAUI_RTABLECONNECTIONDATA_HXX #include "RTableConnectionData.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index a0d8aefc0..038b93ebf 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_RELTABLEWINDOW_HXX #define DBAUI_RELTABLEWINDOW_HXX -#ifndef DBAUI_TABLEWINDOW_HXX #include "TableWindow.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index e3e919f70..8b103410d 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_TABLEFIELDDESCGENPAGE_HXX #define DBAUI_TABLEFIELDDESCGENPAGE_HXX -#ifndef _SV_TABPAGE_HXX #include <vcl/tabpage.hxx> -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 7d0fc5821..c098385b3 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_TABLEEDITORCONTROL_HXX #define DBAUI_TABLEEDITORCONTROL_HXX -#ifndef DBAUI_TABLEDESIGNCONTROL_HXX #include "TableDesignControl.hxx" -#endif -#ifndef DBAUI_TABLEDESIGNVIEW_HXX #include "TableDesignView.hxx" -#endif -#ifndef DBAUI_TABLEFIELDDESCRIPTION_HXX #include "TableFieldDescWin.hxx" -#endif -#ifndef DBAUI_TABLEROW_HXX #include "TableRow.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif class Edit; class SfxUndoManager; diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index da0ed4a80..8c2bde322 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_TABLEFIELDCONTROL_HXX #define DBAUI_TABLEFIELDCONTROL_HXX -#ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX #include "FieldDescControl.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index 3dd5165ec..2bd7ed308 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_TABLEFIELDDESCRIPTION_HXX #define DBAUI_TABLEFIELDDESCRIPTION_HXX -#ifndef _SV_TABPAGE_HXX #include <vcl/tabpage.hxx> -#endif -#ifndef DBAUI_TABLEFIELDDESCGENPAGE_HXX #include "FieldDescGenWin.hxx" -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif class FixedText; namespace dbaui diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index 5f00196eb..644beb156 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -27,21 +27,13 @@ #ifndef DBAUI_TABLEUNDO_HXX #define DBAUI_TABLEUNDO_HXX -#ifndef DBAUI_GENERALUNDO_HXX #include "GeneralUndo.hxx" -#endif -#ifndef _SV_MULTISEL_HXX #include <tools/multisel.hxx> -#endif #include <vector> -#ifndef _COM_SUN_STAR_UNO_ANY_H_ #include <com/sun/star/uno/Any.h> -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index b013208d0..98a61351d 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_COLUMNCONTROL_HXX #define DBAUI_COLUMNCONTROL_HXX -#ifndef _TOOLKIT_CONTROLS_UNOCONTROL_HXX_ #include <toolkit/controls/unocontrol.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index c2fbf3115..3c0efb968 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -27,39 +27,17 @@ #ifndef DBAUI_COLUMNMODEL_HXX #define DBAUI_COLUMNMODEL_HXX -#ifndef _COM_SUN_STAR_AWT_XCONTROLMODEL_HPP_ #include <com/sun/star/awt/XControlModel.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCLONEABLE_HPP_ #include <com/sun/star/util/XCloneable.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XPERSISTOBJECT_HPP_ #include <com/sun/star/io/XPersistObject.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include <comphelper/propertycontainer.hxx> -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _CPPUHELPER_COMPBASE4_HXX_ #include <cppuhelper/compbase4.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index eb1f00480..fb71b46eb 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_COLUMNPEER_HXX #define DBAUI_COLUMNPEER_HXX -#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_ #include <toolkit/awt/vclxwindow.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index b5fa576eb..2e2a204e1 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -29,32 +29,16 @@ #define DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include <com/sun/star/sdbc/XRowSet.hpp> -#endif /** === end UNO includes === **/ -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include <svtools/genericunodialog.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 847fc7859..1e7794c01 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -28,9 +28,7 @@ #ifndef _DBAUI_INTERACTION_HXX_ #define _DBAUI_INTERACTION_HXX_ -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase2.hxx> -#endif #include "moduledbu.hxx" #include "apitools.hxx" diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 407082d37..4ee97b883 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -28,27 +28,13 @@ #ifndef DBAUI_UNODIRECTSQL_HXX #define DBAUI_UNODIRECTSQL_HXX -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include <svtools/genericunodialog.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSQLQueryComposer.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include <com/sun/star/sdbc/XRowSet.hpp> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif //......................................................................... namespace dbaui diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index 767e5c7c6..e8cc6c050 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -28,9 +28,7 @@ #define RPT_FUNCTION_HXX #include <cppuhelper/propertysetmixin.hxx> -#ifndef _COM_SUN_STAR_REPORT_XFunction_HPP_ #include <com/sun/star/report/XFunction.hpp> -#endif #include <cppuhelper/basemutex.hxx> #include "ReportControlModel.hxx" #include <cppuhelper/compbase2.hxx> diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index ee93c84d9..c88431ba6 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -28,9 +28,7 @@ #define RPT_XMLIMAGE_HXX #include "xmlReportElementBase.hxx" -#ifndef _COM_SUN_STAR_REPORT_XImageControl_HPP_ #include <com/sun/star/report/XImageControl.hpp> -#endif namespace rptxml { diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 5f39bd768..bc8ed0ddd 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -34,12 +34,8 @@ #include <xmloff/maptype.hxx> #include <xmloff/prstylei.hxx> #include <xmloff/xmlimppr.hxx> -#ifndef _XMLTEXTMASTERPAGECONTEXT_HXX #include <xmloff/XMLTextMasterPageContext.hxx> -#endif -#ifndef _XMLTEXTMASTERSTYLESCONTEXT_HXX #include <xmloff/XMLTextMasterStylesContext.hxx> -#endif #include <xmloff/contextid.hxx> #include <xmloff/controlpropertyhdl.hxx> #include <vector> diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 33e72b427..b436cbad1 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -27,17 +27,11 @@ #ifndef RPTUI_DATETIME_HXX #define RPTUI_DATETIME_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/util/XNumberFormats.hpp> #include <com/sun/star/lang/Locale.hpp> diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index fcf150feb..3ad89842e 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -28,9 +28,7 @@ #define RPTUI_GROUPS_SORTING_HXX #include <vcl/floatwin.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> diff --git a/reportdesign/source/ui/inc/InsertFunctions.hxx b/reportdesign/source/ui/inc/InsertFunctions.hxx index 4b99c6c34..b68b3af23 100644 --- a/reportdesign/source/ui/inc/InsertFunctions.hxx +++ b/reportdesign/source/ui/inc/InsertFunctions.hxx @@ -27,9 +27,7 @@ #ifndef RPT_INSERTFUNCTIONS_HXX_INCLUDED #define RPT_INSERTFUNCTIONS_HXX_INCLUDED -#ifndef _EVENT_HXX //autogen #include <vcl/event.hxx> -#endif #include <vcl/timer.hxx> class SdrView; diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 01c81e0bc..62ed73c2c 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -27,17 +27,11 @@ #ifndef RPTUI_PAGENUMBER_HXX #define RPTUI_PAGENUMBER_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <com/sun/star/report/XReportDefinition.hpp> |