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 /dbaccess/source/ui/inc | |
| parent | 06052e404ffd12c291ba9b0acb6a0cb3dd7a7e37 (diff) | |
more removed include guards using fixguard.py
Diffstat (limited to 'dbaccess/source/ui/inc')
105 files changed, 0 insertions, 1048 deletions
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 { |