tdf#42949 Fix IWYU warnings in dbaccess/source/ui/[m-u]*/*cxx

Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I6bf360b331589692141f6fca52eee5b8e11ef7bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92827 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-24 00:24:00 +02:00 · 2020-04-24 00:24:00 +02:00 · 8c694a4921
commit 8c694a4921
parent 06a8f5d170
72 changed files with 63 additions and 357 deletions
--- a/dbaccess/IwyuFilter_dbaccess.yaml
+++ b/dbaccess/IwyuFilter_dbaccess.yaml
@ -125,3 +125,37 @@ blacklist:
    - com/sun/star/sdb/XSingleSelectQueryComposer.hpp
    - com/sun/star/container/XNameAccess.hpp
    - com/sun/star/sdbc/XConnection.hpp
+    dbaccess/source/ui/misc/DExport.cxx:
+    # Actually used
+    - com/sun/star/awt/FontDescriptor.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    dbaccess/source/ui/misc/UITools.cxx:
+    # Actually used
+    - com/sun/star/container/XHierarchicalNameContainer.hpp
+    dbaccess/source/ui/misc/indexcollection.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    dbaccess/source/ui/querydesign/QTableWindow.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    dbaccess/source/ui/querydesign/JoinTableView.cxx:
+    # Actually used
+    - com/sun/star/accessibility/XAccessible.hpp
+    dbaccess/source/ui/querydesign/TableWindow.cxx:
+    # Actually used
+    - com/sun/star/container/XNameAccess.hpp
+    dbaccess/source/ui/querydesign/limitboxcontroller.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
+    dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx:
+    # Actually used
+    - com/sun/star/sdbc/XDatabaseMetaData.hpp
+    dbaccess/source/ui/tabledesign/TableFieldControl.cxx:
+    # Actually used
+    - com/sun/star/sdbc/XDatabaseMetaData.hpp
+    dbaccess/source/ui/uno/composerdialogs.cxx:
+    # Actually used
+    - com/sun/star/awt/XWindow.hpp
+    dbaccess/source/ui/uno/unoDirectSql.cxx:
+    # Actually used
+    - com/sun/star/connection/XConnection.hpp
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@ -21,10 +21,7 @@
 #include <core_resource.hxx>

 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
-#include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
@ -33,11 +30,9 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include <stringconstants.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <connectivity/dbconversion.hxx>
-#include <osl/thread.h>
 #include <sal/log.hxx>
 #include <sfx2/sfxhtml.hxx>
 #include <svl/numuno.hxx>
@ -45,20 +40,13 @@
 #include <TypeInfo.hxx>
 #include <FieldDescriptions.hxx>
 #include <UITools.hxx>
-#include <unotools/configmgr.hxx>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <WCopyTable.hxx>
-#include <WExtendPages.hxx>
-#include <WCPage.hxx>
 #include <unotools/syslocale.hxx>
 #include <svl/zforlist.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/FValue.hxx>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
 #include <sqlmessage.hxx>
 #include "UpdateHelperImpl.hxx"
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@ -18,40 +18,23 @@
 */

 #include <HtmlReader.hxx>
-#include <connectivity/dbconversion.hxx>
 #include <connectivity/dbtools.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/stream.hxx>
 #include <tools/tenccvt.hxx>
 #include <comphelper/string.hxx>
 #include <strings.hrc>
-#include <stringconstants.hxx>
-#include <sfx2/sfxhtml.hxx>
 #include <osl/diagnose.h>
 #include <core_resource.hxx>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 #include <tools/color.hxx>
-#include <WCopyTable.hxx>
 #include <WExtendPages.hxx>
-#include <WNameMatch.hxx>
-#include <WColumnSelect.hxx>
-#include <QEnumTypes.hxx>
-#include <WCPage.hxx>
-#include <rtl/tencinfo.h>
-#include <UITools.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>

--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@ -28,7 +28,6 @@
 #include <strings.hrc>
 #include <strings.hxx>
 #include <sqlmessage.hxx>
-#include <stringconstants.hxx>
 #include <com/sun/star/sdbc/XRowUpdate.hpp>

 using namespace dbaui;
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@ -20,29 +20,19 @@
 #include <RtfReader.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <svtools/rtftoken.h>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <strings.hrc>
