[Libreoffice-commits] core.git: accessibility/source avmedia/source canvas/source chart2/source comphelper/source connectivity/source cppcanvas/source cui/source dbaccess/source desktop/source dtrans/source editeng/source embeddedobj/source extensions/source filter/source forms/source formula/source fpicker/source framework/inc framework/source hwpfilter/source i18npool/source i18nutil/source include/comphelper include/connectivity include/editeng include/sfx2 include/svtools include/test include/toolkit include/unotools linguistic/source linguistic/workben oox/source opencl/source package/inc package/source reportdesign/inc reportdesign/source sax/qa sc/qa sc/source sd/qa sd/source sfx2/inc sfx2/source slideshow/source starmath/source svtools/source svx/source sw/qa sw/source toolkit/source tools/source ucb/source unotools/source unoxml/qa uui/source vbahelper/source vcl/backendtest vcl/osx vcl/source vcl/unx vcl/workben writerfilter/source xmloff/source xmlsecurity/qa xmlsecurity/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Tue Jun 5 08:57:24 UTC 2018
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 1 -
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 1 -
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 1 -
accessibility/source/extended/AccessibleGridControlBase.cxx | 1 -
accessibility/source/extended/AccessibleGridControlHeader.cxx | 1 -
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 1 -
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 1 -
accessibility/source/extended/accessiblelistboxentry.cxx | 1 -
accessibility/source/extended/accessibletablistbox.cxx | 1 -
accessibility/source/standard/accessiblemenucomponent.cxx | 1 -
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 1 -
accessibility/source/standard/vclxaccessiblebutton.cxx | 1 -
accessibility/source/standard/vclxaccessiblecheckbox.cxx | 1 -
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx | 1 -
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx | 1 -
accessibility/source/standard/vclxaccessibleedit.cxx | 1 -
accessibility/source/standard/vclxaccessiblelistbox.cxx | 1 -
accessibility/source/standard/vclxaccessiblelistitem.cxx | 1 -
accessibility/source/standard/vclxaccessibleradiobutton.cxx | 1 -
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 1 -
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 1 -
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 1 -
avmedia/source/avmediadummy.cxx | 2 --
avmedia/source/framework/soundhandler.cxx | 1 -
canvas/source/directx/dx_bitmapcanvashelper.cxx | 1 -
canvas/source/directx/dx_textlayout_drawhelper.cxx | 1 -
canvas/source/vcl/canvashelper_texturefill.cxx | 1 -
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 1 -
chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 1 +
chart2/source/controller/main/ChartController_Window.cxx | 1 -
chart2/source/model/main/ChartModel_Persistence.cxx | 1 -
comphelper/source/misc/accessibleeventnotifier.cxx | 1 -
comphelper/source/misc/asyncnotification.cxx | 1 -
comphelper/source/misc/componentmodule.cxx | 2 --
comphelper/source/property/genericpropertyset.cxx | 1 -
comphelper/source/property/propertycontainer.cxx | 1 -
comphelper/source/property/propmultiplex.cxx | 1 +
connectivity/source/commontools/CommonTools.cxx | 1 -
connectivity/source/commontools/DateConversion.cxx | 1 +
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 1 -
connectivity/source/commontools/TColumnsHelper.cxx | 1 -
connectivity/source/commontools/TIndexColumns.cxx | 1 -
connectivity/source/commontools/TIndexes.cxx | 1 +
connectivity/source/commontools/TKeyColumns.cxx | 1 -
connectivity/source/commontools/TKeys.cxx | 1 -
connectivity/source/commontools/TTableHelper.cxx | 1 -
connectivity/source/commontools/dbtools.cxx | 1 +
connectivity/source/commontools/dbtools2.cxx | 1 +
connectivity/source/commontools/parameters.cxx | 1 -
connectivity/source/cpool/ZConnectionPool.cxx | 1 -
connectivity/source/cpool/ZConnectionWrapper.cxx | 1 -
connectivity/source/drivers/ado/AColumn.cxx | 1 -
connectivity/source/drivers/ado/AGroup.cxx | 1 -
connectivity/source/drivers/ado/AIndex.cxx | 1 -
connectivity/source/drivers/ado/AKey.cxx | 1 -
connectivity/source/drivers/ado/AKeys.cxx | 1 -
connectivity/source/drivers/ado/ATable.cxx | 1 -
connectivity/source/drivers/ado/AUser.cxx | 1 -
connectivity/source/drivers/ado/AView.cxx | 1 -
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 1 -
connectivity/source/drivers/calc/CTable.cxx | 1 -
connectivity/source/drivers/calc/CTables.cxx | 1 -
connectivity/source/drivers/component/CTable.cxx | 2 --
connectivity/source/drivers/dbase/DColumns.cxx | 1 -
connectivity/source/drivers/dbase/DIndex.cxx | 1 -
connectivity/source/drivers/dbase/DIndexColumns.cxx | 1 -
connectivity/source/drivers/dbase/DIndexes.cxx | 1 -
connectivity/source/drivers/dbase/DTable.cxx | 1 -
connectivity/source/drivers/dbase/DTables.cxx | 1 -
connectivity/source/drivers/evoab2/NConnection.cxx | 1 -
connectivity/source/drivers/evoab2/NResultSet.cxx | 1 -
connectivity/source/drivers/file/FColumns.cxx | 1 -
connectivity/source/drivers/file/FStatement.cxx | 2 --
connectivity/source/drivers/firebird/Tables.cxx | 1 +
connectivity/source/drivers/flat/ETable.cxx | 2 --
connectivity/source/drivers/flat/ETables.cxx | 1 -
connectivity/source/drivers/hsqldb/HConnection.cxx | 2 --
connectivity/source/drivers/hsqldb/HDriver.cxx | 1 -
connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx | 1 -
connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx | 1 -
connectivity/source/drivers/jdbc/Timestamp.cxx | 1 -
connectivity/source/drivers/macab/macabcondition.hxx | 1 -
connectivity/source/drivers/mysql/YDriver.cxx | 1 +
connectivity/source/inc/ado/AStatement.hxx | 1 -
connectivity/source/inc/file/FStatement.hxx | 1 -
connectivity/source/inc/hsqldb/HDriver.hxx | 1 -
connectivity/source/inc/java/sql/JStatement.hxx | 1 -
connectivity/source/inc/mysql/YDriver.hxx | 1 -
connectivity/source/inc/odbc/OStatement.hxx | 1 -
connectivity/source/sdbcx/VCatalog.cxx | 2 +-
cppcanvas/source/mtfrenderer/implrenderer.cxx | 1 -
cui/source/customize/SvxConfigPageHelper.cxx | 2 ++
cui/source/customize/SvxMenuConfigPage.cxx | 1 -
cui/source/customize/SvxToolbarConfigPage.cxx | 1 -
cui/source/dialogs/SignSignatureLineDialog.cxx | 2 --
cui/source/dialogs/scriptdlg.cxx | 2 --
cui/source/inc/cfg.hxx | 1 -
cui/source/options/optgdlg.cxx | 2 --
cui/source/options/optjava.cxx | 2 --
cui/source/options/optsave.cxx | 1 -
cui/source/tabpages/backgrnd.cxx | 1 -
cui/source/tabpages/labdlg.cxx | 1 -
dbaccess/source/core/api/CRowSetColumn.cxx | 1 -
dbaccess/source/core/api/FilteredContainer.cxx | 1 +
dbaccess/source/core/api/RowSet.cxx | 1 -
dbaccess/source/core/api/RowSetCache.cxx | 1 -
dbaccess/source/core/api/RowSetCache.hxx | 2 --
dbaccess/source/core/api/RowSetRow.hxx | 1 -
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 1 -
dbaccess/source/core/api/TableDeco.cxx | 1 -
dbaccess/source/core/api/callablestatement.cxx | 1 -
dbaccess/source/core/api/column.cxx | 3 +--
dbaccess/source/core/api/datasettings.cxx | 1 -
dbaccess/source/core/api/preparedstatement.cxx | 2 --
dbaccess/source/core/api/query.cxx | 2 --
dbaccess/source/core/api/querycontainer.cxx | 1 -
dbaccess/source/core/api/querydescriptor.cxx | 3 ---
dbaccess/source/core/api/resultcolumn.hxx | 1 +
dbaccess/source/core/api/resultset.cxx | 1 -
dbaccess/source/core/api/statement.cxx | 1 -
dbaccess/source/core/api/table.cxx | 1 -
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 1 -
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 1 -
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2 --
dbaccess/source/core/dataaccess/ModelImpl.cxx | 3 ---
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 1 -
dbaccess/source/core/dataaccess/commanddefinition.hxx | 1 -
dbaccess/source/core/dataaccess/connection.hxx | 1 -
dbaccess/source/core/dataaccess/databasecontext.cxx | 1 -
dbaccess/source/core/dataaccess/databasedocument.cxx | 2 --
dbaccess/source/core/dataaccess/datasource.cxx | 2 --
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 1 -
dbaccess/source/core/dataaccess/documentdefinition.cxx | 3 ---
dbaccess/source/core/dataaccess/intercept.cxx | 1 -
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 2 --
dbaccess/source/core/inc/ModelImpl.hxx | 2 --
dbaccess/source/core/inc/column.hxx | 1 -
dbaccess/source/core/inc/definitioncolumn.hxx | 1 +
dbaccess/source/core/inc/table.hxx | 1 -
dbaccess/source/ext/macromigration/macromigrationwizard.hxx | 1 +
dbaccess/source/ext/macromigration/migrationengine.cxx | 2 --
dbaccess/source/filter/xml/dbloader2.cxx | 1 -
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 1 -
dbaccess/source/ui/app/AppControllerDnD.cxx | 2 --
dbaccess/source/ui/app/AppView.cxx | 1 -
dbaccess/source/ui/browser/dataview.cxx | 1 -
dbaccess/source/ui/browser/dbloader.cxx | 1 +
dbaccess/source/ui/browser/sbagrid.cxx | 1 +
dbaccess/source/ui/control/FieldDescControl.cxx | 2 +-
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPage.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 1 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 1 -
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 3 ---
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 1 -
dbaccess/source/ui/dlg/UserAdmin.cxx | 1 -
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 1 +
dbaccess/source/ui/dlg/dbwizsetup.cxx | 1 -
dbaccess/source/ui/dlg/detailpages.cxx | 1 -
dbaccess/source/ui/dlg/dsselect.cxx | 1 -
dbaccess/source/ui/dlg/paramdialog.cxx | 1 +
dbaccess/source/ui/inc/unosqlmessage.hxx | 1 +
dbaccess/source/ui/misc/UITools.cxx | 1 +
dbaccess/source/ui/misc/databaseobjectview.cxx | 1 -
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 1 -
dbaccess/source/ui/querydesign/JoinController.cxx | 3 ---
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 1 -
dbaccess/source/ui/querydesign/QTableWindow.cxx | 1 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 1 -
dbaccess/source/ui/querydesign/QueryTextView.cxx | 1 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 1 -
dbaccess/source/ui/querydesign/TableConnection.cxx | 1 -
dbaccess/source/ui/querydesign/querycontroller.cxx | 2 --
dbaccess/source/ui/relationdesign/RelationController.cxx | 2 --
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 1 -
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 1 -
dbaccess/source/ui/tabledesign/TableController.cxx | 1 -
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 1 -
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 1 +
dbaccess/source/ui/uno/ColumnModel.cxx | 1 -
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 2 ++
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 2 ++
dbaccess/source/ui/uno/TableFilterDlg.hxx | 2 ++
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 2 ++
dbaccess/source/ui/uno/admindlg.hxx | 2 ++
dbaccess/source/ui/uno/composerdialogs.hxx | 1 +
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 1 +
dbaccess/source/ui/uno/unoDirectSql.hxx | 1 +
dbaccess/source/ui/uno/unoadmin.cxx | 1 -
desktop/source/app/check_ext_deps.cxx | 1 -
desktop/source/app/sofficemain.cxx | 1 -
desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 2 --
desktop/source/deployment/gui/license_dialog.cxx | 1 -
desktop/source/deployment/registry/dp_backend.cxx | 1 -
desktop/source/lib/lokinteractionhandler.cxx | 1 -
dtrans/source/win32/dtobj/FmtFilter.cxx | 1 -
editeng/source/accessibility/AccessibleContextBase.cxx | 1 -
editeng/source/editeng/editdoc.cxx | 1 -
editeng/source/editeng/editobj.cxx | 1 -
editeng/source/items/flditem.cxx | 1 -
editeng/source/items/frmitems.cxx | 1 -
editeng/source/items/paraitem.cxx | 1 -
editeng/source/items/svxfont.cxx | 1 -
editeng/source/uno/unopracc.cxx | 1 -
editeng/source/uno/unotext2.cxx | 1 -
embeddedobj/source/commonembedding/specialobject.cxx | 1 +
embeddedobj/source/inc/intercept.hxx | 1 -
embeddedobj/source/msole/olecomponent.cxx | 1 -
embeddedobj/source/msole/oleembed.cxx | 1 -
extensions/source/inc/componentmodule.cxx | 2 --
extensions/source/propctrlr/MasterDetailLinkDialog.hxx | 2 ++
extensions/source/propctrlr/controlfontdialog.hxx | 1 +
extensions/source/propctrlr/eformshelper.hxx | 1 -
extensions/source/propctrlr/eventhandler.hxx | 1 -
extensions/source/propctrlr/pcrunodialogs.hxx | 1 +
extensions/source/propctrlr/propertycomposer.hxx | 1 -
extensions/source/propctrlr/stringrepresentation.cxx | 2 +-
filter/source/flash/swfdialog.hxx | 1 +
filter/source/pdf/pdfdialog.hxx | 1 +
filter/source/pdf/pdffilter.hxx | 1 -
filter/source/svg/svgexport.cxx | 1 -
forms/source/component/Button.cxx | 1 +
forms/source/component/Columns.cxx | 1 -
forms/source/component/Columns.hxx | 1 +
forms/source/component/ComboBox.cxx | 1 +
forms/source/component/DatabaseForm.cxx | 1 +
forms/source/component/DatabaseForm.hxx | 1 -
forms/source/component/Edit.cxx | 1 +
forms/source/component/EditBase.cxx | 1 +
forms/source/component/File.cxx | 2 +-
forms/source/component/FixedText.cxx | 2 ++
forms/source/component/FormComponent.cxx | 2 +-
forms/source/component/FormattedField.cxx | 1 +
forms/source/component/FormattedField.hxx | 1 -
forms/source/component/Grid.cxx | 1 +
forms/source/component/Grid.hxx | 1 -
forms/source/component/GroupBox.cxx | 1 +
forms/source/component/GroupManager.cxx | 2 ++
forms/source/component/GroupManager.hxx | 3 ---
forms/source/component/Hidden.cxx | 1 +
forms/source/component/ImageControl.cxx | 1 +
forms/source/component/ImageControl.hxx | 3 ---
forms/source/component/ListBox.cxx | 2 +-
forms/source/component/RadioButton.cxx | 1 +
forms/source/component/clickableimage.cxx | 3 ++-
forms/source/component/findpos.cxx | 1 -
forms/source/component/navigationbar.hxx | 1 -
forms/source/component/refvaluecomponent.cxx | 1 +
forms/source/component/scrollbar.cxx | 1 +
forms/source/component/spinbutton.cxx | 1 +
forms/source/inc/FormComponent.hxx | 2 +-
forms/source/inc/InterfaceContainer.hxx | 1 -
forms/source/inc/frm_strings.hxx | 1 -
forms/source/inc/property.hxx | 1 -
forms/source/misc/InterfaceContainer.cxx | 1 +
forms/source/richtext/richtextmodel.hxx | 2 +-
forms/source/xforms/binding.cxx | 1 -
forms/source/xforms/model.cxx | 1 -
forms/source/xforms/propertysetbase.hxx | 1 -
forms/source/xforms/xpathlib/extension.cxx | 4 ++++
formula/source/core/api/FormulaOpCodeMapperObj.cxx | 1 -
formula/source/ui/dlg/formula.cxx | 1 -
fpicker/source/office/OfficeFilePicker.cxx | 1 -
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 2 --
framework/inc/macros/xserviceinfo.hxx | 1 -
framework/inc/services/desktop.hxx | 2 +-
framework/source/dispatch/oxt_handler.cxx | 1 -
framework/source/inc/loadenv/loadenv.hxx | 1 -
framework/source/recording/dispatchrecorder.cxx | 1 +
framework/source/services/desktop.cxx | 1 +
framework/source/services/frame.cxx | 1 -
framework/source/uiconfiguration/imagemanager.cxx | 1 -
framework/source/uiconfiguration/moduleimagemanager.cxx | 1 -
framework/source/uiconfiguration/uicategorydescription.cxx | 1 -
hwpfilter/source/hwpreader.cxx | 1 -
i18npool/source/characterclassification/cclass_unicode.cxx | 1 -
i18npool/source/nativenumber/nativenumbersupplier.cxx | 1 -
i18npool/source/textconversion/textconversion_zh.cxx | 1 -
i18npool/source/transliteration/transliteration_Numeric.cxx | 1 -
i18npool/source/transliteration/transliteration_body.cxx | 1 -
i18nutil/source/utility/widthfolding.cxx | 1 -
include/comphelper/accessiblewrapper.hxx | 1 -
include/comphelper/evtmethodhelper.hxx | 4 +++-
include/comphelper/propmultiplex.hxx | 6 +++++-
include/connectivity/dbtools.hxx | 1 -
include/connectivity/sdbcx/VGroup.hxx | 1 -
include/editeng/unofield.hxx | 2 --
include/sfx2/lokhelper.hxx | 1 -
include/svtools/accessibleruler.hxx | 1 -
include/svtools/genericunodialog.hxx | 1 -
include/svtools/toolboxcontroller.hxx | 1 -
include/test/testinteractionhandler.hxx | 1 -
include/toolkit/controls/tabpagecontainer.hxx | 1 -
include/unotools/accessiblerelationsethelper.hxx | 1 -
include/unotools/accessiblestatesethelper.hxx | 1 -
linguistic/source/spelldta.cxx | 1 -
linguistic/workben/sspellimp.cxx | 1 -
oox/source/core/binarycodec.cxx | 1 -
oox/source/drawingml/textparagraphproperties.cxx | 1 -
oox/source/export/chartexport.cxx | 1 -
oox/source/export/shapes.cxx | 1 -
oox/source/ole/vbaexport.cxx | 1 -
oox/source/ole/vbaproject.cxx | 1 -
opencl/source/openclwrapper.cxx | 1 -
package/inc/ZipPackageStream.hxx | 1 -
package/source/zipapi/ZipOutputEntry.cxx | 1 -
reportdesign/inc/UndoActions.hxx | 1 -
reportdesign/source/core/api/FixedLine.cxx | 2 --
reportdesign/source/core/api/FixedText.cxx | 2 --
reportdesign/source/core/api/FormatCondition.cxx | 2 --
reportdesign/source/core/api/Function.cxx | 2 --
reportdesign/source/core/api/Functions.cxx | 1 -
reportdesign/source/core/api/Group.cxx | 2 --
reportdesign/source/core/api/ImageControl.cxx | 2 --
reportdesign/source/core/api/ReportDefinition.cxx | 3 ---
reportdesign/source/core/api/ReportEngineJFree.cxx | 1 -
reportdesign/source/core/api/Section.cxx | 1 -
reportdesign/source/core/api/Shape.cxx | 1 -
reportdesign/source/core/inc/Group.hxx | 1 -
reportdesign/source/core/inc/ReportEngineJFree.hxx | 1 -
reportdesign/source/core/sdr/RptObject.cxx | 1 -
reportdesign/source/core/sdr/UndoActions.cxx | 2 +-
reportdesign/source/filter/xml/dbloader2.cxx | 2 ++
reportdesign/source/filter/xml/dbloader2.hxx | 2 --
reportdesign/source/filter/xml/xmlCell.cxx | 2 --
reportdesign/source/filter/xml/xmlComponent.cxx | 2 --
reportdesign/source/filter/xml/xmlFormatCondition.cxx | 2 --
reportdesign/source/filter/xml/xmlHelper.cxx | 1 -
reportdesign/source/filter/xml/xmlfilter.hxx | 1 -
reportdesign/source/ui/dlg/Navigator.cxx | 1 -
reportdesign/source/ui/inc/ViewsWindow.hxx | 1 -
reportdesign/source/ui/inspection/GeometryHandler.cxx | 1 +
reportdesign/source/ui/misc/RptUndo.cxx | 1 +
reportdesign/source/ui/report/DesignView.cxx | 1 -
reportdesign/source/ui/report/ReportController.cxx | 1 -
reportdesign/source/ui/report/propbrw.cxx | 2 --
sax/qa/cppunit/test_converter.cxx | 1 -
sc/qa/unit/helper/qahelper.hxx | 1 -
sc/qa/unit/screenshots/screenshots.cxx | 1 -
sc/qa/unit/subsequent_export-test.cxx | 1 +
sc/source/core/data/conditio.cxx | 1 -
sc/source/core/data/dpsave.cxx | 2 --
sc/source/core/data/dptabsrc.cxx | 1 -
sc/source/core/data/global.cxx | 1 -
sc/source/core/tool/address.cxx | 1 -
sc/source/core/tool/chartarr.cxx | 1 -
sc/source/core/tool/editutil.cxx | 1 -
sc/source/core/tool/webservicelink.cxx | 2 --
sc/source/filter/excel/xiescher.cxx | 1 -
sc/source/filter/inc/fapihelper.hxx | 1 -
sc/source/filter/orcus/orcusfiltersimpl.cxx | 1 -
sc/source/ui/Accessibility/AccessibleCell.cxx | 1 -
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 1 -
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 1 -
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 1 -
sc/source/ui/Accessibility/AccessibleDocument.cxx | 1 -
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 1 -
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 1 -
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 1 -
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 1 -
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 1 -
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 1 -
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 1 -
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 1 -
sc/source/ui/app/scdll.cxx | 1 -
sc/source/ui/inc/AccessibleContextBase.hxx | 1 -
sc/source/ui/miscdlgs/acredlin.cxx | 1 -
sc/source/ui/optdlg/calcoptionsdlg.cxx | 1 -
sc/source/ui/undo/undoblk2.cxx | 1 -
sc/source/ui/undo/undodat.cxx | 1 -
sc/source/ui/unoobj/cursuno.cxx | 1 -
sc/source/ui/unoobj/docuno.cxx | 1 -
sc/source/ui/vba/vbaglobals.cxx | 2 --
sc/source/ui/vba/vbarange.cxx | 2 +-
sc/source/ui/vba/vbarange.hxx | 2 --
sc/source/ui/vba/vbaworkbook.cxx | 2 --
sc/source/ui/vba/vbaworksheet.hxx | 2 --
sc/source/ui/view/prevwsh.cxx | 1 -
sc/source/ui/view/tabvwshc.cxx | 1 +
sc/source/ui/view/viewfun3.cxx | 1 -
sd/qa/unit/dialogs-test.cxx | 1 -
sd/source/core/annotations/Annotation.cxx | 1 -
sd/source/ui/dlg/TemplateScanner.cxx | 1 -
sd/source/ui/docshell/docshell.cxx | 1 -
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 1 -
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 2 ++
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 1 -
sd/source/ui/view/sdview2.cxx | 1 -
sfx2/inc/guisaveas.hxx | 1 -
sfx2/source/appl/appserv.cxx | 1 -
sfx2/source/appl/fileobj.cxx | 1 -
sfx2/source/appl/impldde.cxx | 1 -
sfx2/source/control/unoctitm.cxx | 1 -
sfx2/source/dialog/dinfdlg.cxx | 1 -
sfx2/source/dialog/mailmodel.cxx | 1 -
sfx2/source/dialog/newstyle.cxx | 2 --
sfx2/source/dialog/tabdlg.cxx | 1 -
sfx2/source/doc/docfilt.cxx | 1 -
sfx2/source/doc/doctempl.cxx | 1 -
sfx2/source/doc/docundomanager.cxx | 1 -
sfx2/source/doc/guisaveas.cxx | 2 +-
sfx2/source/doc/new.cxx | 1 -
sfx2/source/doc/objcont.cxx | 1 -
sfx2/source/doc/objembed.cxx | 2 --
sfx2/source/doc/objstor.cxx | 2 --
sfx2/source/doc/objxtor.cxx | 1 -
sfx2/source/doc/sfxbasemodel.cxx | 1 +
sfx2/source/inc/eventsupplier.hxx | 1 -
sfx2/source/view/ipclient.cxx | 1 +
sfx2/source/view/lokcharthelper.cxx | 1 +
sfx2/source/view/viewfrm.cxx | 1 -
sfx2/source/view/viewsh.cxx | 1 +
slideshow/source/engine/activities/interpolation.hxx | 1 +
slideshow/source/engine/slide/targetpropertiescreator.cxx | 1 +
slideshow/source/engine/slide/targetpropertiescreator.hxx | 1 -
slideshow/source/engine/slideshowimpl.cxx | 1 -
slideshow/source/engine/transitions/slidetransitionfactory.cxx | 2 --
starmath/source/mathmlimport.cxx | 1 -
svtools/source/brwbox/editbrowsebox.cxx | 1 -
svtools/source/control/ctrltool.cxx | 1 -
svtools/source/control/vclxaccessibleheaderbar.cxx | 1 -
svtools/source/graphic/renderer.cxx | 1 -
svtools/source/misc/embedhlp.cxx | 1 -
svtools/source/uno/addrtempuno.cxx | 2 +-
svtools/source/uno/genericunodialog.cxx | 2 --
svtools/source/uno/svtxgridcontrol.cxx | 1 -
svtools/source/uno/wizard/unowizard.cxx | 1 +
svx/source/dialog/charmap.cxx | 1 -
svx/source/dialog/passwd.cxx | 1 -
svx/source/dialog/searchcharmap.cxx | 1 -
svx/source/dialog/svxruler.cxx | 1 -
svx/source/fmcomp/dbaexchange.cxx | 2 --
svx/source/fmcomp/dbaobjectex.cxx | 2 --
svx/source/fmcomp/gridcols.cxx | 1 -
svx/source/form/dataaccessdescriptor.cxx | 3 +--
svx/source/form/filtnav.cxx | 2 --
svx/source/form/fmexpl.cxx | 1 -
svx/source/form/fmshell.cxx | 1 -
svx/source/form/fmshimp.cxx | 1 +
svx/source/form/fmtools.cxx | 1 -
svx/source/form/fmundo.cxx | 1 +
svx/source/form/fmvwimp.cxx | 1 +
svx/source/form/formcontroller.cxx | 1 -
svx/source/form/tabwin.cxx | 1 +
svx/source/gallery2/galobj.cxx | 1 -
svx/source/inc/GraphCtlAccessibleContext.hxx | 1 -
svx/source/inc/gridcell.hxx | 1 +
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 1 -
svx/source/inc/svxrectctaccessiblecontext.hxx | 1 -
svx/source/inc/tablemodel.hxx | 1 -
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 1 -
svx/source/sdr/contact/viewobjectcontactofe3d.cxx | 1 -
svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx | 1 -
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx | 1 -
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 1 -
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 1 -
svx/source/svdraw/sdrpagewindow.cxx | 1 +
svx/source/svdraw/svdmodel.cxx | 1 -
svx/source/svdraw/svdograf.cxx | 1 -
svx/source/svdraw/svdouno.cxx | 1 -
svx/source/table/cell.cxx | 2 --
svx/source/tbxctrls/layctrl.cxx | 1 -
svx/source/unodraw/unomod.cxx | 1 -
svx/source/unodraw/unopool.cxx | 1 -
svx/source/unodraw/unoshap2.cxx | 1 -
svx/source/unodraw/unoshap3.cxx | 1 -
svx/source/unogallery/unogaltheme.cxx | 1 -
svx/source/unogallery/unogalthemeprovider.cxx | 1 -
sw/qa/api/SwXDocumentIndex.cxx | 1 -
sw/qa/extras/inc/swmodeltestbase.hxx | 1 +
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 1 -
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 1 -
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 1 -
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 1 -
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 1 -
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 1 -
sw/source/core/access/acccell.cxx | 1 -
sw/source/core/access/accdoc.cxx | 1 -
sw/source/core/access/accembedded.cxx | 1 -
sw/source/core/access/accfootnote.cxx | 1 -
sw/source/core/access/accgraphic.cxx | 1 -
sw/source/core/access/accheaderfooter.cxx | 1 -
sw/source/core/access/accpage.cxx | 1 -
sw/source/core/access/accpara.cxx | 1 -
sw/source/core/access/accpreview.cxx | 1 -
sw/source/core/access/acctable.cxx | 1 -
sw/source/core/access/acctextframe.cxx | 1 -
sw/source/core/crsr/crsrsh.cxx | 1 -
sw/source/core/crsr/findtxt.cxx | 1 -
sw/source/core/doc/DocumentRedlineManager.cxx | 1 -
sw/source/core/doc/acmplwrd.cxx | 1 -
sw/source/core/doc/doc.cxx | 1 -
sw/source/core/doc/doctxm.cxx | 1 -
sw/source/core/edit/edglss.cxx | 1 -
sw/source/core/edit/edlingu.cxx | 1 -
sw/source/core/edit/edtox.cxx | 1 -
sw/source/core/fields/ddetbl.cxx | 1 -
sw/source/core/fields/docufld.cxx | 1 -
sw/source/core/fields/reffld.cxx | 1 -
sw/source/core/layout/dbg_lay.cxx | 2 --
sw/source/core/layout/paintfrm.cxx | 1 -
sw/source/core/unocore/unochart.cxx | 1 -
sw/source/core/unocore/unoobj.cxx | 1 -
sw/source/core/unocore/unoredline.cxx | 1 -
sw/source/filter/docx/swdocxreader.cxx | 1 -
sw/source/filter/docx/swdocxreader.hxx | 1 -
sw/source/filter/html/htmlflywriter.cxx | 1 -
sw/source/filter/ww8/docxexport.cxx | 1 -
sw/source/filter/ww8/wrtw8nds.cxx | 2 +-
sw/source/filter/ww8/wrtww8.cxx | 1 -
sw/source/filter/ww8/ww8par.cxx | 2 +-
sw/source/filter/ww8/ww8par5.cxx | 1 -
sw/source/ui/dbui/dbinsdlg.cxx | 1 +
sw/source/ui/dialog/uiregionsw.cxx | 1 -
sw/source/ui/dialog/wordcountdialog.cxx | 1 -
sw/source/ui/envelp/labelexp.cxx | 2 --
sw/source/ui/fldui/inpdlg.cxx | 1 -
sw/source/ui/index/cnttab.cxx | 1 -
sw/source/ui/misc/bookmark.cxx | 1 -
sw/source/ui/table/tabledlg.cxx | 1 -
sw/source/ui/utlui/swrenamexnameddlg.cxx | 1 -
sw/source/ui/vba/vbafield.cxx | 1 -
sw/source/ui/vba/vbaglobals.cxx | 1 -
sw/source/uibase/app/docsh.cxx | 1 -
sw/source/uibase/cctrl/actctrl.cxx | 1 -
sw/source/uibase/docvw/AnnotationWin2.cxx | 1 -
sw/source/uibase/docvw/edtwin2.cxx | 1 -
sw/source/uibase/ribbar/workctrl.cxx | 1 -
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 1 -
sw/source/uibase/uiview/srcview.cxx | 1 -
sw/source/uibase/uiview/view2.cxx | 1 -
sw/source/uibase/uno/SwXDocumentSettings.cxx | 1 -
sw/source/uibase/wrtsh/wrtsh1.cxx | 1 -
toolkit/source/controls/geometrycontrolmodel.cxx | 1 -
toolkit/source/controls/grid/gridcolumn.cxx | 1 -
toolkit/source/controls/grid/gridcontrol.hxx | 1 -
toolkit/source/controls/tabpagemodel.cxx | 1 -
tools/source/inet/inetstrm.cxx | 1 -
tools/source/stream/stream.cxx | 3 ++-
ucb/source/ucp/ext/ucpext_content.cxx | 1 -
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx | 1 -
ucb/source/ucp/webdav/webdavresponseparser.cxx | 1 -
unotools/source/accessibility/accessiblerelationsethelper.cxx | 1 -
unotools/source/accessibility/accessiblestatesethelper.cxx | 1 -
unotools/source/misc/ZipPackageHelper.cxx | 1 -
unoxml/qa/unit/domtest.cxx | 1 -
uui/source/secmacrowarnings.cxx | 1 -
vbahelper/source/msforms/vbacombobox.hxx | 2 --
vbahelper/source/vbahelper/vbadocumentbase.cxx | 1 -
vcl/backendtest/VisualBackendTest.cxx | 1 -
vcl/osx/salmenu.cxx | 1 -
vcl/source/app/salvtables.cxx | 1 -
vcl/source/app/svdata.cxx | 1 -
vcl/source/control/ctrl.cxx | 2 --
vcl/source/control/edit.cxx | 2 --
vcl/source/filter/ixbm/xbmread.cxx | 1 -
vcl/source/gdi/pdfwriter_impl.cxx | 2 --
vcl/source/graphic/UnoGraphic.cxx | 1 -
vcl/source/graphic/UnoGraphicDescriptor.cxx | 1 -
vcl/source/graphic/UnoGraphicProvider.cxx | 1 -
vcl/source/outdev/outdev.cxx | 1 -
vcl/unx/generic/fontmanager/fontmanager.cxx | 1 -
vcl/unx/generic/print/genpspgraphics.cxx | 1 -
vcl/unx/generic/printer/printerinfomanager.cxx | 1 -
vcl/workben/mtfdemo.cxx | 1 -
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 1 +
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 1 -
xmloff/source/core/xmlimp.cxx | 1 -
xmloff/source/draw/animationexport.cxx | 3 +--
xmloff/source/style/xmlnumfi.cxx | 2 --
xmlsecurity/qa/certext/SanCertExt.cxx | 1 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 1 -
xmlsecurity/source/helper/xsecctl.cxx | 1 -
xmlsecurity/source/helper/xsecverify.cxx | 1 -
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 1 -
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 1 -
576 files changed, 121 insertions(+), 577 deletions(-)
New commits:
commit 8ddca0648a2b673b7dd5357871f79a83c3830ed8
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Sun May 27 14:07:43 2018 +0200
tdf#42949 remove unused compheler includes ..
and fix the fallout
Change-Id: I15bc5d626f4d157cbc69a87392078b41e621d14e
Reviewed-on: https://gerrit.libreoffice.org/54882
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index f9ade6d25fa7..f5bf6416380b 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -19,7 +19,6 @@
#include <extended/AccessibleBrowseBoxBase.hxx>
#include <svtools/accessibletableprovider.hxx>
-#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 4497a93f496a..0a8ac6fa3d70 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -19,7 +19,6 @@
#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
#include <svtools/accessibletableprovider.hxx>
-#include <comphelper/servicehelper.hxx>
using ::com::sun::star::uno::Reference;
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 99e96920dc9d..b881cc468105 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -21,7 +21,6 @@
#include <svtools/accessibletableprovider.hxx>
#include <tools/multisel.hxx>
#include <comphelper/sequence.hxx>
-#include <comphelper/servicehelper.hxx>
using css::uno::Reference;
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index a5a634feb129..6f2ab23735a9 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -19,7 +19,6 @@
#include <extended/AccessibleGridControlBase.hxx>
#include <svtools/accessibletable.hxx>
-#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sal/types.h>
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 282aa582313c..296e236e2a5a 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -21,7 +21,6 @@
#include <extended/AccessibleGridControlHeaderCell.hxx>
#include <extended/AccessibleGridControlTableCell.hxx>
#include <svtools/accessibletable.hxx>
-#include <comphelper/servicehelper.hxx>
using ::com::sun::star::uno::Reference;
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index f18f13363c36..68bee622413d 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -21,7 +21,6 @@
#include <svtools/accessibletable.hxx>
#include <tools/multisel.hxx>
#include <comphelper/sequence.hxx>
-#include <comphelper/servicehelper.hxx>
using css::uno::Reference;
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 1520a3db70eb..c965db29ac5d 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -35,7 +35,6 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <svtools/stringtransfer.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 2c9bafee467c..4d409d80299a 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -38,7 +38,6 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
#include <helper/accresmgr.hxx>
#include <strings.hrc>
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index fb2116f74852..ddbc03825c92 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -21,7 +21,6 @@
#include <extended/accessibletablistbox.hxx>
#include <extended/accessibletablistboxtable.hxx>
#include <svtools/svtabbx.hxx>
-#include <comphelper/sequence.hxx>
namespace accessibility
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 86a9946c0e12..efe3e79dc816 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -29,7 +29,6 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 0acbcca9bddd..ba5b930db03e 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -32,7 +32,6 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/accessibletexthelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 02412e3ce204..5ec472639640 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <strings.hxx>
#include <vcl/button.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index a0eff42c5874..6b979c18bfad 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <vcl/button.hxx>
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index a1085da19aa8..2ed7a72fc20c 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -32,7 +32,6 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 1f0b827f38ac..c04cb8fc452f 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -31,7 +31,6 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 118c9d85f6d0..bbc864d86eab 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/string.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index b1faf0feb92e..b116060a2105 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -33,7 +33,6 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 90f2ac4256fd..a519cef8f815 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -39,7 +39,6 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
namespace
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 56fb3c1c61a3..4db841005697 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <vcl/window.hxx>
#include <vcl/button.hxx>
#include <strings.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 7474691ad5e8..c515df91064f 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <vcl/scrbar.hxx>
#include <strings.hxx>
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 851b20471dc8..75aeaf1d5b65 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp2.hxx>
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 20707c94b7e2..65b53191a3c9 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -41,7 +41,6 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <strings.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
index 349483f36194..3cd4a9e70f4f 100644
--- a/avmedia/source/avmediadummy.cxx
+++ b/avmedia/source/avmediadummy.cxx
@@ -34,8 +34,6 @@
#include <ucbhelper/content.hxx>
-#include <comphelper/storagehelper.hxx>
-
using namespace ::com::sun::star;
namespace avmedia
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 0fb8a2b7d5a0..70ed2f53c2dc 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
-#include <comphelper/sequenceashashmap.hxx>
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx
index 2d4954700e55..d8ce12c316bc 100644
--- a/canvas/source/directx/dx_bitmapcanvashelper.cxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/RepaintResult.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
-#include <comphelper/sequence.hxx>
#include <rtl/math.hxx>
#include <tools/diagnose_ex.h>
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 56469e17ee72..3b1246cf15c9 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/rendering/PanoseProportion.hpp>
#include <com/sun/star/rendering/XCanvasFont.hpp>
#include <comphelper/scopeguard.hxx>
-#include <comphelper/sequence.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <tools/color.hxx>
#include <tools/diagnose_ex.h>
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index b8003dd338d1..c65e73fd660a 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/TextDirection.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
-#include <comphelper/sequence.hxx>
#include <rtl/math.hxx>
#include <tools/diagnose_ex.h>
#include <tools/poly.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 2ef8b41ff185..9390c9ffe18b 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -26,7 +26,6 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <comphelper/servicehelper.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 81c28734ba6f..98065d3468bf 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_UNO_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_UNO_HXX
+#include <comphelper/proparrhlp.hxx>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 9c3993095e47..a1c09e85fc87 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -61,7 +61,6 @@
#include <comphelper/lok.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/propertyvalue.hxx>
-#include <comphelper/sequence.hxx>
#include <toolkit/awt/vclxmenu.hxx>
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 6c8312832bff..cdc0d0338a02 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -53,7 +53,6 @@
#include <vcl/cvtgrf.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
-#include <comphelper/sequence.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <tools/diagnose_ex.h>
diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index 884109279251..34c82c6e74c3 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.cxx
@@ -20,7 +20,6 @@
#include <comphelper/accessibleeventnotifier.hxx>
#include <rtl/instance.hxx>
#include <comphelper/interfacecontainer2.hxx>
-#include <comphelper/guarding.hxx>
#include <map>
#include <limits>
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index 2a2ef6b1c819..c73bd22cf163 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -21,7 +21,6 @@
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
#include <rtl/instance.hxx>
-#include <comphelper/guarding.hxx>
#include <cassert>
#include <deque>
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index e1e95aee11a1..786d6d7885cd 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -19,8 +19,6 @@
#include <comphelper/componentmodule.hxx>
-#include <comphelper/sequence.hxx>
-
#include <vector>
namespace comphelper
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 93ce85d3779a..2bb428e9c8c6 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -30,7 +30,6 @@
#include <osl/mutex.hxx>
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/propertysetinfo.hxx>
-#include <comphelper/servicehelper.hxx>
using namespace ::osl;
using namespace ::cppu;
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index 6768075320de..4ee79a43309d 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -18,7 +18,6 @@
*/
#include <comphelper/propertycontainer.hxx>
-#include <comphelper/property.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <uno/data.h>
#include <com/sun/star/uno/genfunc.h>
diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index 5508677396b3..ec9ca1292319 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/propmultiplex.hxx>
#include <osl/diagnose.h>
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index a3c6a2fc2251..51d449ad1bb0 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/interfacecontainer.h>
#include <TConnection.hxx>
-#include <comphelper/types.hxx>
#include <com/sun/star/java/JavaVirtualMachine.hpp>
#if HAVE_FEATURE_JAVA
#include <jvmaccess/virtualmachine.hxx>
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 967c8b5696db..ae9731e3f61f 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -29,6 +29,7 @@
#include <comphelper/extract.hxx>
#include <TConnection.hxx>
#include <comphelper/numbers.hxx>
+#include <comphelper/types.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index ec53891aae38..cfc283d7e86f 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/sdbc/KeyRule.hpp>
#include <com/sun/star/sdbc/ProcedureResult.hpp>
#include <com/sun/star/sdbc/IndexType.hpp>
-#include <comphelper/property.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 700de660730a..6155ec09443b 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -30,7 +30,6 @@
#include <connectivity/dbtools.hxx>
#include <TConnection.hxx>
#include <connectivity/TTableHelper.hxx>
-#include <comphelper/property.hxx>
using namespace ::comphelper;
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 6038be6262b2..966db4fc141c 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <comphelper/property.hxx>
#include <connectivity/TIndex.hxx>
#include <connectivity/TTableHelper.hxx>
#include <TConnection.hxx>
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 33dabdd76a23..0157f5c41051 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -26,6 +26,7 @@
#include <connectivity/TTableHelper.hxx>
#include <TConnection.hxx>
#include <comphelper/extract.hxx>
+#include <comphelper/types.hxx>
#include <rtl/ustrbuf.hxx>
using namespace connectivity;
using namespace connectivity::sdbcx;
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 1f774fd1440d..c31a616926c2 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <comphelper/property.hxx>
#include <TConnection.hxx>
#include <connectivity/TTableHelper.hxx>
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 6736aae96c2e..34259d93e334 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/sdbc/KeyRule.hpp>
#include <connectivity/dbtools.hxx>
#include <comphelper/types.hxx>
-#include <comphelper/property.hxx>
#include <TConnection.hxx>
namespace connectivity
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 7bb03a90da3c..48dab7e1f6b1 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/sdbcx/VCollection.hxx>
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 603d003754f1..1540b49840e4 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -68,6 +68,7 @@
#include <comphelper/interaction.hxx>
#include <comphelper/property.hxx>
#include <comphelper/propertysequence.hxx>
+#include <comphelper/types.hxx>
#include <connectivity/conncleanup.hxx>
#include <connectivity/dbconversion.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 1b9d480f8198..5faf1146e67e 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/container/XChild.hpp>
+#include <comphelper/types.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/sharedunocomponent.hxx>
#include <algorithm>
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 97e80a56cc51..53498e1d43d6 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -34,7 +34,6 @@
#include <tools/diagnose_ex.h>
-#include <comphelper/proparrhlp.hxx>
#include <connectivity/ParameterCont.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index ee727509d1c3..0289e4e55a23 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -21,7 +21,6 @@
#include "ZConnectionPool.hxx"
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/container/ElementExistException.hpp>
-#include <comphelper/types.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include "ZPooledConnection.hxx"
#include "ZPoolCollection.hxx"
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index 1aa6374656c7..46ed4bfb32c3 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 962b57aa0a4c..236d758760d1 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -21,7 +21,6 @@
#include <ado/AConnection.hxx>
#include <ado/Awrapado.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <comphelper/extract.hxx>
#include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 67dc08a055e6..e0c8b49a2d01 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -21,7 +21,6 @@
#include <ado/AGroup.hxx>
#include <ado/AUsers.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <ado/AConnection.hxx>
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 6c0b385bc7f9..29ecf4d4d74b 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <ado/AColumns.hxx>
#include <TConnection.hxx>
#include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index bcf31b79d076..4393666d40be 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <ado/AColumns.hxx>
#include <ado/AConnection.hxx>
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index e96b2dd9b031..559d7a7f101d 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -26,7 +26,6 @@
#include <ado/AConnection.hxx>
#include <comphelper/types.hxx>
#include <ado/Awrapado.hxx>
-#include <comphelper/property.hxx>
#include <connectivity/dbexception.hxx>
#include <strings.hrc>
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index 0c028794a6c3..09c4c397051d 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <ado/Awrapado.hxx>
-#include <comphelper/sequence.hxx>
#include <TConnection.hxx>
#include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 50e270477ce9..cff7695c757d 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -21,7 +21,6 @@
#include <ado/ACatalog.hxx>
#include <ado/AGroups.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <ado/AConnection.hxx>
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index 4b70bf767ddc..c2f0bc86d601 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -22,7 +22,6 @@
#include <ado/adoimp.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <ado/Awrapado.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <TConnection.hxx>
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 828376f63986..65e79f2b5df0 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/sheet/XDatabaseRange.hpp>
#include <FDatabaseMetaDataResultSet.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/types.hxx>
using namespace connectivity::calc;
using namespace connectivity::file;
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index ffeaf9c79ccf..f1154f87dd68 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -41,7 +41,6 @@
#include <rtl/ustrbuf.hxx>
#include <osl/thread.h>
#include <cppuhelper/queryinterface.hxx>
-#include <comphelper/sequence.hxx>
#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 9c74fd8bc77f..943732fdbb36 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -25,7 +25,6 @@
#include <file/FCatalog.hxx>
#include <file/FConnection.hxx>
#include <calc/CCatalog.hxx>
-#include <comphelper/types.hxx>
using namespace ::comphelper;
using namespace connectivity;
diff --git a/connectivity/source/drivers/component/CTable.cxx b/connectivity/source/drivers/component/CTable.cxx
index c31a7f6df349..c02635bf1fc1 100644
--- a/connectivity/source/drivers/component/CTable.cxx
+++ b/connectivity/source/drivers/component/CTable.cxx
@@ -40,12 +40,10 @@
#include <rtl/ustrbuf.hxx>
#include <osl/thread.h>
#include <cppuhelper/queryinterface.hxx>
-#include <comphelper/sequence.hxx>
#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbconversion.hxx>
-#include <comphelper/types.hxx>
using namespace connectivity;
using namespace connectivity::component;
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index 1ffc95fbcfb1..c43caf4a4a8a 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -21,7 +21,6 @@
#include <dbase/DTable.hxx>
#include <connectivity/sdbcx/VColumn.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <comphelper/property.hxx>
using namespace connectivity::dbase;
using namespace connectivity;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 9468c3d3ad25..899e982fe433 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -21,7 +21,6 @@
#include <dbase/DIndexColumns.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <connectivity/sdbcx/VColumn.hxx>
-#include <comphelper/sequence.hxx>
#include <dbase/DTable.hxx>
#include <dbase/DIndexIter.hxx>
#include <osl/file.hxx>
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 5d144bf6f8d6..bdc774e95549 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -21,7 +21,6 @@
#include <dbase/DTable.hxx>
#include <connectivity/sdbcx/VIndexColumn.hxx>
#include <comphelper/types.hxx>
-#include <comphelper/property.hxx>
#include <connectivity/dbexception.hxx>
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index 643c67eeee40..541eb3287634 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -21,7 +21,6 @@
#include <dbase/DIndex.hxx>
#include <connectivity/dbexception.hxx>
#include <unotools/ucbhelper.hxx>
-#include <comphelper/types.hxx>
#include <strings.hrc>
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index f0112d35a03e..3c2e3d832898 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -31,7 +31,6 @@
#include <dbase/DIndex.hxx>
#include <dbase/DIndexes.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/sequence.hxx>
#include <svl/zforlist.hxx>
#include <unotools/syslocale.hxx>
#include <rtl/math.hxx>
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 056b287aa994..99c192dd2751 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -31,7 +31,6 @@
#include <file/FConnection.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <dbase/DCatalog.hxx>
-#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <strings.hrc>
#include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 29fefcf4e80a..1913e5ed7e13 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -25,7 +25,6 @@
#include "NPreparedStatement.hxx"
#include "NStatement.hxx"
#include <connectivity/dbexception.hxx>
-#include <comphelper/sequence.hxx>
#include <rtl/ustring.hxx>
using namespace connectivity::evoab;
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index e20b8adf8f7f..162c6da4aa6a 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
-#include <comphelper/property.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index e3fc8f21b455..f964e1f7d355 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <file/FTable.hxx>
-#include <comphelper/property.hxx>
using namespace connectivity::file;
using namespace connectivity;
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 765c7a542531..d7156147fcff 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -23,8 +23,6 @@
#include <sqlbison.hxx>
#include <file/FDriver.hxx>
#include <file/FResultSet.hxx>
-#include <comphelper/property.hxx>
-#include <comphelper/uno3.hxx>
#include <osl/thread.h>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx
index b41ea4e2d21b..dc8255dbda61 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <comphelper/types.hxx>
using namespace ::connectivity;
using namespace ::connectivity::firebird;
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 33c6557737b2..c1ccf54dd815 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -30,8 +30,6 @@
#include <cppuhelper/queryinterface.hxx>
#include <comphelper/numbers.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/sequence.hxx>
-#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
#include <flat/EDriver.hxx>
#include <com/sun/star/util/NumberFormat.hpp>
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index ebdaaa634703..f38b73e81167 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/sdbcx/KeyType.hpp>
#include <file/FCatalog.hxx>
#include <file/FConnection.hxx>
-#include <comphelper/types.hxx>
using namespace connectivity;
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 7da46daafb2f..04d58a33a1b3 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -33,8 +33,6 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData2.hpp>
-#include <comphelper/listenernotification.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 9facdd3660b6..bf55c45cf975 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -45,7 +45,6 @@
#include <osl/process.h>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
#include <comphelper/propertysequence.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/confignode.hxx>
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 2c738f15f37f..e6a84d46bed5 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-#include <comphelper/types.hxx>
#include <hsqldb/HStorageAccess.hxx>
#include <hsqldb/HStorageMap.hxx>
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 56c0fbdf6856..bd6229d0566e 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-#include <comphelper/types.hxx>
#include <hsqldb/HStorageAccess.hxx>
#include <hsqldb/HStorageMap.hxx>
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index f52c8ad891b9..97f34155dc0d 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -19,7 +19,6 @@
#include <java/sql/Timestamp.hxx>
#include <java/tools.hxx>
-#include <comphelper/types.hxx>
#include <connectivity/dbconversion.hxx>
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index 3f6ce867a801..15eb853b19dd 100644
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
@@ -23,7 +23,6 @@
#include "MacabHeader.hxx"
#include "MacabRecord.hxx"
-#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx>
namespace connectivity
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 95094265e508..b78954531b93 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -21,6 +21,7 @@
#include <mysql/YCatalog.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/types.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbcharset.hxx>
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 4f096b5fffc2..278a3595095b 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -30,7 +30,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
-#include <comphelper/uno3.hxx>
#include <ado/AConnection.hxx>
#include <vector>
#include <ado/Awrapado.hxx>
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index bb759444fe5c..f70568e8f31e 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -31,7 +31,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <file/FConnection.hxx>
#include <file/filedllapi.hxx>
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index b88e1227de1c..4df9a546dafe 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index a6cde3aa2ac3..62cbe81547d2 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -30,7 +30,6 @@
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index fc4b7b35f493..a44f6604802b 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 29d4f51612ba..5beaf9bb6fb3 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -31,7 +31,6 @@
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <odbc/OFunctions.hxx>
#include <odbc/OConnection.hxx>
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index 96f32461871e..b10fd7882917 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <comphelper/types.hxx>
#include <connectivity/sdbcx/VCatalog.hxx>
#include <connectivity/sdbcx/VCollection.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <connectivity/sdbcx/VDescriptor.hxx>
#include <TConnection.hxx>
-#include <comphelper/uno3.hxx>
#include <connectivity/dbtools.hxx>
using namespace connectivity;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 25e9b1b3f1a3..f0b867272651 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -19,7 +19,6 @@
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/anytostring.hxx>
#include <comphelper/propertysequence.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx
index cc81e230ddfa..74f8a9b5d0cd 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -19,6 +19,8 @@
#include <SvxConfigPageHelper.hxx>
+#include <comphelper/random.hxx>
+
static sal_Int16 theImageType =
css::ui::ImageType::COLOR_NORMAL |
css::ui::ImageType::SIZE_DEFAULT;
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 9b69c64a1374..826814b9248c 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -61,7 +61,6 @@
#include <dialmgr.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/random.hxx>
#include <unotools/configmgr.hxx>
#include <o3tl/make_unique.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index bdca809fd326..9cbad5b1d65d 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -61,7 +61,6 @@
#include <dialmgr.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/random.hxx>
#include <unotools/configmgr.hxx>
#include <o3tl/make_unique.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 0753ecf30298..fa7df5861b71 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -15,8 +15,6 @@
#include <strings.hrc>
#include <comphelper/processfactory.hxx>
-#include <comphelper/storagehelper.hxx>
-#include <comphelper/xmltools.hxx>
#include <tools/stream.hxx>
#include <unotools/streamwrap.hxx>
#include <vcl/weld.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 21d06cd6a0d5..91fa1b76a815 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -50,8 +50,6 @@
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/propertycontainer.hxx>
-#include <comphelper/proparrhlp.hxx>
#include <basic/sbx.hxx>
#include <svtools/imagemgr.hxx>
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 5438f48a625e..2b566bcfdfda 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -32,7 +32,6 @@
#include <svtools/svmedit2.hxx>
#include <svtools/svmedit.hxx>
-#include <comphelper/random.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 5b6538eb65dc..454fe099c253 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -42,8 +42,6 @@
#include <unotools/syslocaleoptions.hxx>
#include <unotools/configitem.hxx>
#include <sfx2/objsh.hxx>
-#include <comphelper/string.hxx>
-#include <comphelper/types.hxx>
#include <comphelper/propertysequence.hxx>
#include <svtools/langtab.hxx>
#include <unotools/localfilehelper.hxx>
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 3f8c0cb794da..527c8ee8985c 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -60,8 +60,6 @@
#define CLASSPATH_DELIMITER SAL_PATHSEPARATOR
-#include <comphelper/solarmutex.hxx>
-
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index ae321e6a8fd2..6091c2e84eda 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -23,7 +23,6 @@
#include <comphelper/processfactory.hxx>
#include <unotools/moduleoptions.hxx>
#include <unotools/saveopt.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index c6e4a8952c6f..19874430deec 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -50,7 +50,6 @@
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
#include <vcl/GraphicObject.hxx>
-#include <comphelper/lok.hxx>
#include <svx/unobrushitemhelper.hxx>
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index efaa03fbbe20..2425b08b68af 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <comphelper/string.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <swpossizetabpage.hxx>
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index 7fff37490a36..ce0016bfbc3a 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/sdb/XColumn.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <comphelper/types.hxx>
#include <cppuhelper/typeprovider.hxx>
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 5cb93dd40bf9..ae9cf694e891 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -23,6 +23,7 @@
#include <RefreshListener.hxx>
#include <sdbcoretools.hxx>
#include <com/sun/star/sdbc/XRow.hpp>
+#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <tools/wldcrd.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index f7c7f95cdac5..0ce715ed1a8a 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -55,7 +55,6 @@
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <comphelper/interaction.hxx>
#include <comphelper/property.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index a4b082a21583..4c3f5706935b 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -43,7 +43,6 @@
#include <comphelper/extract.hxx>
#include <comphelper/property.hxx>
-#include <comphelper/seqstream.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/sqliterator.hxx>
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index 4a8373d1ee85..08be66c40108 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -35,8 +35,6 @@
#include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#include <comphelper/propertycontainer.hxx>
-#include <comphelper/proparrhlp.hxx>
#include "RowSetRow.hxx"
#include "RowSetCacheIterator.hxx"
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 673af3d290c5..11337dec7cb6 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -22,7 +22,6 @@
#include <rtl/ref.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/FValue.hxx>
-#include <comphelper/types.hxx>
#include <salhelper/simplereferenceobject.hxx>
namespace dbaccess
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index e7a7af6870e9..6e0797e55f84 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -44,7 +44,6 @@
#include <com/sun/star/uno/XAggregation.hpp>
#include <com/sun/star/util/NumberFormatter.hpp>
-#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/typeprovider.hxx>
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index a57883ba2ba2..d2798165b36c 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -27,7 +27,6 @@
#include <osl/diagnose.h>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/property.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/util/XRefreshListener.hpp>
diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
index 64a91cdbcb48..cbf9ad8ab874 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/queryinterface.hxx>
-#include <comphelper/property.hxx>
#include <stringconstants.hxx>
#include <strings.hxx>
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index fcbd4e9fb456..c344b31c21a6 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -29,10 +29,9 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-#include <comphelper/property.hxx>
-#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
+#include <comphelper/uno3.hxx>
#include <connectivity/TTableHelper.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
index ac10ab6c5d8f..37ec588f4de3 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -20,7 +20,6 @@
#include <datasettings.hxx>
#include <apitools.hxx>
#include <stringconstants.hxx>
-#include <comphelper/property.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index 69e5138d689a..5f7926ce34c0 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -24,8 +24,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <comphelper/property.hxx>
-#include <comphelper/sequence.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index de12b938c00e..6e1eca3faaa5 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -28,8 +28,6 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <comphelper/propagg.hxx>
-#include <comphelper/sequence.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 8215be2e48ce..26bbec26c13d 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -36,7 +36,6 @@
#include <osl/diagnose.h>
#include <comphelper/uno3.hxx>
#include <comphelper/property.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/exc_hlp.hxx>
using namespace dbtools;
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index 84b4ae657bfa..1ec9a990b97e 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -22,8 +22,6 @@
#include "querydescriptor.hxx"
#include <apitools.hxx>
#include <stringconstants.hxx>
-#include <comphelper/property.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -35,7 +33,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::util;
-using namespace ::comphelper;
using namespace ::osl;
using namespace ::cppu;
diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx
index 400838008388..6698429bc03e 100644
--- a/dbaccess/source/core/api/resultcolumn.hxx
+++ b/dbaccess/source/core/api/resultcolumn.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <column.hxx>
#include <boost/optional.hpp>
+#include <comphelper/proparrhlp.hxx>
namespace dbaccess
{
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 4942597e9774..ae663eaf5c84 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -26,7 +26,6 @@
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 1a63e8b7f99a..aaff69dada25 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -22,7 +22,6 @@
#include <stringconstants.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index eec18f7a8952..3590e93613aa 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -28,7 +28,6 @@
#include <osl/diagnose.h>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/util/XRefreshListener.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 72dbde0c2e44..41de9c5f995c 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -22,7 +22,6 @@
#include <stringconstants.hxx>
#include <osl/diagnose.h>
-#include <comphelper/sequence.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <comphelper/property.hxx>
#include <comphelper/propertysequence.hxx>
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index adc7ea3839d5..58f78745a4bc 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMPONENTDEFINITION_HXX
#include <commandbase.hxx>
-#include <comphelper/propertycontainer.hxx>
#include <com/sun/star/sdbcx/XRename.hpp>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/proparrhlp.hxx>
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 18db105b95d9..39f341ddb901 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -21,7 +21,6 @@
#include <ContentHelper.hxx>
#include <rtl/ustrbuf.hxx>
#include <ucbhelper/cancelcommandexecution.hxx>
-#include <comphelper/property.hxx>
#include <com/sun/star/ucb/UnsupportedCommandException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/IllegalAccessException.hpp>
@@ -47,7 +46,6 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::embed;
using namespace ::com::sun::star::container;
-using namespace ::comphelper;
using namespace ::cppu;
OContentHelper_Impl::OContentHelper_Impl()
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index af71c72510c4..0e1df6750176 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -41,9 +41,6 @@
#include <com/sun/star/script/DocumentDialogLibraryContainer.hpp>
#include <com/sun/star/util/NumberFormatsSupplier.hpp>
-#include <comphelper/interaction.hxx>
-#include <comphelper/seqstream.hxx>
-#include <comphelper/sequence.hxx>
#include <connectivity/dbexception.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 57ba4ebae1f8..47d08357a5a7 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -22,7 +22,6 @@
#include <apitools.hxx>
#include <osl/diagnose.h>
-#include <comphelper/sequence.hxx>
#include <comphelper/enumhelper.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index 59a530e71662..112a0eaa2b7c 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -29,7 +29,6 @@
#include <ContentHelper.hxx>
#include "ComponentDefinition.hxx"
-#include <comphelper/propertycontainer.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 0e548f9508d7..a17325b2e1e8 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -45,7 +45,6 @@
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
#include <cppuhelper/implbase13.hxx>
-#include <comphelper/stl_types.hxx>
#include <connectivity/ConnectionWrapper.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/warningscontainer.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 3f4a443abaa1..85683e6a5367 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -54,7 +54,6 @@
#include <comphelper/enumhelper.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index e147cf0281de..516766ca81e3 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -65,10 +65,8 @@
#include <comphelper/documentconstants.hxx>
#include <comphelper/enumhelper.hxx>
#include <comphelper/genericpropertyset.hxx>
-#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/numberedcollection.hxx>
-#include <comphelper/property.hxx>
#include <comphelper/storagehelper.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index ffe45b4521a0..4f1bb6d477be 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -50,11 +50,9 @@
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/view/XPrintable.hpp>
-#include <comphelper/guarding.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/property.hxx>
-#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index ae52ecc5e67b..4acaa00fcc52 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -26,7 +26,6 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <comphelper/sequence.hxx>
#include <comphelper/enumhelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index b48f27ba0144..cf72ef2d2520 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -23,7 +23,6 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <comphelper/property.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/classids.hxx>
@@ -93,9 +92,7 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
-#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/mimeconfighelper.hxx>
-#include <comphelper/storagehelper.hxx>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/io/WrongFormatException.hpp>
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index c54dc9ee95a1..a6837692d691 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <cppuhelper/weak.hxx>
-#include <comphelper/types.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index 21616edaa3da..cb63c28eb9c2 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -35,8 +35,6 @@
#include <cppuhelper/propertysetmixin.hxx>
#include <cppuhelper/implementationentry.hxx>
-#include <comphelper/sequence.hxx>
-
#include <connectivity/parameters.hxx>
#include <connectivity/filtermanager.hxx>
diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx
index 4a763c577912..ab4276c4e5cf 100644
--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -56,8 +56,6 @@
#include <com/sun/star/sdb/XDocumentDataSource.hpp>
#include <comphelper/namedvaluecollection.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include <comphelper/sharedmutex.hxx>
#include <comphelper/solarmutex.hxx>
#include <connectivity/CommonTools.hxx>
#include <cppuhelper/propshlp.hxx>
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index f32a00f6c8d8..eca1a728e841 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -39,7 +39,6 @@
#include <com/sun/star/sdbcx/XDrop.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/FValue.hxx>
diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx
index 8ec104584b2c..b7683f30e709 100644
--- a/dbaccess/source/core/inc/definitioncolumn.hxx
+++ b/dbaccess/source/core/inc/definitioncolumn.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/container/XChild.hpp>
#include <comphelper/IdPropArrayHelper.hxx>
+#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 28ae2b42470e..0b4b284558df 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -35,7 +35,6 @@
#include "column.hxx"
#include <connectivity/CommonTools.hxx>
#include <connectivity/TTableHelper.hxx>
-#include <comphelper/uno3.hxx>
#include <comphelper/IdPropArrayHelper.hxx>
namespace dbaccess
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
index c2ed8b02f66f..1ba2e973cb63 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/frame/XStorable.hpp>
+#include <comphelper/proparrhlp.hxx>
#include <svtools/genericunodialog.hxx>
namespace dbmm
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 1c4c26f435cd..8e17e81c6f58 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -51,10 +51,8 @@
#include <com/sun/star/io/XInputStreamProvider.hpp>
#include <comphelper/documentinfo.hxx>
-#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/storagehelper.hxx>
-#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/ustrbuf.hxx>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 410c3cfa501e..0872891cf1e3 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -55,7 +55,6 @@
#include <comphelper/documentconstants.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/types.hxx>
#include <comphelper/propertysequence.hxx>
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 8afd0c9190bd..e81ab45933f3 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -27,7 +27,6 @@
#include <strings.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <comphelper/sequence.hxx>
#include <svl/filenotation.hxx>
#include <unotools/pathoptions.hxx>
#include <dsntypes.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index e9889c442f83..39e470259e2b 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -19,7 +19,6 @@
#include <memory>
#include "AppController.hxx"
-#include <comphelper/sequence.hxx>
#include <comphelper/property.hxx>
#include <core_resource.hxx>
#include <stringconstants.hxx>
@@ -43,7 +42,6 @@
#include <com/sun/star/sdbcx/XDrop.hpp>
#include <unotools/ucbhelper.hxx>
#include <dlgsave.hxx>
-#include <comphelper/types.hxx>
#include <vcl/weld.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 78931828a8dd..8a2e9d1419e3 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -24,7 +24,6 @@
#include <vcl/toolbox.hxx>
#include <unotools/configmgr.hxx>
#include <vcl/waitobj.hxx>
-#include <comphelper/types.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 18241bf19778..d5ce5952b3a9 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -20,7 +20,6 @@
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <dbaccess/dataview.hxx>
-#include <comphelper/types.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <sfx2/app.hxx>
#include <dbaccess/IController.hxx>
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 97c56ae88f92..2836c3bfd6af 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/types.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 5556e0f02cc6..0f83166db4e1 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -32,6 +32,7 @@
#include <sbagrid.hxx>
#include <dlgattr.hxx>
#include <dlgsize.hxx>
+#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/form/XLoadable.hpp>
#include <com/sun/star/form/ControlFontDialog.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index c884e31e55f5..4f22d829ff10 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -48,7 +48,7 @@
#include <connectivity/dbtools.hxx>
#include <connectivity/dbconversion.hxx>
#include <comphelper/numbers.hxx>
-#include <comphelper/string.hxx>
+#include <comphelper/types.hxx>
#include <UITools.hxx>
#include <strings.hrc>
#include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index f25f0cde10e5..e78cde9de379 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -35,7 +35,6 @@
#include <vcl/weld.hxx>
#include <sfx2/filedlghelper.hxx>
#include <dbadmin.hxx>
-#include <comphelper/types.hxx>
#include <vcl/stdtext.hxx>
#include <sqlmessage.hxx>
#include "odbcconfig.hxx"
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 9575384f1009..ea87983a665d 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -36,7 +36,6 @@
#include <helpids.h>
#include <osl/process.h>
#include <dbadmin.hxx>
-#include <comphelper/types.hxx>
#include <vcl/stdtext.hxx>
#include <sqlmessage.hxx>
#include "odbcconfig.hxx"
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index a6f2203eed6d..d9a96fa9b5cd 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -29,7 +29,6 @@
#include <dsitems.hxx>
#include <osl/process.h>
#include <dbadmin.hxx>
-#include <comphelper/types.hxx>
#include <vcl/stdtext.hxx>
#include <sqlmessage.hxx>
#include "odbcconfig.hxx"
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index b2ca1e21182e..3334dac786e4 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -41,7 +41,6 @@
#include <connectivity/CommonTools.hxx>
#include "DriverSettings.hxx"
#include <dbadmin.hxx>
-#include <comphelper/types.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/sdbc/XDriverAccess.hpp>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 0cce73ebbba6..a0318b05d6be 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -52,11 +52,8 @@
#include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
#include <com/sun/star/ucb/AuthenticationRequest.hpp>
-#include <comphelper/guarding.hxx>
#include <comphelper/interaction.hxx>
-#include <comphelper/property.hxx>
#include <comphelper/sequence.hxx>
-#include <comphelper/string.hxx>
#include <connectivity/DriversConfig.hxx>
#include <connectivity/dbexception.hxx>
#include <osl/file.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index f036b655d8cb..a26ae5b69b2f 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -42,7 +42,6 @@
#include "DriverSettings.hxx"
#include <dbadmin.hxx>
#include <comphelper/string.hxx>
-#include <comphelper/types.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <svl/filenotation.hxx>
#include <unotools/localfilehelper.hxx>
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 0daf9f8f13d9..e3cf3e7f28e6 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -20,7 +20,6 @@
#include "UserAdmin.hxx"
#include <UITools.hxx>
#include <dbu_dlg.hxx>
-#include <comphelper/types.hxx>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <com/sun/star/sdbcx/XUsersSupplier.hpp>
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 37a1db875882..f00712dc408c 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -30,6 +30,7 @@
#include <UserAdminDlg.hxx>
#include <connectivity/dbmetadata.hxx>
+#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 03b520739f25..fc6bd8996ae1 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -74,7 +74,6 @@
#include <svl/filenotation.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
-#include <comphelper/sequenceashashmap.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <connectivity/DriversConfig.hxx>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index a78a7526416d..e5300105392a 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -43,7 +43,6 @@
#include <connectivity/CommonTools.hxx>
#include "DriverSettings.hxx"
#include <dbadmin.hxx>
-#include <comphelper/types.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 3c6485405282..5b4ee249b4b1 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <stringconstants.hxx>
-#include <comphelper/types.hxx>
#include <dsitems.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 36aa35494d20..425c9e0936df 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -25,6 +25,7 @@
#include <commontypes.hxx>
#include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
+#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <stringconstants.hxx>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 7015be4581db..948803be278e 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -22,6 +22,7 @@
#include <svtools/genericunodialog.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/proparrhlp.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index fec1afc95b63..0ab2ec4c0614 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -69,6 +69,7 @@
#include <TypeInfo.hxx>
#include <FieldDescriptions.hxx>
#include <comphelper/stl_types.hxx>
+#include <comphelper/types.hxx>
#include <comphelper/propertysequence.hxx>
#include <svx/svxids.hrc>
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 301fac338545..676b26cbf92f 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
-#include <comphelper/sequence.hxx>
#include <connectivity/dbtools.hxx>
#include <osl/diagnose.h>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 136e83014e5a..d3003aa2aac9 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbmetadata.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index a76706572b2d..34efc1019ae5 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -19,7 +19,6 @@
#include <sfx2/sfxsids.hrc>
#include <browserids.hxx>
-#include <comphelper/types.hxx>
#include <stringconstants.hxx>
#include <connectivity/dbtools.hxx>
#include <com/sun/star/container/XChild.hpp>
@@ -36,8 +35,6 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <connectivity/dbexception.hxx>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <comphelper/streamsection.hxx>
-#include <comphelper/seqstream.hxx>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <sqlmessage.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index f3eced0bc113..d93e8a36a50a 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -24,7 +24,6 @@
#include <adtabdlg.hxx>
#include <vcl/svapp.hxx>
#include <browserids.hxx>
-#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index b5acfc05bbcd..cba04bb093e9 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/sdbcx/KeyType.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include "TableFieldInfo.hxx"
-#include <comphelper/string.hxx>
#include <UITools.hxx>
#include <svtools/treelistentry.hxx>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 077376b66ceb..abce427f98e7 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -37,7 +37,6 @@
#include <strings.hxx>
#include <unotools/configmgr.hxx>
#include <comphelper/string.hxx>
-#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
#include <com/sun/star/i18n/XLocaleData.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index a2da22fc1304..1b192ce1dcca 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -27,7 +27,6 @@
#include <stringconstants.hxx>
#include <vcl/split.hxx>
#include <vcl/svapp.hxx>
-#include <comphelper/types.hxx>
#include <QueryDesignView.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 39f1c0a5866e..455adc02121d 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -27,7 +27,6 @@
#include <browserids.hxx>
#include <comphelper/stl_types.hxx>
#include <comphelper/string.hxx>
-#include <comphelper/types.hxx>
#include "TableFieldInfo.hxx"
#include <core_resource.hxx>
#include <strings.hrc>
diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx
index 25ce126c306d..6aede7e64b54 100644
--- 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 <comphelper/stl_types.hxx>
#include <ConnectionLineAccess.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 8f065adb3a43..f7659b211088 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -68,8 +68,6 @@
#include <comphelper/propertysequence.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/property.hxx>
-#include <comphelper/seqstream.hxx>
-#include <comphelper/streamsection.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 78ffb0d342d8..1ccb6d649d12 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -52,8 +52,6 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbmetadata.hxx>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <comphelper/streamsection.hxx>
-#include <comphelper/seqstream.hxx>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <sqlmessage.hxx>
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index eafa83720b28..6b46690fb5b8 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -23,7 +23,6 @@
#include <svl/undo.hxx>
#include <vcl/svapp.hxx>
#include <browserids.hxx>
-#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 2346efadd685..86b5b44e48be 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <stringconstants.hxx>
#include <connectivity/dbtools.hxx>
-#include <comphelper/sequence.hxx>
#include <helpids.h>
#include <RelationDesignView.hxx>
#include <JoinController.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index de6d7fef6aa1..71c6e722fecc 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -56,7 +56,6 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <comphelper/processfactory.hxx>
-#include <comphelper/streamsection.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 683d84c2abe7..748b47ff8a5c 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -25,7 +25,6 @@
#include "TableFieldDescWin.hxx"
#include <TableRow.hxx>
#include <unotools/configmgr.hxx>
-#include <comphelper/types.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <unotools/syslocale.hxx>
#include <vcl/settings.hxx>
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 8f1d34334555..4b361e5ef3e6 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -24,6 +24,7 @@
#include <dbu_reghelper.hxx>
#include <advancedsettingsdlg.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/proparrhlp.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index 716add82c7db..63799e50dabf 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -26,7 +26,6 @@
#include <cppuhelper/queryinterface.hxx>
#include <stringconstants.hxx>
#include <dbu_reghelper.hxx>
-#include <comphelper/property.hxx>
extern "C" void createRegistryInfo_OColumnControlModel()
{
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index 6be18eba68df..7177ace3845b 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -22,6 +22,8 @@
#include <unoadmin.hxx>
+#include <comphelper/proparrhlp.hxx>
+
namespace dbaui
{
class ODBTypeWizDialog final
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index d70aac205b57..a65062ce083e 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -22,6 +22,8 @@
#include <unoadmin.hxx>
+#include <comphelper/proparrhlp.hxx>
+
namespace dbaui
{
class ODBTypeWizDialogSetup final
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 3a8d9b7f3f6e..075f703f4c2b 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -22,6 +22,8 @@
#include <unoadmin.hxx>
+#include <comphelper/proparrhlp.hxx>
+
namespace dbaui
{
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index b7b7cc66e469..3d54cc9e3940 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -22,6 +22,8 @@
#include <unoadmin.hxx>
+#include <comphelper/proparrhlp.hxx>
+
namespace dbaui
{
// OUserSettingsDialog
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index e0e80e8586ae..394ad2db53c2 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -22,6 +22,8 @@
#include <unoadmin.hxx>
+#include <comphelper/proparrhlp.hxx>
+
namespace dbaui
{
class ODataSourcePropertyDialog final
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index ddc09cb37d32..5ceef84c9fb9 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XRowSet.hpp>
+#include <comphelper/proparrhlp.hxx>
#include <svtools/genericunodialog.hxx>
#include <apitools.hxx>
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 965fd6291a98..46f17eb47a45 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/sdb/XTextConnectionSettings.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/proparrhlp.hxx>
#include <svtools/genericunodialog.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index c100adee7dd5..9855e31cf1bf 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -26,6 +26,7 @@
#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>
namespace dbaui
{
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index 7c665ce21ef3..c19e4d09c9f3 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -23,7 +23,6 @@
#include <unoadmin.hxx>
#include <dbadmin.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/property.hxx>
// --- needed because of the solar mutex
#include <osl/mutex.hxx>
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 620377d60e62..3a59f5cfd854 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -35,7 +35,6 @@
#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 4fb84d39d2d1..372598abdb9d 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -36,7 +36,6 @@
#include <vcl/svmain.hxx>
#include <com/sun/star/beans/NamedValue.hpp>
-#include <comphelper/storagehelper.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <unotools/mediadescriptor.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 5db21a5a40ca..d6755d83d135 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX
-#include <comphelper/sequence.hxx>
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list