Remove UNO includes comments

Change-Id: I48e193322967fb75e93eaf81e9e2110d3056f92a
author: Thomas Arnhold <thomas@arnhold.org> 2012-06-28 12:28:46 +0200
committer: Thomas Arnhold <thomas@arnhold.org> 2012-06-29 09:25:09 +0200
commit: 57154616f064752c237a278db18767241da13c3f (patch)
tree: c105cd45b095b2580c4d9ffec69a49dda8089d9b /dbaccess
parent: 59c8cfffa75d991e3fac8b3cb41dde31389bb8c1 (diff)
130 files changed, 0 insertions, 294 deletions
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>
author	Thomas Arnhold <thomas@arnhold.org>	2012-06-28 12:28:46 +0200
committer	Thomas Arnhold <thomas@arnhold.org>	2012-06-29 09:25:09 +0200
commit	57154616f064752c237a278db18767241da13c3f (patch)
tree	c105cd45b095b2580c4d9ffec69a49dda8089d9b /dbaccess
parent	59c8cfffa75d991e3fac8b3cb41dde31389bb8c1 (diff)