Remove UNO includes comments

Change-Id: I48e193322967fb75e93eaf81e9e2110d3056f92a

48 files changed, 0 insertions, 103 deletions

diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx
index eb32d1011750..6acb2194a810 100644
--- a/svx/inc/svx/databaselocationinput.hxx
+++ b/svx/inc/svx/databaselocationinput.hxx
@@ -22,9 +22,6 @@
 
 #include "svx/svxdllapi.h"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 class PushButton;
 class String;
 namespace svt { class OFileURLControl; }
diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx
index 322a2bc6e1d1..d8aaa61574b7 100644
--- a/svx/inc/svx/fmsrcimp.hxx
+++ b/svx/inc/svx/fmsrcimp.hxx
@@ -32,13 +32,11 @@
 #include <svx/fmtools.hxx>
 #include "svx/svxdllapi.h"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XListBox.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/stl_types.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
index 0ac555b5f89f..6ed1ef523476 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
@@ -20,9 +20,7 @@
 #ifndef SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
 #define SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/uno/Reference.hxx>
-/** === end UNO includes === **/
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 2addaf190d24..50d0a33026c9 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -31,9 +31,7 @@
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/uno/Reference.hxx>
-/** === end UNO includes === **/
 #include <rtl/ref.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx
index c322c8832965..d46b6278b749 100644
--- a/svx/inc/svx/shapeproperty.hxx
+++ b/svx/inc/svx/shapeproperty.hxx
@@ -20,9 +20,6 @@
 #ifndef SVX_SHAPEPROPERTY_HXX
 #define SVX_SHAPEPROPERTY_HXX
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 //........................................................................
 namespace svx
 {
diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx
index e5ae2626438b..457104c40926 100644
--- a/svx/inc/svx/shapepropertynotifier.hxx
+++ b/svx/inc/svx/shapepropertynotifier.hxx
@@ -23,10 +23,8 @@
 #include "svx/svxdllapi.h"
 #include "svx/shapeproperty.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-/** === end UNO includes === **/
 
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index a19ecc49fd61..c5a1abca40b2 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -39,7 +39,6 @@
 #include "svx/svxids.hrc"
 #include <tools/urlobj.hxx>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
@@ -52,7 +51,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/container.hxx>
 #include <comphelper/enumhelper.hxx>
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 14a6bcbf1c3e..6a9005bd2172 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -32,9 +32,7 @@
 
 #include "svx/fmresids.hrc"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 0b278843aa82..fc1b92c23e2f 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -33,7 +33,6 @@
 #include "fmprop.hrc"
 #include "svx/fmresids.hrc"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
@@ -41,7 +40,6 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index b55fbdc15a9a..044eb783380e 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -44,7 +44,6 @@
 #include "svx/svdpagv.hxx"
 #include "svx/svxids.hrc"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/form/XForm.hpp>
@@ -57,7 +56,6 @@
 #include <com/sun/star/form/inspection/DefaultFormComponentInspectorModel.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/inspection/DefaultHelpProvider.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index aaa01e0c3301..bb010865cc56 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -31,11 +31,9 @@
 
 #include "fmprop.hrc"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/awt/XListBox.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 
 //........................................................................
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index f8792313be04..f441deef1873 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -30,7 +30,6 @@
 #include "fmcontrollayout.hxx"
 #include "fmprop.hrc"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
@@ -39,7 +38,6 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/processfactory.hxx>
 #include <i18npool/mslangid.hxx>
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index ea45b810204f..611ac52ffc82 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -30,13 +30,11 @@
 #include "fmdocumentclassification.hxx"
 #include "svx/dbtoolsclient.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/frame/XModule.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index c8e8689a6192..183ec8aaf01f 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -39,13 +39,11 @@
 #include "svx/fmmodel.hxx"
 #include "svx/dialmgr.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-/** === end UNO includes === **/
 #include "svx/fmtools.hxx"
 
 #include <tools/shl.hxx>
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 22d3bf6999f1..26a8ffb14ba9 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -29,7 +29,6 @@
 #include "fmscriptingenv.hxx"
 #include "svx/fmmodel.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/script/XScriptListener.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -37,7 +36,6 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/awt/XControl.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/implbase1.hxx>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d3d644f00111..f9506a3e480c 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -55,7 +55,6 @@
 #include "svx/svxdlg.hxx"
 #include "svx/svxids.hrc"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XListBox.hpp>
@@ -86,7 +85,6 @@
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/extract.hxx>
 #include <comphelper/evtmethodhelper.hxx>
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index bf4c3cd3cb4b..817520ab6ff6 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -28,9 +28,6 @@
 
 #include "fmtextcontrolfeature.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 //........................................................................
 namespace svx
 {
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 4ffc6f89704b..6234c9871d50 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -41,7 +41,6 @@
 #include "svx/svxids.hrc"
 #include "editeng/udlnitem.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -50,7 +49,6 @@
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/awt/XMouseListener.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 9d5352c6382d..bd39bf8d0d7f 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -33,7 +33,6 @@
 #include "svx/dbtoolsclient.hxx"
 #include "svx/fmglob.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
@@ -68,7 +67,6 @@
 #include <com/sun/star/util/XNumberFormats.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
-/** === end UNO includes === **/
 
 #include <basic/sbxvar.hxx>
 #include <svl/eitem.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 4b9acadd960f..b951406a8336 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -40,7 +40,6 @@
 #include "svx/fmmodel.hxx"
 #include "svx/fmpage.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XContainer.hpp>
@@ -49,7 +48,6 @@
 #include <com/sun/star/form/binding/XBindableValue.hpp>
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
 #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
-/** === end UNO includes === **/
 
 #include "svx/fmtools.hxx"
 #include <rtl/logfile.hxx>
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 546540e7a0f6..ca621e899835 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -52,7 +52,6 @@
 #include "svx/svdpagv.hxx"
 #include "svx/xmlexchg.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -80,7 +79,6 @@
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/extract.hxx>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index ec74af27c7a2..0c1e17fac9d5 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -35,7 +35,6 @@
 #include "svx/dialmgr.hxx"
 #include "svx/svdouno.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
@@ -49,7 +48,6 @@
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/numbers.hxx>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 8a6758e105c2..73523525b3c0 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -40,7 +40,6 @@
 #include "svx/fmtools.hxx"
 #include "fmurl.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/FocusChangeReason.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XComboBox.hpp>
@@ -70,7 +69,6 @@
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/extract.hxx>
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index b3ed12601c6b..ceaa327a5cc1 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -34,12 +34,10 @@
 #include "fmprop.hrc"
 #include "svx/fmtools.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/runtime/FormOperations.hpp>
 #include <com/sun/star/form/runtime/FormFeature.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 #include <comphelper/anytostring.hxx>
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 8b91a8b25714..6830e7de6fa7 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -17,12 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "formdispatchinterceptor.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <tools/debug.hxx>
 
 //........................................................................
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 5074829f7a26..8d8cd56a1e71 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -28,9 +28,7 @@
 
 #include "formtoolbars.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
 
 #include <svx/svxids.hrc>
 
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 1fefcb2a9c48..e7491bd5229d 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -28,12 +28,10 @@
 
 #include "fmservs.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/XFormController.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
 
 #include <cppuhelper/implbase2.hxx>
 
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index 655b33b69518..c6339e99b497 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -17,12 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "stringlistresource.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <tools/rcid.h>
 
 //........................................................................
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index ffeaf54f300e..89253bc80a86 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -29,8 +29,6 @@
 
 #include "xfm_addcondition.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
 #include <cppuhelper/typeprovider.hxx>
 #include "datanavi.hxx"
 #include <vcl/msgbox.hxx>
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 9e3273c51473..195e140d78c0 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -19,13 +19,11 @@
 #ifndef SVX_FMPROPBRW_HXX
 #define SVX_FMPROPBRW_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/inspection/XObjectInspectorModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-/** === end UNO includes === **/
 
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/ctrlitem.hxx>
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index f1076d7f6682..39251abcd023 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -20,12 +20,10 @@
 #ifndef SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
 #define SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
-/** === end UNO includes === **/
 #include <comphelper/stl_types.hxx>
 
 #include <set>
diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index aebc5dd2a2a2..6cc152254c13 100644
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.hxx
@@ -20,9 +20,7 @@
 #ifndef SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
 #define SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
 
 #include "fmdocumentclassification.hxx"
 #include <unotools/confignode.hxx>
diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx
index 97a6ae608364..f28f23926992 100644
--- a/svx/source/inc/fmdocumentclassification.hxx
+++ b/svx/source/inc/fmdocumentclassification.hxx
@@ -20,9 +20,7 @@
 #ifndef SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
 #define SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 30ead6d8f706..6d7131ae050a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -38,7 +38,6 @@
 #include <sfx2/ctrlitem.hxx>
 #include <vcl/image.hxx>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
@@ -47,7 +46,6 @@
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
-/** === end UNO includes === **/
 
 #include <svtools/svtreebx.hxx>
 
diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx
index 3a86d3091840..2f098cf119e6 100644
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
@@ -20,9 +20,7 @@
 #ifndef SVX_FMSCRIPTINGENV_HXX
 #define SVX_FMSCRIPTINGENV_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/script/XEventAttacherManager.hpp>
-/** === end UNO includes === **/
 #include <rtl/ref.hxx>
 
 class FmFormModel;
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 549bed51b391..7d1db2f720f9 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -20,12 +20,10 @@
 #ifndef SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
 #define SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/util/URL.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/implbase1.hxx>
 #include "fmslotinvalidator.hxx"
 
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 37cd875a9268..50caebf72560 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -28,7 +28,6 @@
 #ifndef SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
 #define SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
@@ -37,7 +36,6 @@
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-/** === end UNO includes === **/
 #include <comphelper/implementationreference.hxx>
 #include <tools/link.hxx>
 #include <vcl/timer.hxx>
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index c6ef1e3a46e7..dd53b90b03d5 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -34,7 +34,6 @@
 #include "fmscriptingenv.hxx"
 
 
-/** === begin UNO includes === **/
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -45,7 +44,6 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/ContainerEvent.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/implbase3.hxx>
 
 
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index f76c69dc6278..48295cc75ccb 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -31,7 +31,6 @@
 #include "svx/svdmark.hxx"
 #include "fmdocumentclassification.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
@@ -43,7 +42,6 @@
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/sdb/SQLErrorEvent.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/stl_types.hxx>
 #include <tools/link.hxx>
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index 7f46d797178c..bb956e836806 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -23,13 +23,11 @@
 
 #include "fmdocumentclassification.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XNumberFormats.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-/** === end UNO includes === **/
 
 #include <memory>
 
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index b716eea9f462..28f374c401b4 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -32,7 +32,6 @@
 #include "formdispatchinterceptor.hxx"
 #include "sqlparserclient.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XFocusListener.hpp>
@@ -76,7 +75,6 @@
 #include <com/sun/star/util/XModeSelector.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/componentcontext.hxx>
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index ae70507463b8..0aabfa8e25a6 100644
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.hxx
@@ -28,10 +28,8 @@
 #ifndef SVX_FORMDISPATCHINTERCEPTOR_HXX
 #define SVX_FORMDISPATCHINTERCEPTOR_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-/** === end UNO includes === **/
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index fd0a155b2dc9..0f5c25e78aab 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -29,11 +29,9 @@
 #ifndef SVX_FMDISPATCH_HXX
 #define SVX_FMDISPATCH_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/form/runtime/XFormOperations.hpp>
-/** === end UNO includes === **/
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 8852c4be60d0..4f780cc7fdcd 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -34,7 +34,6 @@
 #include "sqlparserclient.hxx"
 #include "typeconversionclient.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <com/sun/star/form/XBoundControl.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
@@ -49,7 +48,6 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/form/XChangeBroadcaster.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/componentcontext.hxx>
diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx
index 3ba1d190ed58..db5ec39d9d0c 100644
--- a/svx/source/inc/xfm_addcondition.hxx
+++ b/svx/source/inc/xfm_addcondition.hxx
@@ -20,9 +20,7 @@
 #ifndef SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
 #define SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/xforms/XModel.hpp>
-/** === end UNO includes === **/
 #include <svtools/genericunodialog.hxx>
 #include <comphelper/proparrhlp.hxx>
 
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 4f4f1da1668a..6d6d41589460 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -27,9 +27,7 @@
 #include <svx/svdview.hxx>
 #include <svx/sdrpagewindow.hxx>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XWindow2.hpp>
-/** === end UNO includes === **/
 
 #include "svx/sdrpaintwindow.hxx"
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index fb3ad54b003b..17f6e0985da7 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -39,7 +39,6 @@
 #include <svx/sdrpagewindow.hxx>
 #include "svx/sdrpaintwindow.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
@@ -54,7 +53,6 @@
 #include <com/sun/star/util/XModeChangeBroadcaster.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-/** === end UNO includes === **/
 
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 5b613c5c4266..c5f6f148c90b 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -28,9 +28,7 @@
 
 #include "svx/shapepropertynotifier.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/stl_types.hxx>
 #include <cppuhelper/interfacecontainer.hxx>