summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx3
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx3
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx3
-rw-r--r--accessibility/source/extended/AccessibleToolPanelDeck.cxx2
-rw-r--r--accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx2
-rw-r--r--accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx2
-rw-r--r--basctl/source/basicide/doceventnotifier.cxx2
-rw-r--r--basctl/source/basicide/docsignature.cxx4
-rw-r--r--basctl/source/basicide/documentenumeration.cxx2
-rw-r--r--basctl/source/basicide/documentenumeration.hxx2
-rw-r--r--basctl/source/basicide/scriptdocument.cxx2
-rw-r--r--basctl/source/inc/doceventnotifier.hxx2
-rw-r--r--basctl/source/inc/docsignature.hxx2
-rw-r--r--basctl/source/inc/scriptdocument.hxx2
-rw-r--r--basic/inc/basic/basicmanagerrepository.hxx2
-rw-r--r--basic/source/basmgr/basicmanagerrepository.cxx2
-rw-r--r--basic/source/uno/sbservices.cxx3
-rw-r--r--chart2/source/controller/main/ChartModelClone.cxx2
-rw-r--r--chart2/source/controller/main/ChartModelClone.hxx2
-rw-r--r--chart2/source/model/main/UndoManager.cxx2
-rw-r--r--chart2/source/model/main/UndoManager.hxx2
-rw-r--r--comphelper/inc/comphelper/anycompare.hxx2
-rw-r--r--comphelper/inc/comphelper/componentbase.hxx4
-rw-r--r--comphelper/inc/comphelper/componentcontext.hxx2
-rw-r--r--comphelper/inc/comphelper/componentguard.hxx2
-rw-r--r--comphelper/inc/comphelper/componentmodule.hxx2
-rw-r--r--comphelper/inc/comphelper/documentinfo.hxx2
-rw-r--r--comphelper/inc/comphelper/listenernotification.hxx2
-rw-r--r--comphelper/inc/comphelper/logging.hxx2
-rw-r--r--comphelper/inc/comphelper/namedvaluecollection.hxx2
-rw-r--r--comphelper/inc/comphelper/officeresourcebundle.hxx2
-rw-r--r--comphelper/inc/comphelper/propertybag.hxx3
-rw-r--r--comphelper/source/container/enumerablemap.cxx2
-rw-r--r--comphelper/source/misc/anycompare.cxx4
-rw-r--r--comphelper/source/misc/componentbase.cxx2
-rw-r--r--comphelper/source/misc/componentcontext.cxx2
-rw-r--r--comphelper/source/misc/componentmodule.cxx2
-rw-r--r--comphelper/source/misc/documentinfo.cxx2
-rw-r--r--comphelper/source/misc/listenernotification.cxx2
-rw-r--r--comphelper/source/misc/logging.cxx2
-rw-r--r--comphelper/source/misc/officeresourcebundle.cxx2
-rw-r--r--comphelper/source/misc/synchronousdispatch.cxx2
-rw-r--r--comphelper/source/property/opropertybag.hxx2
-rw-r--r--comphelper/source/property/propertybag.cxx2
-rw-r--r--connectivity/inc/connectivity/dbmetadata.hxx2
-rw-r--r--connectivity/inc/connectivity/filtermanager.hxx2
-rw-r--r--connectivity/inc/connectivity/formattedcolumnvalue.hxx2
-rw-r--r--connectivity/inc/connectivity/parameters.hxx2
-rw-r--r--connectivity/inc/connectivity/paramwrapper.hxx2
-rw-r--r--connectivity/inc/connectivity/sqlerror.hxx2
-rw-r--r--connectivity/inc/connectivity/statementcomposer.hxx2
-rw-r--r--connectivity/inc/connectivity/warningscontainer.hxx2
-rw-r--r--connectivity/source/commontools/dbmetadata.cxx2
-rw-r--r--connectivity/source/commontools/dbtools.cxx2
-rw-r--r--connectivity/source/commontools/filtermanager.cxx2
-rw-r--r--connectivity/source/commontools/formattedcolumnvalue.cxx2
-rw-r--r--connectivity/source/commontools/parameters.cxx2
-rw-r--r--connectivity/source/commontools/paramwrapper.cxx2
-rw-r--r--connectivity/source/commontools/sqlerror.cxx2
-rw-r--r--connectivity/source/commontools/statementcomposer.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HConnection.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HTools.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HView.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/ConnectionLog.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/ContextClassLoader.cxx4
-rw-r--r--connectivity/source/drivers/kab/KDriver.cxx2
-rw-r--r--connectivity/source/drivers/kab/KDriver.hxx2
-rw-r--r--connectivity/source/drivers/macab/MacabDriver.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabDriver.hxx2
-rw-r--r--connectivity/source/inc/hsqldb/HConnection.hxx2
-rw-r--r--connectivity/source/inc/hsqldb/HTools.hxx3
-rw-r--r--connectivity/source/inc/hsqldb/HView.hxx2
-rw-r--r--connectivity/source/inc/java/ContextClassLoader.hxx3
-rw-r--r--connectivity/source/inc/java/GlobalRef.hxx3
-rw-r--r--connectivity/source/inc/java/LocalRef.hxx3
-rw-r--r--connectivity/source/inc/java/sql/ConnectionLog.hxx2
-rw-r--r--connectivity/source/inc/resource/sharedresources.hxx3
-rw-r--r--connectivity/source/resource/sharedresources.cxx2
-rw-r--r--dbaccess/inc/controllerframe.hxx2
-rw-r--r--dbaccess/inc/dbaundomanager.hxx2
-rw-r--r--dbaccess/inc/dbsubcomponentcontroller.hxx2
-rw-r--r--dbaccess/inc/genericcontroller.hxx2
-rw-r--r--dbaccess/source/core/api/RowSet.cxx2
-rw-r--r--dbaccess/source/core/api/RowSet.hxx2
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx2
-rw-r--r--dbaccess/source/core/api/View.cxx2
-rw-r--r--dbaccess/source/core/api/columnsettings.cxx2
-rw-r--r--dbaccess/source/core/api/definitioncolumn.cxx2
-rw-r--r--dbaccess/source/core/api/query.cxx2
-rw-r--r--dbaccess/source/core/api/querycontainer.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/connection.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/connection.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/databaseregistrations.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databaseregistrations.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/documenteventexecutor.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/documenteventexecutor.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/documenteventnotifier.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/documenteventnotifier.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.hxx2
-rw-r--r--dbaccess/source/core/inc/View.hxx2
-rw-r--r--dbaccess/source/core/inc/columnsettings.hxx2
-rw-r--r--dbaccess/source/core/inc/composertools.hxx2
-rw-r--r--dbaccess/source/core/inc/containerapprove.hxx2
-rw-r--r--dbaccess/source/core/inc/objectnameapproval.hxx2
-rw-r--r--dbaccess/source/core/inc/querycontainer.hxx2
-rw-r--r--dbaccess/source/core/inc/recovery/dbdocrecovery.hxx2
-rw-r--r--dbaccess/source/core/inc/sdbcoretools.hxx2
-rw-r--r--dbaccess/source/core/inc/veto.hxx2
-rw-r--r--dbaccess/source/core/misc/objectnameapproval.cxx2
-rw-r--r--dbaccess/source/core/misc/sdbcoretools.cxx2
-rw-r--r--dbaccess/source/core/misc/veto.cxx4
-rw-r--r--dbaccess/source/core/recovery/dbdocrecovery.cxx2
-rw-r--r--dbaccess/source/core/recovery/settingsimport.cxx4
-rw-r--r--dbaccess/source/core/recovery/settingsimport.hxx2
-rw-r--r--dbaccess/source/core/recovery/storagestream.cxx2
-rw-r--r--dbaccess/source/core/recovery/storagestream.hxx2
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx2
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.hxx3
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.cxx2
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.hxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponentloader.cxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponentloader.hxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.hxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponents.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/docinteraction.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/docinteraction.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationwizard.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationengine.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationengine.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationerror.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationlog.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationlog.hxx3
-rw-r--r--dbaccess/source/ext/macromigration/migrationprogress.hxx3
-rw-r--r--dbaccess/source/ext/macromigration/progresscapture.cxx4
-rw-r--r--dbaccess/source/ext/macromigration/progresscapture.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/progressmixer.cxx4
-rw-r--r--dbaccess/source/ext/macromigration/progressmixer.hxx3
-rw-r--r--dbaccess/source/ext/macromigration/rangeprogressbar.hxx3
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx2
-rw-r--r--dbaccess/source/sdbtools/connection/connectiondependent.hxx2
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.cxx6
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.hxx2
-rw-r--r--dbaccess/source/sdbtools/connection/datasourcemetadata.cxx2
-rw-r--r--dbaccess/source/sdbtools/connection/datasourcemetadata.hxx2
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.cxx2
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.hxx2
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.cxx2
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.hxx2
-rw-r--r--dbaccess/source/ui/app/AppController.cxx2
-rw-r--r--dbaccess/source/ui/app/AppController.hxx2
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx2
-rw-r--r--dbaccess/source/ui/app/IApplicationController.hxx3
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.cxx2
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.hxx2
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx2
-rw-r--r--dbaccess/source/ui/browser/dbloader.cxx2
-rw-r--r--dbaccess/source/ui/browser/dsbrowserDnD.cxx2
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx2
-rw-r--r--dbaccess/source/ui/control/charsetlistbox.cxx4
-rw-r--r--dbaccess/source/ui/control/opendoccontrols.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx2
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx4
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx3
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx2
-rw-r--r--dbaccess/source/ui/dlg/textconnectionsettings.cxx4
-rw-r--r--dbaccess/source/ui/inc/advancedsettingsdlg.hxx3
-rw-r--r--dbaccess/source/ui/inc/asyncmodaldialog.hxx2
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx2
-rw-r--r--dbaccess/source/ui/inc/charsetlistbox.hxx3
-rw-r--r--dbaccess/source/ui/inc/defaultobjectnamecheck.hxx2
-rw-r--r--dbaccess/source/ui/inc/dsmeta.hxx3
-rw-r--r--dbaccess/source/ui/inc/imageprovider.hxx2
-rw-r--r--dbaccess/source/ui/inc/objectnamecheck.hxx3
-rw-r--r--dbaccess/source/ui/inc/propertystorage.hxx2
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx2
-rw-r--r--dbaccess/source/ui/inc/singledoccontroller.hxx2
-rw-r--r--dbaccess/source/ui/inc/textconnectionsettings.hxx3
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx2
-rw-r--r--dbaccess/source/ui/misc/asyncmodaldialog.cxx2
-rw-r--r--dbaccess/source/ui/misc/controllerframe.cxx2
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx2
-rw-r--r--dbaccess/source/ui/misc/dbaundomanager.cxx2
-rw-r--r--dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx2
-rw-r--r--dbaccess/source/ui/misc/defaultobjectnamecheck.cxx2
-rw-r--r--dbaccess/source/ui/misc/dsmeta.cxx2
-rw-r--r--dbaccess/source/ui/misc/imageprovider.cxx2
-rw-r--r--dbaccess/source/ui/misc/propertystorage.cxx4
-rw-r--r--dbaccess/source/ui/misc/singledoccontroller.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx2
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.cxx2
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.hxx2
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx2
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.hxx2
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx2
-rw-r--r--extensions/source/logging/consolehandler.cxx2
-rw-r--r--extensions/source/logging/csvformatter.cxx2
-rw-r--r--extensions/source/logging/filehandler.cxx2
-rw-r--r--extensions/source/logging/log_services.cxx3
-rw-r--r--extensions/source/logging/logger.cxx2
-rw-r--r--extensions/source/logging/loggerconfig.cxx2
-rw-r--r--extensions/source/logging/loggerconfig.hxx2
-rw-r--r--extensions/source/logging/loghandler.cxx2
-rw-r--r--extensions/source/logging/loghandler.hxx2
-rw-r--r--extensions/source/logging/logrecord.cxx3
-rw-r--r--extensions/source/logging/logrecord.hxx2
-rw-r--r--extensions/source/logging/methodguard.hxx3
-rw-r--r--extensions/source/logging/plaintextformatter.cxx2
-rw-r--r--extensions/source/propctrlr/browserline.hxx2
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx2
-rw-r--r--extensions/source/propctrlr/browserlistbox.hxx2
-rw-r--r--extensions/source/propctrlr/buttonnavigationhandler.cxx2
-rw-r--r--extensions/source/propctrlr/buttonnavigationhandler.hxx3
-rw-r--r--extensions/source/propctrlr/cellbindinghandler.cxx2
-rw-r--r--extensions/source/propctrlr/cellbindinghandler.hxx2
-rw-r--r--extensions/source/propctrlr/cellbindinghelper.hxx2
-rw-r--r--extensions/source/propctrlr/commoncontrol.hxx2
-rw-r--r--extensions/source/propctrlr/composeduiupdate.cxx2
-rw-r--r--extensions/source/propctrlr/composeduiupdate.hxx2
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx2
-rw-r--r--extensions/source/propctrlr/defaultforminspection.hxx3
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.cxx2
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.hxx2
-rw-r--r--extensions/source/propctrlr/editpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/editpropertyhandler.hxx3
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx2
-rw-r--r--extensions/source/propctrlr/eformshelper.hxx2
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.hxx3
-rw-r--r--extensions/source/propctrlr/enumrepresentation.hxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.hxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.hxx2
-rw-r--r--extensions/source/propctrlr/formcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/formcontroller.hxx2
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx2
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx2
-rw-r--r--extensions/source/propctrlr/formlinkdialog.hxx2
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.hxx2
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx2
-rw-r--r--extensions/source/propctrlr/handlerhelper.hxx2
-rw-r--r--extensions/source/propctrlr/inspectorhelpwindow.cxx3
-rw-r--r--extensions/source/propctrlr/inspectorhelpwindow.hxx3
-rw-r--r--extensions/source/propctrlr/inspectormodelbase.cxx2
-rw-r--r--extensions/source/propctrlr/inspectormodelbase.hxx2
-rw-r--r--extensions/source/propctrlr/linedescriptor.hxx2
-rw-r--r--extensions/source/propctrlr/listselectiondlg.cxx3
-rw-r--r--extensions/source/propctrlr/listselectiondlg.hxx2
-rw-r--r--extensions/source/propctrlr/newdatatype.cxx3
-rw-r--r--extensions/source/propctrlr/newdatatype.hxx3
-rw-r--r--extensions/source/propctrlr/objectinspectormodel.cxx2
-rw-r--r--extensions/source/propctrlr/pcrcommon.cxx2
-rw-r--r--extensions/source/propctrlr/pcrcommon.hxx2
-rw-r--r--extensions/source/propctrlr/pcrcommontypes.hxx2
-rw-r--r--extensions/source/propctrlr/pcrcomponentcontext.cxx2
-rw-r--r--extensions/source/propctrlr/pcrcomponentcontext.hxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.hxx2
-rw-r--r--extensions/source/propctrlr/propcontrolobserver.hxx2
-rw-r--r--extensions/source/propctrlr/propertycomposer.cxx2
-rw-r--r--extensions/source/propctrlr/propertycomposer.hxx2
-rw-r--r--extensions/source/propctrlr/propertycontrolextender.cxx2
-rw-r--r--extensions/source/propctrlr/propertycontrolextender.hxx2
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx2
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx2
-rw-r--r--extensions/source/propctrlr/propertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/propertyhandler.hxx2
-rw-r--r--extensions/source/propctrlr/propeventtranslation.cxx2
-rw-r--r--extensions/source/propctrlr/propeventtranslation.hxx2
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.cxx2
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.hxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx2
-rw-r--r--extensions/source/propctrlr/submissionhandler.cxx2
-rw-r--r--extensions/source/propctrlr/submissionhandler.hxx2
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx2
-rw-r--r--extensions/source/propctrlr/xsddatatypes.cxx2
-rw-r--r--extensions/source/propctrlr/xsddatatypes.hxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationhelper.cxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationhelper.hxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx3
-rw-r--r--forms/source/component/Columns.hxx2
-rw-r--r--forms/source/component/ComboBox.cxx2
-rw-r--r--forms/source/component/ComboBox.hxx2
-rw-r--r--forms/source/component/Filter.cxx2
-rw-r--r--forms/source/component/FormComponent.cxx2
-rw-r--r--forms/source/component/Grid.cxx2
-rw-r--r--forms/source/component/Grid.hxx2
-rw-r--r--forms/source/component/ListBox.cxx2
-rw-r--r--forms/source/component/ListBox.hxx2
-rw-r--r--forms/source/component/Pattern.cxx4
-rw-r--r--forms/source/component/cachedrowset.cxx2
-rw-r--r--forms/source/component/cachedrowset.hxx2
-rw-r--r--forms/source/component/entrylisthelper.hxx2
-rw-r--r--forms/source/component/propertybaghelper.cxx2
-rw-r--r--forms/source/component/refvaluecomponent.cxx3
-rw-r--r--forms/source/component/refvaluecomponent.hxx3
-rw-r--r--forms/source/helper/commanddescriptionprovider.cxx2
-rw-r--r--forms/source/helper/commandimageprovider.cxx2
-rw-r--r--forms/source/helper/resettable.cxx4
-rw-r--r--forms/source/helper/urltransformer.cxx2
-rw-r--r--forms/source/helper/windowstateguard.cxx2
-rw-r--r--forms/source/inc/FormComponent.hxx2
-rw-r--r--forms/source/inc/commanddescriptionprovider.hxx2
-rw-r--r--forms/source/inc/commandimageprovider.hxx2
-rw-r--r--forms/source/inc/componenttools.hxx2
-rw-r--r--forms/source/inc/controlfeatureinterception.hxx2
-rw-r--r--forms/source/inc/listenercontainers.hxx2
-rw-r--r--forms/source/inc/propertybaghelper.hxx2
-rw-r--r--forms/source/inc/resettable.hxx2
-rw-r--r--forms/source/inc/togglestate.hxx3
-rw-r--r--forms/source/inc/urltransformer.hxx2
-rw-r--r--forms/source/inc/windowstateguard.hxx2
-rw-r--r--forms/source/misc/componenttools.cxx2
-rw-r--r--forms/source/misc/listenercontainers.cxx4
-rw-r--r--forms/source/richtext/attributedispatcher.cxx2
-rw-r--r--forms/source/richtext/clipboarddispatcher.cxx2
-rw-r--r--forms/source/richtext/featuredispatcher.cxx3
-rw-r--r--forms/source/richtext/featuredispatcher.hxx2
-rw-r--r--forms/source/richtext/richtextcontrol.cxx2
-rw-r--r--forms/source/richtext/richtextcontrol.hxx2
-rw-r--r--forms/source/richtext/richtextmodel.cxx2
-rw-r--r--forms/source/richtext/richtextmodel.hxx2
-rw-r--r--forms/source/richtext/richtextunowrapper.cxx2
-rw-r--r--forms/source/richtext/richtextvclcontrol.hxx3
-rw-r--r--forms/source/runtime/formoperations.cxx2
-rw-r--r--forms/source/runtime/formoperations.hxx2
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx2
-rw-r--r--forms/source/solar/component/navbarcontrol.hxx2
-rw-r--r--forms/source/xforms/datatyperepository.cxx2
-rw-r--r--forms/source/xforms/datatyperepository.hxx2
-rw-r--r--forms/source/xforms/datatypes.hxx2
-rw-r--r--fpicker/source/office/asyncfilepicker.hxx3
-rw-r--r--fpicker/source/office/fpsmartcontent.cxx2
-rw-r--r--fpicker/source/office/fpsmartcontent.hxx2
-rw-r--r--framework/inc/framework/documentundoguard.hxx2
-rw-r--r--framework/inc/framework/undomanagerhelper.hxx2
-rw-r--r--framework/source/fwe/helper/documentundoguard.cxx2
-rw-r--r--framework/source/fwe/helper/undomanagerhelper.cxx2
-rw-r--r--reportdesign/inc/ReportDefinition.hxx2
-rw-r--r--reportdesign/inc/UndoActions.hxx2
-rw-r--r--reportdesign/inc/conditionalexpression.hxx4
-rw-r--r--reportdesign/inc/reportformula.hxx2
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx2
-rw-r--r--reportdesign/source/core/inc/conditionupdater.hxx2
-rw-r--r--reportdesign/source/core/misc/conditionalexpression.cxx3
-rw-r--r--reportdesign/source/core/misc/conditionupdater.cxx2
-rw-r--r--reportdesign/source/core/misc/reportformula.cxx4
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx2
-rw-r--r--reportdesign/source/core/sdr/UndoEnv.cxx2
-rw-r--r--reportdesign/source/core/sdr/formatnormalizer.cxx2
-rw-r--r--reportdesign/source/core/sdr/formatnormalizer.hxx2
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.cxx2
-rw-r--r--reportdesign/source/ui/inc/DefaultInspection.hxx2
-rw-r--r--reportdesign/source/ui/inc/FixedTextColor.hxx2
-rw-r--r--reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx2
-rw-r--r--reportdesign/source/ui/inc/IReportControllerObserver.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx2
-rw-r--r--reportdesign/source/ui/inc/metadata.hxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.hxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelFactory.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelUIElement.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelUIElement.hxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx2
-rw-r--r--sd/workben/custompanel/ctp_panel.cxx2
-rw-r--r--sd/workben/custompanel/ctp_panel.hxx2
-rw-r--r--sfx2/inc/frmload.hxx2
-rw-r--r--sfx2/inc/sfx2/docmacromode.hxx2
-rw-r--r--sfx2/inc/sfx2/docstoragemodifylistener.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxmodelfactory.hxx2
-rw-r--r--sfx2/inc/sfx2/userinputinterception.hxx2
-rw-r--r--sfx2/source/dialog/taskpane.cxx2
-rw-r--r--sfx2/source/doc/docmacromode.cxx2
-rw-r--r--sfx2/source/doc/docstoragemodifylistener.cxx4
-rw-r--r--sfx2/source/doc/docundomanager.cxx2
-rw-r--r--sfx2/source/doc/sfxmodelfactory.cxx2
-rw-r--r--sfx2/source/inc/docundomanager.hxx2
-rw-r--r--sfx2/source/view/frmload.cxx2
-rw-r--r--sfx2/source/view/userinputinterception.cxx2
-rw-r--r--sfx2/workben/custompanel/ctp_factory.cxx2
-rw-r--r--sfx2/workben/custompanel/ctp_factory.hxx2
-rw-r--r--sfx2/workben/custompanel/ctp_panel.cxx2
-rw-r--r--sfx2/workben/custompanel/ctp_panel.hxx2
-rw-r--r--sfx2/workben/custompanel/ctp_services.cxx4
-rw-r--r--svtools/inc/svtools/imageresourceaccess.hxx2
-rw-r--r--svtools/source/contnr/contentenumeration.cxx2
-rw-r--r--svtools/source/contnr/contentenumeration.hxx2
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx2
-rw-r--r--svtools/source/table/cellvalueconversion.cxx4
-rw-r--r--svtools/source/table/cellvalueconversion.hxx2
-rw-r--r--svtools/source/table/gridtablerenderer.cxx2
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx2
-rw-r--r--svtools/source/toolpanel/paneltabbarpeer.cxx2
-rw-r--r--svtools/source/toolpanel/paneltabbarpeer.hxx3
-rw-r--r--svtools/source/toolpanel/toolpaneldeck.cxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldeckpeer.cxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldeckpeer.hxx3
-rw-r--r--svtools/source/toolpanel/toolpaneldrawerpeer.cxx2
-rw-r--r--svtools/source/uno/unocontroltablemodel.cxx2
-rw-r--r--svtools/source/uno/unocontroltablemodel.hxx2
-rw-r--r--svtools/source/uno/unogridcolumnfacade.cxx2
-rw-r--r--svtools/source/uno/unogridcolumnfacade.hxx2
-rw-r--r--svtools/source/uno/unowizard.hxx2
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx2
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.cxx2
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.hxx2
-rw-r--r--svtools/source/uno/wizard/wizardshell.cxx2
-rw-r--r--svtools/source/uno/wizard/wizardshell.hxx2
-rw-r--r--svtools/workben/unodialog/udlg_services.cxx3
-rw-r--r--svtools/workben/unodialog/unodialogsample.cxx3
-rw-r--r--svx/inc/svx/databaselocationinput.hxx3
-rw-r--r--svx/inc/svx/fmsrcimp.hxx2
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx2
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx2
-rw-r--r--svx/inc/svx/shapeproperty.hxx3
-rw-r--r--svx/inc/svx/shapepropertynotifier.hxx2
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/form/databaselocationinput.cxx2
-rw-r--r--svx/source/form/filtnav.cxx2
-rw-r--r--svx/source/form/fmPropBrw.cxx2
-rw-r--r--svx/source/form/fmcontrolbordermanager.cxx2
-rw-r--r--svx/source/form/fmcontrollayout.cxx2
-rw-r--r--svx/source/form/fmdocumentclassification.cxx2
-rw-r--r--svx/source/form/fmobj.cxx2
-rw-r--r--svx/source/form/fmscriptingenv.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx2
-rw-r--r--svx/source/form/fmtextcontrolfeature.cxx3
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx2
-rw-r--r--svx/source/form/fmtools.cxx2
-rw-r--r--svx/source/form/fmundo.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx2
-rw-r--r--svx/source/form/formcontrolfactory.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/form/formcontrolling.cxx2
-rw-r--r--svx/source/form/formdispatchinterceptor.cxx4
-rw-r--r--svx/source/form/formtoolbars.cxx2
-rw-r--r--svx/source/form/legacyformcontroller.cxx2
-rw-r--r--svx/source/form/stringlistresource.cxx4
-rw-r--r--svx/source/form/xfm_addcondition.cxx2
-rw-r--r--svx/source/inc/fmPropBrw.hxx2
-rw-r--r--svx/source/inc/fmcontrolbordermanager.hxx2
-rw-r--r--svx/source/inc/fmcontrollayout.hxx2
-rw-r--r--svx/source/inc/fmdocumentclassification.hxx2
-rw-r--r--svx/source/inc/fmexpl.hxx2
-rw-r--r--svx/source/inc/fmscriptingenv.hxx2
-rw-r--r--svx/source/inc/fmtextcontrolfeature.hxx2
-rw-r--r--svx/source/inc/fmtextcontrolshell.hxx2
-rw-r--r--svx/source/inc/fmundo.hxx2
-rw-r--r--svx/source/inc/fmvwimp.hxx2
-rw-r--r--svx/source/inc/formcontrolfactory.hxx2
-rw-r--r--svx/source/inc/formcontroller.hxx2
-rw-r--r--svx/source/inc/formdispatchinterceptor.hxx2
-rw-r--r--svx/source/inc/formfeaturedispatcher.hxx2
-rw-r--r--svx/source/inc/gridcell.hxx2
-rw-r--r--svx/source/inc/xfm_addcondition.hxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofunocontrol.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx2
-rw-r--r--svx/source/unodraw/shapepropertynotifier.cxx2
-rw-r--r--toolkit/inc/toolkit/awt/animatedimagespeer.hxx2
-rw-r--r--toolkit/inc/toolkit/controls/animatedimages.hxx2
-rw-r--r--toolkit/inc/toolkit/controls/spinningprogress.hxx3
-rw-r--r--toolkit/inc/toolkit/helper/formpdfexport.hxx2
-rw-r--r--toolkit/inc/toolkit/helper/imagealign.hxx4
-rw-r--r--toolkit/source/awt/animatedimagespeer.cxx2
-rw-r--r--toolkit/source/awt/stylesettings.cxx2
-rw-r--r--toolkit/source/awt/stylesettings.hxx2
-rw-r--r--toolkit/source/controls/animatedimages.cxx2
-rw-r--r--toolkit/source/controls/grid/defaultgridcolumnmodel.cxx2
-rw-r--r--toolkit/source/controls/grid/defaultgridcolumnmodel.hxx2
-rw-r--r--toolkit/source/controls/grid/grideventforwarder.cxx4
-rw-r--r--toolkit/source/controls/grid/grideventforwarder.hxx2
-rw-r--r--toolkit/source/controls/grid/initguard.hxx2
-rw-r--r--toolkit/source/controls/grid/sortablegriddatamodel.cxx2
-rw-r--r--toolkit/source/controls/grid/sortablegriddatamodel.hxx2
-rw-r--r--toolkit/source/controls/spinningprogress.cxx2
-rw-r--r--toolkit/source/helper/formpdfexport.cxx2
-rw-r--r--ucb/source/ucp/ext/ucpext_content.cxx2
-rw-r--r--ucb/source/ucp/ext/ucpext_content.hxx2
-rw-r--r--ucb/source/ucp/ext/ucpext_datasupplier.cxx2
-rw-r--r--ucb/source/ucp/ext/ucpext_provider.cxx4
-rw-r--r--ucb/source/ucp/ext/ucpext_resultset.cxx4
-rw-r--r--ucb/source/ucp/ext/ucpext_services.cxx4
-rw-r--r--unotools/inc/unotools/closeveto.hxx2
-rw-r--r--unotools/inc/unotools/componentresmodule.hxx2
-rw-r--r--unotools/inc/unotools/desktopterminationobserver.hxx3
-rw-r--r--unotools/source/misc/closeveto.cxx2
-rw-r--r--unotools/source/misc/desktopterminationobserver.cxx2
-rw-r--r--xmloff/inc/xmloff/XMLSettingsExportContext.hxx2
-rw-r--r--xmloff/source/forms/elementexport.cxx2
-rw-r--r--xmloff/source/forms/elementimport.cxx2
-rw-r--r--xmloff/source/forms/elementimport.hxx2
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.cxx2
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.hxx2
-rw-r--r--xmloff/source/forms/layerexport.cxx2
511 files changed, 1 insertions, 1134 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
index df76b8b050d5..24462dd291aa 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
@@ -20,9 +20,6 @@
#ifndef ACC_ACCESSIBLETOOLPANELDECK_HXX
#define ACC_ACCESSIBLETOOLPANELDECK_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/implbase1.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
index 3a27c63ae20a..ad81c5897d33 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
@@ -20,9 +20,6 @@
#ifndef ACC_ACCESSIBLETOOLPANELTABBAR_HXX
#define ACC_ACCESSIBLETOOLPANELTABBAR_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/implbase1.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
index 3516bbb2564d..8126621dac70 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
@@ -20,9 +20,6 @@
#ifndef ACC_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX
#define ACC_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index b0a7ff82f546..786a4b408a01 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -28,12 +28,10 @@
#include "accessibility/extended/AccessibleToolPanelDeck.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <svtools/toolpanel/toolpaneldeck.hxx>
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 8ede78c910bd..6a58f99c88a1 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -31,12 +31,10 @@
#include "accessibility/helper/accresmgr.hxx"
#include "accessibility/helper/accessiblestrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <svtools/toolpanel/toolpaneldeck.hxx>
#include <svtools/toolpanel/paneltabbar.hxx>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index fb51f547e8a0..87ef61eee5f9 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -28,12 +28,10 @@
#include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <svtools/toolpanel/toolpaneldeck.hxx>
#include <svtools/toolpanel/paneltabbar.hxx>
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 2e6175d1e7b9..bc863a29b4b9 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -21,9 +21,7 @@
#include "doceventnotifier.hxx"
#include "scriptdocument.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XEventBroadcaster.hpp>
-/** === end UNO includes === **/
#include <vcl/svapp.hxx>
diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx
index c1284d3447b6..17adaf30822f 100644
--- a/basctl/source/basicide/docsignature.cxx
+++ b/basctl/source/basicide/docsignature.cxx
@@ -17,13 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "docsignature.hxx"
#include "scriptdocument.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <sfx2/objsh.hxx>
#include <sfx2/signaturestate.hxx>
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index 8f0b634c785d..87f521cc5393 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -20,13 +20,11 @@
#include "documentenumeration.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/frame/XModel2.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XFramesSupplier.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx
index 998a579c924f..4ee864626fed 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -20,10 +20,8 @@
#ifndef BASCTL_DOCUMENTENUMERATION_HXX
#define BASCTL_DOCUMENTENUMERATION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XController.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index e1ef569373fe..f0a92f756d6c 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -25,7 +25,6 @@
#include "doceventnotifier.hxx"
#include "documentenumeration.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
@@ -37,7 +36,6 @@
#include <com/sun/star/document/XEmbeddedScripts.hpp>
#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
-/** === end UNO includes === **/
#include <sfx2/objsh.hxx>
#include <sfx2/app.hxx>
diff --git a/basctl/source/inc/doceventnotifier.hxx b/basctl/source/inc/doceventnotifier.hxx
index 071ee0e57f90..145e18dea019 100644
--- a/basctl/source/inc/doceventnotifier.hxx
+++ b/basctl/source/inc/doceventnotifier.hxx
@@ -20,9 +20,7 @@
#ifndef BASCTL_DOCEVENTNOTIFIER_HXX
#define BASCTL_DOCEVENTNOTIFIER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx
index 86faed75133f..4ff3e2a48c7b 100644
--- a/basctl/source/inc/docsignature.hxx
+++ b/basctl/source/inc/docsignature.hxx
@@ -19,9 +19,7 @@
#ifndef BASCTL_DOCSIGNATURE_HXX
#define BASCTL_DOCSIGNATURE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
#include <memory>
diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx
index f525586fe30c..e941222b21e3 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -20,12 +20,10 @@
#ifndef SCRIPTDOCUMENT_HXX
#define SCRIPTDOCUMENT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/io/XInputStreamProvider.hpp>
-/** === end UNO includes === **/
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/basic/inc/basic/basicmanagerrepository.hxx
index bf7d8a803162..42adef060986 100644
--- a/basic/inc/basic/basicmanagerrepository.hxx
+++ b/basic/inc/basic/basicmanagerrepository.hxx
@@ -29,10 +29,8 @@
#ifndef BASICMANAGERREPOSITORY_HXX
#define BASICMANAGERREPOSITORY_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-/** === end UNO includes === **/
#include "basicdllapi.h"
class BasicManager;
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index f3ef0b11b282..f318dd0723a8 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -33,11 +33,9 @@
#include <basic/sbuno.hxx>
#include "sbintern.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
-/** === end UNO includes === **/
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index 6b22e1868301..9f804905f2e6 100644
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
@@ -28,9 +28,6 @@
#include "sbmodule.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace basic
{
diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx
index 4d6b3c888aac..ed9717e6f79c 100644
--- a/chart2/source/controller/main/ChartModelClone.cxx
+++ b/chart2/source/controller/main/ChartModelClone.cxx
@@ -23,7 +23,6 @@
#include "ControllerLockGuard.hxx"
#include "DataSourceHelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
@@ -33,7 +32,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
-/** === end UNO includes === **/
#include <comphelper/property.hxx>
#include <tools/diagnose_ex.h>
diff --git a/chart2/source/controller/main/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx
index 851387926314..a4af3d25b0f9 100644
--- a/chart2/source/controller/main/ChartModelClone.hxx
+++ b/chart2/source/controller/main/ChartModelClone.hxx
@@ -20,10 +20,8 @@
#ifndef CHART2_CHARTMODELCLONE_HXX
#define CHART2_CHARTMODELCLONE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/chart2/XInternalDataProvider.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 95095db4385a..65bca73bb660 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -29,9 +29,7 @@
#include "UndoManager.hxx"
#include "ChartViewHelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <framework/undomanagerhelper.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx
index 55eceda01ae1..c261b6c85024 100644
--- a/chart2/source/model/main/UndoManager.hxx
+++ b/chart2/source/model/main/UndoManager.hxx
@@ -20,11 +20,9 @@
#ifndef CHART2_UNDOMANAGER_HXX
#define CHART2_UNDOMANAGER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/document/XUndoManager.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
diff --git a/comphelper/inc/comphelper/anycompare.hxx b/comphelper/inc/comphelper/anycompare.hxx
index 7295332c14ba..5ae1d938cae8 100644
--- a/comphelper/inc/comphelper/anycompare.hxx
+++ b/comphelper/inc/comphelper/anycompare.hxx
@@ -22,10 +22,8 @@
#include "comphelper/comphelperdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/i18n/XCollator.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
diff --git a/comphelper/inc/comphelper/componentbase.hxx b/comphelper/inc/comphelper/componentbase.hxx
index 7c82ea371a96..0b81031f5b8a 100644
--- a/comphelper/inc/comphelper/componentbase.hxx
+++ b/comphelper/inc/comphelper/componentbase.hxx
@@ -29,10 +29,6 @@
#define COMPHELPER_COMPONENTBASE_HXX
#include "comphelper/comphelperdllapi.h"
-
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/interfacecontainer.hxx>
//........................................................................
diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx
index 5b6a901385c3..1ea3d76273e8 100644
--- a/comphelper/inc/comphelper/componentcontext.hxx
+++ b/comphelper/inc/comphelper/componentcontext.hxx
@@ -31,10 +31,8 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper
diff --git a/comphelper/inc/comphelper/componentguard.hxx b/comphelper/inc/comphelper/componentguard.hxx
index 9c2c55b13608..3fc17f94dfe7 100644
--- a/comphelper/inc/comphelper/componentguard.hxx
+++ b/comphelper/inc/comphelper/componentguard.hxx
@@ -20,9 +20,7 @@
#ifndef COMPHELPER_COMPONENTGUARD_HXX
#define COMPHELPER_COMPONENTGUARD_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index 8397e7c5fce7..dc106cef3e1a 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.hxx
@@ -30,10 +30,8 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-/** === end UNO includes === **/
#include <cppuhelper/factory.hxx>
diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/comphelper/inc/comphelper/documentinfo.hxx
index 1d092a2f805d..e97b749443b2 100644
--- a/comphelper/inc/comphelper/documentinfo.hxx
+++ b/comphelper/inc/comphelper/documentinfo.hxx
@@ -22,9 +22,7 @@
#include "comphelper/comphelperdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper {
diff --git a/comphelper/inc/comphelper/listenernotification.hxx b/comphelper/inc/comphelper/listenernotification.hxx
index 46ae73a1f651..f79f796eee72 100644
--- a/comphelper/inc/comphelper/listenernotification.hxx
+++ b/comphelper/inc/comphelper/listenernotification.hxx
@@ -31,9 +31,7 @@
#include <cppuhelper/interfacecontainer.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XEventListener.hpp>
-/** === end UNO includes === **/
#include "comphelper/comphelperdllapi.h"
#include <memory>
diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx
index 2b1d03e30760..c9cb2d47748b 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/comphelper/inc/comphelper/logging.hxx
@@ -31,11 +31,9 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/logging/XLogHandler.hpp>
#include <com/sun/star/logging/LogLevel.hpp>
-/** === end UNO includes === **/
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx
index bfaa1a017bde..6a0335e4a145 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.hxx
@@ -31,12 +31,10 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-/** === end UNO includes === **/
#include <memory>
#include <algorithm>
diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx
index 4946feeb6157..595596d31c68 100644
--- a/comphelper/inc/comphelper/officeresourcebundle.hxx
+++ b/comphelper/inc/comphelper/officeresourcebundle.hxx
@@ -31,9 +31,7 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
-/** === end UNO includes === **/
#include <rtl/ustring.hxx>
#include <memory>
diff --git a/comphelper/inc/comphelper/propertybag.hxx b/comphelper/inc/comphelper/propertybag.hxx
index 7491e75db4fc..997b9e37015a 100644
--- a/comphelper/inc/comphelper/propertybag.hxx
+++ b/comphelper/inc/comphelper/propertybag.hxx
@@ -23,9 +23,6 @@
#include "comphelper/comphelperdllapi.h"
#include <comphelper/propertycontainerhelper.hxx>
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <memory>
//........................................................................
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index d55465c2af16..6d8d27355d69 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -33,13 +33,11 @@
#include "comphelper/componentcontext.hxx"
#include "comphelper/extract.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XEnumerableMap.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/beans/Pair.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index 5ee5c109a67f..66e8a7bd02aa 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -25,12 +25,8 @@
*
************************************************************************/
-
#include "comphelper/anycompare.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//......................................................................................................................
namespace comphelper
{
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index 872f1e11a503..c13256295498 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -20,10 +20,8 @@
#include "comphelper/componentbase.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NotInitializedException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper
diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
index a1cc1711853b..a57c63739574 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.cxx
@@ -28,11 +28,9 @@
#include <comphelper/componentcontext.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 6f4e1fe6f60d..a39f4ba82167 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -28,8 +28,6 @@
#include <comphelper/componentmodule.hxx>
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <comphelper/sequence.hxx>
#include <osl/diagnose.h>
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 7a7e69bb8e2d..eb26e702d6fc 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -30,13 +30,11 @@
#include "comphelper/documentinfo.hxx"
#include "comphelper/namedvaluecollection.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/frame/XTitle.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/exc_hlp.hxx>
diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx
index e3d189ac8813..8947b6003b6f 100644
--- a/comphelper/source/misc/listenernotification.cxx
+++ b/comphelper/source/misc/listenernotification.cxx
@@ -19,9 +19,7 @@
#include <comphelper/listenernotification.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index a72d8c887f5e..846b62d32897 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -30,12 +30,10 @@
#include <comphelper/logging.hxx>
#include <comphelper/componentcontext.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/logging/LoggerPool.hpp>
#include <com/sun/star/logging/LogLevel.hpp>
#include <com/sun/star/resource/XResourceBundle.hpp>
#include <com/sun/star/resource/XResourceBundleLoader.hpp>
-/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index db51b134cef1..2efa02cc9428 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.cxx
@@ -28,11 +28,9 @@
#include <comphelper/officeresourcebundle.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/resource/XResourceBundle.hpp>
#include <com/sun/star/resource/XResourceBundleLoader.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
-/** === end UNO includes === **/
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index f25fb8aed7f6..f699ec3d79d4 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.cxx
@@ -27,13 +27,11 @@
************************************************************************/
-/** === begin UNO includes === **/
#include "com/sun/star/frame/XDispatchProvider.hpp"
#include "com/sun/star/frame/XSynchronousDispatch.hpp"
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/util/XURLTransformer.hpp"
-/** === end UNO includes === **/
#include "comphelper/synchronousdispatch.hxx"
#include "comphelper/processfactory.hxx"
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 0fd4b1c84b95..f5dbf4ebfd9c 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -20,7 +20,6 @@
#ifndef COMPHELPER_OPROPERTYBAG_HXX
#define COMPHELPER_OPROPERTYBAG_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -30,7 +29,6 @@
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/container/XSet.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase6.hxx>
#include <comphelper/propstate.hxx>
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index 4583153d789c..d2752c18fe7e 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -28,13 +28,11 @@
#include "comphelper/propertybag.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/IllegalTypeException.hpp>
#include <com/sun/star/beans/PropertyExistException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/NotRemoveableException.hpp>
-/** === end UNO includes === **/
#include <map>
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index 42eb5fc62baf..cc4cd02e5216 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -20,9 +20,7 @@
#ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
#define CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XConnection.hpp>
-/** === end UNO includes === **/
#include <memory>
#include "connectivity/dbtoolsdllapi.hxx"
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx
index 65516ce7c46c..f52d6d6727e1 100644
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/connectivity/inc/connectivity/filtermanager.hxx
@@ -19,12 +19,10 @@
#ifndef CONNECTIVITY_FILTERMANAGER_HXX
#define CONNECTIVITY_FILTERMANAGER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/XSQLQueryComposer.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
index 7e222fd187cb..a56147afa011 100644
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
@@ -20,13 +20,11 @@
#ifndef CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
#define CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/XColumn.hpp>
#include <com/sun/star/sdb/XColumnUpdate.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index a4c2d97ae11d..0e25f99161be 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
@@ -22,7 +22,6 @@
#include <map>
#include <vector>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XAggregation.hpp>
#include <com/sun/star/form/XDatabaseParameterListener.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
@@ -32,7 +31,6 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-/** === end UNO includes === **/
#include "connectivity/dbtoolsdllapi.hxx"
#include "connectivity/paramwrapper.hxx"
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx
index f60a01d00a1c..e2fbfc3eb77a 100644
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/connectivity/inc/connectivity/paramwrapper.hxx
@@ -23,12 +23,10 @@
#include "connectivity/dbtoolsdllapi.hxx"
#include <connectivity/FValue.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
-/** === end UNO includes === **/
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
index 2de7c14b34ad..0a3cce96b6d0 100644
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/connectivity/inc/connectivity/sqlerror.hxx
@@ -20,9 +20,7 @@
#ifndef CONNECTIVITY_SQLERROR_HXX
#define CONNECTIVITY_SQLERROR_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/SQLException.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx
index fcc547c39aa0..f2ba862821ad 100644
--- a/connectivity/inc/connectivity/statementcomposer.hxx
+++ b/connectivity/inc/connectivity/statementcomposer.hxx
@@ -20,10 +20,8 @@
#ifndef CONNECTIVITY_STATEMENTCOMPOSER_HXX
#define CONNECTIVITY_STATEMENTCOMPOSER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx
index 08306c1dcb7f..63ebc4106a7e 100644
--- a/connectivity/inc/connectivity/warningscontainer.hxx
+++ b/connectivity/inc/connectivity/warningscontainer.hxx
@@ -20,10 +20,8 @@
#ifndef DBTOOLS_WARNINGSCONTAINER_HXX
#define DBTOOLS_WARNINGSCONTAINER_HXX
-/** ==== begin UNO includes === **/
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
-/** ==== end UNO includes === **/
#include "connectivity/dbtoolsdllapi.hxx"
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 49f90a590841..d9cc23c21b13 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -24,7 +24,6 @@
#include "resource/common_res.hrc"
#include "resource/sharedresources.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -35,7 +34,6 @@
#include <com/sun/star/sdbcx/XUsersSupplier.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <com/sun/star/sdbc/XDriverAccess.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index d2756417fa54..bd024cb902fe 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -23,7 +23,6 @@
#include "TConnection.hxx"
#include "connectivity/ParameterCont.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XChild.hpp>
@@ -62,7 +61,6 @@
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
#include <comphelper/interaction.hxx>
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 414323627abc..1388c5b69c29 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -19,9 +19,7 @@
#include "connectivity/filtermanager.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-/** === end UNO includes === **/
#include "TConnection.hxx"
#include <osl/diagnose.h>
#include "connectivity/dbtools.hxx"
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 58634e5f2f9e..ec509e78a28e 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -22,14 +22,12 @@
#include "connectivity/dbtools.hxx"
#include "connectivity/dbconversion.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <i18npool/mslangid.hxx>
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 2428112ae7bd..b082e88adff3 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -19,7 +19,6 @@
#include "connectivity/parameters.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/DatabaseParameterEvent.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/container/XChild.hpp>
@@ -28,7 +27,6 @@
#include <com/sun/star/sdb/XParametersSupplier.hpp>
#include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
#include <com/sun/star/sdb/ParametersRequest.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbtools.hxx>
#include "connectivity/filtermanager.hxx"
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 17870b868da4..cf82fcf5c97b 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -18,13 +18,11 @@
*/
#include <connectivity/paramwrapper.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/lang/WrappedTargetException.hpp>
#include <com/sun/star/sdb/XParametersSupplier.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <comphelper/enumhelper.hxx>
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 2ff211ed66b0..9dcf56d970aa 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -20,9 +20,7 @@
#include "connectivity/sqlerror.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/SQLException.hpp>
-/** === end UNO includes === **/
#include <comphelper/officeresourcebundle.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 2520bbffdcef..085f6e161d68 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -21,13 +21,11 @@
#include <connectivity/dbtools.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
#include <unotools/sharedunocomponent.hxx>
#include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 4920b7732713..1c85dde2191c 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -24,7 +24,6 @@
#include <connectivity/dbtools.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
@@ -35,7 +34,6 @@
#include <com/sun/star/graphic/GraphicColorMode.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData2.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/listenernotification.hxx>
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 5d883f75ae9e..b955e15436a1 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "hsqldb/HTools.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace connectivity { namespace hsqldb
{
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 2ccb5d717abb..4d0a25b044a5 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -26,11 +26,9 @@
#include "connectivity/dbexception.hxx"
#include "connectivity/dbtools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/WrappedTargetException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/exc_hlp.hxx>
#include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 1496cabf5e31..2a43f9bef2e0 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -20,11 +20,9 @@
#include "java/sql/ConnectionLog.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/DateTime.hpp>
-/** === end UNO includes === **/
#include <stdio.h>
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 1b92e1010d46..29fe0ad31e79 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -17,13 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "java/ContextClassLoader.hxx"
#include "java/lang/Object.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace connectivity { namespace jdbc
{
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 504a71fc4fe3..88c3702a3aef 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -23,12 +23,10 @@
#include "KConnection.hxx"
#include "rtl/strbuf.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
-/** === end UNO includes === **/
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index e5bbdcdcba58..b51058151279 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -20,11 +20,9 @@
#ifndef _CONNECTIVITY_KAB_DRIVER_HXX_
#define _CONNECTIVITY_KAB_DRIVER_HXX_
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase3.hxx>
#include <osl/module.h>
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index c9483e04260c..9c318ad2c128 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -21,11 +21,9 @@
#include "MacabDriver.hxx"
#include "MacabConnection.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/SQLContext.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
-/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
#include "resource/macab_res.hrc"
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index 1aa80d530b0f..c908ee481d2c 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -20,11 +20,9 @@
#ifndef _CONNECTIVITY_MACAB_DRIVER_HXX_
#define _CONNECTIVITY_MACAB_DRIVER_HXX_
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase3.hxx>
#include <osl/module.h>
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index bc2ff3b4ef46..aad422e3817e 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -21,14 +21,12 @@
#define CONNECTIVITY_HSQLDB_CONNECTION_HXX
#include "connectivity/ConnectionWrapper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XFlushable.hpp>
#include <com/sun/star/sdbc/XDriver.hpp>
#ifndef __com_sun_star_sdb_application_XTableUIProvider_hpp__
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
#endif
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase2.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index 5e6a3aad823a..03c3c274468e 100644
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
@@ -20,9 +20,6 @@
#ifndef CONNECTIVITY_HTOOLS_HXX
#define CONNECTIVITY_HTOOLS_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <rtl/ustrbuf.hxx>
//........................................................................
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index e840d9f58ee1..52ee16589cca 100644
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
@@ -22,9 +22,7 @@
#include "connectivity/sdbcx/VView.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdbcx/XAlterView.hpp>
-/** === end UNO includes === **/
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 8a57e1b83796..34d6b2b18ba8 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -22,9 +22,6 @@
#include "java/GlobalRef.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
namespace comphelper
{
class ResourceBasedEventLogger;
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index c27eaa6710ed..49bd698185dc 100644
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
@@ -23,9 +23,6 @@
#include "java/LocalRef.hxx"
#include "java/lang/Object.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <jvmaccess/virtualmachine.hxx>
//........................................................................
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index e1dc98e78e65..668b70944ef6 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -20,9 +20,6 @@
#ifndef CONNECTIVITY_LOCALREF_HXX
#define CONNECTIVITY_LOCALREF_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <jvmaccess/virtualmachine.hxx>
//........................................................................
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 0c99a31d9101..09fd0508d4c6 100644
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
@@ -20,9 +20,7 @@
#ifndef CONNECTIVITY_CONNECTIONLOG_HXX
#define CONNECTIVITY_CONNECTIONLOG_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/logging/LogLevel.hpp>
-/** === end UNO includes === **/
#include <rtl/ustring.hxx>
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index dfea975f46c8..7aa65140e487 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -20,9 +20,6 @@
#ifndef CONNECTIVITY_SHAREDRESOURCES_HXX
#define CONNECTIVITY_SHAREDRESOURCES_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <rtl/ustring.hxx>
#include <list>
#include "connectivity/dbtoolsdllapi.hxx"
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 28834d096903..1fc4a66f5272 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -22,10 +22,8 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/officeresourcebundle.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
diff --git a/dbaccess/inc/controllerframe.hxx b/dbaccess/inc/controllerframe.hxx
index 2e6d4ea8660a..d6834e20e90f 100644
--- a/dbaccess/inc/controllerframe.hxx
+++ b/dbaccess/inc/controllerframe.hxx
@@ -20,10 +20,8 @@
#ifndef DBACCESS_CONTROLLERFRAME_HXX
#define DBACCESS_CONTROLLERFRAME_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/FrameAction.hpp>
-/** === end UNO includes === **/
#include <memory>
diff --git a/dbaccess/inc/dbaundomanager.hxx b/dbaccess/inc/dbaundomanager.hxx
index 372c60027319..cd3bb3a7ff36 100644
--- a/dbaccess/inc/dbaundomanager.hxx
+++ b/dbaccess/inc/dbaundomanager.hxx
@@ -22,9 +22,7 @@
#include "dbaccessdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XUndoManager.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/inc/dbsubcomponentcontroller.hxx b/dbaccess/inc/dbsubcomponentcontroller.hxx
index 51f98bb5b24d..d397974f7cf5 100644
--- a/dbaccess/inc/dbsubcomponentcontroller.hxx
+++ b/dbaccess/inc/dbsubcomponentcontroller.hxx
@@ -22,14 +22,12 @@
#include "genericcontroller.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XScriptInvocationContext.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/util/XModifiable.hpp>
-/** === end UNO includes === **/
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/proparrhlp.hxx>
diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx
index c73c91dd9529..8ab991dc79db 100644
--- a/dbaccess/inc/genericcontroller.hxx
+++ b/dbaccess/inc/genericcontroller.hxx
@@ -25,7 +25,6 @@
#include "dbaccessdllapi.h"
#include "IController.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/frame/CommandGroup.hpp>
#include <com/sun/star/frame/XController2.hpp>
@@ -45,7 +44,6 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/awt/XUserInputInterception.hpp>
-/** === end UNO includes === **/
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/sharedmutex.hxx>
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 40da39654393..e5cf7fdfa1f5 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -30,7 +30,6 @@
#include "core_resource.hxx"
#include "tablecontainer.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
@@ -50,7 +49,6 @@
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/extract.hxx>
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 090a98797de7..9a0aee6d85e0 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -23,7 +23,6 @@
#include "apitools.hxx"
#include "RowSetBase.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
@@ -41,7 +40,6 @@
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
#include <com/sun/star/sdb/XParametersSupplier.hpp>
#include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase12.hxx>
#include <connectivity/paramwrapper.hxx>
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 3546339fd989..45b6609394c3 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -26,7 +26,6 @@
#include "SingleSelectQueryComposer.hxx"
#include "sdbcoretools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/i18n/XLocaleData.hpp>
@@ -42,7 +41,6 @@
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/uno/XAggregation.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
-/** === end UNO includes === **/
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index bd62c2e15de9..54c735438928 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -24,11 +24,9 @@
#include "connectivity/dbexception.hxx"
#include "connectivity/dbtools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/WrappedTargetException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/exc_hlp.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index b3f38bb694a5..64784c654e1d 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -21,9 +21,7 @@
#include "columnsettings.hxx"
#include "dbastrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx>
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index c6dbd05a2392..1c378dfc160d 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -23,10 +23,8 @@
#include "definitioncolumn.hxx"
#include "sdbcoretools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-/** === end UNO includes === **/
#include <comphelper/property.hxx>
#include <comphelper/types.hxx>
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 6b9826ee91d0..85c7e34cc360 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -32,12 +32,10 @@
#include <comphelper/propagg.hxx>
#include <comphelper/sequence.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-/** === end UNO includes === **/
#include <comphelper/types.hxx>
#include <comphelper/property.hxx>
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 2db909473cd2..9744c161ceb5 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -25,12 +25,10 @@
#include "ContainerListener.hxx"
#include "veto.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/container/XContainerApproveBroadcaster.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 69e051fb8944..bc4f690f84b3 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -30,7 +30,6 @@
#include "userinformation.hxx"
#include "sdbcoretools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
@@ -40,7 +39,6 @@
#include <com/sun/star/script/DocumentDialogLibraryContainer.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/form/XLoadable.hpp>
-/** === end UNO includes === **/
#include <comphelper/interaction.hxx>
#include <comphelper/mediadescriptor.hxx>
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 1a6025376a26..e3c94e394ef2 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -26,7 +26,6 @@
#include "core_resource.hxx"
#include "documentevents.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
@@ -59,7 +58,6 @@
#include <com/sun/star/util/XRefreshable.hpp>
#include <com/sun/star/sdb/XDocumentDataSource.hpp>
#include <com/sun/star/frame/DoubleInitializationException.hpp>
-/** === end UNO includes === **/
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 413a706006f2..44a4299f8656 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -31,13 +31,11 @@
#include "querycomposer.hxx"
#include "sdbcoretools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/XDriverAccess.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <com/sun/star/reflection/XProxyFactory.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbtools.hxx>
#include <connectivity/dbmetadata.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index ab06b601b650..90e17b23602d 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -25,7 +25,6 @@
#include "viewcontainer.hxx"
#include "RefreshListener.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
@@ -38,7 +37,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
-/** === end UNO includes === **/
#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14)
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index b7c729d2ae78..27f7b189966a 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -21,14 +21,12 @@
#include "dbastrings.hrc"
#include "module_dba.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdb/XDataAccessDescriptorFactory.hpp>
-/** === end UNO includes === **/
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 3b8258bcd4db..63df72b72d83 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -28,7 +28,6 @@
#include "dbastrings.hrc"
#include "module_dba.hxx"
-/** === being UNO includes === **/
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -46,7 +45,6 @@
#include <com/sun/star/ucb/InteractiveIOException.hpp>
#include <com/sun/star/ucb/IOErrorCode.hpp>
#include <com/sun/star/util/XCloseable.hpp>
-/** === end UNO includes === **/
#include <basic/basmgr.hxx>
#include <comphelper/enumhelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index dac0159f44a9..83b0195b096a 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -22,7 +22,6 @@
#include "ModelImpl.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/ElementExistException.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -36,7 +35,6 @@
#include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/uno/XAggregation.hpp>
-/** === end UNO includes === **/
#include <basic/basicmanagerrepository.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 75ea693aba05..305379cb3e45 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -30,7 +30,6 @@
#include "sdbcoretools.hxx"
#include "recovery/dbdocrecovery.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/document/XFilter.hpp>
@@ -60,7 +59,6 @@
#include <com/sun/star/awt/XDialogProvider.hpp>
#include <com/sun/star/document/XGraphicObjectResolver.hpp>
-/** === end UNO includes === **/
#include <comphelper/documentconstants.hxx>
#include <comphelper/enumhelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 30a691034f45..552d348fab8a 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -22,7 +22,6 @@
#include "ModelImpl.hxx"
#include "documenteventnotifier.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
#include <com/sun/star/frame/XModel2.hpp>
@@ -50,7 +49,6 @@
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/document/XDocumentRecovery.hpp>
-/** === end UNO includes === **/
#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_17)
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_17
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 5cb8dc6231f6..504c35cc4f55 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -18,9 +18,7 @@
*/
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
index a9058413097a..064af3867325 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
@@ -20,9 +20,7 @@
#ifndef OOO_DATASOURCEREGISTRATIONS_HXX
#define OOO_DATASOURCEREGISTRATIONS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XAggregation.hpp>
-/** === end UNO includes === **/
namespace comphelper
{
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 04b3f72c4b50..df2153e69006 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -31,7 +31,6 @@
#include "OAuthenticationContinuation.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
@@ -48,7 +47,6 @@
#include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp>
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/view/XPrintable.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
#include <comphelper/guarding.hxx>
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index 9bb9cf4866a1..7d41a9ebd38a 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -20,13 +20,11 @@
#include "documenteventexecutor.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index 27d57005a504..3cc3b93a384d 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -20,10 +20,8 @@
#ifndef DBACCESS_DOCUMENTEVENTEXECUTOR_HXX
#define DBACCESS_DOCUMENTEVENTEXECUTOR_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/document/XDocumentEventListener.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 387d0461d557..bfa12a539730 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -20,9 +20,7 @@
#include "documenteventnotifier.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/DoubleInitializationException.hpp>
-/** === end UNO includes === **/
#include <comphelper/asyncnotification.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
index 326d5576cbc2..4b4a68537ebf 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
@@ -21,10 +21,8 @@
#ifndef DBACCESS_DOCUMENTEVENTNOTIFIER_HXX
#define DBACCESS_DOCUMENTEVENTNOTIFIER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/document/XDocumentEventListener.hpp>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 272a8b1228a2..14121c82e7e3 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -20,9 +20,7 @@
#include "documentevents.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyValue.hpp>
-/** === end UNO includes === **/
#include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx
index 9c5e3fc9eb43..1ed70b454283 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/dataaccess/documentevents.hxx
@@ -20,10 +20,8 @@
#ifndef DBACCESS_DOCUMENTEVENTS_HXX
#define DBACCESS_DOCUMENTEVENTS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx
index 5d7a75564aac..c4a45a04b423 100644
--- a/dbaccess/source/core/inc/View.hxx
+++ b/dbaccess/source/core/inc/View.hxx
@@ -22,10 +22,8 @@
#include "connectivity/sdbcx/VView.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdbcx/XAlterView.hpp>
#include <com/sun/star/sdb/tools/XViewAccess.hpp>
-/** === end UNO includes === **/
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx
index f40126794ed1..fada42c84a34 100644
--- a/dbaccess/source/core/inc/columnsettings.hxx
+++ b/dbaccess/source/core/inc/columnsettings.hxx
@@ -20,9 +20,7 @@
#ifndef COLUMNSETTINGS_HXX
#define COLUMNSETTINGS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
namespace dbaccess
{
diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx
index ffa6b9788c92..5549a7049152 100644
--- a/dbaccess/source/core/inc/composertools.hxx
+++ b/dbaccess/source/core/inc/composertools.hxx
@@ -20,8 +20,6 @@
#ifndef DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
#define DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index b626f60511c2..d3a00c956c8e 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -20,9 +20,7 @@
#ifndef DBACCESS_CONTAINERAPPROVE_HXX
#define DBACCESS_CONTAINERAPPROVE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XInterface.hpp>
-/** === end UNO includes === **/
#include <boost/shared_ptr.hpp>
diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx
index 9256a1474283..68eff1be4637 100644
--- a/dbaccess/source/core/inc/objectnameapproval.hxx
+++ b/dbaccess/source/core/inc/objectnameapproval.hxx
@@ -22,9 +22,7 @@
#include "containerapprove.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XConnection.hpp>
-/** === end UNO includes === **/
namespace dbaccess
{
diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
index 89303041e9b2..4e583d784815 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -24,7 +24,6 @@
#include <comphelper/stl_types.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-/** === begin UNO includes == **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
@@ -41,7 +40,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/container/XContainerApproveListener.hpp>
-/** === end UNO includes === **/
#include "definitioncontainer.hxx"
#include "apitools.hxx"
diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
index 401e1a7969ba..e0f70f575bd4 100644
--- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
+++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
@@ -22,10 +22,8 @@
#include "dbaccessdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/frame/XController.hpp>
-/** === end UNO includes === **/
#include <vector>
#include <memory>
diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx
index 58b617f36f52..cd8a9a93ebc4 100644
--- a/dbaccess/source/core/inc/sdbcoretools.hxx
+++ b/dbaccess/source/core/inc/sdbcoretools.hxx
@@ -20,14 +20,12 @@
#ifndef DBACORE_SDBCORETOOLS_HXX
#define DBACORE_SDBCORETOOLS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/lang/WrappedTargetException.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
-/** === end UNO includes === **/
namespace comphelper
{
diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx
index 37920d16e048..78c7bd137618 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -20,9 +20,7 @@
#ifndef DBACCESS_VETO_HXX
#define DBACCESS_VETO_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/util/XVeto.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index 7127fceb86c4..ff9e8fdbbe5c 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -20,12 +20,10 @@
#include "objectnameapproval.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 46dd57251c4a..0f11c1517a36 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -21,7 +21,6 @@
#include "sdbcoretools.hxx"
#include "dbastrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XChild.hpp>
@@ -30,7 +29,6 @@
#include <com/sun/star/task/XInteractionRequestStringResolver.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <tools/debug.hxx>
diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx
index c54d723b7de1..4ad7a20f3fde 100644
--- a/dbaccess/source/core/misc/veto.cxx
+++ b/dbaccess/source/core/misc/veto.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "veto.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace dbaccess
{
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index e0a92b5c0d08..bc75824a7171 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -25,7 +25,6 @@
#include "subcomponents.hxx"
#include "dbastrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
@@ -35,7 +34,6 @@
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index deb09bed9f8e..0f92f496012a 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "settingsimport.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <tools/diagnose_ex.h>
#include <sax/tools/converter.hxx>
#include <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx
index 513bc6d0a469..e0daac2f929b 100644
--- a/dbaccess/source/core/recovery/settingsimport.hxx
+++ b/dbaccess/source/core/recovery/settingsimport.hxx
@@ -20,9 +20,7 @@
#ifndef SETTINGSIMPORT_HXX
#define SETTINGSIMPORT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/xml/sax/XAttributeList.hpp>
-/** === end UNO includes === **/
#include <comphelper/namedvaluecollection.hxx>
#include <rtl/ref.hxx>
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index b3f6e154544e..0c4d1165d1fb 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -20,9 +20,7 @@
#include "storagestream.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/embed/ElementModes.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx
index 1992b57825d8..c4a4849aef0f 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -22,9 +22,7 @@
#include "dbaccessdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/embed/XStorage.hpp>
-/** === end UNO includes === **/
namespace comphelper
{
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index c6c29e012862..4ab012706a39 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -20,10 +20,8 @@
#include "storagetextstream.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/io/XTextOutputStream.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx
index aa3d58a3930a..46924f36fd46 100644
--- a/dbaccess/source/core/recovery/storagetextstream.hxx
+++ b/dbaccess/source/core/recovery/storagetextstream.hxx
@@ -22,9 +22,6 @@
#include "storagestream.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <memory>
//......................................................................................................................
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index 5e7c36a316c5..ad5dec9df070 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -20,11 +20,9 @@
#include "storagexmlstream.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index 8c86db5c22d5..5f4faf5a76f9 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -22,10 +22,8 @@
#include "storagestream.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-/** === end UNO includes === **/
#include <memory>
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index 6014bc0145b8..5e3e86785b45 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -20,10 +20,8 @@
#include "subcomponentloader.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ucb/Command.hpp>
#include <com/sun/star/frame/XController2.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx
index b8218326d854..73285a8fbd7b 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.hxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.hxx
@@ -22,12 +22,10 @@
#include "dbaccessdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ucb/XCommandProcessor.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 47bd079bbfe7..0c962b62b8e1 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -25,7 +25,6 @@
#include "subcomponentloader.hxx"
#include "settingsimport.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
@@ -34,7 +33,6 @@
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-/** === end UNO includes === **/
#include <comphelper/namedvaluecollection.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
index 4f8956c9cac9..68f75eb1fa43 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
@@ -22,10 +22,8 @@
#include "subcomponents.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index 04bbba2681aa..3ff36d791b0c 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -22,9 +22,7 @@
#include "dbaccessdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/application/DatabaseObject.hpp>
-/** === end UNO includes === **/
#include <rtl/ustring.hxx>
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index ebc832327a5d..d0554ed0c3cd 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -20,10 +20,8 @@
#include "docinteraction.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/DocumentPasswordRequest.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx
index 8fd1543428a4..502a289cf546 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.hxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.hxx
@@ -20,10 +20,8 @@
#ifndef DBACCESS_DOCERRORHANDLING_HXX
#define DBACCESS_DOCERRORHANDLING_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-/** === end UNO includes === **/
namespace comphelper {
class ComponentContext;
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 50484a69fea7..bd759075ff59 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -28,7 +28,6 @@
#include "migrationerror.hxx"
#include "migrationlog.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
#include <com/sun/star/frame/XModel2.hpp>
#include <com/sun/star/frame/XStorable.hpp>
@@ -37,7 +36,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/ucb/XContentProvider.hpp>
-/** === end UNO includes === **/
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 2642a299ee6f..72cdc57532f9 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -20,9 +20,7 @@
#ifndef DBACCESS_MACROMIGRATIONDIALOG_HXX
#define DBACCESS_MACROMIGRATIONDIALOG_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <svtools/roadmapwizard.hxx>
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index f5fb5aa8466d..0bd39fe8f1ef 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -25,9 +25,7 @@
#include "macromigrationpages.hxx"
#include "macromigrationdialog.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 5a472f5a2503..33c64b7ba11b 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -22,11 +22,9 @@
#include "dbmm_global.hrc"
#include "macromigrationdialog.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/frame/XStorable.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <svtools/genericunodialog.hxx>
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 612485c8f5b5..3524b6ac271e 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -29,7 +29,6 @@
#include "progresscapture.hxx"
#include "progressmixer.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
#include <com/sun/star/util/XCloseable.hpp>
@@ -57,7 +56,6 @@
#include <com/sun/star/io/WrongFormatException.hpp>
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
#include <com/sun/star/io/XInputStreamProvider.hpp>
-/** === end UNO includes === **/
#include <comphelper/documentinfo.hxx>
#include <comphelper/interaction.hxx>
diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx
index 220f57516d49..262a1fca1ffc 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.hxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.hxx
@@ -20,9 +20,7 @@
#ifndef DBACCESS_MIGRATIONENGINE_HXX
#define DBACCESS_MIGRATIONENGINE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx
index 954e006c03bd..1056c24232bc 100644
--- a/dbaccess/source/ext/macromigration/migrationerror.hxx
+++ b/dbaccess/source/ext/macromigration/migrationerror.hxx
@@ -20,9 +20,7 @@
#ifndef DBACCESS_MIGRATIONERROR_HXX
#define DBACCESS_MIGRATIONERROR_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Any.hxx>
-/** === end UNO includes === **/
#include <vector>
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index bab34b8a96c1..18a5d7d62b25 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -23,8 +23,6 @@
#include "migrationerror.hxx"
#include "migrationlog.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <comphelper/anytostring.hxx>
#include <tools/string.hxx>
diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx
index 26bbde04becd..608f62893cee 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.hxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.hxx
@@ -22,9 +22,6 @@
#include "dbmm_types.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <rtl/ustring.hxx>
#include <memory>
diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx
index 99461e937285..f30f0be53c3e 100644
--- a/dbaccess/source/ext/macromigration/migrationprogress.hxx
+++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx
@@ -20,9 +20,6 @@
#ifndef DBACCESS_MIGRATIONPROGRESS_HXX
#define DBACCESS_MIGRATIONPROGRESS_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace dbmm
{
diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index 3d60eca9dc36..e9a6a853feff 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -17,13 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "progresscapture.hxx"
#include "migrationprogress.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx
index 5330868971fd..a606f32bbe53 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.hxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.hxx
@@ -20,9 +20,7 @@
#ifndef DBACCESS_PROGRESSCAPTURE_HXX
#define DBACCESS_PROGRESSCAPTURE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/task/XStatusIndicator.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx
index 0f39df8e8807..6a34e91a5ec6 100644
--- a/dbaccess/source/ext/macromigration/progressmixer.cxx
+++ b/dbaccess/source/ext/macromigration/progressmixer.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "progressmixer.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <osl/diagnose.h>
#include <map>
diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx
index 4cb18b8325f8..39d6ccd32135 100644
--- a/dbaccess/source/ext/macromigration/progressmixer.hxx
+++ b/dbaccess/source/ext/macromigration/progressmixer.hxx
@@ -20,9 +20,6 @@
#ifndef DBACCESS_PROGRESSMIXER_HXX
#define DBACCESS_PROGRESSMIXER_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <sal/types.h>
#include <memory>
diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index 8577e67188bb..5c3585a53986 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -20,9 +20,6 @@
#ifndef DBACCESS_RANGEPROGRESSBAR_HXX
#define DBACCESS_RANGEPROGRESSBAR_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <svtools/prgsbar.hxx>
//........................................................................
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index d08f5f548cd6..f3ebf33738ca 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -21,7 +21,6 @@
#include "flt_reghelper.hxx"
#include "xmlstrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XEventListener.hpp>
@@ -50,7 +49,6 @@
#include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
#include <com/sun/star/sdb/application/NamedDatabaseObject.hpp>
#include <com/sun/star/frame/XLoadable.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/documentconstants.hxx>
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
index c59fb910a81d..54d1eaff9a9b 100644
--- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
@@ -20,10 +20,8 @@
#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX
#define DBACCESS_CONNECTION_DEPENDENT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <cppuhelper/weakref.hxx>
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 6376db189d26..330a86c158dc 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -17,18 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "connectiontools.hxx"
-
#include "tablename.hxx"
#include "objectnames.hxx"
#include "datasourcemetadata.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <comphelper/namedvaluecollection.hxx>
-
#include <connectivity/dbtools.hxx>
#include <connectivity/statementcomposer.hxx>
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index 1ed3db2c2542..087460e9b730 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -24,12 +24,10 @@
#include "connectiondependent.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
index d34d9a5ca16f..6b6d2798ec16 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
@@ -20,9 +20,7 @@
#include "datasourcemetadata.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NullPointerException.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbmetadata.hxx>
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index c94f54fffc2d..7cddf4efd79e 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -22,9 +22,7 @@
#include "connectiondependent.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/tools/XDataSourceMetaData.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index fbd95d6d944c..a4c1e5e77df9 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -23,13 +23,11 @@
#include "module_sdbt.hxx"
#include "sdbt_resource.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/sdb/ErrorCondition.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbmetadata.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index 89b8cad3b27e..7faab22d3658 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -22,9 +22,7 @@
#include "connectiondependent.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/tools/XObjectNames.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index 031d39b2007a..ce4c1961e17c 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -23,11 +23,9 @@
#include "module_sdbt.hxx"
#include "sdbtstrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/sdb/tools/CompositionType.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbtools.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index 399db5354d09..81ec29e34302 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -22,9 +22,7 @@
#include "connectiondependent.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/tools/XTableName.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index ade7a071a473..0614c4721f51 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -23,7 +23,6 @@
#include "advancedsettingsdlg.hxx"
#include "subcomponentmanager.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XContainer.hpp>
@@ -61,7 +60,6 @@
#include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/container/XHierarchicalName.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <tools/string.hxx>
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 816fe3235c3a..262c0a2998b8 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -30,13 +30,11 @@
#include "moduledbu.hxx"
#include "TableCopyHelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/ui/XContextMenuInterception.hpp>
-/** === end UNO includes === **/
#include <comphelper/stl_types.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 1bd371685661..44a55dc29ef4 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -29,7 +29,6 @@
#include "UITools.hxx"
#include "subcomponentmanager.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XHierarchicalNameContainer.hpp>
@@ -51,7 +50,6 @@
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/exc_hlp.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx
index fe0c597f659e..ed38088a3376 100644
--- a/dbaccess/source/ui/app/IApplicationController.hxx
+++ b/dbaccess/source/ui/app/IApplicationController.hxx
@@ -24,9 +24,6 @@
#include "AppElementType.hxx"
#include "callbacks.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
class SvTreeListBox;
class SvLBoxEntry;
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index c554ced4b1f4..c32cb38cbd88 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -21,7 +21,6 @@
#include "AppController.hxx"
#include "dbustrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XModel2.hpp>
@@ -31,7 +30,6 @@
#include <com/sun/star/ucb/XCommandProcessor.hpp>
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx
index d3c88db7ce96..52981edb0bc3 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.hxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.hxx
@@ -22,10 +22,8 @@
#include "AppElementType.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/frame/XController.hpp>
-/** === end UNO includes === **/
#include <comphelper/sharedmutex.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 8c25fcbee8c3..ad0b4e647d74 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -26,7 +26,6 @@
#include "queryorder.hxx"
#include "sqlmessage.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XNamed.hpp>
@@ -61,7 +60,6 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/uno/TypeClass.hpp>
#include <com/sun/star/util/XCancellable.hpp>
-/** === end UNO includes === **/
#include <comphelper/enumhelper.hxx>
#include <comphelper/extract.hxx>
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 1e1b9526210e..019e9ec22b5d 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -22,7 +22,6 @@
#include "dbustrings.hrc"
#include "UITools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XSet.hpp>
@@ -38,7 +37,6 @@
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/frame/XModule.hpp>
-/** === end UNO includes === **/
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 3a7001174fcd..8f6f446c8ec0 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -28,11 +28,9 @@
#include "UITools.hxx"
#include "unodatbr.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 9ceb555d3328..b679e180fd4f 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -54,7 +54,6 @@
#include "WExtendPages.hxx"
#include "WNameMatch.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/LineEndFormat.hpp>
#include <com/sun/star/awt/MouseWheelBehavior.hpp>
#include <com/sun/star/awt/TextAlign.hpp>
@@ -99,7 +98,6 @@
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/ui/XContextMenuInterceptor.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index 6153e002db8a..305a2d94dd57 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "charsetlistbox.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index fd17245f18ad..6f95cc1a9c55 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -20,7 +20,6 @@
#include "opendoccontrols.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -29,7 +28,6 @@
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/ui/XImageManager.hpp>
-/** === end UNO includes === **/
#include <comphelper/processfactory.hxx>
#include <vcl/graph.hxx>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 5931d4eb8cd9..cda30378d4e4 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -39,7 +39,6 @@
#include "stringlistitem.hxx"
#include "OAuthenticationContinuation.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
@@ -49,7 +48,6 @@
#include <com/sun/star/task/XInteractionRequest.hpp>
#include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
#include <com/sun/star/ucb/AuthenticationRequest.hpp>
-/** === end UNO includes === **/
#include <comphelper/guarding.hxx>
#include <comphelper/interaction.hxx>
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index bc26a4cc1916..6ae17f4d5003 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "advancedsettings.hxx"
#include "advancedsettingsdlg.hxx"
#include "moduledbu.hxx"
@@ -30,9 +29,6 @@
#include "dbadmin.hrc"
#include "advancedsettings.hrc"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 40a5e960239c..c980d59d6e4c 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -23,9 +23,6 @@
#include "adminpages.hxx"
#include "dsmeta.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <svtools/dialogcontrolling.hxx>
#include <vcl/lstbox.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index a6a51a86ca76..273efc5c0de0 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -49,7 +49,6 @@
#include <sfx2/filedlghelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -75,7 +74,6 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-/** === end UNO includes === **/
#include <svl/filenotation.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index 77eeb125869d..a7fab79f7481 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "textconnectionsettings.hxx"
#include "TextConnectionHelper.hxx"
#include "dbu_resource.hrc"
@@ -25,9 +24,6 @@
#include "dsitems.hxx"
#include "dbustrings.hrc"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <vcl/msgbox.hxx>
//........................................................................
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 24a9ac25458f..529eaad925f1 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -23,9 +23,6 @@
#include "IItemSetHelper.hxx"
#include "moduledbu.hxx"
- /** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <sfx2/tabdlg.hxx>
#include <memory>
diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx
index ffa29f2ac8b1..8a03d91a29b1 100644
--- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx
+++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx
@@ -20,9 +20,7 @@
#ifndef DBACCESS_ASYNCMODALDIALOG_HXX
#define DBACCESS_ASYNCMODALDIALOG_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace dbaui
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 5ae051d51d34..3c9d402a7ab3 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -25,7 +25,6 @@
#include "brwview.hxx"
#include "sbagrid.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/XLoadable.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/sdb/XSQLErrorListener.hpp>
@@ -39,7 +38,6 @@
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/frame/XModule.hpp>
-/** === end UNO includes === **/
#include <vcl/timer.hxx>
#include <svtools/transfer.hxx>
diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx
index 82192ee25d48..5782a1792ef9 100644
--- a/dbaccess/source/ui/inc/charsetlistbox.hxx
+++ b/dbaccess/source/ui/inc/charsetlistbox.hxx
@@ -22,9 +22,6 @@
#include "charsets.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <vcl/lstbox.hxx>
class SfxItemSet;
diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index e650a13aeae8..bc10aba889c9 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -22,11 +22,9 @@
#include "objectnamecheck.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-/** === end UNO includes === **/
#include <memory>
#include <boost/noncopyable.hpp>
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx
index 72248456c371..5bf05f602eb7 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -23,9 +23,6 @@
#include "dsntypes.hxx"
#include "dsitems.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <boost/shared_ptr.hpp>
//........................................................................
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index 08de168e9c89..a5d7ba09b270 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -22,10 +22,8 @@
#include <vcl/image.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/application/DatabaseObject.hpp>
-/** === end UNO includes === **/
#include <tools/string.hxx>
#include <boost/shared_ptr.hpp>
diff --git a/dbaccess/source/ui/inc/objectnamecheck.hxx b/dbaccess/source/ui/inc/objectnamecheck.hxx
index 3449f0d86c25..50a7b163d6aa 100644
--- a/dbaccess/source/ui/inc/objectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/objectnamecheck.hxx
@@ -20,9 +20,6 @@
#ifndef DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX
#define DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
namespace rtl { class OUString; }
namespace dbtools { class SQLExceptionInfo; }
diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx
index 30e562181944..66daa0be0320 100644
--- a/dbaccess/source/ui/inc/propertystorage.hxx
+++ b/dbaccess/source/ui/inc/propertystorage.hxx
@@ -20,9 +20,7 @@
#ifndef PROPERTYSTORAGE_HXX
#define PROPERTYSTORAGE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Any.hxx>
-/** === end UNO includes === **/
#include <tools/solar.h>
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 5c9c7ba5f6eb..c6b5779f6744 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -27,14 +27,12 @@
#include "svx/ParseContext.hxx"
#include "TableFieldDescription.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/io/XObjectInputStream.hpp>
#include <com/sun/star/io/XObjectOutputStream.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/XSQLQueryComposer.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbcx/XAlterView.hpp>
-/** === end UNO includes === **/
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx
index 1cb817811b57..3fb4d4999dbe 100644
--- a/dbaccess/source/ui/inc/singledoccontroller.hxx
+++ b/dbaccess/source/ui/inc/singledoccontroller.hxx
@@ -22,9 +22,7 @@
#include "dbsubcomponentcontroller.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx
index 7ed6aa27691b..96a35c81a6e5 100644
--- a/dbaccess/source/ui/inc/textconnectionsettings.hxx
+++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx
@@ -22,9 +22,6 @@
#include "propertystorage.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 1465ce350eec..782eb3cb9f3f 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -31,7 +31,6 @@
#include "WNameMatch.hxx"
#include "WTypeSelect.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/application/CopyTableOperation.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
@@ -46,7 +45,6 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
#include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
index 01e33e709fb9..3a90c074081d 100644
--- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx
+++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
@@ -20,9 +20,7 @@
#include "asyncmodaldialog.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
#include <vcl/svapp.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 242c60cdeda5..d5dae84f709f 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -20,14 +20,12 @@
#include "controllerframe.hxx"
#include "IController.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/frame/XController2.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index a0839781ae5d..6ad3829e3fd4 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -22,7 +22,6 @@
#include "dbustrings.hrc"
#include "asyncmodaldialog.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XFrame.hpp>
@@ -32,7 +31,6 @@
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 393c13a5416b..9dbf67dc8f97 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -20,9 +20,7 @@
#include "dbaundomanager.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <svl/undo.hxx>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 7e1f40541578..fb86ac82443d 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -26,7 +26,6 @@
#include "moduledbu.hxx"
#include "dbsubcomponentcontroller.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XUntitledNumbers.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XChild.hpp>
@@ -35,7 +34,6 @@
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index aa560389802c..457082543a18 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -24,13 +24,11 @@
#include "moduledbu.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbexception.hxx>
#include <connectivity/dbmetadata.hxx>
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index f0d7a37c10e9..69adb66b53e2 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -21,8 +21,6 @@
#include <connectivity/DriversConfig.hxx>
#include "dsntypes.hxx"
#include <comphelper/processfactory.hxx>
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <map>
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index 3d98df406858..857aafacb07d 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -23,13 +23,11 @@
#include "moduledbu.hxx"
#include "dbustrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/GraphicColorMode.hpp>
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx
index 304bebf72a7e..0429f0a06efe 100644
--- a/dbaccess/source/ui/misc/propertystorage.cxx
+++ b/dbaccess/source/ui/misc/propertystorage.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "propertystorage.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index d253adb66c54..c194885b4d9f 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbaundomanager.hxx"
#include "singledoccontroller.hxx"
#include "browserids.hxx"
@@ -25,9 +24,6 @@
#include "dbustrings.hrc"
#include "moduledbu.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <svl/undo.hxx>
#include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 2d1605344090..a67519e7cb94 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -40,7 +40,6 @@
#include "TableFieldDescription.hxx"
#include "UITools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -64,7 +63,6 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/util/VetoException.hpp>
#include <com/sun/star/frame/XUntitledNumbers.hpp>
-/** === end UNO includes === **/
#include <comphelper/basicio.hxx>
#include <comphelper/extract.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 5fe91125f436..e86d6f1bc933 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -35,7 +35,6 @@
#include "indexdialog.hxx"
#include "sqlmessage.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -56,7 +55,6 @@
#include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
#include <comphelper/streamsection.hxx>
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index f975f971c6a0..ca5fdd188ec6 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -20,10 +20,8 @@
#include "composerdialogs.hxx"
-/** === begin UNO includes === **/
#include "dbu_reghelper.hxx"
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-/** === end UNO includes === **/
#include "dbustrings.hrc"
#include "queryfilter.hxx"
#include "queryorder.hxx"
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index 8582eadef5c3..64be0b04079d 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -20,13 +20,11 @@
#ifndef DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX
#define DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XRowSet.hpp>
-/** === end UNO includes === **/
#include <svtools/genericunodialog.hxx>
#include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index bbebb6af92da..ea9ceb80b9f3 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -25,7 +25,6 @@
#include "sqlmessage.hxx"
#include "WCopyTable.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdb/application/XCopyTableWizard.hpp>
#include <com/sun/star/sdb/application/CopyTableContinuation.hpp>
@@ -53,7 +52,6 @@
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
#include <com/sun/star/sdbc/XDriverManager.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/interaction.hxx>
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 5dca0ab8ecc1..216c566d1101 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -25,14 +25,12 @@
#include "moduledbu.hxx"
#include "apitools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/task/XInteractionHandler2.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ucb/AuthenticationRequest.hpp>
#include <com/sun/star/sdb/ParametersRequest.hpp>
#include <com/sun/star/sdb/DocumentSaveRequest.hpp>
-/** === end UNO includes === **/
namespace dbtools
{
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index d915a6871445..ff41dee33468 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -26,10 +26,8 @@
#include "dbustrings.hrc"
#include "propertystorage.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <svtools/genericunodialog.hxx>
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index c7a3dd0141ea..84f1cb7e83d1 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -31,7 +31,6 @@
#include "methodguard.hxx"
#include "loghandler.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/logging/XConsoleHandler.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/logging/LogLevel.hpp>
@@ -39,7 +38,6 @@
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index d73d2d8c68d7..26dfc9de8636 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -23,12 +23,10 @@
#include <stdio.h>
#include <string>
-/** === begin UNO includes === **/
#include <com/sun/star/logging/XCsvLogFormatter.hpp>
#include <com/sun/star/logging/XLogFormatter.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 0d5d9d9965f3..be841ffe5c0c 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -31,7 +31,6 @@
#include "methodguard.hxx"
#include "loghandler.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/logging/XLogHandler.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
@@ -39,7 +38,6 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/util/PathSubstitution.hpp>
#include <com/sun/star/util/XStringSubstitution.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index 46dd19c0b85e..e5af7a66f236 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_services.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include "log_module.hxx"
//........................................................................
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index d637a1c9b075..e692919c78a2 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -22,13 +22,11 @@
#include "logrecord.hxx"
#include "loggerconfig.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/logging/XLogger.hpp>
#include <com/sun/star/logging/LogLevel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/logging/XLoggerPool.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 72438786a6bb..86a1f007f0c9 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -29,7 +29,6 @@
#include "loggerconfig.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -41,7 +40,6 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/logging/XLogHandler.hpp>
#include <com/sun/star/logging/XLogFormatter.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/logging/loggerconfig.hxx b/extensions/source/logging/loggerconfig.hxx
index c5172e47a2bb..3697ac3dbbdd 100644
--- a/extensions/source/logging/loggerconfig.hxx
+++ b/extensions/source/logging/loggerconfig.hxx
@@ -20,9 +20,7 @@
#ifndef EXTENSIONS_LOGGERCONFIG_HXX
#define EXTENSIONS_LOGGERCONFIG_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/logging/XLogger.hpp>
-/** === end UNO includes === **/
namespace comphelper
{
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index 42107c364a45..dcba3ba995b2 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -20,12 +20,10 @@
#include "loghandler.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/logging/LogLevel.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/logging/PlainTextFormatter.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <comphelper/componentcontext.hxx>
diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx
index 194435c8b1af..2852c9fe53f2 100644
--- a/extensions/source/logging/loghandler.hxx
+++ b/extensions/source/logging/loghandler.hxx
@@ -29,11 +29,9 @@
#ifndef LOGHANDLER_HXX
#define LOGHANDLER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/logging/XLogFormatter.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/logging/LogRecord.hpp>
-/** === end UNO includes === **/
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx
index 191d4efdaecf..96e19f786197 100644
--- a/extensions/source/logging/logrecord.cxx
+++ b/extensions/source/logging/logrecord.cxx
@@ -19,9 +19,6 @@
#include "logrecord.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <osl/time.h>
#include <osl/thread.h>
#include <osl/diagnose.h>
diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx
index d846d8dda522..85962d19a594 100644
--- a/extensions/source/logging/logrecord.hxx
+++ b/extensions/source/logging/logrecord.hxx
@@ -20,9 +20,7 @@
#ifndef LOGRECORD_HXX
#define LOGRECORD_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/logging/LogRecord.hpp>
-/** === end UNO includes === **/
#include <osl/interlck.h>
diff --git a/extensions/source/logging/methodguard.hxx b/extensions/source/logging/methodguard.hxx
index b84d95ae37fe..aa5a9474bfbe 100644
--- a/extensions/source/logging/methodguard.hxx
+++ b/extensions/source/logging/methodguard.hxx
@@ -20,9 +20,6 @@
#ifndef EXTENSIONS_METHODGUARD_HXX
#define EXTENSIONS_METHODGUARD_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace logging
{
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 83b64c3a1988..fd84d20fece2 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -31,11 +31,9 @@
#include <stdio.h>
-/** === begin UNO includes === **/
#include <com/sun/star/logging/XLogFormatter.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index be88c81b3b01..f08d10d0e521 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -29,9 +29,7 @@
#ifndef _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_
#define _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XPropertyControl.hpp>
-/** === end UNO includes === **/
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index ec907ab4caff..5ecccec0738e 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -33,11 +33,9 @@
#include "linedescriptor.hxx"
#include "inspectorhelpwindow.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/asyncnotification.hxx>
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index a2f0ea8545b5..7fcdb6c3014e 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -33,10 +33,8 @@
#include "modulepcr.hxx"
#include "pcrcommon.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XPropertyControl.hpp>
#include <com/sun/star/inspection/XPropertyHandler.hpp>
-/** === end UNO includes === **/
#include <vcl/scrbar.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/button.hxx>
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index b2966475ce7c..8a91da2b5b8e 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -31,8 +31,6 @@
#include "formmetadata.hxx"
#include "pushbuttonnavigation.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <tools/debug.hxx>
//------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx
index 5c89202eb8a1..5cd55f7bfd59 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.hxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx
@@ -22,9 +22,6 @@
#include "propertyhandler.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace pcr
{
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index d58c8ae5fa3e..a149a7a605f2 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -31,11 +31,9 @@
#include "formmetadata.hxx"
#include "cellbindinghelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/binding/XValueBinding.hpp>
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
//------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx
index cf086fc758c3..bb771ddf90d1 100644
--- a/extensions/source/propctrlr/cellbindinghandler.hxx
+++ b/extensions/source/propctrlr/cellbindinghandler.hxx
@@ -22,9 +22,7 @@
#include "propertyhandler.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
#include <memory>
diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx
index 58fa295a2b5b..c5257ddf72d1 100644
--- a/extensions/source/propctrlr/cellbindinghelper.hxx
+++ b/extensions/source/propctrlr/cellbindinghelper.hxx
@@ -29,7 +29,6 @@
#ifndef EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX
#define EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -39,7 +38,6 @@
#include <com/sun/star/form/binding/XListEntrySource.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
-/** === end UNO includes === **/
//............................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index 5be4d409613b..cd2e23280613 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -29,10 +29,8 @@
#ifndef _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_
#define _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XPropertyControl.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase1.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <tools/link.hxx>
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index a3e06f6f4d23..0512dad4bf82 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -28,11 +28,9 @@
#include "composeduiupdate.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/inspection/PropertyLineElement.hpp>
-/** === end UNO includes === **/
#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index 1a9617cf6948..12e90abc6cf0 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -31,9 +31,7 @@
#include "propertyhandler.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
#include <map>
#include <set>
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 3389d485b172..ceb203d01419 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -34,10 +34,8 @@
#include "propctrlr.hrc"
#include "formmetadata.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <osl/diagnose.h>
#include <sal/macros.h>
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index 9ceaa157e215..d8b6ebec3d6b 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -30,9 +30,6 @@
#include "inspectormodelbase.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <memory>
//........................................................................
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index bcced921218e..3401fb405267 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -31,11 +31,9 @@
#include "pcrcommon.hxx"
#include "modulepcr.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
-/** === end UNO includes === **/
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx
index d276b885d378..cf0444c58740 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.hxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.hxx
@@ -20,11 +20,9 @@
#ifndef EXTENSIONS_DEFAULTHELPPROVIDER_HXX
#define EXTENSIONS_DEFAULTHELPPROVIDER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XPropertyControlObserver.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 79c319c65ecd..9da028e8a5d3 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -30,9 +30,7 @@
#include "formstrings.hxx"
#include "formmetadata.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#define TEXTTYPE_SINGLELINE 0
diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx
index 9b8b135575e4..803f1ca6d668 100644
--- a/extensions/source/propctrlr/editpropertyhandler.hxx
+++ b/extensions/source/propctrlr/editpropertyhandler.hxx
@@ -22,9 +22,6 @@
#include "propertyhandler.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace pcr
{
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index db5155b36d7f..76ebdd27c18a 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -33,13 +33,11 @@
#include "propeventtranslation.hxx"
#include "formbrowsertools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/xforms/XFormsUIHelper1.hpp>
#include <com/sun/star/xsd/DataTypeClass.hpp>
#include <com/sun/star/form/binding/XListEntrySink.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <rtl/ustrbuf.hxx>
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index 8adda94f1c2f..d4ba742fc817 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -22,14 +22,12 @@
#include "pcrcommon.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/xforms/XModel.hpp>
#include <com/sun/star/xforms/XFormsSupplier.hpp>
#include <com/sun/star/form/binding/XBindableValue.hpp>
#include <com/sun/star/form/binding/XListEntrySource.hpp>
-/** === end UNO includes === **/
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 4b1cbc6ed32e..c3219954acfa 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -34,11 +34,9 @@
#include "eformshelper.hxx"
#include "handlerhelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <functional>
diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx
index 60ac93d9d860..cbad1720c6d9 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.hxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.hxx
@@ -22,9 +22,6 @@
#include "propertyhandler.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <memory>
//........................................................................
diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx
index 226ec231b34c..0834b7888c49 100644
--- a/extensions/source/propctrlr/enumrepresentation.hxx
+++ b/extensions/source/propctrlr/enumrepresentation.hxx
@@ -20,9 +20,7 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Any.hxx>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index ecc045a0a166..f7a6862598fd 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -38,7 +38,6 @@
#include "pcrstrings.hxx"
#include "propertycontrolextender.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XTabControllerModel.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
@@ -59,7 +58,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/uri/XVndSunStarScriptUrlReference.hpp>
-/** === end UNO includes === **/
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/evtmethodhelper.hxx>
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 228d3cf44634..4ce21617071c 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -33,13 +33,11 @@
#include "pcrcommontypes.hxx"
#include "pcrcommon.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/inspection/XPropertyHandler.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase2.hxx>
#include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 4d13636b63a8..5cd7b37c5ca1 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -43,7 +43,6 @@
#include "taborder.hxx"
#include "usercontrol.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -77,7 +76,6 @@
#include <com/sun/star/resource/MissingResourceException.hpp>
#include <com/sun/star/graphic/GraphicObject.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
#include <connectivity/dbconversion.hxx>
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index b1bd7f914842..61036725692c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -26,13 +26,11 @@
#include <comphelper/uno3.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/form/XForm.hpp>
-/** === end UNO includes === **/
#include <tools/fldunit.hxx>
#include <vcl/waitobj.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 556e6460b03b..8956acb854a5 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -32,12 +32,10 @@
#include "defaultforminspection.hxx"
#include "propctrlr.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/typeprovider.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx
index 8644a2931842..f6e6c7d6b11a 100644
--- a/extensions/source/propctrlr/formcontroller.hxx
+++ b/extensions/source/propctrlr/formcontroller.hxx
@@ -21,8 +21,6 @@
#include "propcontroller.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <cppuhelper/propshlp.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 2fc5f763a5f1..3a9d88d3bd7c 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -32,7 +32,6 @@
#include "handlerhelper.hxx"
#include "cellbindinghelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/drawing/XControlShape.hpp>
@@ -46,7 +45,6 @@
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/componentbase.hxx>
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 1762069c953e..e8b19fd7e257 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -41,7 +41,6 @@
#include <connectivity/dbexception.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
#include <com/sun/star/sdbcx/KeyType.hpp>
@@ -50,7 +49,6 @@
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
-/** === end UNO includes === **/
//............................................................................
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 1aa488cdbcae..1ed5330769c8 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -33,12 +33,10 @@
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <memory>
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 5389c9b47a8d..6d630decda24 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -30,7 +30,6 @@
#include "formmetadata.hxx"
#include "handlerhelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/reflection/XEnumTypeDescription.hpp>
#include <com/sun/star/beans/XIntrospection.hpp>
@@ -40,7 +39,6 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <comphelper/extract.hxx>
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index 3b2807704e9a..3ba0cb1fcace 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -25,11 +25,9 @@
#include "pcrcommon.hxx"
#include "pcrcomponentcontext.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XIntrospectionAccess.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <rtl/ref.hxx>
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index c1b47bf96733..d20e9064cf65 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -35,7 +35,6 @@
#include "formmetadata.hxx"
#include "pcrcomponentcontext.hxx"
-/** === begin UNO includes === **/
#include "com/sun/star/inspection/StringRepresentation.hpp"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -45,7 +44,6 @@
#include <com/sun/star/inspection/PropertyControlType.hpp>
#include <com/sun/star/inspection/XStringListControl.hpp>
#include <com/sun/star/inspection/XNumericControl.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/StringListResource.hxx>
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index 28eac9b7a24d..3d212affa8d0 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -20,7 +20,6 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
@@ -28,7 +27,6 @@
#include <com/sun/star/inspection/XPropertyControlFactory.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/Optional.hpp>
-/** === end UNO includes === **/
#include <vector>
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 2e77a3e32ef9..bbcf8f06d9c1 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -20,9 +20,6 @@
#include "modulepcr.hxx"
#include "propresid.hrc"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace pcr
{
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx
index 9e09bbd90d68..886240696221 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.hxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx
@@ -19,9 +19,6 @@
#ifndef INSPECTORHELPWINDOW_HXX
#define INSPECTORHELPWINDOW_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <vcl/fixed.hxx>
#include <svtools/svmedit.hxx>
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index 002138f8e81c..d346b16f4e81 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -20,9 +20,7 @@
#include "inspectormodelbase.hxx"
#include "pcrcommon.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
-/** === end UNO includes === **/
#include <comphelper/propertycontainerhelper.hxx>
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index 42dfcad3cfaa..a82e64601a94 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -20,11 +20,9 @@
#ifndef INSPECTORMODELBASE_HXX
#define INSPECTORMODELBASE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XObjectInspectorModel.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/propshlp.hxx>
diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx
index dfb9670994fb..578897182d73 100644
--- a/extensions/source/propctrlr/linedescriptor.hxx
+++ b/extensions/source/propctrlr/linedescriptor.hxx
@@ -20,9 +20,7 @@
#define _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_
#include <vcl/image.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/LineDescriptor.hpp>
-/** === end UNO includes === **/
//............................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 3b13fac234c4..b46ece0f41e3 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -34,9 +34,6 @@
#include "formstrings.hxx"
#include <vcl/msgbox.hxx>
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace pcr
{
diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx
index 9a473d86945f..67083efed777 100644
--- a/extensions/source/propctrlr/listselectiondlg.hxx
+++ b/extensions/source/propctrlr/listselectiondlg.hxx
@@ -25,9 +25,7 @@
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 367a550cffc3..7c88b1b34de7 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -32,9 +32,6 @@
#include "modulepcr.hxx"
#include "formresid.hrc"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace pcr
{
diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx
index 725ebcf52835..57395679da52 100644
--- a/extensions/source/propctrlr/newdatatype.hxx
+++ b/extensions/source/propctrlr/newdatatype.hxx
@@ -20,9 +20,6 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 24107f4de114..61f116a90e93 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -21,10 +21,8 @@
#include "pcrcommon.hxx"
#include "inspectormodelbase.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index 196a9dac6dab..e3d718de07f2 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -30,9 +30,7 @@
#include "modulepcr.hxx"
#include "propresid.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/util/MeasureUnit.hpp>
-/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
#include <tools/urlobj.hxx>
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index e99902fbbf9f..6412839fb0a7 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -23,11 +23,9 @@
#define EDITOR_LIST_APPEND (sal_uInt16)-1
#define EDITOR_LIST_REPLACE_EXISTING (sal_uInt16)-1
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-/** === end UNO includes === **/
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx
index 7cec06d7e10c..cb7f6f0deac4 100644
--- a/extensions/source/propctrlr/pcrcommontypes.hxx
+++ b/extensions/source/propctrlr/pcrcommontypes.hxx
@@ -29,9 +29,7 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/Property.hpp>
-/** === end UNO includes === **/
#include <rtl/ustring.hxx>
#include <boost/unordered_map.hpp>
diff --git a/extensions/source/propctrlr/pcrcomponentcontext.cxx b/extensions/source/propctrlr/pcrcomponentcontext.cxx
index 319f35cd4d3c..4b972c91d965 100644
--- a/extensions/source/propctrlr/pcrcomponentcontext.cxx
+++ b/extensions/source/propctrlr/pcrcomponentcontext.cxx
@@ -28,11 +28,9 @@
#include "pcrcomponentcontext.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/pcrcomponentcontext.hxx b/extensions/source/propctrlr/pcrcomponentcontext.hxx
index cf12486be52c..dba5c34415ef 100644
--- a/extensions/source/propctrlr/pcrcomponentcontext.hxx
+++ b/extensions/source/propctrlr/pcrcomponentcontext.hxx
@@ -29,10 +29,8 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PCROMPONENTCONTEXT_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_PCROMPONENTCONTEXT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 36bc66627533..ecc18697fb23 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -39,12 +39,10 @@
#include "formbrowsertools.hxx"
#include "propertycomposer.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/types.hxx>
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index a2343ebc2d97..c03ba71da0be 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -39,7 +39,6 @@
#include "propertyinfo.hxx"
#include "pcrcomponentcontext.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XFocusListener.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -61,7 +60,6 @@
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
#include <com/sun/star/inspection/XPropertyHandler.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbtools.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/implbase7.hxx>
diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx
index c42aa438b32f..831ae94a6a28 100644
--- a/extensions/source/propctrlr/propcontrolobserver.hxx
+++ b/extensions/source/propctrlr/propcontrolobserver.hxx
@@ -28,9 +28,7 @@
#ifndef PROPCONTROLOBSERVER_HXX
#define PROPCONTROLOBSERVER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XPropertyControl.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index d694c0abc352..1d6aea4574c0 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -28,10 +28,8 @@
#include "propertycomposer.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
#include <osl/diagnose.h>
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index cbfd8c820912..75e4e1af07e0 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -33,11 +33,9 @@
#include "composeduiupdate.hxx"
#include "formbrowsertools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/inspection/XPropertyHandler.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase2.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx
index 0e5bbec51aea..ef9215b6ff0a 100644
--- a/extensions/source/propctrlr/propertycontrolextender.cxx
+++ b/extensions/source/propctrlr/propertycontrolextender.cxx
@@ -20,9 +20,7 @@
#include "propertycontrolextender.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/KeyFunction.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx
index e4fa15328547..91cf9e4aa30b 100644
--- a/extensions/source/propctrlr/propertycontrolextender.hxx
+++ b/extensions/source/propctrlr/propertycontrolextender.hxx
@@ -20,10 +20,8 @@
#ifndef EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX
#define EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XKeyListener.hpp>
#include <com/sun/star/inspection/XPropertyControl.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 3bf59dc1039c..9679bfba4cad 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -30,8 +30,6 @@
#include "browserpage.hxx"
#include "linedescriptor.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <tools/debug.hxx>
//............................................................................
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index 0a43a2f4cd79..8cb20f56005e 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -31,9 +31,7 @@
#include "pcrcommon.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XPropertyControl.hpp>
-/** === end UNO includes === **/
#include <vcl/tabctrl.hxx>
#include <comphelper/stl_types.hxx>
#include <boost/mem_fn.hpp>
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 7532c9aead42..b41c0fc2255a 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -32,11 +32,9 @@
#include "handlerhelper.hxx"
#include "formstrings.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/util/XModifiable.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <unotools/confignode.hxx>
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index af68b60ba1fb..56384e8db613 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -24,7 +24,6 @@
#include "pcrcommon.hxx"
#include "modulepcr.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -39,7 +38,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/inspection/XPropertyHandler.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
#include <osl/interlck.h>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx
index 36fcb5427146..1c5f5de66fb0 100644
--- a/extensions/source/propctrlr/propeventtranslation.cxx
+++ b/extensions/source/propctrlr/propeventtranslation.cxx
@@ -19,10 +19,8 @@
#include "propeventtranslation.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index cfdad684d399..73fa3004e44e 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -20,9 +20,7 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
//........................................................................
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 11fc70a99546..96d164c50953 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -23,7 +23,6 @@
#include "modulepcr.hxx"
#include "unourl.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -39,7 +38,6 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
-/** === end UNO includes === **/
#include <svtools/localresaccess.hxx>
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index 7d1cd616af47..c3bf797e58c4 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -20,14 +20,12 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbtools.hxx>
#include <tools/link.hxx>
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 0a42576b6bc4..f42f186ae2be 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -29,14 +29,12 @@
#include "standardcontrol.hxx"
#include "pcrcommon.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/Color.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
-/** === end UNO includes === **/
#include <comphelper/string.hxx>
#include <rtl/math.hxx>
#include <sfx2/objsh.hxx>
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index 6b95f2b6f31f..91bf8a097897 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -23,12 +23,10 @@
#include "commoncontrol.hxx"
#include "pcrcommon.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XNumericControl.hpp>
#include <com/sun/star/inspection/XStringListControl.hpp>
#include <com/sun/star/inspection/XHyperlinkControl.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-/** === end UNO includes === **/
#include <vcl/field.hxx>
#include <vcl/longcurr.hxx>
#include <svtools/ctrlbox.hxx>
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 16b19470df46..71f1ec2ee69c 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -31,13 +31,11 @@
#include "formstrings.hxx"
#include "handlerhelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/form/submission/XSubmissionSupplier.hpp>
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index bee254f773ed..f62011ac53e5 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -23,9 +23,7 @@
#include "propertyhandler.hxx"
#include "eformshelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/xforms/XSubmission.hpp>
-/** === end UNO includes === **/
#include <comphelper/propmultiplex.hxx>
namespace comphelper
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 84108c64e4e6..1144e8373a6f 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -28,9 +28,7 @@
#include "usercontrol.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/PropertyControlType.hpp>
-/** === end UNO includes === **/
#include <svl/numuno.hxx>
#include <rtl/math.hxx>
#include <tools/debug.hxx>
diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx
index 982fde64fec9..547abdbf948a 100644
--- a/extensions/source/propctrlr/xsddatatypes.cxx
+++ b/extensions/source/propctrlr/xsddatatypes.cxx
@@ -29,11 +29,9 @@
#include "xsddatatypes.hxx"
#include "formstrings.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/xsd/DataTypeClass.hpp>
#include <com/sun/star/xsd/XDataType.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
//........................................................................
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index b409ff256db2..743ea3490842 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -20,9 +20,7 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Reference.hxx>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
namespace com { namespace sun { namespace star {
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 54988490b004..327b1a87346b 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -30,14 +30,12 @@
#include "xsddatatypes.hxx"
#include "formstrings.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xsd/DataTypeClass.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/xforms/XDataTypeRepository.hpp>
-/** === end UNO includes === **/
#include <unotools/syslocale.hxx>
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx
index b789bef49d05..3311d7f1c93a 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.hxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx
@@ -23,10 +23,8 @@
#include "eformshelper.hxx"
#include "xsddatatypes.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/xsd/XDataType.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
//........................................................................
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 0620a5b07dc1..64eefc03f456 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -39,7 +39,6 @@
#include "pcrcommon.hxx"
#include "handlerhelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
#include <com/sun/star/xsd/DataTypeClass.hpp>
@@ -47,7 +46,6 @@
#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
#include <com/sun/star/inspection/PropertyLineElement.hpp>
-/** === end UNO includes === **/
#include <vcl/msgbox.hxx>
#include <tools/debug.hxx>
#include <svtools/localresaccess.hxx>
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index 056ee740b26e..0c9c40245f29 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -22,9 +22,6 @@
#include "propertyhandler.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <memory>
//........................................................................
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 1a6f1ad745bd..ec691038141d 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -32,12 +32,10 @@
#include "cloneable.hxx"
#include "frm_strings.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/io/XObjectInputStream.hpp>
#include <com/sun/star/io/XObjectOutputStream.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-/** === end UNO includes === **/
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 7a2c4d4aef08..c08054822470 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -36,7 +36,6 @@
#include "frm_resource.hrc"
#include "BaseListBox.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/SQLErrorEvent.hpp>
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
@@ -47,7 +46,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
-/** === end UNO includes === **/
#include <comphelper/numbers.hxx>
#include <comphelper/basicio.hxx>
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 78941877e3c4..8adbfeb2ca34 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -34,13 +34,11 @@
#include "entrylisthelper.hxx"
#include "cachedrowset.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
#include <com/sun/star/form/ListSourceType.hpp>
#include <com/sun/star/awt/XItemListener.hpp>
#include <com/sun/star/awt/XFocusListener.hpp>
-/** === end UNO includes === **/
#include <connectivity/formattedcolumnvalue.hxx>
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index c63d60bd8e66..cb2ac2a50249 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -34,7 +34,6 @@
#include "property.hrc"
#include "property.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
#include <com/sun/star/awt/XCheckBox.hpp>
#include <com/sun/star/awt/XComboBox.hpp>
@@ -55,7 +54,6 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/awt/XItemList.hpp>
-/** === end UNO includes === **/
#include <comphelper/numbers.hxx>
#include <comphelper/property.hxx>
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 291384948ebe..27600cfe8cbc 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -34,7 +34,6 @@
#include "property.hrc"
#include "services.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/awt/XWindow.hpp>
@@ -47,7 +46,6 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
-/** === end UNO includes === **/
#include <comphelper/basicio.hxx>
#include <comphelper/guarding.hxx>
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 01e0c0d2166a..9c71efbe432c 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -34,12 +34,10 @@
#include "property.hxx"
#include "services.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/form/XLoadable.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
-/** === end UNO includes === **/
#include <comphelper/basicio.hxx>
#include <comphelper/container.hxx>
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index dc5f16e39694..f29e6be26d1c 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -22,13 +22,11 @@
#include "formcontrolfont.hxx"
#include "InterfaceContainer.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/XGridColumnFactory.hpp>
#include <com/sun/star/form/XLoadable.hpp>
#include <com/sun/star/sdb/XRowSetSupplier.hpp>
#include <com/sun/star/sdb/XRowSetChangeBroadcaster.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-/** === end UNO includes === **/
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/implbase7.hxx>
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 84bf9ff22059..f152d5a1951b 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -37,7 +37,6 @@
#include "listenercontainers.hxx"
#include "componenttools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -47,7 +46,6 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
-/** === end UNO includes === **/
#include <comphelper/basicio.hxx>
#include <comphelper/container.hxx>
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 0eb833ce89fd..2c696c3f6781 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -34,7 +34,6 @@
#include "errorbroadcaster.hxx"
#include "entrylisthelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
#include <com/sun/star/form/ListSourceType.hpp>
@@ -43,7 +42,6 @@
#include <com/sun/star/awt/XListBox.hpp>
#include <com/sun/star/form/XChangeBroadcaster.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-/** === end UNO includes === **/
#include <comphelper/asyncnotification.hxx>
#include <connectivity/FValue.hxx>
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 55aea67e95c9..bbec5bf779a2 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -26,12 +26,8 @@
*
************************************************************************/
-
#include "Pattern.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//.........................................................................
namespace frm
{
diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx
index f914581907f1..0d7c91bef43b 100644
--- a/forms/source/component/cachedrowset.cxx
+++ b/forms/source/component/cachedrowset.cxx
@@ -22,12 +22,10 @@
#include "services.hxx"
#include "frm_strings.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx
index b3d18178f73d..15443e547cd8 100644
--- a/forms/source/component/cachedrowset.hxx
+++ b/forms/source/component/cachedrowset.hxx
@@ -20,10 +20,8 @@
#ifndef CACHEDROWSET_HXX
#define CACHEDROWSET_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <unotools/sharedunocomponent.hxx>
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index 34807f70b9b0..929b5a5cd1e5 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -20,12 +20,10 @@
#ifndef FORMS_ENTRYLISTHELPER_HXX
#define FORMS_ENTRYLISTHELPER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/form/binding/XListEntrySink.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
#include <com/sun/star/form/binding/XListEntryListener.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index e0ca22a01a1a..a9ababe50048 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -21,13 +21,11 @@
#include "property.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/beans/PropertyExistException.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/NotRemoveableException.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index 5950a854e4ff..ada07d95b89b 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -28,9 +28,6 @@
#include "refvaluecomponent.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <tools/diagnose_ex.h>
#include <list>
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index 1acad8c17cf7..c0a10ea857d8 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -23,9 +23,6 @@
#include "FormComponent.hxx"
#include "togglestate.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace frm
{
diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx
index b8b61878dc73..9adff2b7f00f 100644
--- a/forms/source/helper/commanddescriptionprovider.cxx
+++ b/forms/source/helper/commanddescriptionprovider.cxx
@@ -20,11 +20,9 @@
#include "commanddescriptionprovider.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-/** === end UNO includes === **/
#include <comphelper/namedvaluecollection.hxx>
#include <tools/diagnose_ex.h>
diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index 1d96c3c6d660..878a72e93679 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -28,13 +28,11 @@
#include "commandimageprovider.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/XImageManager.hpp>
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/ui/ImageType.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/forms/source/helper/resettable.cxx b/forms/source/helper/resettable.cxx
index 52c1c981bd35..fd40b1da69dc 100644
--- a/forms/source/helper/resettable.cxx
+++ b/forms/source/helper/resettable.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "resettable.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/weak.hxx>
//........................................................................
diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx
index f9d05378f838..28aea0b33b5e 100644
--- a/forms/source/helper/urltransformer.cxx
+++ b/forms/source/helper/urltransformer.cxx
@@ -28,9 +28,7 @@
#include "urltransformer.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/URLTransformer.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx
index 17c217c22e61..a06f16ee0817 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -29,10 +29,8 @@
#include "windowstateguard.hxx"
#include "frm_strings.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XWindowListener2.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <tools/diagnose_ex.h>
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 104117856f33..1596097ff630 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -38,7 +38,6 @@
#include "services.hxx"
#include "windowstateguard.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
@@ -68,7 +67,6 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/form/XLoadable.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/propagg.hxx>
diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx
index cc86b01a0e60..f319c5edc6e0 100644
--- a/forms/source/inc/commanddescriptionprovider.hxx
+++ b/forms/source/inc/commanddescriptionprovider.hxx
@@ -20,9 +20,7 @@
#ifndef COMMANDDESCRIPTIONPROVIDER_HXX
#define COMMANDDESCRIPTIONPROVIDER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx
index caf19b4f2c5f..5535f0c47151 100644
--- a/forms/source/inc/commandimageprovider.hxx
+++ b/forms/source/inc/commandimageprovider.hxx
@@ -28,9 +28,7 @@
#ifndef COMMANDIMAGEPROVIDER_HXX
#define COMMANDIMAGEPROVIDER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <vcl/image.hxx>
diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx
index 5e3cee339277..7f62f9b28e6a 100644
--- a/forms/source/inc/componenttools.hxx
+++ b/forms/source/inc/componenttools.hxx
@@ -20,11 +20,9 @@
#ifndef FORMS_SOURCE_INC_COMPONENTTOOLS_HXX
#define FORMS_SOURCE_INC_COMPONENTTOOLS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Type.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
#include <set>
#include <functional>
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index c34294cf26ff..499c59ceb8cb 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -29,10 +29,8 @@
#ifndef FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
#define FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
-/** === end UNO includes === **/
#include <memory>
diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx
index 5ab0fc7e4cec..1e9809b390ab 100644
--- a/forms/source/inc/listenercontainers.hxx
+++ b/forms/source/inc/listenercontainers.hxx
@@ -20,9 +20,7 @@
#ifndef FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX
#define FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/form/XResetListener.hpp>
-/** === end UNO includes === **/
#include <comphelper/listenernotification.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx
index 7600618fa8f1..eee19b8f852a 100644
--- a/forms/source/inc/propertybaghelper.hxx
+++ b/forms/source/inc/propertybaghelper.hxx
@@ -29,9 +29,7 @@
#ifndef FORMS_PROPERTYBAGHELPER_HXX
#define FORMS_PROPERTYBAGHELPER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyValue.hpp>
-/** === end UNO includes === **/
#include <comphelper/propertybag.hxx>
#include <comphelper/propagg.hxx>
diff --git a/forms/source/inc/resettable.hxx b/forms/source/inc/resettable.hxx
index 3f2a7218cf2d..b002f1b64b4f 100644
--- a/forms/source/inc/resettable.hxx
+++ b/forms/source/inc/resettable.hxx
@@ -20,9 +20,7 @@
#ifndef FORMS_RESETTABLE_HXX
#define FORMS_RESETTABLE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/form/XResetListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/forms/source/inc/togglestate.hxx b/forms/source/inc/togglestate.hxx
index 16c97c5d2560..daa1ae1146e3 100644
--- a/forms/source/inc/togglestate.hxx
+++ b/forms/source/inc/togglestate.hxx
@@ -20,9 +20,6 @@
#ifndef FORMS_TOGGLESTATE_HXX
#define FORMS_TOGGLESTATE_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace frm
{
diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx
index ea4c40402bab..3ee1af6e8c63 100644
--- a/forms/source/inc/urltransformer.hxx
+++ b/forms/source/inc/urltransformer.hxx
@@ -20,11 +20,9 @@
#ifndef FORMS_SOURCE_INC_URLTRANSFORMER_HXX
#define FORMS_SOURCE_INC_URLTRANSFORMER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/URL.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace frm
diff --git a/forms/source/inc/windowstateguard.hxx b/forms/source/inc/windowstateguard.hxx
index e05505d37080..523e7aa943a4 100644
--- a/forms/source/inc/windowstateguard.hxx
+++ b/forms/source/inc/windowstateguard.hxx
@@ -20,10 +20,8 @@
#ifndef FORMS_WINDOWSTATEGUARD_HXX
#define FORMS_WINDOWSTATEGUARD_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/awt/XControlModel.hpp>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
//........................................................................
diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx
index 66c1fde30bf7..9d5c04ac6ffd 100644
--- a/forms/source/misc/componenttools.cxx
+++ b/forms/source/misc/componenttools.cxx
@@ -28,9 +28,7 @@
#include "componenttools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
#include <algorithm>
#include <iterator>
diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx
index efd53a2e3d91..0345c4c406c7 100644
--- a/forms/source/misc/listenercontainers.cxx
+++ b/forms/source/misc/listenercontainers.cxx
@@ -26,12 +26,8 @@
*
************************************************************************/
-
#include "listenercontainers.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace frm
{
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index 84096ea49ef4..0f6c7036973d 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -28,8 +28,6 @@
#include "attributedispatcher.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <editeng/editview.hxx>
//........................................................................
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 5de8473a1419..097ab031b30b 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -20,9 +20,7 @@
#include "clipboarddispatcher.hxx"
#include <editeng/editview.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <svtools/cliplistener.hxx>
#include <svtools/transfer.hxx>
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index 06301ed7a375..045f2d1f3517 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -28,9 +28,6 @@
#include "featuredispatcher.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace frm
{
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index d205a43d708b..e6ed7faff4d6 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -20,10 +20,8 @@
#ifndef FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX
#define FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/broadcasthelper.hxx>
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 7e1694a4bcdc..a229e710d6e0 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -37,9 +37,7 @@
#include "parametrizedattributedispatcher.hxx"
#include "specialdispatchers.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/PosSize.hpp>
-/** === end UNO includes === **/
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index fbea515ef329..4260335d5aca 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -23,9 +23,7 @@
#include <toolkit/controls/unocontrols.hxx>
#include <toolkit/awt/vclxwindow.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XDispatchProvider.hpp>
-/** === end UNO includes === **/
#include <comphelper/uno3.hxx>
#include <comphelper/implementationreference.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index b04156b12c37..141b2f0df325 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -33,11 +33,9 @@
#include "richtextengine.hxx"
#include "richtextunowrapper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/LineEndFormat.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/style/VerticalAlignment.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/guarding.hxx>
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index f5d4467f812f..7d2fff59586f 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -26,10 +26,8 @@
#include <comphelper/propertycontainerhelper.hxx>
#include <comphelper/listenernotification.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
#include <tools/link.hxx>
#include <memory>
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index 0beae8fe9ef3..817bf2f634a7 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -19,10 +19,8 @@
#include "richtextunowrapper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-/** === end UNO includes === **/
#include <editeng/unofored.hxx>
#include <editeng/editview.hxx>
#include <editeng/unoipset.hxx>
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index a20a7b89ebb0..d9cbf81fd321 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -27,9 +27,6 @@
#include "rtattributes.hxx"
#include "textattributelistener.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
class EditView;
class EditEngine;
class SfxItemSet;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 7d01dbf13274..3c29f88bc21e 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -33,7 +33,6 @@
#include "frm_resource.hrc"
#include "frm_module.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/form/runtime/FormFeature.hpp>
@@ -53,7 +52,6 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 4531dd06d9d4..825c08ffa3ca 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -20,7 +20,6 @@
#ifndef FORMS_FORMOPERATIONS_HXX
#define FORMS_FORMOPERATIONS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/form/runtime/XFormOperations.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/form/XForm.hpp>
@@ -30,7 +29,6 @@
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index e814595f432b..fca8e7b8f0a9 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -36,13 +36,11 @@
#include "commandimageprovider.hxx"
#include "commanddescriptionprovider.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XView.hpp>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/form/runtime/FormFeature.hpp>
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 39587c8fa016..4188b3dcd4bf 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -22,10 +22,8 @@
#include "formnavigation.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
-/** === end UNO includes === **/
#include <toolkit/controls/unocontrol.hxx>
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index 00cce243b947..1a6f305a11fb 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -34,8 +34,6 @@
#include "frm_strings.hxx"
#include "property.hrc"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <comphelper/enumhelper.hxx>
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index 10a936c504bd..7859a014ee07 100644
--- a/forms/source/xforms/datatyperepository.hxx
+++ b/forms/source/xforms/datatyperepository.hxx
@@ -20,9 +20,7 @@
#ifndef OFFAPI_COM_SUN_STAR_XFORMS_DATATYPEREPOSITORY_HXX
#define OFFAPI_COM_SUN_STAR_XFORMS_DATATYPEREPOSITORY_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/xforms/XDataTypeRepository.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 77e554dff5a9..045eb8afa0aa 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -20,14 +20,12 @@
#ifndef FORMS_SOURCE_XFORMS_DATATYPES_HXX
#define FORMS_SOURCE_XFORMS_DATATYPES_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/xsd/XDataType.hpp>
#include <com/sun/star/xsd/DataTypeClass.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/propertycontainer.hxx>
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index bec0f285eb3a..d573ae2bc049 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -20,9 +20,6 @@
#ifndef SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX
#define SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <tools/link.hxx>
#include <tools/string.hxx>
#include <rtl/ref.hxx>
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 69bb4034d0a0..bcfa290c8d02 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -28,12 +28,10 @@
#include "fpsmartcontent.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/ucb/ContentInfo.hpp>
#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
#include <com/sun/star/ucb/XContent.hpp>
-/** === end UNO includes === **/
#include <comphelper/processfactory.hxx>
#include <ucbhelper/commandenvironment.hxx>
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index 81aff5b2e020..8684b36c1ca9 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -31,10 +31,8 @@
#include "fpinteraction.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-/** === end UNO includes === **/
#include <ucbhelper/content.hxx>
//........................................................................
diff --git a/framework/inc/framework/documentundoguard.hxx b/framework/inc/framework/documentundoguard.hxx
index 27477f2c0ade..1954a72b5c67 100644
--- a/framework/inc/framework/documentundoguard.hxx
+++ b/framework/inc/framework/documentundoguard.hxx
@@ -22,9 +22,7 @@
#include "framework/fwedllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XInterface.hpp>
-/** === end UNO includes === **/
#include <boost/scoped_ptr.hpp>
diff --git a/framework/inc/framework/undomanagerhelper.hxx b/framework/inc/framework/undomanagerhelper.hxx
index 2e559f3e3040..20941826db2a 100644
--- a/framework/inc/framework/undomanagerhelper.hxx
+++ b/framework/inc/framework/undomanagerhelper.hxx
@@ -32,10 +32,8 @@
#include "framework/iguard.hxx"
#include "framework/imutex.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XUndoManager.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
-/** === end UNO includes === **/
#include <boost/scoped_ptr.hpp>
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 763f2434871e..fb522f905a2c 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -20,9 +20,7 @@
#include "framework/documentundoguard.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index fdfc2fd16df7..926e783b8d7f 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -28,9 +28,7 @@
#include "framework/undomanagerhelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XComponent.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index fe7fc36d83e8..deedb7d0eb2b 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -33,7 +33,6 @@
#include "ReportHelperDefines.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
@@ -46,7 +45,6 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/report/XReportDefinition.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-/** === end UNO includes === **/
#include <comphelper/embeddedobjectcontainer.hxx>
#include <comphelper/uno3.hxx>
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 61d055c73fb1..12825ef9cdb8 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -32,7 +32,6 @@
#include "RptModel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
@@ -46,7 +45,6 @@
#include <com/sun/star/report/XReportDefinition.hpp>
#include <com/sun/star/report/XGroup.hpp>
#include <com/sun/star/document/XUndoManager.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx
index 6faeb539409f..a8a968ab40d3 100644
--- a/reportdesign/inc/conditionalexpression.hxx
+++ b/reportdesign/inc/conditionalexpression.hxx
@@ -22,11 +22,7 @@
#include "dllapi.h"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <rtl/ustring.hxx>
-
#include <boost/shared_ptr.hpp>
#include <map>
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 1ff7c091dfe6..7604fede8153 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -31,9 +31,7 @@
#include "dllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Any.hxx>
-/** === end UNO includes === **/
#include <osl/diagnose.h>
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 202567b1f40f..6e7976715e39 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -45,7 +45,6 @@
#include "core_resource.hxx"
#include "corestrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XMultiPropertyStates.hpp>
#include <com/sun/star/chart2/data/DatabaseDataProvider.hpp>
@@ -82,7 +81,6 @@
#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
#include <com/sun/star/xml/AttributeData.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-/** === end UNO includes === **/
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/documentconstants.hxx>
diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx
index 2799ca179571..4508769a73fe 100644
--- a/reportdesign/source/core/inc/conditionupdater.hxx
+++ b/reportdesign/source/core/inc/conditionupdater.hxx
@@ -22,10 +22,8 @@
#include "conditionalexpression.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/report/XReportControlModel.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx
index 7da6fad42d14..2630af52fde1 100644
--- a/reportdesign/source/core/misc/conditionalexpression.cxx
+++ b/reportdesign/source/core/misc/conditionalexpression.cxx
@@ -27,9 +27,6 @@
************************************************************************/
#include "conditionalexpression.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace rptui
{
diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx
index f165cc77091f..20f37015d040 100644
--- a/reportdesign/source/core/misc/conditionupdater.cxx
+++ b/reportdesign/source/core/misc/conditionupdater.cxx
@@ -28,9 +28,7 @@
#include "conditionupdater.hxx"
#include "reportformula.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/report/XFormatCondition.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index b319a1e68303..fce2bd67a193 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -25,10 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "reportformula.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
+#include "reportformula.hxx"
#include <rtl/ustrbuf.hxx>
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 26bbb70b78ed..eb278b75beb5 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -39,13 +39,11 @@
#include "RptResId.hrc"
#include "RptModel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/script/XEventAttacherManager.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbtools.hxx>
#include <svl/smplhint.hxx>
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 46b898681627..cfb35bce51cf 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -38,7 +38,6 @@
#include "RptResId.hrc"
#include "RptModel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/script/XEventAttacherManager.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -46,7 +45,6 @@
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/beans/XIntrospectionAccess.hpp>
#include <com/sun/star/beans/XIntrospection.hpp>
-/** === end UNO includes === **/
#include <connectivity/dbtools.hxx>
#include <svl/smplhint.hxx>
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 4e34f131f08d..8373575dc7b8 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -29,11 +29,9 @@
#include "formatnormalizer.hxx"
#include "RptModel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdb/XParametersSupplier.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
-/** === end UNO includes === **/
#include <dbaccess/dbsubcomponentcontroller.hxx>
#include <unotools/syslocale.hxx>
diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx
index cafe1f4de165..b23795218da9 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.hxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.hxx
@@ -20,11 +20,9 @@
#ifndef REPORTDESIGN_FORMATNORMALIZER_HXX
#define REPORTDESIGN_FORMATNORMALIZER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/report/XReportDefinition.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/report/XFormattedField.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 0a7c337feeba..0942580540c1 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -39,10 +39,8 @@
#include "ReportController.hxx"
#include "Condition.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 77071c13e8c0..7efd3f8a563f 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -19,12 +19,10 @@
#ifndef RPT_DEFAULTINSPECTION_HXX
#define RPT_DEFAULTINSPECTION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/inspection/XObjectInspectorModel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
#include <memory>
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx
index f3bc74502a12..65950fa1ede4 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -20,14 +20,12 @@
#ifndef INCLUDED_FIXEDTEXTCOLOR_HXX
#define INCLUDED_FIXEDTEXTCOLOR_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/report/XFixedText.hpp>
-/** === end UNO includes === **/
#include <IReportControllerObserver.hxx>
#include <vector>
diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
index e158862aa40a..ba75b9274b93 100644
--- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
+++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
@@ -20,12 +20,10 @@
#ifndef INCLUDED_FORMATTEDFIELDBEAUTIFIER_HXX
#define INCLUDED_FORMATTEDFIELDBEAUTIFIER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/report/XReportComponent.hpp>
-/** === end UNO includes === **/
#include <vector>
#include <IReportControllerObserver.hxx>
diff --git a/reportdesign/source/ui/inc/IReportControllerObserver.hxx b/reportdesign/source/ui/inc/IReportControllerObserver.hxx
index 841a87ebe21b..7fb6d084464f 100644
--- a/reportdesign/source/ui/inc/IReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/IReportControllerObserver.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_BEAUTIFIER_HXX
#define INCLUDED_BEAUTIFIER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-/** === end UNO includes === **/
namespace rptui
{
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 7c36f8861503..8c07708681e6 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -33,7 +33,6 @@
#include "ReportControllerObserver.hxx"
#include "RptDef.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -53,7 +52,6 @@
#include <com/sun/star/util/XModeSelector.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-/** === end UNO includes === **/
#include <comphelper/implementationreference.hxx>
#include <comphelper/proparrhlp.hxx>
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 5ad211bc3a68..97ee6b250f33 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -21,10 +21,8 @@
#include "ModuleHelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/inspection/XPropertyHandler.hpp>
-/** === end UNO includes === **/
//............................................................................
namespace rptui
diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx
index 9224acd94e10..ba815ee1f9b4 100644
--- a/sd/source/ui/toolpanel/ToolPanel.cxx
+++ b/sd/source/ui/toolpanel/ToolPanel.cxx
@@ -30,9 +30,7 @@
#include "MethodGuard.hxx"
#include <taskpane/TaskPaneTreeNode.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <vcl/window.hxx>
diff --git a/sd/source/ui/toolpanel/ToolPanel.hxx b/sd/source/ui/toolpanel/ToolPanel.hxx
index 07eca366ff68..1ec20dcb192e 100644
--- a/sd/source/ui/toolpanel/ToolPanel.hxx
+++ b/sd/source/ui/toolpanel/ToolPanel.hxx
@@ -20,9 +20,7 @@
#ifndef SD_TOOLPANEL_HXX
#define SD_TOOLPANEL_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/ui/XToolPanel.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx>
diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx
index 4b5bb57e99a5..85beb2c32c14 100644
--- a/sd/source/ui/toolpanel/ToolPanelFactory.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx
@@ -32,14 +32,12 @@
#include "ViewShellBase.hxx"
#include "app.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/XUIElementFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/awt/XWindow.hpp>
-/** === end UNO includes === **/
#include <sfx2/frame.hxx>
#include <vcl/svapp.hxx>
diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx
index af1e90d806f8..d2dd02ad694e 100644
--- a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx
@@ -21,10 +21,8 @@
#include "ToolPanelUIElement.hxx"
#include "MethodGuard.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/UIElementType.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
index 04f73a4eb09d..c3f6e90199c1 100644
--- a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
+++ b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
@@ -20,10 +20,8 @@
#ifndef SD_TOOLPANELUIELEMENT_HXX
#define SD_TOOLPANELUIELEMENT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/ui/XToolPanel.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 8eb9bc7f8800..fae7729860c7 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -52,12 +52,10 @@
#include "sdresid.hxx"
#include "framework/FrameworkHelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
#include <com/sun/star/drawing/framework/AnchorBindingMode.hpp>
#include <com/sun/star/drawing/XDrawSubController.hpp>
-/** === end UNO includes === **/
#include <svtools/toolpanel/toolpanel.hxx>
#include <svtools/toolpanel/toolpaneldeck.hxx>
diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx
index 0e966f4ff9a0..c87611101f94 100644
--- a/sd/workben/custompanel/ctp_panel.cxx
+++ b/sd/workben/custompanel/ctp_panel.cxx
@@ -20,7 +20,6 @@
#include "ctp_panel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/drawing/framework/XPane.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
@@ -30,7 +29,6 @@
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/awt/XGraphics.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx
index df6410f63bd1..f3fa1718f415 100644
--- a/sd/workben/custompanel/ctp_panel.hxx
+++ b/sd/workben/custompanel/ctp_panel.hxx
@@ -20,14 +20,12 @@
#ifndef SD_WORKBENCH_CTP_PANEL_HXX
#define SD_WORKBENCH_CTP_PANEL_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/ui/XToolPanel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/awt/XPaintListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index 2c883787ba47..ee77297488b0 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -23,7 +23,6 @@
#include "sfx2/sfxuno.hxx"
#include "sfx2/objsh.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XLoadEventListener.hpp>
#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
#include <com/sun/star/frame/XController2.hpp>
@@ -35,7 +34,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-/** === end UNO includes === **/
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx
index a9f2a9dfeeed..a4adc7471890 100644
--- a/sfx2/inc/sfx2/docmacromode.hxx
+++ b/sfx2/inc/sfx2/docmacromode.hxx
@@ -31,12 +31,10 @@
#include "sfx2/dllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
-/** === end UNO includes === **/
#include <boost/shared_ptr.hpp>
diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
index 3bf32be455cb..d5a2b1aeb0e6 100644
--- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx
+++ b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
@@ -31,9 +31,7 @@
#include "sfx2/dllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XModifyListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx
index 29c0fc69a1bd..3ff0c317c72f 100644
--- a/sfx2/inc/sfx2/sfxmodelfactory.hxx
+++ b/sfx2/inc/sfx2/sfxmodelfactory.hxx
@@ -22,10 +22,8 @@
#include "sfx2/dllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace sfx2
diff --git a/sfx2/inc/sfx2/userinputinterception.hxx b/sfx2/inc/sfx2/userinputinterception.hxx
index 1949e32ebe44..7350314b4835 100644
--- a/sfx2/inc/sfx2/userinputinterception.hxx
+++ b/sfx2/inc/sfx2/userinputinterception.hxx
@@ -22,9 +22,7 @@
#include "sfx2/dllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XUserInputInterception.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
#include <memory>
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 0ebdcb366372..ea90d62e731a 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -35,7 +35,6 @@
#include "sfxlocal.hrc"
#include "helpid.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/ui/XToolPanel.hpp>
@@ -46,7 +45,6 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/awt/XControl.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 371264fa73ff..4a3ae6006cf2 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -31,7 +31,6 @@
#include "sfx2/signaturestate.hxx"
#include "sfx2/docfile.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/task/ErrorCodeRequest.hpp>
#include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp>
@@ -39,7 +38,6 @@
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
#include <com/sun/star/script/vba/XVBACompatibility.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index f9d888eb7f5f..d03c81108b2f 100644
--- a/sfx2/source/doc/docstoragemodifylistener.cxx
+++ b/sfx2/source/doc/docstoragemodifylistener.cxx
@@ -26,13 +26,9 @@
*
************************************************************************/
-
#include "sfx2/docstoragemodifylistener.hxx"
#include <osl/mutex.hxx>
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace sfx2
{
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index 6c3948163e4c..f74d12b6e3e4 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -33,9 +33,7 @@
#include "sfx2/viewsh.hxx"
#include "sfx2/bindings.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XComponent.hpp>
-/** === end UNO includes === **/
#include <comphelper/anytostring.hxx>
#include <comphelper/flagguard.hxx>
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index 7a2441bfe1e8..7a9bd9094045 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -28,11 +28,9 @@
#include "sfx2/sfxmodelfactory.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-/** === end UNO includes === **/
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index d6e559827614..14a29e33cdcb 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -22,9 +22,7 @@
#include "sfx2/sfxbasemodel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XUndoManager.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 00a64bd9e990..7aeab2f8b4cd 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -46,7 +46,6 @@
#include "sfx2/viewsh.hxx"
#include "sfx2/viewfac.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/document/XTypeDetection.hpp>
#include <com/sun/star/frame/XFrame.hpp>
@@ -55,7 +54,6 @@
#include <com/sun/star/task/XInteractionHandler2.hpp>
#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-/** === end UNO includes === **/
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index 23449126772c..31669042319b 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -29,10 +29,8 @@
#include "sfx2/userinputinterception.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/MouseButton.hpp>
#include <com/sun/star/awt/KeyModifier.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx
index 35f08ca5693c..695bc22c4463 100644
--- a/sfx2/workben/custompanel/ctp_factory.cxx
+++ b/sfx2/workben/custompanel/ctp_factory.cxx
@@ -29,11 +29,9 @@
#include "ctp_factory.hxx"
#include "ctp_panel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NotInitializedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-/** === end UNO includes === **/
//......................................................................................................................
namespace sd { namespace colortoolpanel
diff --git a/sfx2/workben/custompanel/ctp_factory.hxx b/sfx2/workben/custompanel/ctp_factory.hxx
index dd9e43dd3a3e..e726b99f7f40 100644
--- a/sfx2/workben/custompanel/ctp_factory.hxx
+++ b/sfx2/workben/custompanel/ctp_factory.hxx
@@ -20,11 +20,9 @@
#ifndef SD_WORKBENCH_CTP_FACTORY_HXX
#define SD_WORKBENCH_CTP_FACTORY_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ui/XUIElementFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/sfx2/workben/custompanel/ctp_panel.cxx b/sfx2/workben/custompanel/ctp_panel.cxx
index 6327560101cf..2910add96009 100644
--- a/sfx2/workben/custompanel/ctp_panel.cxx
+++ b/sfx2/workben/custompanel/ctp_panel.cxx
@@ -20,7 +20,6 @@
#include "ctp_panel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/awt/XToolkit.hpp>
@@ -30,7 +29,6 @@
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/awt/XGraphics.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/sfx2/workben/custompanel/ctp_panel.hxx b/sfx2/workben/custompanel/ctp_panel.hxx
index 27825fbe5962..82b74d0d2d3f 100644
--- a/sfx2/workben/custompanel/ctp_panel.hxx
+++ b/sfx2/workben/custompanel/ctp_panel.hxx
@@ -20,13 +20,11 @@
#ifndef SD_WORKBENCH_CTP_PANEL_HXX
#define SD_WORKBENCH_CTP_PANEL_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/ui/XToolPanel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/awt/XPaintListener.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/compbase1.hxx>
diff --git a/sfx2/workben/custompanel/ctp_services.cxx b/sfx2/workben/custompanel/ctp_services.cxx
index ef79fe911599..9e13abb45540 100644
--- a/sfx2/workben/custompanel/ctp_services.cxx
+++ b/sfx2/workben/custompanel/ctp_services.cxx
@@ -25,12 +25,8 @@
*
************************************************************************/
-
#include "ctp_factory.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/implementationentry.hxx>
//......................................................................................................................
diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx
index b0b1d843e4a6..dec37c75d086 100644
--- a/svtools/inc/svtools/imageresourceaccess.hxx
+++ b/svtools/inc/svtools/imageresourceaccess.hxx
@@ -22,10 +22,8 @@
#include "svtools/svtdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
class SvStream;
//........................................................................
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 9b4fdd69f332..c79636c77a2c 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -31,7 +31,6 @@
#include <svtools/inettbc.hxx>
#include <svtools/imagemgr.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
@@ -39,7 +38,6 @@
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
#include <comphelper/processfactory.hxx>
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index 576b0e6e5721..04d77925588c 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -29,10 +29,8 @@
#ifndef SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX
#define SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/document/XStandaloneDocumentInfo.hpp>
-/** === end UNO includes === **/
#include <salhelper/thread.hxx>
#include <rtl/ref.hxx>
#include <ucbhelper/content.hxx>
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 92f08a2c42e8..b34eea012426 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -29,13 +29,11 @@
#include <svtools/imageresourceaccess.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/io/NotConnectedException.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/io/XStream.hpp>
-/** === end UNO includes === **/
#include <unotools/ucbstreamhelper.hxx>
#include <tools/stream.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index 1f362d9345aa..afb27ae3778a 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -25,12 +25,8 @@
*
************************************************************************/
-
#include "cellvalueconversion.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//......................................................................................................................
namespace svt
{
diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx
index 96440f9088f2..accdf42a45c9 100644
--- a/svtools/source/table/cellvalueconversion.hxx
+++ b/svtools/source/table/cellvalueconversion.hxx
@@ -28,9 +28,7 @@
#ifndef SVTOOLS_CELLVALUECONVERSION_HXX
#define SVTOOLS_CELLVALUECONVERSION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Any.hxx>
-/** === end UNO includes === **/
//......................................................................................................................
namespace svt
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 5a20053b694c..f4a1f1d9dcf3 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -30,9 +30,7 @@
#include "svtools/table/gridtablerenderer.hxx"
#include "svtools/colorcfg.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/graphic/XGraphic.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 8091fa508a2f..127785990301 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -35,12 +35,10 @@
#include "tablegeometry.hxx"
#include "cellvalueconversion.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
-/** === end UNO includes === **/
#include <comphelper/flagguard.hxx>
#include <vcl/scrbar.hxx>
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index c512600f0924..4851baeed201 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -21,9 +21,7 @@
#include "paneltabbarpeer.hxx"
#include "svtools/toolpanel/paneltabbar.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/toolpanel/paneltabbarpeer.hxx b/svtools/source/toolpanel/paneltabbarpeer.hxx
index fab0047f31f9..9ee78691495b 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.hxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.hxx
@@ -22,9 +22,6 @@
#include "svtaccessiblefactory.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <toolkit/awt/vclxwindow.hxx>
//......................................................................................................................
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 129595e76f25..6a66ff317f7a 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -34,10 +34,8 @@
#include "svtools/toolpanel/tablayouter.hxx"
#include "svtools/toolpanel/drawerlayouter.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index 4580f3e8ac10..1c9a1ef12027 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -21,9 +21,7 @@
#include "toolpaneldeckpeer.hxx"
#include "svtools/toolpanel/toolpaneldeck.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
index 0de2f1dd11e7..fba078dbed71 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.hxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
@@ -22,9 +22,6 @@
#include "svtaccessiblefactory.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <toolkit/awt/vclxwindow.hxx>
//......................................................................................................................
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
index 5791aeac5eac..afb41738724e 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
@@ -21,10 +21,8 @@
#include "toolpaneldrawerpeer.hxx"
#include "toolpaneldrawer.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index f6cd8944451d..f363d4a950b8 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -33,12 +33,10 @@
#include "svtools/table/gridtablerenderer.hxx"
#include "svtools/table/tablecontrol.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/grid/XGridColumn.hpp>
#include <com/sun/star/view/SelectionType.hpp>
#include <com/sun/star/awt/grid/XGridColumnListener.hpp>
#include <com/sun/star/awt/grid/XSortableGridData.hpp>
-/** === end UNO includes === **/
#include <comphelper/stlunosequence.hxx>
#include <cppuhelper/weakref.hxx>
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index d804ca0f03b4..15881dde71b2 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -32,7 +32,6 @@
#include "svtools/table/tablemodel.hxx"
#include "svtools/table/tablecontrol.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/grid/XGridControl.hpp>
#include <com/sun/star/awt/grid/GridDataEvent.hpp>
#include <com/sun/star/awt/grid/XGridColumnModel.hpp>
@@ -41,7 +40,6 @@
#include <com/sun/star/awt/grid/XGridColumn.hpp>
#include <com/sun/star/util/Color.hpp>
#include <com/sun/star/style/VerticalAlignment.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
#include <rtl/ref.hxx>
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 711615053f6f..d04024ddf7d8 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -33,11 +33,9 @@
#include "svtools/table/gridtablerenderer.hxx"
#include "svtools/table/tablecontrol.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/grid/XGridColumn.hpp>
#include <com/sun/star/view/SelectionType.hpp>
#include <com/sun/star/awt/grid/XGridColumnListener.hpp>
-/** === end UNO includes === **/
#include <comphelper/stlunosequence.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index 8dcc628b705d..29d4f3894530 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -23,11 +23,9 @@
#include "svtools/table/tablemodel.hxx"
#include "svtools/table/tablecontrol.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/grid/XGridColumn.hpp>
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <com/sun/star/style/HorizontalAlignment.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
#include <rtl/ref.hxx>
diff --git a/svtools/source/uno/unowizard.hxx b/svtools/source/uno/unowizard.hxx
index d933d737274c..1ef6f7d1a6d0 100644
--- a/svtools/source/uno/unowizard.hxx
+++ b/svtools/source/uno/unowizard.hxx
@@ -22,11 +22,9 @@
#include "svtools/genericunodialog.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/dialogs/XWizard.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ui/dialogs/XWizardController.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index ee64f0c120a5..4e9a769b8291 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -29,14 +29,12 @@
#include "../unowizard.hxx"
#include "wizardshell.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/ui/dialogs/XWizardController.hpp>
#include <com/sun/star/ui/dialogs/WizardButton.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <rtl/strbuf.hxx>
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index b711a87115b6..2f58edeb12a4 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -21,10 +21,8 @@
#include "wizardpagecontroller.hxx"
#include "wizardshell.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/awt/XControl.hpp>
-/** === end UNO includes === **/
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index 098266336255..6261a27e5279 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -30,9 +30,7 @@
#include "svtools/wizardmachine.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/dialogs/XWizardController.hpp>
-/** === end UNO includes === **/
//......................................................................................................................
namespace svt { namespace uno
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 37b033864edc..0cf7e20bea2f 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -31,9 +31,7 @@
#include <tools/diagnose_ex.h>
-/** === begin UNO includes === **/
#include <com/sun/star/ui/dialogs/WizardTravelType.hpp>
-/** === end UNO includes === **/
#include <vcl/msgbox.hxx>
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index ab4969941213..ae8edcddf22e 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -20,10 +20,8 @@
#ifndef SVT_UNO_WIZARD_SHELL
#define SVT_UNO_WIZARD_SHELL
-/** === begin UNO includes === **/
#include <com/sun/star/ui/dialogs/XWizardController.hpp>
#include <com/sun/star/ui/dialogs/XWizard.hpp>
-/** === end UNO includes === **/
#include <svtools/roadmapwizard.hxx>
diff --git a/svtools/workben/unodialog/udlg_services.cxx b/svtools/workben/unodialog/udlg_services.cxx
index cb2949791e9c..93ed5101d230 100644
--- a/svtools/workben/unodialog/udlg_services.cxx
+++ b/svtools/workben/unodialog/udlg_services.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include "udlg_module.hxx"
//........................................................................
diff --git a/svtools/workben/unodialog/unodialogsample.cxx b/svtools/workben/unodialog/unodialogsample.cxx
index 30ffd07240ee..205771057c9c 100644
--- a/svtools/workben/unodialog/unodialogsample.cxx
+++ b/svtools/workben/unodialog/unodialogsample.cxx
@@ -20,9 +20,6 @@
#include "udlg_module.hxx"
#include "roadmapskeleton.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <comphelper/componentcontext.hxx>
#include "svtools/genericunodialog.hxx"
diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx
index eb32d1011750..6acb2194a810 100644
--- a/svx/inc/svx/databaselocationinput.hxx
+++ b/svx/inc/svx/databaselocationinput.hxx
@@ -22,9 +22,6 @@
#include "svx/svxdllapi.h"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
class PushButton;
class String;
namespace svt { class OFileURLControl; }
diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx
index 322a2bc6e1d1..d8aaa61574b7 100644
--- a/svx/inc/svx/fmsrcimp.hxx
+++ b/svx/inc/svx/fmsrcimp.hxx
@@ -32,13 +32,11 @@
#include <svx/fmtools.hxx>
#include "svx/svxdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XCheckBox.hpp>
#include <com/sun/star/awt/XListBox.hpp>
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
-/** === end UNO includes === **/
#include <comphelper/stl_types.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
index 0ac555b5f89f..6ed1ef523476 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
@@ -20,9 +20,7 @@
#ifndef SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
#define SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Reference.hxx>
-/** === end UNO includes === **/
#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
#include <svx/svxdllapi.h>
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 2addaf190d24..50d0a33026c9 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -31,9 +31,7 @@
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Reference.hxx>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
#include <svx/svxdllapi.h>
diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx
index c322c8832965..d46b6278b749 100644
--- a/svx/inc/svx/shapeproperty.hxx
+++ b/svx/inc/svx/shapeproperty.hxx
@@ -20,9 +20,6 @@
#ifndef SVX_SHAPEPROPERTY_HXX
#define SVX_SHAPEPROPERTY_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace svx
{
diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx
index e5ae2626438b..457104c40926 100644
--- a/svx/inc/svx/shapepropertynotifier.hxx
+++ b/svx/inc/svx/shapepropertynotifier.hxx
@@ -23,10 +23,8 @@
#include "svx/svxdllapi.h"
#include "svx/shapeproperty.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index a19ecc49fd61..c5a1abca40b2 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -39,7 +39,6 @@
#include "svx/svxids.hrc"
#include <tools/urlobj.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/form/FormComponentType.hpp>
@@ -52,7 +51,6 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/sdbcx/XRowLocate.hpp>
-/** === end UNO includes === **/
#include <comphelper/container.hxx>
#include <comphelper/enumhelper.hxx>
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 14a6bcbf1c3e..6a9005bd2172 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -32,9 +32,7 @@
#include "svx/fmresids.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 0b278843aa82..fc1b92c23e2f 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -33,7 +33,6 @@
#include "fmprop.hrc"
#include "svx/fmresids.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XTextComponent.hpp>
@@ -41,7 +40,6 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
-/** === end UNO includes === **/
#include <comphelper/processfactory.hxx>
#include <comphelper/property.hxx>
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index b55fbdc15a9a..044eb783380e 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -44,7 +44,6 @@
#include "svx/svdpagv.hxx"
#include "svx/svxids.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/form/XForm.hpp>
@@ -57,7 +56,6 @@
#include <com/sun/star/form/inspection/DefaultFormComponentInspectorModel.hpp>
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
#include <com/sun/star/inspection/DefaultHelpProvider.hpp>
-/** === end UNO includes === **/
#include <comphelper/processfactory.hxx>
#include <comphelper/property.hxx>
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index aaa01e0c3301..bb010865cc56 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -31,11 +31,9 @@
#include "fmprop.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/awt/XListBox.hpp>
-/** === end UNO includes === **/
#include <tools/debug.hxx>
//........................................................................
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index f8792313be04..f441deef1873 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -30,7 +30,6 @@
#include "fmcontrollayout.hxx"
#include "fmprop.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
@@ -39,7 +38,6 @@
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
#include <comphelper/processfactory.hxx>
#include <i18npool/mslangid.hxx>
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index ea45b810204f..611ac52ffc82 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -30,13 +30,11 @@
#include "fmdocumentclassification.hxx"
#include "svx/dbtoolsclient.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xforms/XFormsSupplier.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/frame/XModule.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index c8e8689a6192..183ec8aaf01f 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -39,13 +39,11 @@
#include "svx/fmmodel.hxx"
#include "svx/dialmgr.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
#include <com/sun/star/io/XPersistObject.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-/** === end UNO includes === **/
#include "svx/fmtools.hxx"
#include <tools/shl.hxx>
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 22d3bf6999f1..26a8ffb14ba9 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -29,7 +29,6 @@
#include "fmscriptingenv.hxx"
#include "svx/fmmodel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/script/XScriptListener.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -37,7 +36,6 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/awt/XControl.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <cppuhelper/implbase1.hxx>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d3d644f00111..f9506a3e480c 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -55,7 +55,6 @@
#include "svx/svxdlg.hxx"
#include "svx/svxids.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/awt/XCheckBox.hpp>
#include <com/sun/star/awt/XListBox.hpp>
@@ -86,7 +85,6 @@
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/beans/XIntrospection.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
#include <comphelper/evtmethodhelper.hxx>
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index bf4c3cd3cb4b..817520ab6ff6 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -28,9 +28,6 @@
#include "fmtextcontrolfeature.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace svx
{
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 4ffc6f89704b..6234c9871d50 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -41,7 +41,6 @@
#include "svx/svxids.hrc"
#include "editeng/udlnitem.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -50,7 +49,6 @@
#include <com/sun/star/awt/XFocusListener.hpp>
#include <com/sun/star/awt/XMouseListener.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 9d5352c6382d..bd39bf8d0d7f 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -33,7 +33,6 @@
#include "svx/dbtoolsclient.hxx"
#include "svx/fmglob.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/LineEndFormat.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XIntrospection.hpp>
@@ -68,7 +67,6 @@
#include <com/sun/star/util/XNumberFormats.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
-/** === end UNO includes === **/
#include <basic/sbxvar.hxx>
#include <svl/eitem.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 4b9acadd960f..b951406a8336 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -40,7 +40,6 @@
#include "svx/fmmodel.hxx"
#include "svx/fmpage.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XContainer.hpp>
@@ -49,7 +48,6 @@
#include <com/sun/star/form/binding/XBindableValue.hpp>
#include <com/sun/star/form/binding/XListEntrySink.hpp>
#include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
-/** === end UNO includes === **/
#include "svx/fmtools.hxx"
#include <rtl/logfile.hxx>
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 546540e7a0f6..ca621e899835 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -52,7 +52,6 @@
#include "svx/svdpagv.hxx"
#include "svx/xmlexchg.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -80,7 +79,6 @@
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/container/XContainer.hpp>
-/** === end UNO includes === **/
#include <comphelper/enumhelper.hxx>
#include <comphelper/extract.hxx>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index ec74af27c7a2..0c1e17fac9d5 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -35,7 +35,6 @@
#include "svx/dialmgr.hxx"
#include "svx/svdouno.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/XFormComponent.hpp>
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
@@ -49,7 +48,6 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/numbers.hxx>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 8a6758e105c2..73523525b3c0 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -40,7 +40,6 @@
#include "svx/fmtools.hxx"
#include "fmurl.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/FocusChangeReason.hpp>
#include <com/sun/star/awt/XCheckBox.hpp>
#include <com/sun/star/awt/XComboBox.hpp>
@@ -70,7 +69,6 @@
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
#include <com/sun/star/sdb/XColumn.hpp>
-/** === end UNO includes === **/
#include <comphelper/enumhelper.hxx>
#include <comphelper/extract.hxx>
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index b3ed12601c6b..ceaa327a5cc1 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -34,12 +34,10 @@
#include "fmprop.hrc"
#include "svx/fmtools.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/runtime/FormOperations.hpp>
#include <com/sun/star/form/runtime/FormFeature.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
#include <comphelper/anytostring.hxx>
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 8b91a8b25714..6830e7de6fa7 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "formdispatchinterceptor.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <tools/debug.hxx>
//........................................................................
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 5074829f7a26..8d8cd56a1e71 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -28,9 +28,7 @@
#include "formtoolbars.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <svx/svxids.hrc>
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 1fefcb2a9c48..e7491bd5229d 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -28,12 +28,10 @@
#include "fmservs.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/XFormController.hpp>
#include <com/sun/star/form/runtime/XFormController.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index 655b33b69518..c6339e99b497 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "stringlistresource.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <tools/rcid.h>
//........................................................................
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index ffeaf54f300e..89253bc80a86 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -29,8 +29,6 @@
#include "xfm_addcondition.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <cppuhelper/typeprovider.hxx>
#include "datanavi.hxx"
#include <vcl/msgbox.hxx>
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 9e3273c51473..195e140d78c0 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -19,13 +19,11 @@
#ifndef SVX_FMPROPBRW_HXX
#define SVX_FMPROPBRW_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/inspection/XObjectInspectorModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-/** === end UNO includes === **/
#include <sfx2/basedlgs.hxx>
#include <sfx2/ctrlitem.hxx>
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index f1076d7f6682..39251abcd023 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -20,12 +20,10 @@
#ifndef SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
#define SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
-/** === end UNO includes === **/
#include <comphelper/stl_types.hxx>
#include <set>
diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index aebc5dd2a2a2..6cc152254c13 100644
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.hxx
@@ -20,9 +20,7 @@
#ifndef SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
#define SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include "fmdocumentclassification.hxx"
#include <unotools/confignode.hxx>
diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx
index 97a6ae608364..f28f23926992 100644
--- a/svx/source/inc/fmdocumentclassification.hxx
+++ b/svx/source/inc/fmdocumentclassification.hxx
@@ -20,9 +20,7 @@
#ifndef SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
#define SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace svxform
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 30ead6d8f706..6d7131ae050a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -38,7 +38,6 @@
#include <sfx2/ctrlitem.hxx>
#include <vcl/image.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/form/XFormComponent.hpp>
@@ -47,7 +46,6 @@
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
-/** === end UNO includes === **/
#include <svtools/svtreebx.hxx>
diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx
index 3a86d3091840..2f098cf119e6 100644
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
@@ -20,9 +20,7 @@
#ifndef SVX_FMSCRIPTINGENV_HXX
#define SVX_FMSCRIPTINGENV_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/script/XEventAttacherManager.hpp>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
class FmFormModel;
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 549bed51b391..7d1db2f720f9 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -20,12 +20,10 @@
#ifndef SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
#define SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/util/URL.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include "fmslotinvalidator.hxx"
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 37cd875a9268..50caebf72560 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -28,7 +28,6 @@
#ifndef SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
#define SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
@@ -37,7 +36,6 @@
#include <com/sun/star/form/runtime/XFormController.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-/** === end UNO includes === **/
#include <comphelper/implementationreference.hxx>
#include <tools/link.hxx>
#include <vcl/timer.hxx>
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index c6ef1e3a46e7..dd53b90b03d5 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -34,7 +34,6 @@
#include "fmscriptingenv.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -45,7 +44,6 @@
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/container/ContainerEvent.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index f76c69dc6278..48295cc75ccb 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -31,7 +31,6 @@
#include "svx/svdmark.hxx"
#include "fmdocumentclassification.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
@@ -43,7 +42,6 @@
#include <com/sun/star/awt/XFocusListener.hpp>
#include <com/sun/star/sdb/SQLErrorEvent.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
-/** === end UNO includes === **/
#include <comphelper/stl_types.hxx>
#include <tools/link.hxx>
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index 7f46d797178c..bb956e836806 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -23,13 +23,11 @@
#include "fmdocumentclassification.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XNumberFormats.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-/** === end UNO includes === **/
#include <memory>
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index b716eea9f462..28f374c401b4 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -32,7 +32,6 @@
#include "formdispatchinterceptor.hxx"
#include "sqlparserclient.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/awt/XFocusListener.hpp>
@@ -76,7 +75,6 @@
#include <com/sun/star/util/XModeSelector.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
-/** === end UNO includes === **/
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index ae70507463b8..0aabfa8e25a6 100644
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.hxx
@@ -28,10 +28,8 @@
#ifndef SVX_FORMDISPATCHINTERCEPTOR_HXX
#define SVX_FORMDISPATCHINTERCEPTOR_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase2.hxx>
#include <comphelper/uno3.hxx>
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index fd0a155b2dc9..0f5c25e78aab 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -29,11 +29,9 @@
#ifndef SVX_FMDISPATCH_HXX
#define SVX_FMDISPATCH_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/form/runtime/XFormOperations.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 8852c4be60d0..4f780cc7fdcd 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -34,7 +34,6 @@
#include "sqlparserclient.hxx"
#include "typeconversionclient.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/sdb/XColumn.hpp>
#include <com/sun/star/form/XBoundControl.hpp>
#include <com/sun/star/awt/XTextComponent.hpp>
@@ -49,7 +48,6 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/form/XChangeBroadcaster.hpp>
#include <com/sun/star/awt/XWindow.hpp>
-/** === end UNO includes === **/
#include <comphelper/propmultiplex.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx
index 3ba1d190ed58..db5ec39d9d0c 100644
--- a/svx/source/inc/xfm_addcondition.hxx
+++ b/svx/source/inc/xfm_addcondition.hxx
@@ -20,9 +20,7 @@
#ifndef SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
#define SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/xforms/XModel.hpp>
-/** === end UNO includes === **/
#include <svtools/genericunodialog.hxx>
#include <comphelper/proparrhlp.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 4f4f1da1668a..6d6d41589460 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -27,9 +27,7 @@
#include <svx/svdview.hxx>
#include <svx/sdrpagewindow.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XWindow2.hpp>
-/** === end UNO includes === **/
#include "svx/sdrpaintwindow.hxx"
#include <tools/diagnose_ex.h>
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index fb3ad54b003b..17f6e0985da7 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -39,7 +39,6 @@
#include <svx/sdrpagewindow.hxx>
#include "svx/sdrpaintwindow.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XControlModel.hpp>
@@ -54,7 +53,6 @@
#include <com/sun/star/util/XModeChangeBroadcaster.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/container/XContainer.hpp>
-/** === end UNO includes === **/
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 5b613c5c4266..c5f6f148c90b 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -28,9 +28,7 @@
#include "svx/shapepropertynotifier.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <comphelper/stl_types.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/toolkit/inc/toolkit/awt/animatedimagespeer.hxx b/toolkit/inc/toolkit/awt/animatedimagespeer.hxx
index f86f64f74317..8606c1293508 100644
--- a/toolkit/inc/toolkit/awt/animatedimagespeer.hxx
+++ b/toolkit/inc/toolkit/awt/animatedimagespeer.hxx
@@ -22,10 +22,8 @@
#include "toolkit/awt/vclxwindow.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XAnimation.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase3.hxx>
diff --git a/toolkit/inc/toolkit/controls/animatedimages.hxx b/toolkit/inc/toolkit/controls/animatedimages.hxx
index 35f63c3a04a5..6faa70111257 100644
--- a/toolkit/inc/toolkit/controls/animatedimages.hxx
+++ b/toolkit/inc/toolkit/controls/animatedimages.hxx
@@ -23,11 +23,9 @@
#include "toolkit/controls/unocontrolbase.hxx"
#include "toolkit/controls/unocontrolmodel.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XAnimation.hpp>
#include <com/sun/star/awt/XAnimatedImages.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/toolkit/inc/toolkit/controls/spinningprogress.hxx b/toolkit/inc/toolkit/controls/spinningprogress.hxx
index 46ddbea92234..e9914883bb39 100644
--- a/toolkit/inc/toolkit/controls/spinningprogress.hxx
+++ b/toolkit/inc/toolkit/controls/spinningprogress.hxx
@@ -22,9 +22,6 @@
#include "toolkit/controls/animatedimages.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//......................................................................................................................
namespace toolkit
{
diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/toolkit/inc/toolkit/helper/formpdfexport.hxx
index 000387e432c2..9e88d71f5b3f 100644
--- a/toolkit/inc/toolkit/helper/formpdfexport.hxx
+++ b/toolkit/inc/toolkit/helper/formpdfexport.hxx
@@ -22,9 +22,7 @@
#include <toolkit/dllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XControl.hpp>
-/** === end UNO includes === **/
#include <vcl/pdfwriter.hxx>
diff --git a/toolkit/inc/toolkit/helper/imagealign.hxx b/toolkit/inc/toolkit/helper/imagealign.hxx
index a904a4edb8ee..f6f2ac5e3860 100644
--- a/toolkit/inc/toolkit/helper/imagealign.hxx
+++ b/toolkit/inc/toolkit/helper/imagealign.hxx
@@ -20,11 +20,7 @@
#ifndef TOOLKIT_INC_TOOLKIT_HELPER_IMAGEALIGN_HXX
#define TOOLKIT_INC_TOOLKIT_HELPER_IMAGEALIGN_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <sal/types.h>
-
#include <vcl/button.hxx>
//........................................................................
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index 124dcdb88646..12cc95ffdac3 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -29,7 +29,6 @@
#include "toolkit/awt/animatedimagespeer.hxx"
#include "toolkit/helper/property.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XAnimatedImages.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
@@ -37,7 +36,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/awt/ImageScaleMode.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 017538272ba2..018b48c9df1a 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -30,9 +30,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/interfacecontainer.hxx>
#include <osl/mutex.hxx>
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index b79969f455f2..3385a1aa5289 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -28,9 +28,7 @@
#ifndef TOOLKIT_STYLESETTINGS_HXX
#define TOOLKIT_STYLESETTINGS_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XStyleSettings.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 213fc865a9b0..e7be773056c3 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -31,12 +31,10 @@
#include "toolkit/helper/property.hxx"
#include "toolkit/helper/unopropertyarrayhelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/awt/ImageScaleMode.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
-/** === end UNO includes === **/
//......................................................................................................................
namespace toolkit
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 1661740120db..d0fcaa50bdee 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -30,9 +30,7 @@
#include "defaultgridcolumnmodel.hxx"
#include "gridcolumn.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/XVclWindowPeer.hpp>
-/** === end UNO includes === **/
#include <comphelper/sequence.hxx>
#include <comphelper/componentguard.hxx>
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
index 7da262188b71..8d8bd240a865 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/** === begin UNO includes === **/
#include <com/sun/star/awt/grid/XGridColumnModel.hpp>
#include <com/sun/star/awt/grid/XGridColumn.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
@@ -25,7 +24,6 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <com/sun/star/util/Color.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase2.hxx>
diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx
index 44e2a0601792..de50bbcfc747 100644
--- a/toolkit/source/controls/grid/grideventforwarder.cxx
+++ b/toolkit/source/controls/grid/grideventforwarder.cxx
@@ -17,13 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "grideventforwarder.hxx"
#include "gridcontrol.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//......................................................................................................................
namespace toolkit
{
diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx
index f8a15d036ebf..87a0efad4d25 100644
--- a/toolkit/source/controls/grid/grideventforwarder.hxx
+++ b/toolkit/source/controls/grid/grideventforwarder.hxx
@@ -20,11 +20,9 @@
#ifndef TOOLKIT_GRIDEVENTFORWARDER_HXX
#define TOOLKIT_GRIDEVENTFORWARDER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/awt/grid/XGridDataListener.hpp>
#include <com/sun/star/awt/grid/XGridColumnListener.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
diff --git a/toolkit/source/controls/grid/initguard.hxx b/toolkit/source/controls/grid/initguard.hxx
index 570768fe3ca4..f4c96cb719d0 100644
--- a/toolkit/source/controls/grid/initguard.hxx
+++ b/toolkit/source/controls/grid/initguard.hxx
@@ -20,9 +20,7 @@
#ifndef SVTOOLS_INITGUARD_HXX
#define SVTOOLS_INITGUARD_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NotInitializedException.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentguard.hxx>
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 094760e748b8..fd476e3d31a7 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -29,11 +29,9 @@
#include "sortablegriddatamodel.hxx"
#include "toolkit/helper/servicenames.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
-/** === end UNO includes === **/
#include <comphelper/anycompare.hxx>
#include <cppuhelper/typeprovider.hxx>
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.hxx b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
index 83cb6ce86dd2..4222ed6b45b6 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.hxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
@@ -30,13 +30,11 @@
#include "initguard.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/awt/grid/XSortableMutableGridDataModel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/awt/grid/XGridDataListener.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index 696f3036637b..ecc038ed733c 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -30,8 +30,6 @@
#include "toolkit/helper/servicenames.hxx"
#include "toolkit/helper/unopropertyarrayhelper.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index c28156371f35..22fec372cf28 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -29,7 +29,6 @@
#include <toolkit/helper/formpdfexport.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -42,7 +41,6 @@
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/form/FormSubmitMethod.hpp>
-/** === end UNO includes === **/
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/pdfextoutdevdata.hxx>
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 69d60f47469b..6e47cad61aa9 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -32,7 +32,6 @@
#include "ucpext_provider.hxx"
#include "ucpext_resultset.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/lang/IllegalAccessException.hpp>
@@ -50,7 +49,6 @@
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
#include <com/sun/star/lang/IllegalAccessException.hpp>
#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
-/** === end UNO includes === **/
#include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/propertyvalueset.hxx>
diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx
index a1dcf1030e1b..a975cdcd0fa4 100644
--- a/ucb/source/ucp/ext/ucpext_content.hxx
+++ b/ucb/source/ucp/ext/ucpext_content.hxx
@@ -20,10 +20,8 @@
#ifndef UCB_UCPEXT_CONTENT_HXX
#define UCB_UCPEXT_CONTENT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
#include <ucbhelper/contenthelper.hxx>
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index 8425ffe8135b..29356a7e68e5 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -30,9 +30,7 @@
#include "ucpext_content.hxx"
#include "ucpext_provider.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
-/** === end UNO includes === **/
#include <ucbhelper/contentidentifier.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 8da160067d77..e6dbe6781330 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -25,13 +25,9 @@
*
************************************************************************/
-
#include "ucpext_provider.hxx"
#include "ucpext_content.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <ucbhelper/contentidentifier.hxx>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx
index aa9e202b548b..73fe97431f93 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.cxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.cxx
@@ -17,14 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "ucpext_resultset.hxx"
#include "ucpext_content.hxx"
#include "ucpext_datasupplier.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <ucbhelper/resultset.hxx>
//......................................................................................................................
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 599c04be65e6..b6e10684cf44 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -25,12 +25,8 @@
*
************************************************************************/
-
#include "ucpext_provider.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/implementationentry.hxx>
//......................................................................................................................
diff --git a/unotools/inc/unotools/closeveto.hxx b/unotools/inc/unotools/closeveto.hxx
index 1fddd439ca04..d0b97bf08dc4 100644
--- a/unotools/inc/unotools/closeveto.hxx
+++ b/unotools/inc/unotools/closeveto.hxx
@@ -30,9 +30,7 @@
#include "unotools/unotoolsdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XInterface.hpp>
-/** === end UNO includes === **/
#include <boost/scoped_ptr.hpp>
diff --git a/unotools/inc/unotools/componentresmodule.hxx b/unotools/inc/unotools/componentresmodule.hxx
index 0ac796f33d73..a7018932e59c 100644
--- a/unotools/inc/unotools/componentresmodule.hxx
+++ b/unotools/inc/unotools/componentresmodule.hxx
@@ -31,8 +31,6 @@
#include <comphelper/componentmodule.hxx>
#include <unotools/unotoolsdllapi.h>
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <tools/resid.hxx>
#include <memory>
diff --git a/unotools/inc/unotools/desktopterminationobserver.hxx b/unotools/inc/unotools/desktopterminationobserver.hxx
index f56582cb46ef..8c8050a6d5bb 100644
--- a/unotools/inc/unotools/desktopterminationobserver.hxx
+++ b/unotools/inc/unotools/desktopterminationobserver.hxx
@@ -30,9 +30,6 @@
#ifndef UNOTOOLS_INC_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
#define UNOTOOLS_INC_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace utl
{
diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx
index fb74733c5178..86eeab131663 100644
--- a/unotools/source/misc/closeveto.cxx
+++ b/unotools/source/misc/closeveto.cxx
@@ -28,9 +28,7 @@
#include <unotools/closeveto.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/util/XCloseable.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index 279a85071854..9e636a0dcfd1 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.cxx
@@ -28,10 +28,8 @@
#include <unotools/desktopterminationobserver.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase1.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
index b3be0276e780..e70dbe355dc1 100644
--- a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
+++ b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
@@ -27,9 +27,7 @@
#ifndef XML_SETTINGS_EXPORT_CONTEXT_HXX
#define XML_SETTINGS_EXPORT_CONTEXT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
#include "xmloff/xmltoken.hxx"
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 06ad07bb9189..f62e0da52aa2 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -36,7 +36,6 @@
#include "xmloff/xformsexport.hxx"
#include "property_meta_data.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/io/XPersistObject.hpp>
@@ -53,7 +52,6 @@
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/form/ListSourceType.hpp>
#include <com/sun/star/awt/ImagePosition.hpp>
-/** === end UNO includes === **/
#include <sax/tools/converter.hxx>
#include <tools/wintypes.hxx> // for check states
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 405a8fa1998c..03b1d044448d 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -42,7 +42,6 @@
#include "property_description.hxx"
#include "property_meta_data.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/util/Duration.hpp>
@@ -51,7 +50,6 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-/** === end UNO includes === **/
#include <sax/tools/converter.hxx>
#include <tools/urlobj.hxx>
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index e5b58726e6f1..61fb2b2f0e82 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -27,13 +27,11 @@
#include "logging.hxx"
#include "property_description.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
-/** === end UNO includes === **/
#include <comphelper/stl_types.hxx>
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index 6dec3d6d5cc0..5b00ec4ee355 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -28,11 +28,9 @@
#include "gridcolumnproptranslator.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/awt/TextAlign.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
-/** === end UNO includes === **/
#include <osl/diagnose.h>
#include <cppuhelper/implbase1.hxx>
diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx
index 01dfa8fae9f2..ce391297496f 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.hxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.hxx
@@ -20,10 +20,8 @@
#ifndef XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
#define XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
//........................................................................
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 846c00cba503..225ba07bf5ce 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -55,9 +55,7 @@
#include <xmloff/xmlnumfe.hxx>
#include "xmloff/xformsexport.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/text/XText.hpp>
-/** === end UNO includes === **/
#include <numeric>