diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-03-01 10:34:34 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-03-03 17:28:41 +0100 |
| commit | 131d5cdbb9526477864ea3bd839deab0e544b821 (patch) | |
| tree | f0408a86e38d7203fb57042f3a1d9214e84c278f | |
| parent | 2940d1905b921d9909b08b1e32014d3c44474ef0 (diff) | |
tdf#42949 Fix IWYU warnings in dbaccess/source/ui/*/*hxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I1f4396eea206e2a8852a96e793be1f179ae837b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89773
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
132 files changed, 89 insertions, 179 deletions
diff --git a/dbaccess/IwyuFilter_dbaccess.yaml b/dbaccess/IwyuFilter_dbaccess.yaml index 2e56f22afaa1..da6e9450ed21 100644 --- a/dbaccess/IwyuFilter_dbaccess.yaml +++ b/dbaccess/IwyuFilter_dbaccess.yaml @@ -21,3 +21,12 @@ blacklist: dbaccess/source/filter/xml/xmlExport.hxx: # Needed for implicit dtor - xmloff/txtprmap.hxx + dbaccess/source/ui/inc/sbamultiplex.hxx: + # Needed for macros + - cppuhelper/queryinterface.hxx + dbaccess/source/ui/dlg/odbcconfig.hxx: + # Needed on WIN32 + - tools/link.hxx + dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx: + # Needed for direct member access + - JoinTableView.hxx diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index d8c6612c0868..58393e84d0bb 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -21,6 +21,7 @@ #include "AppController.hxx" #include <core_resource.hxx> #include <stringconstants.hxx> +#include <strings.hxx> #include <advancedsettingsdlg.hxx> #include "subcomponentmanager.hxx" #include <uiservices.hxx> diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index e1d5903e05d7..d70f4a199039 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -31,17 +31,14 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/ui/XContextMenuInterception.hpp> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase5.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <sot/storage.hxx> #include <vcl/transfer.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <vcl/timer.hxx> #include <memory> diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index a7ee7749495b..9c5adfb43995 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -22,6 +22,7 @@ #include <comphelper/property.hxx> #include <core_resource.hxx> #include <stringconstants.hxx> +#include <strings.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 53a9453a585c..61a12a87fede 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -24,6 +24,7 @@ #include <dbaccess_slotid.hrc> #include <strings.hrc> #include <stringconstants.hxx> +#include <strings.hxx> #include <defaultobjectnamecheck.hxx> #include <dlgsave.hxx> #include <UITools.hxx> diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 92d33c9bda51..2c6584f68f01 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -60,6 +60,7 @@ #include <imageprovider.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/settings.hxx> +#include <vcl/cvtgrf.hxx> #include <vcl/event.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <tools/stream.hxx> diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index e237a4413f08..75db4cb47cb3 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -22,19 +22,17 @@ #include <vector> #include <rtl/ustring.hxx> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/ucb/XContent.hpp> +#include <com/sun/star/container/XNameAccess.hpp> #include <AppElementType.hxx> #include <vcl/treelistbox.hxx> #include <svtools/DocumentInfoPreview.hxx> #include <vcl/fixed.hxx> #include <vcl/toolbox.hxx> -#include <vcl/cvtgrf.hxx> #include <vcl/graph.hxx> #include <vcl/GraphicObject.hxx> -#include <callbacks.hxx> -#include <memory> namespace com{ namespace sun { namespace star { namespace awt { class XWindow; } } } } namespace com{ namespace sun { namespace star { namespace frame { class XFrame2; } } } } diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index dd7a76f9e30f..febe987a319f 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -20,11 +20,9 @@ #define INCLUDED_DBACCESS_SOURCE_UI_APP_APPVIEW_HXX #include <dbaccess/dataview.hxx> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp> -#include <vcl/fixed.hxx> +#include <com/sun/star/sdbc/XConnection.hpp> #include <unotools/eventlisteneradapter.hxx> #include <IClipBoardTest.hxx> #include <AppElementType.hxx> diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 1bc1cd9b3386..f1bfbf0a2931 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -29,6 +29,7 @@ #include <strings.hxx> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/awt/XControlContainer.hpp> +#include <com/sun/star/awt/PosSize.hpp> #include <UITools.hxx> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx index d1497f0bcd63..8b8db2792685 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.hxx +++ b/dbaccess/source/ui/browser/dbtreemodel.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEMODEL_HXX #define INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEMODEL_HXX -#include <com/sun/star/container/XNameAccess.hpp> #include <unodatbr.hxx> #include <commontypes.hxx> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index a47db2b688e9..91166e08617b 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -73,6 +73,7 @@ #include <comphelper/types.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <browserids.hxx> #include <stringconstants.hxx> #include <strings.hrc> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 383da2b4e088..ff34dfa9282b 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -37,6 +37,7 @@ #include <sbagrid.hrc> #include <sbagrid.hxx> #include <sqlmessage.hxx> +#include <strings.hxx> #include <TokenWriter.hxx> #include <UITools.hxx> #include <unodatbr.hxx> diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index d4aee8488a22..7324ff8fa98a 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -36,6 +36,7 @@ #include <svl/numuno.hxx> #include <vcl/transfer.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatPreviewer.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index e32e0ef05345..405e0f3d6e14 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/sdbcx/PrivilegeObject.hpp> #include <com/sun/star/sdbcx/XUsersSupplier.hpp> #include <com/sun/star/sdbcx/XAuthorizable.hpp> +#include <toolkit/helper/vclunohelper.hxx> #include <vcl/button.hxx> #include <vcl/svapp.hxx> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index f5a41a5d701f..a491f0736a6c 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -55,6 +55,7 @@ #include <unotools/localfilehelper.hxx> #include <unotools/ucbhelper.hxx> #include <ucbhelper/commandenvironment.hxx> +#include <ucbhelper/content.hxx> #include "finteraction.hxx" #include <connectivity/CommonTools.hxx> #include <tools/urlobj.hxx> diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 4af8bbcef480..ed58eac076c1 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONHELPER_HXX #include "adminpages.hxx" -#include <ucbhelper/content.hxx> #include <curledit.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 11509f3bfb1d..3b514f86677e 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -21,9 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONPAGE_HXX #include "ConnectionHelper.hxx" -#include "adminpages.hxx" -#include <ucbhelper/content.hxx> -#include <curledit.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index b1333aff70f8..f7cfe37ad2d6 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -22,8 +22,6 @@ #include "ConnectionHelper.hxx" #include "adminpages.hxx" -#include <ucbhelper/content.hxx> -#include <curledit.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 9c3f5cb47a17..057e7e584afd 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -24,12 +24,8 @@ #include "adminpages.hxx" #include "admincontrols.hxx" -#include <curledit.hxx> #include "TextConnectionHelper.hxx" -#include <vcl/roadmapwizard.hxx> -#include <ucbhelper/content.hxx> - namespace dbaui { class ODbTypeWizDialogSetup; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 8ecc47963a92..c7fbcdc6da20 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -23,9 +23,7 @@ #include <sal/config.h> #include <map> -#include <set> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdb/XDatabaseContext.hpp> diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 367277bde656..3fc4e9792653 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -19,11 +19,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX -#include <dsntypes.hxx> #include <sfx2/tabdlg.hxx> -#include <svl/poolitem.hxx> -#include <vcl/vclptr.hxx> -#include <vector> class SfxTabPage; namespace vcl { class Window; } diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index b284f7edbc05..e002c77e8ba8 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -20,12 +20,8 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_TEXTCONNECTIONHELPER_HXX #define INCLUDED_DBACCESS_SOURCE_UI_DLG_TEXTCONNECTIONHELPER_HXX -#include "ConnectionPageSetup.hxx" #include "adminpages.hxx" #include <charsetlistbox.hxx> -#include <ucbhelper/content.hxx> -#include <curledit.hxx> -#include <vcl/roadmapwizard.hxx> #include <rtl/ustring.hxx> namespace dbaui diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 9db03a7b1296..cbdec09d0ba9 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -21,8 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADMINPAGES_HXX #include <sfx2/tabdlg.hxx> -#include <dsntypes.hxx> -#include <commontypes.hxx> #include <vcl/wizardmachine.hxx> #include <curledit.hxx> diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index 9df39fe61c44..d13203ad89eb 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -20,8 +20,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ADODATALINKS_HXX #define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADODATALINKS_HXX -#include <osl/module.h> -#include <commontypes.hxx> +#include <rtl/ustring.hxx> OUString getAdoDatalink(long hWnd, OUString const& oldLink); #endif diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 04dceaa09259..1a74a67ca6a7 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -30,6 +30,8 @@ #include <querycontroller.hxx> #include <connectivity/dbtools.hxx> #include <browserids.hxx> +#include <com/sun/star/container/XContainer.hpp> +#include <com/sun/star/sdb/application/DatabaseObject.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/sdbcx/XViewsSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 541c289255f6..ff82ce06dbc5 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DETAILPAGES_HXX #include "adminpages.hxx" -#include <charsets.hxx> #include <charsetlistbox.hxx> #include "TextConnectionHelper.hxx" #include "admincontrols.hxx" diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 6a96a2a574c7..500fc5e95e21 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -27,6 +27,7 @@ #include <editeng/eeitem.hxx> #include <osl/mutex.hxx> #include <svl/itemset.hxx> +#include <svtools/editsyntaxhighlighter.hxx> #include <tools/diagnose_ex.h> #include <rtl/strbuf.hxx> #include <vcl/event.hxx> diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index e9e5aa2ed98e..091f3ef7a67d 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -37,10 +37,8 @@ namespace dbaui { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::ui::dialogs; -using namespace ::comphelper; ODatasourceSelectDialog::ODatasourceSelectDialog(weld::Window* _pParent, const std::set<OUString>& _rDatasources) : GenericDialogController(_pParent, "dbaccess/ui/choosedatasourcedialog.ui", "ChooseDataSourceDialog") diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 2f2322de1f38..f365eaf007ca 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -20,14 +20,11 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DSSELECT_HXX #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DSSELECT_HXX -#include <dsntypes.hxx> -#include "odbcconfig.hxx" -#include <commontypes.hxx> - #include <rtl/ustring.hxx> #include <vcl/weld.hxx> #include <memory> +#include <set> class SfxItemSet; namespace dbaui diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index cbcdf8320205..5f256f27021d 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -18,6 +18,7 @@ */ #include <core_resource.hxx> +#include <indexcollection.hxx> #include <indexfieldscontrol.hxx> #include <dbu_dlg.hxx> #include <strings.hrc> diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 22ba099109f2..0b4a78452033 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ODBCCONFIG_HXX #define INCLUDED_DBACCESS_SOURCE_UI_DLG_ODBCCONFIG_HXX -#include <commontypes.hxx> - #if defined(_WIN32) || (defined (UNX) && !defined(ANDROID) && !defined(IOS)) #define HAVE_ODBC_SUPPORT #endif @@ -30,6 +28,7 @@ #define HAVE_ODBC_ADMINISTRATION #endif +#include <rtl/ustring.hxx> #include <tools/link.hxx> #include <osl/module.h> diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 15e647dc0bc1..0eb1273d1eb7 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_DLG_TABLESPAGE_HXX #include "adminpages.hxx" -#include <com/sun/star/i18n/XCollator.hpp> #include <tabletree.hxx> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 4dd484f24e9b..7d693329fefc 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -23,7 +23,6 @@ #include <vcl/weld.hxx> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> namespace dbaui diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 5fd37cdbf4bf..4365e7134053 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEACCESS_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEACCESS_HXX +#include "TableConnection.hxx" #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <cppuhelper/implbase2.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 397b527d6d7d..f14fbb38554e 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -22,14 +22,10 @@ #include <sal/config.h> #include <com/sun/star/sdbc/SQLException.hpp> -#include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <map> diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 59600a0b91a5..98c1a7cfcbae 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDCONTROLS_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDCONTROLS_HXX -#include <vcl/svapp.hxx> #include "SqlNameEdit.hxx" namespace dbaui diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index d485b60d4cd8..576a4016b267 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -19,10 +19,8 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCRIPTIONS_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCRIPTIONS_HXX -#include "QEnumTypes.hxx" #include <editeng/svxenum.hxx> #include "TypeInfo.hxx" -#include <osl/diagnose.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index ef688f306b98..2d8f42508696 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -21,7 +21,8 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_IITEMSETHELPER_HXX #include <sal/types.h> -#include <dsntypes.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> namespace com { namespace sun { namespace star { namespace sdbc { diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 8e8b2c6dccb3..f5410bef975c 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_JACCESS_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_JACCESS_HXX +#include "JoinTableView.hxx" #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <cppuhelper/implbase1.hxx> #include <vcl/vclptr.hxx> diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 733e46d7dd67..94638e638bea 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -20,12 +20,10 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_JOINCONTROLLER_HXX #include "singledoccontroller.hxx" -#include <com/sun/star/beans/XPropertySet.hpp> #include "JoinTableView.hxx" #include "JoinDesignView.hxx" #include "TableConnectionData.hxx" #include "TableWindowData.hxx" -#include <tools/fract.hxx> #include <memory> namespace comphelper diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index b953f121902c..c1153e3463e7 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX #include <dbaccess/dataview.hxx> -#include "QEnumTypes.hxx" class Splitter; diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 72aa0d1de73e..a1a73595ae5c 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_JOINEXCHANGE_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_JOINEXCHANGE_HXX -#include "dbexchange.hxx" #include "TableWindowListBox.hxx" #include <vcl/transfer.hxx> diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index fefd6cc9d311..feb1266b24fb 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -21,10 +21,8 @@ #include "JoinDesignView.hxx" #include <vcl/split.hxx> -#include "QEnumTypes.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include "querycontroller.hxx" -#include "ConnectionLineData.hxx" namespace connectivity { diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx index d8a5c5a7167f..901427c056b5 100644 --- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx +++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx @@ -11,7 +11,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYPROPERTIESDIALOG_HXX #include <vcl/weld.hxx> -#include <rtl/ustring.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index ce56e3dc15fd..cdcad0e168b0 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -20,8 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYTABLEVIEW_HXX #include "JoinTableView.hxx" -#include <com/sun/star/container/XNameAccess.hpp> -#include "querycontroller.hxx" +#include "TableFieldDescription.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index 85862c736ba0..879c29b01d42 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -19,7 +19,9 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYVIEWSWITCH_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYVIEWSWITCH_HXX -#include "JoinDesignView.hxx" +#include <com/sun/star/uno/XComponentContext.hpp> +#include <tools/gen.hxx> +#include <vcl/vclptr.hxx> namespace dbtools { diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 6995275ee8ff..88011b23c9aa 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -21,7 +21,6 @@ #include "TableConnectionData.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include "QEnumTypes.hxx" namespace dbaui diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index bace921f45df..a6bfa0ec956d 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -19,9 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELCONTROLIFACE_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_RELCONTROLIFACE_HXX -#include <com/sun/star/sdbc/XConnection.hpp> -#include "TableConnectionData.hxx" - namespace dbaui { class IRelationControlInterface diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 39f57338f48f..d8901f8e91a1 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -21,7 +21,6 @@ #include <memory> #include "JoinController.hxx" -#include "RelationDesignView.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace weld diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index ae498b119c6f..bc69359c82ce 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -21,9 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDESIGNVIEW_HXX #include "JoinDesignView.hxx" -#include <vector> -#include "QEnumTypes.hxx" -#include "RelationTableView.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx index 602f39d3a375..87e50018aa2d 100644 --- a/dbaccess/source/ui/inc/ScrollHelper.hxx +++ b/dbaccess/source/ui/inc/ScrollHelper.hxx @@ -21,7 +21,6 @@ #include <tools/link.hxx> #include <tools/gen.hxx> -#include <vcl/timer.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 81963c622e7f..6e3192b6cd1a 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -20,10 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX #include "singledoccontroller.hxx" -#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/io/XObjectOutputStream.hpp> -#include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "TypeInfo.hxx" #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index 8c05358d207d..9d933b3e6245 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNCONTROL_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNCONTROL_HXX -#include <svtools/tabbar.hxx> #include <svtools/editbrowsebox.hxx> #include "IClipBoardTest.hxx" diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 36bd42701eed..262e04933959 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -20,7 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNVIEW_HXX #include <dbaccess/dataview.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/Locale.hpp> #include <vcl/split.hxx> #include "IClipBoardTest.hxx" diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 8c9187f10834..1834f409f84d 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <rtl/ref.hxx> #include <vcl/vclptr.hxx> +#include <vcl/window.hxx> #include <salhelper/simplereferenceobject.hxx> diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 7286bd27db5d..7f7062f52842 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XAuthorizable.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> class Edit; diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 3710838687ba..6d3668f6d0ec 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROWEXCHANGE_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROWEXCHANGE_HXX -#include <com/sun/star/beans/PropertyValue.hpp> #include <vcl/transfer.hxx> #include <memory> diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index ff266f99b624..4ee3539a25bb 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX +#include "TableWindow.hxx" #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <cppuhelper/implbase2.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index ca03617b052f..ad5ef5cfb1e5 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -19,21 +19,22 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX -#include "DExport.hxx" #include "commontypes.hxx" #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/sdb/CommandType.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/util/XNumberFormatter.hpp> #include <cppuhelper/implbase.hxx> #include <svx/dataaccessdescriptor.hxx> +#include <vcl/weld.hxx> namespace com { namespace sun { namespace star { namespace sdbc{ diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 97c1e150c00f..36cf41e9228d 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnSearch.hpp> -#include <com/sun/star/sdbc/ColumnValue.hpp> #include <map> #include <memory> diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index c3e2097a4a70..b4ec36341a1d 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -23,7 +23,6 @@ #include <comphelper/stl_types.hxx> #include "TypeInfo.hxx" #include <editeng/svxenum.hxx> -#include <toolkit/helper/vclunohelper.hxx> #include <vcl/taskpanelist.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 98ad2923584f..1c595513f649 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_USERADMINDLG_HXX #include <sfx2/tabdlg.hxx> -#include <dsntypes.hxx> #include "IItemSetHelper.hxx" #include <memory> diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 2dbe36d01c5a..617f723c78fa 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -21,8 +21,6 @@ #include "WTabPage.hxx" -#include "QEnumTypes.hxx" - namespace dbaui { class OWizColumnSelect; diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 798b5d83e567..fffc3cf1dee4 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -22,8 +22,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index eb843569e404..0b4b45617cad 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -20,7 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_WNAMEMATCH_HXX #include "WTabPage.hxx" -#include "marktree.hxx" #include "DExport.hxx" #include "WCopyTable.hxx" diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 7f73941d66dd..58a13cf17690 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -40,7 +40,6 @@ #include <vcl/timer.hxx> #include <vcl/transfer.hxx> -#include <osl/thread.hxx> #include <cppuhelper/implbase.hxx> #include <svtools/cliplistener.hxx> diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index acbc3d54f5b9..8ba0ae5dd8cb 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -22,7 +22,6 @@ #include <vcl/window.hxx> -#include <com/sun/star/awt/PosSize.hpp> #include <dbaccess/dataview.hxx> #include <unotools/eventlisteneradapter.hxx> diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index f80f5aee7d2f..8a607db34eff 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -21,9 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_CALLBACKS_HXX #include <sot/exchange.hxx> -#include <sot/formats.hxx> -#include <vcl/vclptr.hxx> -#include <com/sun/star/container/XContainer.hpp> class SvTreeListEntry; class Point; diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 0556dfdfab20..b48e14f6e5a7 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -22,7 +22,6 @@ #include <connectivity/dbcharset.hxx> #include <rtl/ustring.hxx> -#include <svx/txenctab.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index ca4a905ff1b7..9fa293c0e213 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -24,17 +24,12 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <memory> - namespace dbaui { /** encapsulates access to the view of a database object. diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index 9144667ff1f8..30cc3cdfe730 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DATASOURCECONNECTOR_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_DATASOURCECONNECTOR_HXX -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 48a7fc7dc501..10d2c2feee2d 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -19,13 +19,10 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBEXCHANGE_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_DBEXCHANGE_HXX -#include <com/sun/star/beans/PropertyValue.hpp> +#include "TokenWriter.hxx" #include <com/sun/star/util/XNumberFormatter.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <svx/dbaexchange.hxx> -#include <vector> #include <rtl/ref.hxx> diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index b8bf380a71f9..c1678108f1e5 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -22,11 +22,9 @@ #include "ScrollHelper.hxx" #include <com/sun/star/frame/XPopupMenuController.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/treelistbox.hxx> #include <vcl/timer.hxx> -#include <vcl/weld.hxx> #include <memory> #include <set> diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 6c17e3319bfc..ffacf517bd4c 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZ_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZ_HXX -#include <sfx2/tabdlg.hxx> #include <dsntypes.hxx> #include "IItemSetHelper.hxx" #include <vcl/wizardmachine.hxx> diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index b7205532c2b7..cc40eb25d17c 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -20,13 +20,11 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZSETUP_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZSETUP_HXX -#include <sfx2/tabdlg.hxx> #include <dsntypes.hxx> #include "IItemSetHelper.hxx" #include <tools/urlobj.hxx> #include <memory> #include <vcl/roadmapwizard.hxx> -#include <connectivity/dbtools.hxx> namespace com { namespace sun { namespace star { namespace beans { diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index 7190d72448cf..e86f2575cf8c 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -23,7 +23,6 @@ #include "objectnamecheck.hxx" #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <memory> diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index d515a2f20183..7a3c60a2d327 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -22,9 +22,11 @@ #include <sal/config.h> +#include <comphelper/syntaxhighlight.hxx> #include <sal/log.hxx> +#include <svtools/colorcfg.hxx> +#include <vcl/timer.hxx> #include <vcl/weld.hxx> -#include <svtools/editsyntaxhighlighter.hxx> #include <deque> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index cb55e2cc8d6f..de0470737bb8 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSAVE_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSAVE_HXX -#include <apitools.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <o3tl/typed_flags_set.hxx> #include <vcl/weld.hxx> diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx index ee8c4202c45e..9d05d0adf728 100644 --- a/dbaccess/source/ui/inc/dsitems.hxx +++ b/dbaccess/source/ui/inc/dsitems.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DSITEMS_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_DSITEMS_HXX +#include <sal/types.h> + typedef sal_Int32 ItemID; // item ids for the data source administration dialog diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 5c475e23db1b..b6b7ab997e74 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -24,9 +24,10 @@ #include <set> -#include <dsntypes.hxx> #include "dsitems.hxx" +#include <rtl/ustring.hxx> + #include <memory> namespace dbaui diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index ee8a5a44d8d6..1f267818a592 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdb/application/DatabaseObject.hpp> #include <memory> diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index 351f8e52c2c0..d58a4c180cef 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXCOLLECTION_HXX #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include "indexes.hxx" diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 1ed17eac2d49..00357f903a76 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -21,11 +21,9 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXDIALOG_HXX #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -#include <unotools/viewoptions.hxx> #include <vcl/weld.hxx> #include "indexes.hxx" diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index ee7cef14af15..0a54aff7ec17 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -22,6 +22,8 @@ #include <sal/config.h> +#include <rtl/ustring.hxx> + #include <vector> namespace dbaui diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 3a4c8bbddca1..b09723d570f5 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -21,9 +21,9 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX #include <svtools/editbrowsebox.hxx> -#include "indexcollection.hxx" #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include "indexes.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index 0e1ca710429b..0a18bdcd2fa8 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -25,9 +25,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 214a07e08549..9ab29b624dee 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -22,7 +22,6 @@ #include <vcl/weld.hxx> #include <rtl/ustring.hxx> -#include <map> namespace dbaui { diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index bf3f453c9e3f..201aabe29d25 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -20,15 +20,12 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_PARAMDIALOG_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_PARAMDIALOG_HXX -#include "commontypes.hxx" - #include <vcl/weld.hxx> #include <vcl/timer.hxx> #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <connectivity/predicateinput.hxx> #include <svx/ParseContext.hxx> diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 00a005046991..c3988baac8ae 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -21,26 +21,20 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYCONTROLLER_HXX #include "JoinController.hxx" -#include "JoinTableView.hxx" #include "querycontainerwindow.hxx" #include <svx/ParseContext.hxx> #include "TableFieldDescription.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/io/XObjectInputStream.hpp> -#include <com/sun/star/io/XObjectOutputStream.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XSQLQueryComposer.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbcx/XAlterView.hpp> #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/uno3.hxx> #include <connectivity/sqliterator.hxx> -#include <connectivity/sqlnode.hxx> #include <connectivity/sqlparse.hxx> -#include <svl/undo.hxx> namespace comphelper { diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 4401a527cf46..629ea7c5087c 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -24,7 +24,6 @@ #include <svx/fmgridif.hxx> -#include <com/sun/star/sdb/XSQLQueryComposer.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/URL.hpp> #include <comphelper/servicehelper.hxx> diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 055d4c034271..86de9186ec9e 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -21,20 +21,12 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_SBAMULTIPLEX_HXX #include <com/sun/star/beans/XVetoableChangeListener.hpp> -#include <com/sun/star/form/XUpdateListener.hpp> -#include <com/sun/star/form/XErrorListener.hpp> -#include <com/sun/star/form/XRestoreListener.hpp> -#include <com/sun/star/form/XInsertListener.hpp> -#include <com/sun/star/form/XDeleteListener.hpp> -#include <com/sun/star/form/XPositioningListener.hpp> #include <com/sun/star/form/XDatabaseParameterListener.hpp> #include <com/sun/star/form/XLoadListener.hpp> -#include <com/sun/star/beans/XPropertyStateChangeListener.hpp> #include <com/sun/star/beans/XPropertiesChangeListener.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/form/XSubmitListener.hpp> #include <com/sun/star/form/XResetListener.hpp> -#include <com/sun/star/util/XRefreshListener.hpp> #include <com/sun/star/sdb/XSQLErrorListener.hpp> #include <com/sun/star/sdb/XRowSetApproveListener.hpp> #include <com/sun/star/sdbc/XRowSetListener.hpp> diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index bbf3b72f1343..4bb1e8c9c113 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -23,7 +23,6 @@ #include <rtl/ref.hxx> #include <svtools/editsyntaxhighlighter.hxx> -#include <svl/lstner.hxx> #include <svtools/colorcfg.hxx> namespace com { namespace sun { namespace star { namespace beans { diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 5df47663a8da..9be6310cd59f 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -23,11 +23,8 @@ #include "imageprovider.hxx" #include "marktree.hxx" -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp> #include <vcl/weld.hxx> #include <memory> diff --git a/dbaccess/source/ui/inc/uiservices.hxx b/dbaccess/source/ui/inc/uiservices.hxx index 8718f05a838a..da225602a0d4 100644 --- a/dbaccess/source/ui/inc/uiservices.hxx +++ b/dbaccess/source/ui/inc/uiservices.hxx @@ -22,8 +22,6 @@ #include <sal/config.h> -#include <sal/types.h> - extern "C" { void createRegistryInfo_ComposerDialogs(); diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index b1e132d4e9e8..8d7f1d9ba56f 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -20,6 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_UNDOSQLEDIT_HXX #include "GeneralUndo.hxx" +#include "sqledit.hxx" #include <vcl/vclptr.hxx> #include <strings.hrc> diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index ed1511cde629..e0674cd541ca 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -22,10 +22,8 @@ #include <memory> #include "brwctrlr.hxx" -#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/i18n/XCollator.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/awt/XWindow.hpp> @@ -36,10 +34,8 @@ #include <com/sun/star/sdb/XDatabaseRegistrationsListener.hpp> #include <cppuhelper/implbase5.hxx> #include "callbacks.hxx" -#include <vcl/timer.hxx> #include <vcl/transfer.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <sot/storage.hxx> #include "TableCopyHelper.hxx" #include "commontypes.hxx" diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 4d67664e011a..fab8c2ae1433 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -18,6 +18,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <DExport.hxx> #include <TokenWriter.hxx> #include <com/sun/star/sdbc/XColumnLocate.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index d3848766916a..b4ebf89c6c47 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/sdb/application/CopyTableOperation.hpp> #include <com/sun/star/sdb/application/CopyTableWizard.hpp> #include <com/sun/star/sdb/DataAccessDescriptorFactory.hpp> +#include <com/sun/star/sdb/CommandType.hpp> #include <RtfReader.hxx> #include <HtmlReader.hxx> @@ -42,6 +43,7 @@ #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XViewsSupplier.hpp> #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp> diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 29a606b765c8..3869a313d11e 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -31,6 +31,7 @@ #include <strings.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> +#include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 0522d4ab834e..9273b4759f07 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -25,6 +25,7 @@ #include <dlgsave.hxx> #include <dbtreelistbox.hxx> #include <defaultobjectnamecheck.hxx> +#include <strings.hxx> #include <comphelper/extract.hxx> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index 766a4cefc139..48780724604a 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -19,12 +19,8 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_MISC_UPDATEHELPERIMPL_HXX #define INCLUDED_DBACCESS_SOURCE_UI_MISC_UPDATEHELPERIMPL_HXX -#include <com/sun/star/sdbc/XResultSetUpdate.hpp> -#include <com/sun/star/sdbc/XRowUpdate.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XPreparedStatement.hpp> -#include <com/sun/star/sdbc/XRowSet.hpp> -#include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <IUpdateHelper.hxx> namespace dbaui diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 9404d777cea5..86e55b226df0 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -22,6 +22,7 @@ #include <osl/diagnose.h> #include <strings.hrc> #include <rtl/tencinfo.h> +#include <svx/txenctab.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 16548dc43edd..886c36dbec3d 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/graphic/GraphicColorMode.hpp> #include <com/sun/star/sdb/application/XTableUIProvider.hpp> +#include <com/sun/star/sdb/application/DatabaseObject.hpp> #include <com/sun/star/sdbcx/XViewsSupplier.hpp> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index e680e1cec9ab..f3606d4bd927 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -19,6 +19,7 @@ #include <indexcollection.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 7ee7a49d58d5..312c9d8e9958 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -25,7 +25,6 @@ namespace dbaui { using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer; diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 24f1aa749445..5b1fd6cd772a 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include "QueryMoveTabWinUndoAct.hxx" #include "QuerySizeTabWinUndoAct.hxx" +#include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 2f6811c992f7..d8f2f2efd1a9 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -20,7 +20,6 @@ #include "QTableWindowData.hxx" using namespace dbaui; -using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; OQueryTableWindowData::OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias ) diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index 8acab3bd4097..382611eeca52 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -20,9 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOWDATA_HXX #include <TableWindowData.hxx> -#include <vector> -#include <com/sun/star/io/XObjectOutputStream.hpp> -#include <com/sun/star/io/XObjectInputStream.hpp> namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index 6f99819d077d..63f09af2e508 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -22,6 +22,7 @@ #include <GeneralUndo.hxx> #include <strings.hrc> #include "SelectionBrowseBox.hxx" +#include <osl/diagnose.h> namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx index 17e6e734d8ec..817e003415a8 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx @@ -20,6 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX #include <GeneralUndo.hxx> +#include <JoinTableView.hxx> #include <vcl/vclptr.hxx> namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index d60e5fb95e54..38cca8bc61bd 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -21,6 +21,8 @@ #include "QueryDesignUndoAction.hxx" #include <strings.hrc> +#include <JoinTableView.hxx> +#include <TableWindow.hxx> #include <tools/gen.hxx> namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index fb0c48b30ad1..a36eb5eb5fe9 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -21,6 +21,7 @@ #include "QueryDesignUndoAction.hxx" #include <strings.hrc> +#include <TableWindow.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index d71068b24ba2..36b1aae981a6 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -20,6 +20,8 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABCONNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" +#include "QTableConnection.hxx" +#include <JoinTableView.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index 3b637c62d6ce..008c76260216 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -20,8 +20,9 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINUNDOACT_HXX #include "QueryDesignUndoAction.hxx" +#include "QTableWindow.hxx" +#include <TableConnection.hxx> #include <vector> -#include <algorithm> namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3c90b02df40a..2ffac3d5203a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -20,6 +20,7 @@ #include "SelectionBrowseBox.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <JoinExchange.hxx> #include <QueryDesignView.hxx> #include <querycontroller.hxx> #include <sqlbison.hxx> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 69769aaf65d2..1668b4913edf 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -21,10 +21,9 @@ #include <svtools/editbrowsebox.hxx> #include <TableFieldDescription.hxx> -#include <JoinExchange.hxx> +#include <TableWindowListBox.hxx> #include <QEnumTypes.hxx> -#include <com/sun/star/util/XNumberFormatter.hpp> -#include <vcl/transfer.hxx> +#include <com/sun/star/sdbc/XConnection.hpp> namespace connectivity { diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 2dd9e6112232..cf76c4b2cf9c 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -33,10 +33,12 @@ #include <vcl/ptrstyle.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> +#include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> +#include <com/sun/star/sdb/application/DatabaseObject.hpp> #include <querycontroller.hxx> #include <stringconstants.hxx> #include <bitmaps.hlst> diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index ffcee79520d7..baaca8b8e5c8 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -8,6 +8,7 @@ */ #include "limitboxcontroller.hxx" +#include <apitools.hxx> #include <uiservices.hxx> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx index 7539450095f7..cf37276254e1 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx @@ -11,13 +11,12 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_LIMITBOXCONTROLLER_HXX #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <connectivity/CommonTools.hxx> #include <svtools/toolboxcontroller.hxx> #include <rtl/ustring.hxx> #include <vcl/vclptr.hxx> -#include <apitools.hxx> - namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 3937c3d09d0d..fd6ccbdf0528 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -21,6 +21,7 @@ #include <browserids.hxx> #include <core_resource.hxx> #include <strings.hrc> +#include <strings.hxx> #include <query.hrc> #include <dbu_reghelper.hxx> #include <stringconstants.hxx> @@ -72,6 +73,7 @@ #include <connectivity/dbtools.hxx> #include <cppuhelper/exc_hlp.hxx> #include <sfx2/sfxsids.hrc> +#include <svl/undo.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 92de0dced688..b4bc2cfe10ab 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -18,6 +18,7 @@ */ #include "RTableConnection.hxx" +#include <RTableConnectionData.hxx> #include <RelationTableView.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx index 58b2bb462bdf..dabdfe47d2a1 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx @@ -20,7 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_RELATIONDESIGN_RTABLECONNECTION_HXX #include <TableConnection.hxx> -#include <RTableConnectionData.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index cbc4f9b009e2..a92aa2fdd3d6 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> +#include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 4408f36a6427..ba723189839b 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -18,6 +18,7 @@ */ #include "TEditControl.hxx" +#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index d9d427b53379..44469bf29d1e 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -23,7 +23,6 @@ #include <TableDesignView.hxx> #include "TableFieldDescWin.hxx" #include <TableRow.hxx> -#include <QEnumTypes.hxx> #include <TypeInfo.hxx> class Edit; diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index c32cce6c97ce..3e63f4c0c8d8 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -29,6 +29,7 @@ #include <dbu_reghelper.hxx> #include <stringconstants.hxx> #include <strings.hrc> +#include <strings.hxx> #include <defaultobjectnamecheck.hxx> #include <dlgsave.hxx> #include <dsmeta.hxx> diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index d0e96a4ab6bf..235639c31919 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -21,7 +21,7 @@ #include <connectivity/CommonTools.hxx> #include <toolkit/controls/unocontrol.hxx> -#include <apitools.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index b887469221de..f50ce5d79a4b 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <comphelper/proparrhlp.hxx> diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 7824298889fa..68b1f47413ba 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -18,6 +18,7 @@ */ #include "dbinteraction.hxx" +#include <apitools.hxx> #include <dbu_reghelper.hxx> #include <uiservices.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 36e93c202b4b..bbe509eab2fc 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -23,14 +23,11 @@ #include <cppuhelper/implbase.hxx> #include <connectivity/CommonTools.hxx> -#include <apitools.hxx> - #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/ucb/AuthenticationRequest.hpp> #include <com/sun/star/sdb/ParametersRequest.hpp> #include <com/sun/star/sdb/DocumentSaveRequest.hpp> diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 07644a9c52cf..0b8fa43dd4db 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/connection/XConnection.hpp> #include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <directsql.hxx> #include <stringconstants.hxx> #include <datasourceconnector.hxx> @@ -47,7 +48,6 @@ namespace dbaui using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; - using namespace ::com::sun::star::sdb; // ODirectSQLDialog ODirectSQLDialog::ODirectSQLDialog(const Reference< XComponentContext >& _rxORB) diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 6de19899debd..afad0d820062 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -22,9 +22,6 @@ #include <svtools/genericunodialog.hxx> #include <apitools.hxx> -#include <com/sun/star/sdb/XSQLQueryComposer.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <comphelper/proparrhlp.hxx> #include <connectivity/CommonTools.hxx> |