remove boilerplate comments

Change-Id: I44a476a9843816f70a7a4d84b8c35edeecd5daaf

46 files changed, 8 insertions, 104 deletions

diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index 8ab90a35105b..8523a7020564 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -35,7 +35,6 @@
 namespace dbaccess
 {
 
-    /** === begin UNO using === **/
     using namespace ::com::sun::star::uno;
     using ::com::sun::star::sdbc::XDatabaseMetaData;
     using ::com::sun::star::sdbc::SQLException;
@@ -46,7 +45,6 @@ namespace dbaccess
     using ::com::sun::star::sdbc::XStatement;
     using ::com::sun::star::lang::DisposedException;
     using ::com::sun::star::sdbc::XRow;
-    /** === end UNO using === **/
 
     ::rtl::OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& i_sSetting)
     {
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index 64784c654e1d..a2ade21289c6 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -33,7 +33,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -48,7 +47,7 @@ namespace dbaccess
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::beans::XPropertySet;
     using ::com::sun::star::beans::XPropertySetInfo;
-    /** === end UNO using === **/
+
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
 
     //==============================================================================
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index be895d7ad99c..b2f3bc4dbc6e 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -40,7 +40,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -61,7 +60,6 @@ namespace dbaccess
     using ::com::sun::star::beans::XPropertySet;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::beans::PropertyValue;
-    /** === end UNO using === **/
 
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
     namespace CommandType = ::com::sun::star::sdb::CommandType;
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 6eb4656a29af..e7b271b24e2c 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -30,7 +30,6 @@
 
 namespace dbaccess
 {
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -51,7 +50,6 @@ namespace dbaccess
     using ::com::sun::star::sdb::XDatabaseRegistrationsListener;
     using ::com::sun::star::sdb::DatabaseRegistrationEvent;
     using ::com::sun::star::uno::XAggregation;
-    /** === end UNO using === **/
 
     static const OUString& getConfigurationRootPath()
     {
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index 094006bf494e..063876e58439 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -35,7 +35,6 @@
 namespace dbaccess
 {
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -61,7 +60,7 @@ namespace dbaccess
     using ::com::sun::star::beans::PropertyValue;
     using ::com::sun::star::frame::XController;
     using ::com::sun::star::document::DocumentEvent;
-    /** === end UNO using === **/
+
     using namespace ::com::sun::star;
 
     //====================================================================
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 1bd422905b22..651fb00ef720 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -30,7 +30,6 @@
 namespace dbaccess
 {
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -46,7 +45,7 @@ namespace dbaccess
     using ::com::sun::star::document::XDocumentEventListener;
     using ::com::sun::star::document::DocumentEvent;
     using ::com::sun::star::frame::XController2;
-    /** === end UNO using === **/
+
     using namespace ::com::sun::star;
 
     //==================================================================
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 14121c82e7e3..65f54ffa6f02 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -31,7 +31,6 @@
 namespace dbaccess
 {
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -47,7 +46,6 @@ namespace dbaccess
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::Type;
-    /** === end UNO using === **/
 
     //====================================================================
     //= DocumentEvents_Data
diff --git a/dbaccess/source/core/misc/ContainerListener.cxx b/dbaccess/source/core/misc/ContainerListener.cxx
index 9fd482d739cb..66c5126b69f9 100644
--- a/dbaccess/source/core/misc/ContainerListener.cxx
+++ b/dbaccess/source/core/misc/ContainerListener.cxx
@@ -25,7 +25,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::container::ContainerEvent;
     using ::com::sun::star::lang::WrappedTargetException;
     using ::com::sun::star::uno::RuntimeException;
@@ -34,7 +33,6 @@ namespace dbaccess
     using ::com::sun::star::lang::EventObject;
     using ::com::sun::star::util::XVeto;
     using ::com::sun::star::uno::Reference;
-    /** === end UNO using === **/
 
     //====================================================================
     //= OContainerListener
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index ff9e8fdbbe5c..6d1e59603864 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -33,7 +33,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::uno::WeakReference;
     using ::com::sun::star::uno::Reference;
@@ -43,7 +42,6 @@ namespace dbaccess
     using ::com::sun::star::sdb::tools::XObjectNames;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::sdbc::SQLException;
-    /** === end UNO using === **/
 
     namespace CommandType = com::sun::star::sdb::CommandType;
 
diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx
index 4ad7a20f3fde..a08e4116c0cf 100644
--- a/dbaccess/source/core/misc/veto.cxx
+++ b/dbaccess/source/core/misc/veto.cxx
@@ -24,10 +24,8 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::RuntimeException;
-    /** === end UNO using === **/
 
     //====================================================================
     //= Veto
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 67988f86f88c..409784feccdf 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -46,7 +46,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -74,7 +73,6 @@ namespace dbaccess
     using ::com::sun::star::frame::XModel;
     using ::com::sun::star::util::XModifiable;
     using ::com::sun::star::beans::XPropertySet;
-    /** === end UNO using === **/
 
     namespace ElementModes = ::com::sun::star::embed::ElementModes;
 
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index e54aa04d7629..5fd94023f954 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -28,7 +28,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -41,7 +40,6 @@ namespace dbaccess
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::Type;
     using ::com::sun::star::xml::sax::XAttributeList;
-    /** === end UNO using === **/
 
     //====================================================================
     //= SettingsImport
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index 900fc39e3f4d..fec9492b22e7 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -29,7 +29,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -44,7 +43,7 @@ namespace dbaccess
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::embed::XStorage;
     using ::com::sun::star::io::XStream;
-    /** === end UNO using === **/
+
     namespace ElementModes = ::com::sun::star::embed::ElementModes;
 
     //====================================================================
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index 8c8cbb37b410..fcce399dd92a 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -29,7 +29,6 @@ namespace dbaccess
 {
 //......................................................................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -46,7 +45,6 @@ namespace dbaccess
     using ::com::sun::star::io::TextOutputStream;
     using ::com::sun::star::io::XTextOutputStream2;
     using ::com::sun::star::io::XActiveDataSource;
-    /** === end UNO using === **/
 
     //==================================================================================================================
     //= StorageTextOutputStream_Data
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index e2f17222895e..d17593bc7a58 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -37,7 +37,6 @@ namespace dbaccess
 {
 //......................................................................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -61,7 +60,6 @@ namespace dbaccess
     using ::com::sun::star::xml::sax::Parser;
     using ::com::sun::star::xml::sax::XParser;
     using ::com::sun::star::xml::sax::InputSource;
-    /** === end UNO using === **/
 
     //==================================================================================================================
     //= StorageXMLOutputStream_Data
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index 8b6dd3bd244f..85ae960dea4a 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -30,7 +30,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -51,7 +50,6 @@ namespace dbaccess
     using ::com::sun::star::ucb::XCommandProcessor;
     using ::com::sun::star::frame::XController2;
     using ::com::sun::star::lang::XComponent;
-    /** === end UNO using === **/
 
     //====================================================================
     //= SubComponentLoader
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 58942d810c9b..e70acbbf6561 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -45,7 +45,6 @@ namespace dbaccess
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -78,7 +77,6 @@ namespace dbaccess
     using ::com::sun::star::xml::sax::XLocator;
     using ::com::sun::star::xml::sax::XDocumentHandler;
     using ::com::sun::star::xml::sax::XAttributeList;
-    /** === end UNO using === **/
 
     namespace ElementModes = ::com::sun::star::embed::ElementModes;
 
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index 9468a9c4453e..c811340f7df1 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -34,7 +34,6 @@ namespace dbmm
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -51,7 +50,6 @@ namespace dbmm
     using ::com::sun::star::task::InteractionClassification_QUERY;
     using ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER;
     using ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER;
-    /** === end UNO using === **/
 
     //====================================================================
     //= InteractionHandler_Data
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 01c1dd2ff542..93a1bdf8294c 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -60,7 +60,6 @@ namespace dbmm
 
 #define PATH_DEFAULT            1
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::uno::XInterface;
@@ -92,7 +91,6 @@ namespace dbmm
     using ::com::sun::star::ucb::XCommandEnvironment;
     using ::com::sun::star::ucb::XContent;
     using ::com::sun::star::ucb::XContentIdentifier;
-    /** === end UNO using === **/
 
     //====================================================================
     //= helper
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 0e824f3cc216..a82ab8811339 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -37,7 +37,6 @@ namespace dbmm
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -49,7 +48,6 @@ namespace dbmm
     using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::frame::XModel;
-    /** === end UNO using === **/
 
     //====================================================================
     //= MacroMigrationPage
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 7b0f64747b0e..0485a1293f32 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -33,7 +33,6 @@ namespace dbmm
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -51,7 +50,6 @@ namespace dbmm
     using ::com::sun::star::sdb::XOfficeDatabaseDocument;
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::frame::XStorable;
-    /** === end UNO using === **/
 
     //====================================================================
     //= MacroMigrationDialogService
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 705c47189857..bd75b8a39971 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -80,7 +80,6 @@ namespace dbmm
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -134,7 +133,7 @@ namespace dbmm
     using ::com::sun::star::script::XScriptEventsSupplier;
     using ::com::sun::star::io::XInputStreamProvider;
     using ::com::sun::star::io::XInputStream;
-    /** === end UNO using === **/
+
     namespace ElementModes = ::com::sun::star::embed::ElementModes;
 
 // migration phases whose progresses are to be mixed into one progress
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 4a8c6316f9ab..cee60652defb 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -35,11 +35,6 @@
 //........................................................................
 namespace dbmm
 {
-//........................................................................
-
-    /** === begin UNO using === **/
-    /** === end UNO using === **/
-
     //====================================================================
     //= LibraryEntry
     //====================================================================
diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index 371e99cc31ff..efdb8af3c3d4 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -28,7 +28,6 @@ namespace dbmm
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -38,7 +37,6 @@ namespace dbmm
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::makeAny;
-    /** === end UNO using === **/
 
     //====================================================================
     //= ProgressCapture_Data
diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx
index 6a34e91a5ec6..5f883d38f7bb 100644
--- a/dbaccess/source/ext/macromigration/progressmixer.cxx
+++ b/dbaccess/source/ext/macromigration/progressmixer.cxx
@@ -26,11 +26,6 @@
 //........................................................................
 namespace dbmm
 {
-//........................................................................
-
-    /** === begin UNO using === **/
-    /** === end UNO using === **/
-
 #define OVERALL_RANGE   100000
 
     //====================================================================
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 55b6c0229dd2..4b46d411028f 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -38,7 +38,6 @@ namespace sdbtools
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using namespace ::com::sun::star;
     using namespace ::com::sun::star::uno;
     using ::com::sun::star::uno::Reference;
@@ -53,7 +52,6 @@ namespace sdbtools
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::uno::XComponentContext;
-    /** === end UNO using === **/
 
     //====================================================================
     //= ConnectionTools
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
index f5e2d0ecbfc1..2a68e485a510 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
@@ -29,13 +29,11 @@ namespace sdbtools
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::lang::NullPointerException;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::XComponentContext;
-    /** === end UNO using === **/
 
     //====================================================================
     //= DataSourceMetaData_Impl
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index f9cb51372f17..9e1d0dd69cec 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -43,7 +43,6 @@ namespace sdbtools
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::lang::NullPointerException;
@@ -60,7 +59,6 @@ namespace sdbtools
     using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::XComponentContext;
-    /** === end UNO using === **/
 
     namespace CommandType = ::com::sun::star::sdb::CommandType;
     namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index 0bf1a31741be..1b640cb2e18a 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -36,7 +36,6 @@ namespace sdbtools
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::lang::NullPointerException;
@@ -52,7 +51,6 @@ namespace sdbtools
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::beans::XPropertySetInfo;
     using ::com::sun::star::uno::XComponentContext;
-    /** === end UNO using === **/
 
     namespace CompositionType = ::com::sun::star::sdb::tools::CompositionType;
 
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 56d755fc9924..7da24412dc9e 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -20,13 +20,11 @@
 
 #include "module_sdbt.hxx"
 
-/** === begin UNO using === **/
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::registry::InvalidRegistryException;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::XInterface;
-/** === end UNO using === **/
 
 extern "C" void SAL_CALL createRegistryInfo_ConnectionTools();
 
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 6dfa8e8e57b6..c308d96ac0a9 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -87,10 +87,8 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::ucb;
 
-/** === begin UNO using === **/
 using ::com::sun::star::util::XCloseable;
 using ::com::sun::star::ui::XContextMenuInterceptor;
-/** === end UNO using === **/
 
 namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
 namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index 803a4b5548be..5ed65de095ee 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -43,7 +43,6 @@ namespace dbaui
 {
 //......................................................................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -70,7 +69,6 @@ namespace dbaui
     using ::com::sun::star::document::XDocumentEventBroadcaster;
     using ::com::sun::star::beans::XPropertySet;
     using ::com::sun::star::beans::PropertyChangeEvent;
-    /** === end UNO using === **/
 
     //==================================================================================================================
     //= helper structs
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index 305a2d94dd57..3d698e06b08a 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -26,11 +26,6 @@
 //........................................................................
 namespace dbaui
 {
-//........................................................................
-
-    /** === begin UNO using === **/
-    /** === end UNO using === **/
-
     //====================================================================
     //= CharSetListBox
     //====================================================================
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index d2ec3e9a5e3a..0230697af9d3 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -40,7 +40,6 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::lang::XMultiServiceFactory;
     using ::com::sun::star::uno::Any;
@@ -49,7 +48,6 @@ namespace dbaui
     using ::com::sun::star::beans::XPropertySet;
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::sdbc::XDriver;
-    /** === end UNO using === **/
 
     //========================================================================
     //= SpecialSettingsPage
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index a7fab79f7481..2841341aa019 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -29,11 +29,6 @@
 //........................................................................
 namespace dbaui
 {
-//........................................................................
-
-    /** === begin UNO using === **/
-    /** === end UNO using === **/
-
     //====================================================================
     //= TextConnectionSettingsDialog
     //====================================================================
diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
index 3a90c074081d..40337deda37b 100644
--- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx
+++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
@@ -30,12 +30,10 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::ui::dialogs::XExecutableDialog;
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::uno::Exception;
-    /** === end UNO using === **/
 
     //====================================================================
     //= AsyncDialogExecutor
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 28c21278515f..09eab6b4a648 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -39,7 +39,6 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -67,7 +66,6 @@ namespace dbaui
     using ::com::sun::star::lang::EventObject;
     using ::com::sun::star::document::XDocumentEventBroadcaster;
     using ::com::sun::star::awt::XWindow;
-    /** === end UNO using === **/
 
     //====================================================================
     //= FrameWindowActivationListener
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 9dbf67dc8f97..83d2c30a7252 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -31,7 +31,6 @@ namespace dbaui
 {
 //......................................................................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -54,7 +53,6 @@ namespace dbaui
     using ::com::sun::star::document::XUndoManagerListener;
     using ::com::sun::star::util::NotLockedException;
     using ::com::sun::star::lang::NoSupportException;
-    /** === end UNO using === **/
 
     //==================================================================================================================
     //= UndoManager_Impl
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index e5d51adeef12..7fc12d00b3be 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -53,7 +53,6 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::beans::XPropertySet;
@@ -85,7 +84,6 @@ namespace dbaui
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::frame::XUntitledNumbers;
     using ::com::sun::star::beans::PropertyVetoException;
-    /** === end UNO using === **/
 
     class DataSourceHolder
     {
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index 457082543a18..019f112d2d12 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -47,7 +47,6 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::container::XNameAccess;
     using ::com::sun::star::lang::IllegalArgumentException;
@@ -63,7 +62,6 @@ namespace dbaui
     using ::com::sun::star::sdb::tools::XObjectNames;
     using ::com::sun::star::sdb::tools::XConnectionTools;
     using ::com::sun::star::uno::UNO_QUERY;
-    /** === end UNO using === **/
 
     using namespace dbtools;
 
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 64fda00bcd82..d03a803c0f04 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -30,10 +30,8 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using namespace dbaccess;
     using namespace ::com::sun::star;
-    /** === end UNO using === **/
 
     struct FeatureSupport
     {
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index 857aafacb07d..293775ca7cd8 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -36,7 +36,6 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::uno::Exception;
@@ -48,7 +47,7 @@ namespace dbaui
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::sdbcx::XViewsSupplier;
     using ::com::sun::star::uno::UNO_SET_THROW;
-    /** === end UNO using === **/
+
     namespace GraphicColorMode = ::com::sun::star::graphic::GraphicColorMode;
 
     //====================================================================
diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx
index 287daad6e972..c48e3893eadb 100644
--- a/dbaccess/source/ui/misc/propertystorage.cxx
+++ b/dbaccess/source/ui/misc/propertystorage.cxx
@@ -30,7 +30,6 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -38,7 +37,6 @@ namespace dbaui
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::makeAny;
-    /** === end UNO using === **/
 
     //====================================================================
     //= PropertyStorage
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index 27ac7a1e4740..0b3f19bd7ef5 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -34,7 +34,6 @@ namespace dbaui
 {
 //......................................................................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -51,7 +50,6 @@ namespace dbaui
     using ::com::sun::star::lang::XMultiServiceFactory;
     using ::com::sun::star::beans::PropertyValue;
     using ::com::sun::star::lang::EventObject;
-    /** === end UNO using === **/
 
     //==================================================================================================================
     //= OSingleDocumentController_Data
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 758b4e5c525d..385b70499a54 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -76,7 +76,6 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -134,7 +133,7 @@ namespace dbaui
     using ::com::sun::star::sdbc::XDriverManager;
     using ::com::sun::star::sdbc::DriverManager;
     using ::com::sun::star::beans::PropertyValue;
-    /** === end UNO using === **/
+
     namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
     namespace CopyTableContinuation = ::com::sun::star::sdb::application::CopyTableContinuation;
     namespace CommandType = ::com::sun::star::sdb::CommandType;
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 572126dcc215..fb9741792985 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -39,7 +39,6 @@ namespace dbaui
 {
 //........................................................................
 
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -53,7 +52,7 @@ namespace dbaui
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::beans::Property;
     using ::com::sun::star::lang::IllegalArgumentException;
-    /** === end UNO using === **/
+
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
 
     //====================================================================