-#include <connectivity/dbconversion.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/string.hxx>
 #include <tools/color.hxx>
 #include <WExtendPages.hxx>
-#include <QEnumTypes.hxx>
-#include <UITools.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>

--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@ -19,45 +19,28 @@

 #include <TableCopyHelper.hxx>
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
-#include <sqlmessage.hxx>
-#include <WCopyTable.hxx>
 #include <dbaccess/genericcontroller.hxx>
-#include <WCPage.hxx>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #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>
 #include <TokenWriter.hxx>
 #include <UITools.hxx>
 #include <dbaccess/dataview.hxx>
+#include <svx/dbaexchange.hxx>
 #include <unotools/ucbhelper.hxx>
 #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>
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdb/XQueriesSupplier.hpp>
-#include <com/sun/star/sdbc/XColumnLocate.hpp>
-#include <com/sun/star/sdbcx/XRowLocate.hpp>
-#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
 #include <unotools/tempfile.hxx>
 #include <cppuhelper/exc_hlp.hxx>

-#include <dbexchange.hxx>
 namespace dbaui
 {
 using namespace ::dbtools;
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@ -18,7 +18,6 @@
 */

 #include <TokenWriter.hxx>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/stream.hxx>
 #include <osl/diagnose.h>
@ -27,7 +26,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <RtfReader.hxx>
 #include <HtmlReader.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
@ -39,7 +37,6 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
@ -59,7 +56,6 @@
 #include <svtools/rtfout.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
-#include <unotools/syslocale.hxx>
 #include <memory>

 using namespace dbaui;
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@ -19,11 +19,8 @@

 #include <UITools.hxx>
 #include <sfx2/docfilt.hxx>
-#include <callbacks.hxx>
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <dlgsave.hxx>
-#include <dbtreelistbox.hxx>
 #include <defaultobjectnamecheck.hxx>
 #include <strings.hxx>
 #include <comphelper/extract.hxx>
@ -32,7 +29,6 @@
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@ -46,28 +42,19 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
 #include <com/sun/star/ucb/IOErrorCode.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/awt/vclxwindow.hxx>
-#include <vcl/stdtext.hxx>
+#include <vcl/syswin.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/awt/TextAlign.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
-#include <com/sun/star/awt/FontRelief.hpp>
-#include <com/sun/star/awt/FontWidth.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <TypeInfo.hxx>
 #include <FieldDescriptions.hxx>
 #include <comphelper/stl_types.hxx>
@ -83,7 +70,6 @@
 #include <sbagrid.hrc>
 #include <svl/rngitem.hxx>
 #include <svl/intitem.hxx>
-#include <svx/algitem.hxx>
 #include <svx/numinf.hxx>
 #include <svl/zforlist.hxx>
 #include <dlgattr.hxx>
@ -93,18 +79,11 @@
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <strings.hrc>
 #include <sqlmessage.hxx>
-#include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <vcl/toolbox.hxx>
 #include <dlgsize.hxx>
 #include <svtools/editbrowsebox.hxx>
-#include <unotools/configmgr.hxx>
-#include <svtools/helpopt.hxx>
-#include <ucbhelper/content.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <svl/numuno.hxx>
-#include <unotools/pathoptions.hxx>
 #include <svl/filenotation.hxx>
 #include <connectivity/FValue.hxx>

--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@ -19,22 +19,15 @@

 #include <WCPage.hxx>
 #include <WCopyTable.hxx>
-#include <WColumnSelect.hxx>
-#include <WExtendPages.hxx>

 #include <defaultobjectnamecheck.hxx>
 #include <strings.hrc>
 #include <core_resource.hxx>
-#include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
-#include <UITools.hxx>
-#include <cppuhelper/exc_hlp.hxx>

 using namespace ::dbaui;
 using namespace ::dbtools;
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@ -21,16 +21,9 @@
 #include <strings.hrc>
 #include <osl/diagnose.h>
 #include <WCopyTable.hxx>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
 #include <core_resource.hxx>
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
-#include <vcl/svapp.hxx>
-#include <stringconstants.hxx>
-#include <functional>

 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@ -19,7 +19,6 @@

 #include <strings.hrc>
 #include <strings.hxx>
-#include <stringconstants.hxx>
 #include <core_resource.hxx>
 #include <sqlmessage.hxx>
 #include <UITools.hxx>
@ -47,7 +46,6 @@
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>

-#include <comphelper/types.hxx>
 #include <comphelper/interaction.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbmetadata.hxx>
@ -55,11 +53,8 @@
 #include <o3tl/safeint.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>

-#include <functional>
-
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@ -24,7 +24,6 @@
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
-#include <vcl/settings.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>

 using namespace ::dbaui;
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@ -18,7 +18,6 @@
 */

 #include <WTypeSelect.hxx>
-#include <stringconstants.hxx>
 #include <bitmaps.hlst>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
@ -26,15 +25,11 @@
 #include <WCopyTable.hxx>
 #include <strings.hrc>
 #include <tools/stream.hxx>
-#include <svtools/svparser.hxx>
 #include <vcl/commandevent.hxx>
 #include <UITools.hxx>
 #include <core_resource.hxx>
-#include <sqlmessage.hxx>
 #include <FieldControls.hxx>

-#include <dbaccess_slotid.hrc>
-
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@ -18,7 +18,6 @@
 */

 #include <databaseobjectview.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <asyncmodaldialog.hxx>

@ -28,7 +27,6 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/application/XTableUIProvider.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>

 #include <connectivity/dbtools.hxx>
 #include <osl/diagnose.h>
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@ -20,15 +20,12 @@
 #include <core_resource.hxx>
 #include <datasourceconnector.hxx>
 #include <osl/diagnose.h>
-#include <stringconstants.hxx>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <osl/thread.h>
 #include <comphelper/namedvaluecollection.hxx>
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/sdbc/XDataSource.hpp>
@ -36,8 +33,6 @@
 #include <vcl/outdev.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/weld.hxx>
-#include <svl/filenotation.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/exc_hlp.hxx>
 #include <strings.hrc>
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@ -23,13 +23,10 @@
 #include <dbaccess/dataview.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
-#include <stringconstants.hxx>
 #include <dbaccess/dbsubcomponentcontroller.hxx>

 #include <com/sun/star/frame/XUntitledNumbers.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
@ -40,7 +37,6 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include <connectivity/dbtools.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@ -36,7 +36,6 @@
 #include <cppuhelper/exc_hlp.hxx>

 #include <memory>
-#include <vector>

 namespace dbaui
 {
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@ -18,7 +18,6 @@
 */

 #include <imageprovider.hxx>
-#include <stringconstants.hxx>
 #include <bitmaps.hlst>

 #include <com/sun/star/graphic/GraphicColorMode.hpp>
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@ -26,7 +26,6 @@
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <comphelper/extract.hxx>
 #include <com/sun/star/sdbcx/XDrop.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>

 namespace dbaui
 {
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@ -22,38 +22,27 @@
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 #include <unotools/confignode.hxx>
-#include <stringconstants.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/task/XJobExecutor.hpp>
 #include <comphelper/types.hxx>
-#include <ucbhelper/content.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <svl/filenotation.hxx>
 #include <browserids.hxx>
-#include <sfx2/new.hxx>
-#include <sfx2/app.hxx>
-#include <basic/sbx.hxx>
-#include <basic/sbuno.hxx>
-#include <svtools/ehdl.hxx>
-#include <svx/dataaccessdescriptor.hxx>
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
 #include <comphelper/mimeconfighelper.hxx>
+#include <vcl/weld.hxx>

 #include <cppuhelper/exc_hlp.hxx>
 #include <connectivity/dbtools.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/io/WrongFormatException.hpp>
-#include <com/sun/star/sdb/RowSetVetoException.hpp>

 namespace dbaui
 {
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@ -23,7 +23,6 @@
 #include <singledoccontroller.hxx>
 #include <browserids.hxx>
 #include <strings.hrc>
-#include <stringconstants.hxx>

 #include <svl/undo.hxx>

--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@ -23,11 +23,8 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <toolkit/awt/vclxwindow.hxx>
 #include <TableConnection.hxx>
 #include <TableWindow.hxx>
-#include <JoinDesignView.hxx>
-#include <JoinController.hxx>
 #include <comphelper/sequence.hxx>

 namespace dbaui
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@ -22,8 +22,6 @@
 #include <TableWindow.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <JoinDesignView.hxx>
-#include <JoinController.hxx>
 #include <TableConnection.hxx>
 #include <o3tl/safeint.hxx>

--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@ -17,27 +17,10 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <sfx2/sfxsids.hrc>
 #include <browserids.hxx>
-#include <stringconstants.hxx>
-#include <connectivity/dbtools.hxx>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/KeyType.hpp>
-#include <com/sun/star/sdbcx/XDrop.hpp>
-#include <com/sun/star/sdbcx/XAlterTable.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <sqlmessage.hxx>
 #include <JoinController.hxx>
 #include <TableWindowData.hxx>
 #include <TableWindow.hxx>
@ -45,7 +28,6 @@
 #include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <UITools.hxx>
 #include <osl/diagnose.h>

 using namespace ::com::sun::star::uno;
@ -55,7 +37,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::ui::dialogs;
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@ -20,19 +20,7 @@
 #include <JoinDesignView.hxx>
 #include <JoinTableView.hxx>
 #include <JoinController.hxx>
-#include <svl/undo.hxx>
-#include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
-#include <browserids.hxx>
-#include <connectivity/dbtools.hxx>
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <TableConnection.hxx>
-#include <ConnectionLine.hxx>
-#include <ConnectionLineData.hxx>
-#include <TableConnectionData.hxx>
-#include <stringconstants.hxx>
-#include <UITools.hxx>
 #include <vcl/settings.hxx>

 using namespace ::com::sun::star::uno;
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@ -19,7 +19,7 @@

 #include <JoinTableView.hxx>
 #include <osl/diagnose.h>
-#include <querycontroller.hxx>
+#include <JoinController.hxx>
 #include <JoinDesignView.hxx>
 #include <TableWindow.hxx>
 #include <TableWindowListBox.hxx>
@ -28,8 +28,8 @@
 #include <ConnectionLine.hxx>
 #include <ConnectionLineData.hxx>
 #include <browserids.hxx>
-#include <svl/urlbmk.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include "QueryMoveTabWinUndoAct.hxx"
 #include "QuerySizeTabWinUndoAct.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
@ -38,13 +38,14 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
+#include <vcl/builder.hxx>
 #include <TableWindowData.hxx>
 #include <JAccess.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <UITools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
 #include <algorithm>
 #include <functional>
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@ -20,7 +20,7 @@
 #include "QTableConnection.hxx"
 #include <osl/diagnose.h>
 #include <QueryTableView.hxx>
-#include <ConnectionLine.hxx>
+
 using namespace dbaui;

 OQueryTableConnection::OQueryTableConnection(OQueryTableView* pContainer, const TTableConnectionData::value_type& pTabConnData)
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@ -19,28 +19,21 @@

 #include "QTableWindow.hxx"
 #include <QueryTableView.hxx>
-#include <stringconstants.hxx>
+#include <JoinController.hxx>
+#include <JoinDesignView.hxx>
 #include <osl/diagnose.h>
 #include <helpids.h>
-#include <QueryDesignView.hxx>
 #include <browserids.hxx>
-#include <querycontroller.hxx>
-#include <vcl/image.hxx>
 #include <TableWindowListBox.hxx>
 #include <strings.hxx>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdbcx/KeyType.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include "TableFieldInfo.hxx"
-#include <UITools.hxx>
+#include <comphelper/stl_types.hxx>
 #include <vcl/treelistentry.hxx>
 #include <comphelper/types.hxx>

 using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@ -20,15 +20,12 @@
 #include <QueryDesignView.hxx>
 #include <QueryTableView.hxx>
 #include "QTableWindow.hxx"
-#include <vcl/toolbox.hxx>
 #include <querycontroller.hxx>
 #include <sqlbison.hxx>
 #include <vcl/split.hxx>
-#include <svl/undo.hxx>
 #include <tools/diagnose_ex.h>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
-#include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/weld.hxx>
@ -36,24 +33,19 @@
 #include "SelectionBrowseBox.hxx"
 #include <strings.hrc>
 #include <strings.hxx>
-#include <unotools/configmgr.hxx>
 #include <comphelper/string.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include <com/sun/star/i18n/XLocaleData.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <connectivity/PColumn.hxx>
 #include "QTableConnection.hxx"
-#include <ConnectionLine.hxx>
 #include <ConnectionLineData.hxx>
 #include "QTableConnectionData.hxx"
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <UITools.hxx>
 #include <querycontainerwindow.hxx>
-#include <sqlmessage.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <memory>
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
@ -19,7 +19,7 @@

 #include "QueryMoveTabWinUndoAct.hxx"
 #include <JoinTableView.hxx>
-#include "QTableWindow.hxx"
+
 using namespace dbaui;
 void OJoinMoveTabWinUndoAct::TogglePosition()
 {
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
@ -19,7 +19,6 @@

 #include "QueryTabConnUndoAction.hxx"
 #include "QTableConnection.hxx"
-#include "QTableWindow.hxx"
 #include <QueryTableView.hxx>
 #include "QueryAddTabConnUndoAction.hxx"
 #include "QueryTabWinShowUndoAct.hxx"
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@ -20,9 +20,7 @@
 #include "QueryTabWinUndoAct.hxx"
 #include <osl/diagnose.h>
 #include "QTableWindow.hxx"
-#include "QTableWindowData.hxx"
 #include <TableConnection.hxx>
-#include <TableConnectionData.hxx>
 #include "QueryDesignFieldUndoAct.hxx"
 #include <QueryTableView.hxx>

--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@ -18,7 +18,6 @@
 */

 #include <QueryTableView.hxx>
-#include "TableFieldInfo.hxx"
 #include <TableFieldDescription.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
@ -27,24 +26,19 @@
 #include "QTableConnection.hxx"
 #include "QTableConnectionData.hxx"
 #include <QueryDesignView.hxx>
-#include <querycontroller.hxx>
 #include "QueryAddTabConnUndoAction.hxx"
 #include "QueryTabWinShowUndoAct.hxx"
 #include <browserids.hxx>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <JAccess.hxx>
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <stringconstants.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
 #include "querydlg.hxx"
-#include <JoinExchange.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@ -19,14 +19,8 @@

 #include <QueryTextView.hxx>
 #include <querycontainerwindow.hxx>
-#include <QueryViewSwitch.hxx>
 #include <sqledit.hxx>
 #include <undosqledit.hxx>
-#include <browserids.hxx>
-#include <querycontroller.hxx>
-#include <stringconstants.hxx>
-#include <vcl/split.hxx>
-#include <vcl/svapp.hxx>
 #include <QueryDesignView.hxx>

 using namespace dbaui;
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@ -21,7 +21,6 @@
 #include <QueryDesignView.hxx>
 #include <QueryTextView.hxx>
 #include <querycontainerwindow.hxx>
-#include <browserids.hxx>
 #include <adtabdlg.hxx>
 #include <querycontroller.hxx>
 #include <sqledit.hxx>
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@ -33,8 +33,6 @@
 #include <strings.hrc>
 #include <strings.hxx>
 #include <helpids.h>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <stringconstants.hxx>
 #include "QTableWindow.hxx"
 #include <vcl/button.hxx>
 #include <vcl/weld.hxx>
--- a/dbaccess/source/ui/querydesign/TableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnection.cxx
@ -21,7 +21,6 @@
 #include <ConnectionLine.hxx>
 #include <TableConnectionData.hxx>
 #include <JoinTableView.hxx>
-#include <ConnectionLineAccess.hxx>

 using namespace dbaui;
 using namespace comphelper;
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@ -19,11 +19,11 @@

 #include <TableWindow.hxx>
 #include <TableWindowListBox.hxx>
-#include <QueryTableView.hxx>
-#include <QueryDesignView.hxx>
 #include <TableWindowData.hxx>
 #include <imageprovider.hxx>
-#include <tools/diagnose_ex.h>
+#include <JoinController.hxx>
+#include <JoinTableView.hxx>
+#include <JoinDesignView.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/wall.hxx>
@ -32,21 +32,15 @@
 #include <vcl/event.hxx>
 #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>
-#include <UITools.hxx>
 #include <TableWindowAccess.hxx>
-#include <browserids.hxx>
 #include <connectivity/dbtools.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/builder.hxx>

 using namespace dbaui;
 using namespace ::utl;
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@ -18,16 +18,11 @@
 */

 #include <TableWindowAccess.hxx>
-#include <JAccess.hxx>
 #include <TableWindow.hxx>
 #include <TableWindowListBox.hxx>
-#include <JoinDesignView.hxx>
-#include <JoinController.hxx>
 #include <JoinTableView.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <comphelper/sequence.hxx>

--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@ -19,12 +19,13 @@

 #include <TableWindowListBox.hxx>
 #include <TableWindow.hxx>
-#include <QueryDesignView.hxx>
-#include <QueryTableView.hxx>
-#include <querycontroller.hxx>
+#include <JoinController.hxx>
 #include <JoinExchange.hxx>
+#include <JoinTableView.hxx>
+#include <JoinDesignView.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@ -19,21 +19,15 @@

 #include <TableWindowTitle.hxx>
 #include <TableWindow.hxx>
-#include <QueryTableView.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
-#include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
-#include <stringconstants.hxx>
 #include <TableWindowListBox.hxx>
 #include <TableConnection.hxx>
-#include <QueryDesignView.hxx>
 #include <JoinController.hxx>

-#include <algorithm>
-
 using namespace dbaui;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@ -23,16 +23,13 @@
 #include <vcl/settings.hxx>
 #include <JoinController.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <vcl/event.hxx>
-#include <vcl/fixed.hxx>
 #include <UITools.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Frame.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#include <memory>

 namespace dbaui
 {
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <adtabdlg.hxx>
 #include <browserids.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
@ -28,14 +27,10 @@
 #include <defaultobjectnamecheck.hxx>
 #include <dlgsave.hxx>
 #include <uiservices.hxx>
-#include "QTableWindow.hxx"
-#include "QTableWindowData.hxx"
 #include <querycontainerwindow.hxx>
 #include <querycontroller.hxx>
 #include <QueryDesignView.hxx>
 #include <QueryTableView.hxx>
-#include <QueryTextView.hxx>
-#include <QueryViewSwitch.hxx>
 #include <sqlmessage.hxx>
 #include <TableConnectionData.hxx>
 #include <TableFieldDescription.hxx>
@ -43,18 +38,13 @@
 #include <QueryPropertiesDialog.hxx>

 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
@ -72,7 +62,6 @@
 #include <connectivity/dbexception.hxx>
 #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>
@ -81,7 +70,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/strbuf.hxx>
 #include <memory>
 #include <vector>

--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@ -18,17 +18,16 @@
 */

 #include "querydlg.hxx"
+#include <JoinController.hxx>
+#include <JoinDesignView.hxx>
 #include <strings.hrc>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include "QTableConnectionData.hxx"
 #include <core_resource.hxx>
-#include <querycontroller.hxx>
 #include <QueryTableView.hxx>
-#include <QueryDesignView.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <RelationControl.hxx>
-#include <vcl/settings.hxx>

 #define ID_INNER_JOIN       1
 #define ID_LEFT_JOIN        2
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@ -20,16 +20,13 @@
 #include <RTableConnectionData.hxx>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <stringconstants.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
-#include <UITools.hxx>
 #include <core_resource.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@ -24,7 +24,6 @@

 #include <dbu_reghelper.hxx>
 #include <uiservices.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <vcl/svapp.hxx>
@ -32,28 +31,16 @@
 #include <browserids.hxx>
 #include <comphelper/types.hxx>
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include <com/sun/star/sdbcx/XDrop.hpp>
-#include <com/sun/star/sdbcx/XAlterTable.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbmetadata.hxx>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
 #include <sqlmessage.hxx>
 #include <RelationController.hxx>
 #include <TableWindowData.hxx>
@ -61,7 +48,6 @@
 #include <RTableConnectionData.hxx>
 #include <RelationTableView.hxx>
 #include <RelationDesignView.hxx>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/thread.hxx>
 #include <osl/mutex.hxx>
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@ -20,19 +20,7 @@
 #include <RelationDesignView.hxx>
 #include <RelationTableView.hxx>
 #include <RelationController.hxx>
-#include <svl/undo.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
-#include <browserids.hxx>
-#include <connectivity/dbtools.hxx>
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include "RTableConnection.hxx"
-#include <ConnectionLine.hxx>
-#include <ConnectionLineData.hxx>
-#include <RTableConnectionData.hxx>
-#include <stringconstants.hxx>
-#include <UITools.hxx>

 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@ -18,20 +18,15 @@
 */

 #include <RelationTableView.hxx>
-#include <JoinExchange.hxx>
 #include <core_resource.hxx>
 #include <browserids.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
-#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>
-#include <stringconstants.hxx>
 #include <connectivity/dbtools.hxx>
 #include <helpids.h>
 #include <RelationDesignView.hxx>
@ -43,11 +38,9 @@
 #include <RelationDlg.hxx>
 #include <sqlmessage.hxx>
 #include <strings.hrc>
-#include <UITools.hxx>
 #include <connectivity/dbexception.hxx>
 #include "RTableWindow.hxx"
 #include <JAccess.hxx>
-#include <svl/undo.hxx>
 #include <vcl/stdtext.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>

--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@ -18,11 +18,9 @@
 */

 #include <FieldDescriptions.hxx>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <strings.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <stringconstants.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/extract.hxx>
 #include <UITools.hxx>
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@ -22,16 +22,10 @@
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XAlterTable.hpp>
-#include <com/sun/star/sdbcx/XDrop.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
-#include <stringconstants.hxx>
-#include <browserids.hxx>
 #include <helpids.h>
 #include <comphelper/types.hxx>
 #include <FieldDescControl.hxx>
@ -43,14 +37,13 @@
 #include <SqlNameEdit.hxx>
 #include <TableRowExchange.hxx>
 #include <sot/storage.hxx>
+#include <svx/svxids.hrc>
 #include <UITools.hxx>
 #include "TableFieldControl.hxx"
 #include <dsntypes.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>

-#include <dbaccess_slotid.hrc>
-
 using namespace ::dbaui;
 using namespace ::comphelper;
 using namespace ::svt;
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@ -27,26 +27,19 @@
 #include <browserids.hxx>
 #include <core_resource.hxx>
 #include <dbu_reghelper.hxx>
-#include <stringconstants.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <defaultobjectnamecheck.hxx>
 #include <dlgsave.hxx>
-#include <dsmeta.hxx>
 #include <indexdialog.hxx>
 #include <sqlmessage.hxx>
 #include <uiservices.hxx>

-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/frame/XTitleChangeListener.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/sdbcx/XAlterTable.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
@ -54,15 +47,12 @@
 #include <com/sun/star/sdbcx/XDrop.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>

 #include <comphelper/processfactory.hxx>
-#include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@ -20,7 +20,6 @@
 #include <TableDesignControl.hxx>
 #include <TableDesignView.hxx>
 #include <TableController.hxx>
-#include <browserids.hxx>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/builder.hxx>
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@ -22,7 +22,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/vclmedit.hxx>
 #include <helpids.h>
-#include <memory>
+
 using namespace dbaui;
 #define STANDARD_MARGIN                 6
 OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) :
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@ -24,12 +24,9 @@
 #include "TEditControl.hxx"
 #include "TableFieldDescWin.hxx"
 #include <TableRow.hxx>
-#include <unotools/configmgr.hxx>
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/syslocale.hxx>
 #include <vcl/settings.hxx>
-#include <UITools.hxx>
 #include <memory>

 using namespace ::dbaui;
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@ -21,13 +21,10 @@
 #include <TableController.hxx>
 #include <TableDesignView.hxx>
 #include "TEditControl.hxx"
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <comphelper/types.hxx>
 #include <TypeInfo.hxx>
-#include <UITools.hxx>

 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@ -20,7 +20,6 @@
 #include <TableRow.hxx>
 #include <tools/stream.hxx>
 #include <FieldDescriptions.hxx>
-#include <algorithm>
 #include <comphelper/types.hxx>

 using namespace dbaui;
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@ -21,10 +21,10 @@
 #include <strings.hrc>
 #include "TEditControl.hxx"
 #include <TableRow.hxx>
-#include <browserids.hxx>
 #include <TableController.hxx>
 #include <TableDesignView.hxx>
 #include <FieldDescriptions.hxx>
+#include <svx/svxids.hrc>

 using namespace dbaui;
 using namespace ::svt;
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@ -25,7 +25,6 @@
 #include <advancedsettingsdlg.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>

 namespace dbaui
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@ -19,7 +19,6 @@

 #include "ColumnControl.hxx"
 #include "ColumnPeer.hxx"
-#include <stringconstants.hxx>
 #include <uiservices.hxx>
 #include <apitools.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@ -19,11 +19,8 @@

 #include "ColumnModel.hxx"
 #include <uiservices.hxx>
-#include <com/sun/star/awt/FontRelief.hpp>
-#include <com/sun/star/awt/FontEmphasisMark.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>

-#include <cppuhelper/queryinterface.hxx>
 #include <stringconstants.hxx>
 #include <dbu_reghelper.hxx>

--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@ -20,7 +20,6 @@
 #include "ColumnPeer.hxx"
 #include <ColumnControlWindow.hxx>
 #include <vcl/svapp.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <FieldDescriptions.hxx>

--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@ -19,13 +19,9 @@

 #include <dbu_reghelper.hxx>
 #include <uiservices.hxx>
-#include <com/sun/star/document/XEventListener.hpp>
-#include <com/sun/star/container/XSet.hpp>
 #include "DBTypeWizDlgSetup.hxx"
 #include <dbwizsetup.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
@ -43,7 +39,6 @@ namespace dbaui
    using namespace ::com::sun::star::uno;
    using namespace ::com::sun::star::lang;
    using namespace ::com::sun::star::beans;
-    using namespace ::com::sun::star::sdb;
    using namespace ::com::sun::star::sdbc;

 ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XComponentContext >& _rxORB)
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@ -22,7 +22,6 @@
 #include "TableFilterDlg.hxx"
 #include <TablesSingleDlg.hxx>
 #include <comphelper/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>

 using namespace dbaui;
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@ -22,7 +22,6 @@
 #include "UserSettingsDlg.hxx"
 #include <UserAdminDlg.hxx>
 #include <comphelper/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>

 using namespace dbaui;
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@ -22,7 +22,6 @@
 #include "admindlg.hxx"
 #include <dbadmin.hxx>
 #include <comphelper/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>

 using namespace dbaui;
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@ -24,12 +24,10 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <stringconstants.hxx>
 #include <queryfilter.hxx>
 #include <queryorder.hxx>
 #include <comphelper/processfactory.hxx>
 #include <connectivity/dbtools.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@ -21,9 +21,7 @@
 #include <dbu_reghelper.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
-#include <stringconstants.hxx>
 #include <core_resource.hxx>
-#include <sqlmessage.hxx>
 #include <uiservices.hxx>
 #include <WCopyTable.hxx>

--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@ -36,10 +36,8 @@
 #include <paramdialog.hxx>
 #include <vcl/svapp.hxx>
 #include <CollectionView.hxx>
-#include <UITools.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <toolkit/helper/vclunohelper.hxx>

 extern "C" void createRegistryInfo_OInteractionHandler()
 {
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@ -32,7 +32,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <svtools/genericunodialog.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/implbase.hxx>
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@ -23,12 +23,9 @@
 #include "unoDirectSql.hxx"
 #include <dbu_reghelper.hxx>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#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>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@ -17,16 +17,10 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <stringconstants.hxx>
-#include <toolkit/awt/vclxwindow.hxx>
-#include <dbu_reghelper.hxx>
 #include <unoadmin.hxx>
 #include <dbadmin.hxx>
-#include <cppuhelper/typeprovider.hxx>

-// --- needed because of the solar mutex
 #include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>


 namespace dbaui
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@ -25,7 +25,6 @@
 #include <strings.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/awt/XWindow.hpp>