remove some useless comment lines

which merely announce that the next declaration is a class Change-Id: Ifdb1398bcd99816b13e0b3769b46d0562bfbc1dc Reviewed-on: https://gerrit.libreoffice.org/84229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2019-12-03 09:28:27 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2019-12-03 12:46:27 +0100
commit: f656547d4d41091b5ccb729838e7355554a453cd (patch)
tree: baab3db9b9287d11133c5f4495b3ed4b812f0c17
parent: f51fddc2e7cfa2a2118610a3fc4b02886544d0a9 (diff)
364 files changed, 0 insertions, 715 deletions
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
index 8833020dfb6e..256ddd678753 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -42,7 +42,6 @@ class SvtIconChoiceCtrl;
 namespace accessibility
 {
 
-// class AccessibleIconChoiceCtrlEntry
 
     typedef ::cppu::WeakAggComponentImplHelper8< css::accessibility::XAccessible
                                                 , css::accessibility::XAccessibleContext
diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx
index c042e8875641..d87934435655 100644
--- a/accessibility/inc/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -36,7 +36,6 @@ namespace accessibility
 {
 
 
-    //  class AccessibleTabBar
 
 
     typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx
index 674668eb0536..fe8244e057a4 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -34,7 +34,6 @@ namespace accessibility
 {
 
 
-    //  class AccessibleTabBarPage
 
 
     typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index 5866bad6f2e3..c4164194ab62 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -37,7 +37,6 @@ namespace accessibility
 {
 
 
-    //  class AccessibleTabBarPageList
 
 
     typedef ::cppu::ImplHelper3<
diff --git a/accessibility/inc/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx
index ba18d37e9137..c1595077f53d 100644
--- a/accessibility/inc/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/helper/characterattributeshelper.hxx
@@ -28,7 +28,6 @@
 #include <vector>
 
 
-// class CharacterAttributesHelper
 
 
 class CharacterAttributesHelper
diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
index 243a88d266d7..1ca18681a9a2 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -31,7 +31,6 @@
 const sal_Int32 DEFAULT_INDEX_IN_PARENT = -1;
 
 
-// class VCLListBoxHelper
 
 
 template< class T > class VCLListBoxHelper : public ::accessibility::IComboListBoxHelper
diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index 73dcc8fe5731..ccafbcf363d8 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -39,7 +39,6 @@ class AccessibleStateSetHelper;
 }
 
 
-//  class OAccessibleMenuBaseComponent
 
 typedef ::cppu::ImplHelper2<
     css::accessibility::XAccessible,
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx
index 7c741f66aa17..e6f51fc8581b 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -25,7 +25,6 @@
 #include <cppuhelper/implbase1.hxx>
 
 
-//  class OAccessibleMenuComponent
 
 typedef ::cppu::ImplHelper1<
     css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE;
diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
index 0827ef9ba16c..d450c5991904 100644
--- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
@@ -23,7 +23,6 @@
 #include <standard/accessiblemenubasecomponent.hxx>
 
 
-//  class OAccessibleMenuItemComponent
 
 
 class OAccessibleMenuItemComponent : public OAccessibleMenuBaseComponent
diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx
index 566dc62866b4..c35e12e9157c 100644
--- a/accessibility/inc/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/implbase2.hxx>
 
 
-//  class VCLXAccessibleButton
 
 
 typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
index 3862168fa020..53af5c22a117 100644
--- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/implbase2.hxx>
 
 
-//  class VCLXAccessibleCheckBox
 
 
 typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx
index a6207c202c42..d5f2b932245d 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -27,7 +27,6 @@
 #include <cppuhelper/implbase2.hxx>
 
 
-//  class VCLXAccessibleEdit
 
 
 typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
index 5ce41b7dfbf8..0b7c6a14cfe7 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
@@ -23,7 +23,6 @@
 #include <standard/vclxaccessibletextcomponent.hxx>
 
 
-//  class VCLXAccessibleFixedHyperlink
 
 
 class VCLXAccessibleFixedHyperlink : public VCLXAccessibleTextComponent
diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
index 44875b419c90..96c3f86ca59d 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
@@ -23,7 +23,6 @@
 #include <standard/vclxaccessibletextcomponent.hxx>
 
 
-//  class VCLXAccessibleFixedText
 
 
 class VCLXAccessibleFixedText final : public VCLXAccessibleTextComponent
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
index ce1eb7eed24c..268f5675d9c1 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
@@ -23,7 +23,6 @@
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 
-//  class VCLXAccessibleHeaderBar
 
 typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > >
     ListItems;
diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx
index 958e73470611..1484d7491664 100644
--- a/accessibility/inc/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx
@@ -26,7 +26,6 @@
 #include <cppuhelper/implbase1.hxx>
 
 
-//  class VCLXAccessibleMenu
 
 
 typedef ::cppu::ImplHelper1 <
diff --git a/accessibility/inc/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/standard/vclxaccessiblemenubar.hxx
index d7736baf6031..6540ef4e5edc 100644
--- a/accessibility/inc/standard/vclxaccessiblemenubar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx
@@ -28,7 +28,6 @@ class VclWindowEvent;
 namespace vcl { class Window; }
 
 
-//  class VCLXAccessibleMenuBar
 
 
 class VCLXAccessibleMenuBar final : public OAccessibleMenuComponent
diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
index 0b73bbcb950c..28c8d0e9e045 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
@@ -29,7 +29,6 @@
 #include <comphelper/accessibletexthelper.hxx>
 
 
-//  class VCLXAccessibleMenuItem
 
 
 typedef ::cppu::ImplHelper3<
diff --git a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
index b5939b4d9dbe..c1818d006ee3 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
@@ -23,7 +23,6 @@
 #include <standard/accessiblemenuitemcomponent.hxx>
 
 
-//  class VCLXAccessibleMenuSeparator
 
 
 class VCLXAccessibleMenuSeparator : public OAccessibleMenuItemComponent
diff --git a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
index 64978216c38e..33e761a59c7f 100644
--- a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
@@ -23,7 +23,6 @@
 #include <standard/accessiblemenucomponent.hxx>
 
 
-//  class VCLXAccessiblePopupMenu
 
 
 class VCLXAccessiblePopupMenu : public OAccessibleMenuComponent
diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
index 9706ac2c0312..de8b5cc96d63 100644
--- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
+++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/implbase2.hxx>
 
 
-//  class VCLXAccessibleRadioButton
 
 
 typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
index 228924042108..05abcfd6392c 100644
--- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/implbase2.hxx>
 
 
-//  class VCLXAccessibleScrollBar
 
 
 typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
index c90281d00446..2a49743508a2 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
@@ -27,7 +27,6 @@
 #include <vector>
 
 
-//  class VCLXAccessibleStatusBar
 
 
 class VCLXAccessibleStatusBar final : public VCLXAccessibleComponent
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index b97588d7a613..bf2b03a0cf4e 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -32,7 +32,6 @@ class AccessibleStateSetHelper;
 }
 
 
-//  class VCLXAccessibleStatusBarItem
 
 
 typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index 3f9e0f94888d..ccb7610df9ce 100644
--- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -28,7 +28,6 @@
 #include <vector>
 
 
-//  class VCLXAccessibleTabControl
 
 
 typedef ::cppu::ImplHelper1 <
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx
index 5cbfb2516d7c..726e879f95d1 100644
--- a/accessibility/inc/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx
@@ -34,7 +34,6 @@ class AccessibleStateSetHelper;
 }
 
 
-//  class VCLXAccessibleTabPage
 
 
 typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
index 43f206690a66..e106baeaea01 100644
--- a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
@@ -26,7 +26,6 @@
 #include <vcl/vclptr.hxx>
 
 
-//  class VCLXAccessibleTabPageWindow
 
 
 class VCLXAccessibleTabPageWindow : public VCLXAccessibleComponent
diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
index ab62332ad1fe..290a0083fe98 100644
--- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
@@ -24,7 +24,6 @@
 #include <comphelper/accessibletexthelper.hxx>
 
 
-//  class VCLXAccessibleTextComponent
 
 
 typedef ::cppu::ImplHelper1 <
diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
index b739463ec289..ef982f56567c 100644
--- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 
 
-//  class VCLXAccessibleToolBox
 
 
 typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleSelection > VCLXAccessibleToolBox_BASE;
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 0b9812e6dccf..38f9e4afbeaf 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -51,7 +51,6 @@ namespace
 namespace accessibility
 {
 
-    // class AccessibleIconChoiceCtrlEntry
 
     using namespace ::com::sun::star::accessibility;
     using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 9ee58ccd37e7..6f36c75e3721 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -46,7 +46,6 @@ namespace accessibility
     using namespace ::comphelper;
 
 
-    //  class AccessibleTabBar
 
 
     AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar )
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 581ee98cde76..0f6f08270774 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -43,7 +43,6 @@ namespace accessibility
     using namespace ::comphelper;
 
 
-    // class AccessibleTabBarPage
 
 
     AccessibleTabBarPage::AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId, const Reference< XAccessible >& rxParent )
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 4f12b48422b8..4c403812f0f6 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -44,7 +44,6 @@ namespace accessibility
     using namespace ::comphelper;
 
 
-    // class AccessibleTabBarPageList
 
 
     AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent )
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index a3d70f4329a2..fb46c3e2d968 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class OAccessibleMenuComponent
 
 
 bool OAccessibleMenuComponent::IsEnabled()
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 967205c80da8..15112bfa4e24 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class OAccessibleMenuItemComponent
 
 
 OAccessibleMenuItemComponent::OAccessibleMenuItemComponent( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
index 2ab7808a4cc7..89e485cad0fe 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  class AccessibleTabBar
 
 
 VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar*    pHeadBar, sal_Int32 _nIndexInParent )
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index c3832ffd6e02..0aae134438eb 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class VCLXAccessibleMenuBar
 
 
 VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu )
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 466d889af137..8733b6bb5ea2 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class VCLXAccessibleMenuItem
 
 
 VCLXAccessibleMenuItem::VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
index e40fb750637a..83130c63ceb5 100644
--- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class VCLXAccessibleMenuSeparator
 
 
 VCLXAccessibleMenuSeparator::VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos )
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index a007f09c7810..ad3e7441e3e1 100644
--- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::comphelper;
 
 
-// class VCLXAccessiblePopupMenu
 
 
 bool VCLXAccessiblePopupMenu::IsFocused()
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 6dad3a0e5370..c432ef8c4c5d 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  class VCLXAccessibleStatusBar
 
 
 VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow )
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index dde0ce1be390..ac6e4aff65b2 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class VCLXAccessibleStatusBarItem
 
 
 VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId )
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 83a67b6a3571..c88d8d427321 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  class VCLXAccessibleTabControl
 
 
 VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 429bf952138f..2b5cdb033d2a 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class VCLXAccessibleTabPage
 
 
 VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId )
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index ab1511f28049..8ac6a5118137 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  class VCLXAccessibleTabPageWindow
 
 
 VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindow )
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 5a4a7aff128d..b9880754d058 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  class VCLXAccessibleTextComponent
 
 
 VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow )
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 759dd69dfab9..df8d4fd983dc 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-// class AccessibleDialogControlShape
 
 
 AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj)
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 8c93f667482d..ade28c57f738 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -74,7 +74,6 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor&
 }
 
 
-// class AccessibleDialogWindow
 
 
 AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWindow)
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index 45946173a48f..c7baeeecd980 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -39,7 +39,6 @@ class DlgEdObj;
 class DialogWindow;
 
 
-//  class AccessibleDialogControlShape
 
 typedef ::cppu::ImplHelper3<
         css::accessibility::XAccessible,
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 5b362fa6df96..e8c2305b30a0 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -44,7 +44,6 @@ class DlgEdModel;
 class DlgEdObj;
 
 
-//  class AccessibleDialogWindow
 
 typedef ::cppu::ImplHelper3 <
     css::accessibility::XAccessible,
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 6fe0d5412554..5edb092a1b77 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -25,7 +25,6 @@
 #include <basic/sbxfac.hxx>
 #include <basic/basicdllapi.h>
 
-// class SbStdFactory
 class SbStdFactory : public SbxFactory
 {
 public:
@@ -34,7 +33,6 @@ public:
     virtual SbxObject*  CreateObject( const OUString& rClassName ) override;
 };
 
-// class SbStdPicture
 class SbStdPicture final : public SbxObject
 {
     Graphic     aGraphic;
@@ -54,7 +52,6 @@ public:
     void    SetGraphic( const Graphic& rGrf ) { aGraphic = rGrf; }
 };
 
-// class SbStdFont
 class SbStdFont final : public SbxObject
 {
     bool    bBold;
@@ -91,7 +88,6 @@ public:
     const OUString& GetFontName() const { return aName; }
 };
 
-// class SbStdClipboard
 class SbStdClipboard final : public SbxObject
 {
     virtual ~SbStdClipboard() override;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
index 0e3efa3940db..ba3be4574036 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
@@ -30,7 +30,6 @@ namespace chart
 namespace wrapper
 {
 
-//class WrappedLinkNumberFormatProperty;
 
 class WrappedNumberFormatProperty : public WrappedDirectStateProperty
 {
diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx
index 6fc40ebc7d86..7376b872b9c9 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -87,7 +87,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 
 }   // extern C
 
-// class SampleAddIn
 
 SampleAddIn::SampleAddIn()
 {
diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx
index 12a9bf1b5217..2837f27f5d35 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::osl;
 
 
-// class SequenceInputStream
 
 
 SequenceInputStream::SequenceInputStream(
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 53aeb8f4d4b1..6bf5fad3b74a 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -131,7 +131,6 @@ sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & Proper
 }
 
 
-//  class PropertySetHelper_Impl
 
 class OPropertySetHelper::Impl {
 
@@ -155,7 +154,6 @@ public:
 };
 
 
-//  class PropertySetHelper
 
 OPropertySetHelper::OPropertySetHelper(
     OBroadcastHelper  & rBHelper_ )
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 1aacff5a6395..a077506363ee 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -156,7 +156,6 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const
 }
 
 
-// class SvxChartOptions
 
 
 SvxChartOptions::SvxChartOptions() :
@@ -257,7 +256,6 @@ void SvxChartOptions::Notify( const css::uno::Sequence< OUString >& )
 }
 
 
-// class SvxChartColorTableItem
 
 
 SvxChartColorTableItem::SvxChartColorTableItem( sal_uInt16 nWhich_, const SvxChartColorTable& aTable ) :
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 92edb0825656..92d33c9bda51 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -126,7 +126,6 @@ namespace
         OUString sErase = _rName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part
         return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : nullptr);
     }
-    // class OPreviewWindow
     class OTablePreviewWindow : public vcl::Window
     {
         DECL_LINK(OnDisableInput, void*, void);
@@ -179,7 +178,6 @@ namespace
 
 }
 
-// class OAppDetailPageHelper
 OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
     ,m_rBorderWin(_rBorderWin)
     ,m_aFL(VclPtr<FixedLine>::Create(this,WB_VERT))
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 98a7327e9c60..0d1c2f7fd982 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -520,7 +520,6 @@ void OTasksWindow::Clear()
     m_aCreation->Clear();
 }
 
-// class OApplicationDetailView
 
 OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent )
     ,m_aHorzSplitter(VclPtr<Splitter>::Create(this))
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 6352c7b8ad61..2eb3b6c4ce38 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -27,7 +27,6 @@
 #include <memory>
 
 using namespace ::dbaui;
-// class OApplicationIconControl
 OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
     : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/
                                 WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER)
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 964baa269c7f..05100e13c102 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-// class OApplicationSwapWindow
 OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow )
     :Window(_pParent,WB_DIALOGCONTROL )
     ,m_aIconControl(VclPtr<OApplicationIconControl>::Create(this))
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index bbd9891683c3..96adc210b2f4 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 using ::com::sun::star::sdb::application::NamedDatabaseObject;
 
-// class OAppBorderWindow
 OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
     ,m_pPanel(nullptr)
     ,m_pDetailView(nullptr)
@@ -161,7 +160,6 @@ OApplicationSwapWindow* OAppBorderWindow::getPanel() const
 }
 
 
-// class OApplicationView
 OApplicationView::OApplicationView( vcl::Window* pParent
                                     ,const Reference< XComponentContext >& _rxOrb
                                     ,OApplicationController& _rAppController
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 8e3caac5e36b..8a8eee6e88fc 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -29,7 +29,6 @@ namespace dbaui
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-// class DBTreeView
 DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits)
                     :   Window( pParent, nBits )
                     , m_pTreeListBox(nullptr)
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 5d9d90834dbb..71bd19941a6a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -73,7 +73,6 @@ namespace
     }
 }
 
-// class OFieldDescControl
 OFieldDescControl::OFieldDescControl(weld::Container* pPage, vcl::Window* pParent, OTableDesignHelpBar* pHelpBar)
     :TabPage(pPage ? Application::GetDefDialogParent() : pParent, WB_3DLOOK | WB_DIALOGCONTROL)
     ,m_xBuilder(pPage ? Application::CreateBuilder(pPage, "dbaccess/ui/fielddescpage.ui")
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index e83d66fa74cf..004096c45fa4 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -125,7 +125,6 @@ namespace dbaui
 
     };
 
-    // class ORelationControl
     ORelationControl::ORelationControl(const css::uno::Reference<css::awt::XWindow>& rParent)
         : EditBrowseBox(VCLUnoHelper::GetWindow(rParent),
             EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT,
@@ -433,7 +432,6 @@ namespace dbaui
         return LogicToPixel(Size(140, 80), MapMode(MapUnit::MapAppFont));
     }
 
-    // class OTableListBoxControl
     OTableListBoxControl::OTableListBoxControl(weld::Builder* _pParent,
         const OJoinTableView::OTableWindowMap* _pTableMap,
         IRelationControlInterface* _pParentDialog)
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 337ccfe3aaec..35616d3302ed 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -28,7 +28,6 @@
 
 using namespace ::dbaui;
 
-// class OSplitterView
 OSplitterView::OSplitterView(vcl::Window* _pParent) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER
     ,m_pSplitter( nullptr )
     ,m_pLeft(nullptr)
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index ea9283add4ac..0f505d424c96 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -56,7 +56,6 @@ using namespace ::com::sun::star::ui;
 using namespace ::com::sun::star::view;
 
 #define SPACEBETWEENENTRIES     4
-// class DBTreeListBox
 DBTreeListBox::DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle )
     :SvTreeListBox(pParent,nWinStyle)
     ,m_pDragedEntry(nullptr)
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index 006f6f45a51a..1036ed3b36df 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -23,7 +23,6 @@
 namespace dbaui
 {
 
-    // class OBoldListboxString
     void OBoldListboxString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData)
     {
         SvLBoxString::InitViewData( pView, pEntry, _pViewData );
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 39b44893c7ad..f53a654de997 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::dbaui;
 using namespace ::dbtools;
 
-// class ORelationDialog
 ORelationDialog::ORelationDialog( OJoinTableView* pParent,
                                  const TTableConnectionData::value_type& pConnectionData,
                                  bool bAllowTableSelect )
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index d02abd5dbfd1..cf5af7def510 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -109,7 +109,6 @@ namespace
     }
 }
 
-// class OConnectionLine
 OConnectionLine::OConnectionLine( OTableConnection* _pConn, OConnectionLineDataRef const & _pLineData )
     : m_pTabConn( _pConn )
     , m_pData( _pLineData )
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
index 58a3d4a537ad..db7177294e64 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
@@ -20,7 +20,6 @@
 #include <ConnectionLineData.hxx>
 
 using namespace dbaui;
-//class OConnectionLineData
 OConnectionLineData::OConnectionLineData()
 {
 }
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 9681fdf03710..7ee7a49d58d5 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -29,7 +29,6 @@ namespace dbaui
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::datatransfer;
 
-    // class OJoinExchObj
     OJoinExchObj::OJoinExchObj(const OJoinExchangeData& jxdSource,bool _bFirstEntry)
         :m_bFirstEntry(_bFirstEntry)
         ,m_jxdSourceDescription(jxdSource)
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 5e15f4b9cde0..24f1aa749445 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -156,7 +156,6 @@ void OScrollWindowHelper::Resize()
     m_pTableView->SetPosSizePixel(Point( 0, 0 ),Size( aTotalOutputSize.Width()-nVScrollWidth, aTotalOutputSize.Height()-nHScrollHeight ));
 }
 
-// class OJoinTableView
 
 OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView )
     :Window( pParent,WB_BORDER )
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx
index 201d74b01cae..3642eed0a279 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@@ -22,7 +22,6 @@
 #include <QueryTableView.hxx>
 #include <ConnectionLine.hxx>
 using namespace dbaui;
-// class OQueryTableConnection
 
 OQueryTableConnection::OQueryTableConnection(OQueryTableView* pContainer, const TTableConnectionData::value_type& pTabConnData)
     : OTableConnection(pContainer, pTabConnData)
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index f86ab1f85b1c..c18b5496bd08 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -24,7 +24,6 @@
 
 using namespace dbaui;
 
-// class OQueryTableConnectionData
 OQueryTableConnectionData::OQueryTableConnectionData()
     : OTableConnectionData()
     , m_nFromEntryIndex(0)
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index b98414ef8d5a..cd139398a9fb 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace dbaui;
-// class OQueryTableWindow
 OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData)
     :OTableWindow( pParent, pTabWinData )
     ,m_nAliasNum(0)
diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx
index e27717abead6..2f6811c992f7 100644
--- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx
@@ -23,7 +23,6 @@ using namespace dbaui;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
-// class OQueryTableWindowData
 OQueryTableWindowData::OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias )
     :OTableWindowData(nullptr,_rComposedName, rTableName, rTableAlias)
 {
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 61042d620c02..905f766916a0 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -182,7 +182,6 @@ namespace
     }
 }
 
-// class OQueryTableView
 OQueryTableView::OQueryTableView( vcl::Window* pParent,OQueryDesignView* pView)
     : OJoinTableView( pParent,pView)
 {
diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx
index 3a059f9cfa64..01fd9ad94d0a 100644
--- a/dbaccess/source/ui/querydesign/TableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnection.cxx
@@ -28,7 +28,6 @@ using namespace comphelper;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::accessibility;
 
-// class OTableConnection
 namespace dbaui
 {
     OTableConnection::OTableConnection( OJoinTableView* _pContainer,const TTableConnectionData::value_type& _pTabConnData )
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index ec5b98f4999c..760e1e0aec3a 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -22,7 +22,6 @@
 
 using namespace dbaui;
 
-// class OTableConnectionData
 OTableConnectionData::OTableConnectionData()
 {
     Init();
diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx
index bf3121c9b63c..15c60b83352d 100644
--- a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx
@@ -20,7 +20,6 @@
 #include "TableFieldInfo.hxx"
 
 using namespace dbaui;
-// class OTableFieldInfo
 
 OTableFieldInfo::OTableFieldInfo()  :
     m_eFieldType(TAB_NORMAL_FIELD), m_eDataType(1000)
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 510dd533236c..2dd9e6112232 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -90,7 +90,6 @@ void Draw3DBorder(vcl::RenderContext& rRenderContext, const tools::Rectangle& rR
 
 }
 
-// class OTableWindow
 OTableWindow::OTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData )
           : ::comphelper::OContainerListener(m_aMutex)
           ,Window( pParent, WB_3DLOOK|WB_MOVEABLE )
diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx
index 30a4ef37ae08..be75baf7fbce 100644
--- a/dbaccess/source/ui/querydesign/TableWindowData.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 
-// class OTableWindowData
 OTableWindowData::OTableWindowData( const Reference< XPropertySet>& _xTable
                                    ,const OUString& _rComposedName
                                    ,const OUString& rTableName
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index d7bac39dfd0e..fe5e5382b9cb 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -41,7 +41,6 @@ OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox)
 
 const sal_uLong SCROLLING_TIMESPAN = 500;
 const long LISTBOX_SCROLLING_AREA = 6;
-// class OTableWindowListBox
 OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent )
     :SvTreeListBox( pParent, WB_HASBUTTONS | WB_BORDER)
     ,m_aMousePos( Point(0,0) )
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 2414ea7b98f6..31af42beb652 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -37,7 +37,6 @@
 using namespace dbaui;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
-// class OTableWindowTitle
 OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) :
      FixedText( pParent, WB_3DLOOK|WB_LEFT|WB_NOLABEL|WB_VCENTER )
     ,m_pTabWin( pParent )
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index 56e7549c1998..92de0dced688 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -24,7 +24,6 @@
 #include <ConnectionLine.hxx>
 
 using namespace dbaui;
-// class ORelationTableConnection
 ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContainer,
                                                    const TTableConnectionData::value_type& pTabConnData )
     :OTableConnection( pContainer, pTabConnData )
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 397af96134a4..53c47487d128 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// class ORelationTableConnectionData
 ORelationTableConnectionData::ORelationTableConnectionData()
     :OTableConnectionData()
     ,m_nUpdateRules(KeyRule::NO_ACTION)
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 484194df9d38..968b63a547eb 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -60,7 +60,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::accessibility;
 
-// class ORelationTableView
 ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView )
     :OJoinTableView( pParent, pView )
     , ::comphelper::OContainerListener(m_aMutex)
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index bc9486b0a52c..1a052c19007a 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -27,7 +27,6 @@
 
 using namespace dbaui;
 
-// class OFieldDescGenWin
 OFieldDescGenWin::OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* pHelp ) :
      TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL )
 {
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 86499d13f15a..9f5428b04559 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 
-// class OFieldDescription
 OFieldDescription::OFieldDescription()
     :m_pType()
     ,m_nType(DataType::VARCHAR)
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 62d0f16c5314..bc2b3a489f10 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -25,7 +25,6 @@
 #include <memory>
 using namespace dbaui;
 #define STANDARD_MARGIN                 6
-// class OTableDesignHelpBar
 OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) :
      TabPage( pParent, WB_3DLOOK )
 {
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 60684bd6f7ea..b5d8bc4d1c34 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
-// class OTableBorderWindow
 OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB_BORDER)
     ,m_aHorzSplitter( VclPtr<Splitter>::Create(this) )
 {
@@ -156,7 +155,6 @@ void OTableBorderWindow::GetFocus()
         m_pEditorCtrl->GrabFocus();
 }
 
-// class OTableDesignView
 OTableDesignView::OTableDesignView( vcl::Window* pParent,
                                     const Reference< XComponentContext >& _rxOrb,
                                     OTableController& _rController
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 8e80e52fb1a3..9507507949e1 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -44,7 +44,6 @@
 #define DETAILS_OPT_HELP_HEIGHT         100
 
 using namespace dbaui;
-// class OTableFieldDescWin
 OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent)
     : TabPage(pParent, WB_3DLOOK)
     , m_eChildFocus(NONE)
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx
index 1b52a530bb84..e33ace04874f 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
-// class OTableRow
 OTableRow::OTableRow()
     :m_pActFieldDescr( nullptr )
     ,m_nPos( -1 )
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index 61f0e02cfc03..87baeb3cc80a 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -30,7 +30,6 @@ using namespace dbaui;
 using namespace ::svt;
 
 
-// class OTableDesignUndoAct
 OTableDesignUndoAct::OTableDesignUndoAct(OTableRowView* pOwner, const char* pCommentID)
     : OCommentUndoAction(pCommentID)
     , m_pTabDgnCtrl(pOwner)
@@ -66,7 +65,6 @@ void OTableDesignUndoAct::Redo()
     }
 }
 
-// class OTableDesignCellUndoAct
 OTableDesignCellUndoAct::OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn ) :
      OTableDesignUndoAct( pOwner ,STR_TABED_UNDO_CELLMODIFIED)
     ,m_nCol( nColumn )
@@ -108,7 +106,6 @@ void OTableDesignCellUndoAct::Redo()
     OTableDesignUndoAct::Redo();
 }
 
-// class OTableEditorUndoAct
 OTableEditorUndoAct::OTableEditorUndoAct(OTableEditorCtrl* pOwner, const char* pCommentID)
     : OTableDesignUndoAct(pOwner, pCommentID)
     , pTabEdCtrl(pOwner)
@@ -119,7 +116,6 @@ OTableEditorUndoAct::~OTableEditorUndoAct()
 {
 }
 
-// class OTableEditorTypeSelUndoAct
 OTableEditorTypeSelUndoAct::OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType )
     :OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_TYPE_CHANGED)
     ,m_nCol( nColumn )
@@ -155,7 +151,6 @@ void OTableEditorTypeSelUndoAct::Redo()
     OTableEditorUndoAct::Redo();
 }
 
-// class OTableEditorDelUndoAct
 OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) :
      OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_ROWDELETED)
 {
@@ -216,7 +211,6 @@ void OTableEditorDelUndoAct::Redo()
     OTableEditorUndoAct::Redo();
 }
 
-// class OTableEditorInsUndoAct
 OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
                                                long nInsertPosition ,
                                                const std::vector<  std::shared_ptr<OTableRow> >& _vInsertedRows)
@@ -262,7 +256,6 @@ void OTableEditorInsUndoAct::Redo()
     OTableEditorUndoAct::Redo();
 }
 
-// class OTableEditorInsNewUndoAct
 OTableEditorInsNewUndoAct::OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows ) :
      OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_NEWROWINSERTED)
     ,m_nInsPos( nInsertPosition )
@@ -301,7 +294,6 @@ void OTableEditorInsNewUndoAct::Redo()
     OTableEditorUndoAct::Redo();
 }
 
-// class OPrimKeyUndoAct
 OPrimKeyUndoAct::OPrimKeyUndoAct( OTableEditorCtrl* pOwner, const MultiSelection& aDeletedKeys, const MultiSelection& aInsertedKeys) :
      OTableEditorUndoAct( pOwner ,STR_TABLEDESIGN_UNDO_PRIMKEY)
     ,m_aDelKeys( aDeletedKeys )
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index 8a0c45f664e1..e28c8f8af548 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -43,7 +43,6 @@ namespace migration
         css::uno::Reference< css::uno::XComponentContext > const & xContext );
 
 
-    // class BasicMigration
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 62eb936dccdb..30f198648798 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -52,7 +52,6 @@ namespace migration
         css::uno::Reference< css::uno::XComponentContext > const & xContext );
 
 
-    // class ExtensionMigration
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 81a60f7ee3c8..a312c52e3e4a 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -43,7 +43,6 @@ namespace migration
         css::uno::Reference< css::uno::XComponentContext > const & xContext );
 
 
-    // class WordbookMigration
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx
index 99faa6ecaf9d..80f6ce156e62 100644
--- a/editeng/inc/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -61,7 +61,6 @@ class SfxGrabBagItem;
 #define DEF_METRIC  0
 
 
-// class EditCharAttrib
 
 // bFeature: Attribute must not expand/shrink, length is always 1
 // bEdge: Attribute will not expand, if you want to expand just on the edge
@@ -151,7 +150,6 @@ inline void EditCharAttrib::Collaps( sal_Int32 nDiff )
 }
 
 
-// class EditCharAttribFont
 
 class EditCharAttribFont: public EditCharAttrib
 {
@@ -162,7 +160,6 @@ public:
 };
 
 
-// class EditCharAttribWeight
 
 class EditCharAttribWeight : public EditCharAttrib
 {
@@ -172,7 +169,6 @@ public:
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
-// class EditCharAttribItalic
 
 class EditCharAttribItalic : public EditCharAttrib
 {
@@ -183,7 +179,6 @@ public:
 };
 
 
-// class EditCharAttribShadow
 
 class EditCharAttribShadow : public EditCharAttrib
 {
@@ -194,7 +189,6 @@ public:
 };
 
 
-// class EditCharAttribEscapement
 
 class EditCharAttribEscapement : public EditCharAttrib
 {
@@ -205,7 +199,6 @@ public:
 };
 
 
-// class EditCharAttribOutline
 
 class EditCharAttribOutline : public EditCharAttrib
 {
@@ -216,7 +209,6 @@ public:
 };
 
 
-// class EditCharAttribStrikeout
 
 class EditCharAttribStrikeout : public EditCharAttrib
 {
@@ -227,7 +219,6 @@ public:
 };
 
 
-// class EditCharAttribCaseMap
 
 class EditCharAttribCaseMap : public EditCharAttrib
 {
@@ -238,7 +229,6 @@ public:
 };
 
 
-// class EditCharAttribUnderline
 
 class EditCharAttribUnderline : public EditCharAttrib
 {
@@ -249,7 +239,6 @@ public:
 };
 
 
-// class EditCharAttribOverline
 
 class EditCharAttribOverline : public EditCharAttrib
 {
@@ -260,7 +249,6 @@ public:
 };
 
 
-// class EditCharAttribEmphasisMark
 
 class EditCharAttribEmphasisMark : public EditCharAttrib
 {
@@ -271,7 +259,6 @@ public:
 };
 
 
-// class EditCharAttribRelief
 
 class EditCharAttribRelief : public EditCharAttrib
 {
@@ -282,7 +269,6 @@ public:
 };
 
 
-// class EditCharAttribFontHeight
 
 class EditCharAttribFontHeight : public EditCharAttrib
 {
@@ -293,7 +279,6 @@ public:
 };
 
 
-// class EditCharAttribFontWidth
 
 class EditCharAttribFontWidth : public EditCharAttrib
 {
@@ -304,7 +289,6 @@ public:
 };
 
 
-// class EditCharAttribColor
 
 class EditCharAttribColor : public EditCharAttrib
 {
@@ -314,7 +298,6 @@ public:
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
-// class EditCharAttribBackgroundColor
 
 class EditCharAttribBackgroundColor : public EditCharAttrib
 {
@@ -326,7 +309,6 @@ public:
 };
 
 
-// class EditCharAttribLanguage
 
 class EditCharAttribLanguage : public EditCharAttrib
 {
@@ -337,7 +319,6 @@ public:
 };
 
 
-// class EditCharAttribTab
 
 class EditCharAttribTab : public EditCharAttrib
 {
@@ -348,7 +329,6 @@ public:
 };
 
 
-// class EditCharAttribLineBreak
 
 class EditCharAttribLineBreak : public EditCharAttrib
 {
@@ -359,7 +339,6 @@ public:
 };
 
 
-// class EditCharAttribField
 
 class EditCharAttribField: public EditCharAttrib
 {
@@ -389,7 +368,6 @@ public:
 };
 
 
-// class EditCharAttribPairKerning
 
 class EditCharAttribPairKerning : public EditCharAttrib
 {
@@ -400,7 +378,6 @@ public:
 };
 
 
-// class EditCharAttribKerning
 
 class EditCharAttribKerning : public EditCharAttrib
 {
@@ -411,7 +388,6 @@ public:
 };
 
 
-// class EditCharAttribWordLineMode
 
 class EditCharAttribWordLineMode: public EditCharAttrib
 {
@@ -421,7 +397,6 @@ public:
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
-// class EditCharAttribGrabBag
 
 class EditCharAttribGrabBag: public EditCharAttrib
 {
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index ccff24f1beb3..3dcb3c2cbf13 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -128,12 +128,10 @@ public:
 };
 
 
-//  class SvxColorList
 
 typedef std::vector<Color> SvxColorList;
 
 
-//  class ItemList
 
 
 class ItemList
@@ -153,7 +151,6 @@ public:
 };
 
 
-// class ContentAttribs
 
 class ContentAttribs
 {
@@ -183,7 +180,6 @@ public:
 };
 
 
-// class CharAttribList
 
 class CharAttribList
 {
@@ -236,7 +232,6 @@ public:
 };
 
 
-// class ContentNode
 
 class ContentNode
 {
@@ -304,7 +299,6 @@ public:
 };
 
 
-// class EditPaM
 
 class EditPaM
 {
@@ -381,7 +375,6 @@ struct ExtraPortionInfo
 };
 
 
-// class TextPortion
 
 class TextPortion
 {
@@ -435,7 +428,6 @@ public:
 };
 
 
-// class TextPortionList
 
 class TextPortionList
 {
@@ -464,7 +456,6 @@ public:
 class ParaPortion;
 
 
-// class EditLine
 
 class EditLine
 {
@@ -548,7 +539,6 @@ public:
 };
 
 
-// class LineList
 
 class EditLineList
 {
@@ -571,7 +561,6 @@ public:
 };
 
 
-// class ParaPortion
 
 class ParaPortion
 {
@@ -642,7 +631,6 @@ public:
 };
 
 
-// class ParaPortionList
 
 class ParaPortionList
 {
@@ -676,7 +664,6 @@ public:
 };
 
 
-// class EditSelection
 
 class EditSelection
 {
@@ -709,7 +696,6 @@ public:
 };
 
 
-// class DeletedNodeInfo
 
 class DeletedNodeInfo
 {
@@ -729,7 +715,6 @@ public:
 };
 
 
-// class EditDoc
 
 class EditDoc
 {
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 41b6a0db9bcd..f000cf793560 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -45,7 +45,6 @@
 #include <editattr.hxx>
 
 
-// class EditCharAttrib
 
 EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_Int32 nS, sal_Int32 nE ) :
     nStart(nS), nEnd(nE), bFeature(false), bEdge(false)
@@ -76,7 +75,6 @@ void EditCharAttrib::dumpAsXml(xmlTextWriterPtr pWriter) const
 }
 
 
-// class EditCharAttribFont
 
 EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -95,7 +93,6 @@ void EditCharAttribFont::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribItalic
 
 EditCharAttribItalic::EditCharAttribItalic( const SvxPostureItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -109,7 +106,6 @@ void EditCharAttribItalic::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribWeight
 
 EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -123,7 +119,6 @@ void EditCharAttribWeight::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribUnderline
 
 EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -141,7 +136,6 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
 }
 
 
-// class EditCharAttribOverline
 
 EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -157,7 +151,6 @@ void EditCharAttribOverline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
 }
 
 
-// class EditCharAttribFontHeight
 
 EditCharAttribFontHeight::EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -172,7 +165,6 @@ void EditCharAttribFontHeight::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribFontWidth
 
 EditCharAttribFontWidth::EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -186,7 +178,6 @@ void EditCharAttribFontWidth::SetFont( SvxFont& /*rFont*/, OutputDevice* )
 }
 
 
-// class EditCharAttribStrikeout
 
 EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -200,7 +191,6 @@ void EditCharAttribStrikeout::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribCaseMap
 
 EditCharAttribCaseMap::EditCharAttribCaseMap( const SvxCaseMapItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -214,7 +204,6 @@ void EditCharAttribCaseMap::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribColor
 
 EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -228,7 +217,6 @@ void EditCharAttribColor::SetFont( SvxFont& rFont, OutputDevice* )
     rFont.SetColor( aColor);
 }
 
-// class EditCharAttribBackgroundColor
 
 EditCharAttribBackgroundColor::EditCharAttribBackgroundColor(
                                 const SvxBackgroundColorItem& rAttr,
@@ -246,7 +234,6 @@ void EditCharAttribBackgroundColor::SetFont( SvxFont& rFont, OutputDevice* )
     rFont.SetFillColor(aColor);
 }
 
-// class EditCharAttribLanguage
 EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
@@ -259,7 +246,6 @@ void EditCharAttribLanguage::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribShadow
 
 EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -273,7 +259,6 @@ void EditCharAttribShadow::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribEscapement
 
 EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -295,7 +280,6 @@ void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribOutline
 
 EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -309,7 +293,6 @@ void EditCharAttribOutline::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribTab
 
 EditCharAttribTab::EditCharAttribTab( const SfxVoidItem& rAttr, sal_Int32 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
@@ -322,7 +305,6 @@ void EditCharAttribTab::SetFont( SvxFont&, OutputDevice* )
 }
 
 
-// class EditCharAttribLineBreak
 
 EditCharAttribLineBreak::EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_Int32 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
@@ -335,7 +317,6 @@ void EditCharAttribLineBreak::SetFont( SvxFont&, OutputDevice* )
 }
 
 
-// class EditCharAttribField
 
 EditCharAttribField::EditCharAttribField( const SvxFieldItem& rAttr, sal_Int32 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
@@ -400,7 +381,6 @@ bool EditCharAttribField::operator == ( const EditCharAttribField& rAttr ) const
 }
 
 
-// class EditCharAttribPairKerning
 
 EditCharAttribPairKerning::EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -414,7 +394,6 @@ void EditCharAttribPairKerning::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribKerning
 
 EditCharAttribKerning::EditCharAttribKerning( const SvxKerningItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -428,7 +407,6 @@ void EditCharAttribKerning::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribWordLineMode
 
 EditCharAttribWordLineMode::EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -442,7 +420,6 @@ void EditCharAttribWordLineMode::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribEmphasisMark
 
 EditCharAttribEmphasisMark::EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -456,7 +433,6 @@ void EditCharAttribEmphasisMark::SetFont( SvxFont& rFont, OutputDevice* )
 }
 
 
-// class EditCharAttribRelief
 
 EditCharAttribRelief::EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
@@ -469,7 +445,6 @@ void EditCharAttribRelief::SetFont( SvxFont& rFont, OutputDevice* )
     rFont.SetRelief( static_cast<const SvxCharReliefItem*>(GetItem())->GetValue() );
 }
 
-// class EditCharAttribGrabBag
 
 EditCharAttribGrabBag::EditCharAttribGrabBag( const SfxGrabBagItem& rAttr, sal_Int32 _nStart, sal_Int32 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 744f082bbea5..3aeed7a6e357 100644
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -22,7 +22,6 @@
 #include <editeng/editview.hxx>
 
 
-//  class EditSelFunctionSet
 
 EditSelFunctionSet::EditSelFunctionSet()
 {
@@ -74,7 +73,6 @@ void EditSelFunctionSet::DeselectAll()
 }
 
 
-//  class EditSelectionEngine
 
 EditSelectionEngine::EditSelectionEngine() : SelectionEngine( nullptr )
 {
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 9ada4292ba12..d905d60bb9c3 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -156,12 +156,10 @@ LanguageType EditView::CheckLanguage(
     return nLang;
 }
 
-// class EditViewCallbacks
 EditViewCallbacks::~EditViewCallbacks()
 {
 }
 
-// class EditView
 EditView::EditView( EditEngine* pEng, vcl::Window* pWindow )
 {
     pImpEditView.reset( new ImpEditView( this, pEng, pWindow ) );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index ee0fe7948034..47117b0baab5 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -216,7 +216,6 @@ public:
 };
 
 
-//  class ImpEditView
 
 class ImpEditView : public vcl::unohelper::DragAndDropClient
 {
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 4a3ece288f5a..54a043ec2412 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -280,7 +280,6 @@ static bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh )  // For Ka
 }
 
 
-//  class ImpEditEngine
 
 void ImpEditEngine::UpdateViews( EditView* pCurView )
 {
diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 7d09dfb02acc..0ebaa6850a87 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -103,7 +103,6 @@ css::uno::Reference< css::datatransfer::XTransferable > TextChainingUtils::Creat
 }
 
 
-// class OverflowingText
 
 OverflowingText::OverflowingText(css::uno::Reference< css::datatransfer::XTransferable > const & xOverflowingContent) :
         mxOverflowingContent(xOverflowingContent)
@@ -112,7 +111,6 @@ OverflowingText::OverflowingText(css::uno::Reference< css::datatransfer::XTransf
 }
 
 
-// class NonOverflowingText
 
 NonOverflowingText::NonOverflowingText(const ESelection &aSel, bool bLastParaInterrupted)
     : maContentSel(aSel)
@@ -155,7 +153,6 @@ std::unique_ptr<OutlinerParaObject> OverflowingText::DeeplyMergeParaObject(Outli
     return TextChainingUtils::DeeplyMergeParaObject(mxOverflowingContent, pOutl, pNextPObj);
 }
 
-// class OFlowChainedText
 
 OFlowChainedText::OFlowChainedText(Outliner const *pOutl, bool bIsDeepMerge)
 {
@@ -205,7 +202,6 @@ bool OFlowChainedText::IsLastParaInterrupted() const
 }
 
 
-// classes UFlowChainedText
 
 UFlowChainedText::UFlowChainedText(Outliner const *pOutl, bool bIsDeepMerge)
 {
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 0a20a3e6cadf..d6fc905078c2 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -231,7 +231,6 @@ static tools::Time setTime( util::DateTime const & rDate )
 }
 
 
-// class SvxUnoTextField
 
 namespace
 {
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 25d2b70c3098..475200c27af3 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -206,7 +206,6 @@ static void CheckSelection( struct ESelection& rSel, SvxEditSource *pEdit ) thro
 }
 
 
-// class SvxUnoTextRangeBase
 
 
 UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextRangeBase );
@@ -1595,7 +1594,6 @@ OUString SAL_CALL SvxUnoTextRange::getImplementationName()
 }
 
 
-// class SvxUnoText
 
 
 SvxUnoTextBase::SvxUnoTextBase(const SvxItemPropertySet* _pSet)
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 8addcc5fa2ab..2059d5bc4bd2 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -114,7 +114,6 @@ uno::Any SvxUnoTextContentEnumeration::nextElement()
 }
 
 
-// class SvxUnoTextContent
 
 
 SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_Int32 nPara ) throw()
@@ -376,7 +375,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
 }
 
 
-//  class SvxUnoTextRangeEnumeration
 
 
 SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rParentText, sal_Int32 nPara, const ESelection& rSel)
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 89ab645e3283..240d80ec2505 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -126,7 +126,6 @@ void SvxEditEngineSource::UpdateData()
 {
 }
 
-// class SvxSimpleUnoModel
 
 SvxSimpleUnoModel::SvxSimpleUnoModel()
 {
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index e0b6abb3ce99..5e90428ab8e9 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -39,7 +39,6 @@ namespace pcr
     using ::com::sun::star::uno::Reference;
 
 
-    // class OPropertyEditor
 
 
     OPropertyEditor::OPropertyEditor( vcl::Window* pParent)
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 7d79231e1ecd..568804909835 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -252,7 +252,6 @@ namespace pcr
     }
 
 
-    // class ODateTimeControl
 
 
     ODateTimeControl::ODateTimeControl( vcl::Window* _pParent, WinBits _nWinStyle)
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 7434b0dfaa59..3aa2ec97171f 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -167,7 +167,6 @@ namespace pcr
     }
 
 
-    // class OFormattedNumericControl
 
 
     OFormattedNumericControl::OFormattedNumericControl( vcl::Window* pParent, WinBits nWinStyle )
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 7eeba2cf7ccd..b0293b107c66 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -55,7 +55,6 @@ typedef enum {
 
 enum class tnode {START,READCH,EOL,POCMD,EXPCMD,SETCMD,SETCH,WRITE,EEND,QUIT};
 
-// class T602ImportFilter
 
 
 struct inistruct
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 912834f6d89d..dc9e93b4aa30 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -68,7 +68,6 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form::binding;
 
 
-// class OComboBoxModel
 Sequence<Type> OComboBoxModel::_getTypes()
 {
     return ::comphelper::concatSequences(
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 03386af3cd07..2f691f534f6f 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -693,7 +693,6 @@ void FormulaCompiler::OpCodeMap::putOpCode( const OUString & rStr, const OpCode
     }
 }
 
-// class FormulaCompiler
 
 FormulaCompiler::FormulaCompiler( FormulaTokenArray& rArr, bool bComputeII, bool bMatrixFlag )
         :
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 187415d09a8e..613e40c5e9c7 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -26,7 +26,6 @@ namespace formula
 
 class ParaWin;
 
-// class ArgEdit
 
 class ArgEdit : public RefEdit
 {
@@ -49,7 +48,6 @@ private:
 };
 
 
-// class ArgInput
 
 class ArgInput final
 {
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 491bab8c2769..8e57f8574ddf 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -32,7 +32,6 @@
 namespace formula
 {
 
-// class ArgEdit
 ArgEdit::ArgEdit(std::unique_ptr<weld::Entry> xControl)
     : RefEdit(std::move(xControl))
     , pEdPrev(nullptr)
@@ -130,7 +129,6 @@ bool ArgEdit::KeyInput(const KeyEvent& rKEvt)
     return RefEdit::KeyInput(rKEvt);
 }
 
-// class ArgInput
 ArgInput::ArgInput()
 {
     pFtArg=nullptr;
@@ -373,7 +371,6 @@ IMPL_LINK_NOARG(RefEdit, UpdateHdl, Timer *, void)
         pAnyRefDlg->ShowReference(xEntry->get_text());
 }
 
-//class RefButton
 RefButton::RefButton(std::unique_ptr<weld::Button> xControl)
     : xButton(std::move(xControl))
     , pAnyRefDlg( nullptr )
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index d827240fd4dd..a5ea72a29435 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -32,7 +32,6 @@
 #include <rtl/ustring.hxx>
 
 
-// class declaration
 
 
 class SalAquaFolderPicker :
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index acfa2a855db0..739297e3ea71 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -34,7 +34,6 @@
 #include <postmac.h>
 
 
-// class declaration
 
 
 class SalAquaPicker
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index db7ac9d2bd60..5475a5002561 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -403,7 +403,6 @@ void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )
 }
 
 
-// class SvtFilePicker
 
 SvtFilePicker::SvtFilePicker()
     :m_bMultiSelection  ( false )
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index 9fda18b2a36f..b09f589a32ba 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -1114,7 +1114,6 @@ void SvtFileView::SetConfigString(const OUString& rCfgStr)
     pView->set_column_fixed_widths(aWidths);
 }
 
-// class SvtFileView_Impl
 SvtFileView_Impl::SvtFileView_Impl(SvtFileView* pAntiImpl, weld::Window* pTopLevel,
                                    std::unique_ptr<weld::TreeView> xTreeView,
                                    std::unique_ptr<weld::IconView> xIconView,
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 38fa40fe80b4..cc5bd31a28ec 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -30,7 +30,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace i18npool {
 
 
-//  class BreakIterator
 
 class BreakIteratorImpl : public cppu::WeakImplHelper
 <
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index 5e82f33c2666..a088bd3d94c7 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -26,7 +26,6 @@
 
 namespace i18npool {
 
-//  class BreakIterator_CJK
 
 class BreakIterator_CJK : public BreakIterator_Unicode
 {
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index 16d6cfd15e14..347eb68b1138 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -24,7 +24,6 @@
 namespace i18npool {
 
 
-//  class BreakIterator_th
 
 class BreakIterator_th : public BreakIterator_Unicode
 {
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 41831c676f28..b0e0850f09bc 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -34,7 +34,6 @@ namespace i18npool {
 #define LOAD_LINE_BREAKITERATOR         3
 
 
-//  class BreakIterator_Unicode
 
 class BreakIterator_Unicode : public BreakIteratorImpl
 {
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 299bfe79bae2..f8c9333ed153 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -26,7 +26,6 @@
 
 namespace com::sun::star::uno { class XComponentContext; }
 
-//  class CalendarImpl
 
 
 namespace i18npool {
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index aa9a02965d79..c0541d7443b0 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -30,7 +30,6 @@
 
 namespace i18npool { class NativeNumberSupplierService; }
 
-//  class Calendar_gregorian
 
 
 namespace i18npool {
@@ -146,7 +145,6 @@ private:
 };
 
 
-//  class Calendar_hanja
 
 class Calendar_hanja : public Calendar_gregorian
 {
@@ -158,7 +156,6 @@ public:
 };
 
 
-//  class Calendar_gengou
 
 class Calendar_gengou : public Calendar_gregorian
 {
@@ -168,7 +165,6 @@ public:
 };
 
 
-//  class Calendar_ROC
 
 class Calendar_ROC : public Calendar_gregorian
 {
@@ -178,7 +174,6 @@ public:
 };
 
 
-//  class Calendar_dangi
 
 class Calendar_dangi : public Calendar_gregorian
 {
@@ -188,7 +183,6 @@ public:
 };
 
 
-//  class Calendar_buddhist
 
 class Calendar_buddhist : public Calendar_gregorian
 {
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index 240cc7b20095..3889a9bb3e28 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.hxx
@@ -22,7 +22,6 @@
 #include "calendar_gregorian.hxx"
 
 
-//  class Calendar_hijri
 
 
 namespace i18npool {
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index 91343e3ebb57..f500fa6f05e2 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.hxx
@@ -22,7 +22,6 @@
 #include "calendar_gregorian.hxx"
 
 
-//  class Calendar_jewish
 
 
 namespace i18npool {
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 5b711ea7684d..6a441f3f91e2 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -28,7 +28,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace i18npool {
 
 
-//  class IndexEntrySupplier
 
 class IndexEntrySupplier final : public cppu::WeakImplHelper
 <
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index f15e4711a37a..357a340caaf1 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -26,7 +26,6 @@
 namespace i18npool {
 
 
-//  class IndexEntrySupplier_asian
 
 
 class IndexEntrySupplier_asian : public IndexEntrySupplier_Common {
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index 6870856741a9..a6cfcb3b7964 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -31,7 +31,6 @@ namespace i18npool { class CollatorImpl; }
 namespace i18npool {
 
 
-//  class IndexEntrySupplier_Common
 
 
 class IndexEntrySupplier_Common : public cppu::WeakImplHelper
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index 2c7925fc7edd..5f93e8e20698 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -28,7 +28,6 @@ namespace i18npool {
 class Index;
 
 
-//  class IndexEntrySupplier_Unicode
 
 class IndexEntrySupplier_Unicode : public IndexEntrySupplier_Common {
 public:
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 7635cb143f7d..8b65843d0225 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -25,7 +25,6 @@
 namespace i18npool {
 
 
-//  class IndexEntrySupplier_ja_phonetic
 
 
 class IndexEntrySupplier_ja_phonetic : public IndexEntrySupplier_Common {
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 1c5f2fbf2c94..bbd76025d30c 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -31,7 +31,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace i18npool {
 
 
-//  class InputSequenceCheckerImpl
 
 class InputSequenceCheckerImpl : public cppu::WeakImplHelper
 <
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index b0cbe5052505..b7253e49ddda 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -24,7 +24,6 @@
 namespace i18npool {
 
 
-//  class InputSequenceChecker_hi
 
 class InputSequenceChecker_hi : public InputSequenceCheckerImpl
 {
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index 8f7f1eb56541..aff2c248ca78 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -24,7 +24,6 @@
 namespace i18npool {
 
 
-//  class InputSequenceChecker_th
 
 class InputSequenceChecker_th : public InputSequenceCheckerImpl
 {
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index cff2723615ba..b3096ecf86f2 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -31,7 +31,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace i18npool {
 
 
-//  class TextConversionService
 
 class TextConversionService: public cppu::WeakImplHelper
 <
@@ -83,7 +82,6 @@ typedef struct {
 } Hangul_Index;
 
 
-//  class TextConversion_ko
 
 class TextConversion_ko : public TextConversionService
 {
@@ -120,7 +118,6 @@ private:
 };
 
 
-//  class TextConversion_zh
 
 
 // for SChines/TChinese word conversion
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index 9cd87e8d611c..fd9ab9cf2177 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -28,7 +28,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace i18npool {
 
 
-//  class TextConversion
 
 class TextConversionImpl : public cppu::WeakImplHelper
 <
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index 099552fcf09d..bf4ae87f6f14 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.hxx
@@ -25,7 +25,6 @@
 #include <cppuhelper/implbase.hxx>
 
 
-//  class UnoScriptTypeDetector
 
 class UnoScriptTypeDetector : public cppu::WeakImplHelper
 <
diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index d47e8b880f6d..afcd2708ce90 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -23,7 +23,6 @@
 
 namespace com::sun::star::uno { class XComponentContext; }
 
-//      class UnoScriptTypeDetector
 sal_Int16 SAL_CALL
 UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection )
 {
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index 95a082cdae32..33a14090e3e7 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -61,7 +61,6 @@ class SfxViewShell;
 sal_Int16 MapGroupIDToCommandGroup( SfxGroupId nGroupID );
 
 
-//  class declarations
 
 
 typedef ::cppu::WeakImplHelper  <   css::frame::XController2
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index d625f7871029..7d3be53fd515 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -90,7 +90,6 @@ namespace com::sun::star::ui { class XUIConfigurationManager2; }
 namespace com::sun::star::util { class XCloseListener; }
 namespace com::sun::star::util { class XModifyListener; }
 
-//  class declarations
 
 
 /**_______________________________________________________________________________________________________
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 98f482f9c7b4..a7880202deae 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -24,7 +24,6 @@
 #include <vcl/bitmapex.hxx>
 
 
-// class XPropertyEntry
 
 class SVX_DLLPUBLIC XPropertyEntry
 {
diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index 9e43df6b98e0..a8a925939f7b 100644
--- a/include/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
@@ -23,7 +23,6 @@
 #include <svx/svxdllapi.h>
 
 
-// class SdrAngleItem
 
 class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
 public:
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index f786fd1681b6..2f4c4ef78535 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -24,7 +24,6 @@
 #include <svx/svxdllapi.h>
 
 
-// class SdrTextAniDirectionItem
 
 
 enum class SdrTextAniDirection
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 25b16799b984..bfedb5c39117 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -24,7 +24,6 @@
 #include <svx/svxdllapi.h>
 
 
-// class SdrTextVertAdjustItem
 
 
 enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP,      // aligned to top (normally used)
@@ -49,7 +48,6 @@ public:
 };
 
 
-// class SdrTextHorzAdjustItem
 
 
 enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT,     // left adjusted
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 76500486b47f..2e6d8a9bda15 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -40,7 +40,6 @@ enum class SdrCircKind { Full, Section, Cut, Arc };
 
 extern SVX_DLLPUBLIC SdrCircKind ToSdrCircKind(SdrObjKind);
 
-// class SdrCircObj
 
 class SVX_DLLPUBLIC SdrCircObj final : public SdrRectObj
 {
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index 72db35e6f911..f08c8acbbf5d 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -26,7 +26,6 @@
 enum class SdrCaptionType { Type1, Type2, Type3, Type4 };
 
 
-// class SdrCaptionTypeItem
 
 class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem<SdrCaptionType> {
 public:
diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index bfb5b60299f9..2c302a3397e0 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -29,7 +29,6 @@ enum class SdrEdgeKind
 };
 
 
-// class SdrEdgeKindItem
 
 class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem<SdrEdgeKind> {
 public:
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index 22ad0ed12494..bc152fdaf357 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/MeasureTextHorzPos.hpp>
 #include <com/sun/star/drawing/MeasureTextVertPos.hpp>
 
-// class SdrMeasureTextHPosItem
 class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem<css::drawing::MeasureTextHorzPos> {
 public:
     SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO)
@@ -42,7 +41,6 @@ public:
     virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
 };
 
-// class SdrMeasureTextVPosItem
 class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem<css::drawing::MeasureTextVertPos> {
 public:
     SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO)
diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx
index cb9b7f0db0ad..c4bbbd4e9e6d 100644
--- a/include/svx/txenctab.hxx
+++ b/include/svx/txenctab.hxx
@@ -23,7 +23,6 @@
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
 
-//  class SvxTextEncodingTable
 class SVX_DLLPUBLIC SvxTextEncodingTable
 {
 public:
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index 2c1ea768a8ee..fd915fa6a214 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -27,7 +27,6 @@
 
 class SdrModel;
 
-// class XFillBitmapItem
 
 class SVX_DLLPUBLIC XFillBitmapItem : public NameOrIndex
 {
diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index df3723542516..2919f2034462 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -28,7 +28,6 @@
 class XColorList;
 
 
-// class XColorItem
 
 class SVX_DLLPUBLIC XColorItem : public NameOrIndex
 {
diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx
index 275e01fb997c..8cc68be065f7 100644
--- a/include/svx/xdash.hxx
+++ b/include/svx/xdash.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_XDASH_HXX
 
 
-// class XDash
 
 
 #include <svx/svxdllapi.h>
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index e0855dfb7c56..57443f186b8b 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 
 
-// class XFillStyleItem
 
 
 class SVX_DLLPUBLIC XFillStyleItem final : public SfxEnumItem<css::drawing::FillStyle>
diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx
index d3998bb17002..3679f0f3e217 100644
--- a/include/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
@@ -28,7 +28,6 @@
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 
-// class XFillColorItem
 
 class SVX_DLLPUBLIC XFillColorItem final : public XColorItem
 {
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index a6daf1006535..87d587315d19 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -25,7 +25,6 @@
 #include <boost/property_tree/json_parser.hpp>
 
 
-// class XFillFloatTransparenceItem -
 
 
 class SVX_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem
diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index 1b1d860c8fb9..4fbf399e6389 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -28,7 +28,6 @@
 class SdrModel;
 
 
-// class XFillGradientItem
 
 class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex
 {
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index 760d89b9c43d..7a6cb5dde8fb 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -28,7 +28,6 @@
 class SdrModel;
 
 
-// class XFillHatchItem
 
 class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex
 {
diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx
index ffcd8fbeff0f..95c02d0b34e8 100644
--- a/include/svx/xhatch.hxx
+++ b/include/svx/xhatch.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/HatchStyle.hpp>
 
 
-// class XHatch
 
 
 class SVX_DLLPUBLIC XHatch final
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 0ca9124f7826..317fcd3edae0 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -32,7 +32,6 @@ class NameOrIndex;
 typedef bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
 
 
-// class NameOrIndex
 
 class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem
 {
diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx
index b526a5aa12cc..a561bec0375a 100644
--- a/include/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
@@ -22,7 +22,6 @@
 
 #include <svl/eitem.hxx>
 
-// class LineStyleItem
 
 #include <svx/svxdllapi.h>
 #include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index ed5749f9953e..612c747ef5b5 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/LineJoint.hpp>
 
 
-// class XLineJointItem
 
 
 class SVX_DLLPUBLIC XLineJointItem final : public SfxEnumItem<css::drawing::LineJoint>
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index c4d6fb875024..8657c83807b7 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/LineCap.hpp>
 
 
-// class XLineCapItem
 
 
 class SVX_DLLPUBLIC XLineCapItem final : public SfxEnumItem<css::drawing::LineCap>
diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx
index af5be068449e..8f2e6db05dff 100644
--- a/include/svx/xlnclit.hxx
+++ b/include/svx/xlnclit.hxx
@@ -24,7 +24,6 @@
 #include <svx/svxdllapi.h>
 
 
-// class XLineColorItem
 
 class SVX_DLLPUBLIC XLineColorItem final : public XColorItem
 {
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index f853ba2fb4a2..067b5821a8d7 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -29,7 +29,6 @@
 class SdrModel;
 
 
-// class XLineDashItem
 
 class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex
 {
diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx
index 8befa988388e..b427aca7ba05 100644
--- a/include/svx/xlnedcit.hxx
+++ b/include/svx/xlnedcit.hxx
@@ -24,7 +24,6 @@
 #include <svx/svxdllapi.h>
 
 
-// class XLineEndCenterItem
 
 class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem
 {
diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx
index 7a4c33475f37..81530d5274de 100644
--- a/include/svx/xlnedit.hxx
+++ b/include/svx/xlnedit.hxx
@@ -27,7 +27,6 @@
 class SdrModel;
 
 
-// class XLineEndItem
 
 class SVX_DLLPUBLIC XLineEndItem final : public NameOrIndex
 {
diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx
index 372b7ba3ecaa..81961d068e1e 100644
--- a/include/svx/xlnedwit.hxx
+++ b/include/svx/xlnedwit.hxx
@@ -26,7 +26,6 @@
 #define LINE_END_WIDTH_DEFAULT      (200)
 
 
-// class XLineEndWidthItem
 
 
 class SVX_DLLPUBLIC XLineEndWidthItem final : public SfxMetricItem
diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx
index 133b80fb2958..d3f6164cd5f3 100644
--- a/include/svx/xlnstcit.hxx
+++ b/include/svx/xlnstcit.hxx
@@ -24,7 +24,6 @@
 #include <svx/svxdllapi.h>
 
 
-// class XLineStartCenterItem
 
 class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem
 {
diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx
index 6a01d7e5fdc4..387f57b88e49 100644
--- a/include/svx/xlnstit.hxx
+++ b/include/svx/xlnstit.hxx
@@ -27,7 +27,6 @@
 class SdrModel;
 
 
-// class XLineStartItem
 
 class SVX_DLLPUBLIC XLineStartItem final : public NameOrIndex
 {
diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx
index 0809db0d42d2..5e8b38f5f5d6 100644
--- a/include/svx/xlnstwit.hxx
+++ b/include/svx/xlnstwit.hxx
@@ -26,7 +26,6 @@
 #define LINE_START_WIDTH_DEFAULT        (200)
 
 
-// class XLineStartWidthItem
 
 class SVX_DLLPUBLIC XLineStartWidthItem final : public SfxMetricItem
 {
diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx
index 7fecd90ecef1..114abf0b4811 100644
--- a/include/svx/xlnwtit.hxx
+++ b/include/svx/xlnwtit.hxx
@@ -24,7 +24,6 @@
 #include <svx/svxdllapi.h>
 
 
-// class XLineWidthItem
 
 class SVX_DLLPUBLIC XLineWidthItem final : public SfxMetricItem
 {
diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx
index dce7c5678b78..86a7921b34a6 100644
--- a/include/svx/xsflclit.hxx
+++ b/include/svx/xsflclit.hxx
@@ -23,7 +23,6 @@
 #include <svx/xcolit.hxx>
 
 
-// class XSecondaryFillColorItem
 
 class SVX_DLLPUBLIC XSecondaryFillColorItem final : public XColorItem
 {
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 377dcbc57ce1..db5a15c9be21 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -42,7 +42,6 @@ class AccessibleStateSetHelper;
 }
 
 
-//  class VCLXAccessibleComponent
 
 typedef ::cppu::ImplHelper1<
     css::lang::XServiceInfo > VCLXAccessibleComponent_BASE;
diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx
index d2ff89c2845c..40201ae82784 100644
--- a/include/toolkit/awt/vclxbitmap.hxx
+++ b/include/toolkit/awt/vclxbitmap.hxx
@@ -30,7 +30,6 @@
 #include <vcl/bitmapex.hxx>
 
 
-//  class VCLXBitmap
 
 
 class VCLXBitmap final : public cppu::WeakImplHelper<
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 9550d8b48c02..f73cdf2c4495 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -28,7 +28,6 @@
 #include <toolkit/awt/vclxwindow.hxx>
 
 
-//  class VCLXContainer
 
 
 class VCLXContainer : public css::awt::XVclContainer,
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 07cd499cacfb..59d1a65edfee 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -73,7 +73,6 @@ public:
 };
 
 
-//  class VCLXVirtualDevice
 
 
 class VCLXVirtualDevice : public VCLXDevice
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index e21936f20c99..92ea58480de4 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace awt { class XDevice;
 class FontMetric;
 
 
-//  class VCLXFont
 
 
 class TOOLKIT_DLLPUBLIC VCLXFont final :
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index 264843dae6ae..0689e48b9e56 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -51,7 +51,6 @@ namespace o3tl
 }
 
 
-//  class VCLXGraphics
 
 
 class VCLXGraphics final : public cppu::WeakImplHelper<
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 34f5d8f2a58a..298a8ccdd676 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -48,7 +48,6 @@ typedef ::std::vector<
 > PopupMenuRefList;
 
 
-//  class VCLXMenu
 
 
 class TOOLKIT_DLLPUBLIC VCLXMenu :  public css::awt::XMenuBar,
diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx
index ab210d2b545b..8346637a074d 100644
--- a/include/toolkit/awt/vclxpointer.hxx
+++ b/include/toolkit/awt/vclxpointer.hxx
@@ -31,7 +31,6 @@
 #include <vcl/ptrstyle.hxx>
 
 
-//  class VCLXPointer
 
 
 class VCLXPointer final : public cppu::WeakImplHelper<
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index 81aebf443c6e..e03a3a7b2044 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -47,7 +47,6 @@ class Printer;
 */
 
 
-//  class VCLXPrinterPropertySet
 
 
 typedef ::cppu::WeakImplHelper <   css::awt::XPrinterPropertySet
@@ -100,7 +99,6 @@ public:
 };
 
 
-//  class VCLXPrinter
 
 
 typedef ::cppu::ImplInheritanceHelper  <   VCLXPrinterPropertySet
@@ -139,7 +137,6 @@ public:
 };
 
 
-//  class VCLXInfoPrinter
 
 
 typedef ::cppu::ImplInheritanceHelper  <   VCLXPrinterPropertySet
@@ -172,7 +169,6 @@ public:
 };
 
 
-//  class VCLXPrinterServer
 
 
 typedef ::cppu::WeakImplHelper <   css::awt::XPrinterServer2,
diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx
index aec3e0b0af5d..d4c43ef31730 100644
--- a/include/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
@@ -31,7 +31,6 @@
 #include <vcl/region.hxx>
 
 
-//  class VCLXRegion
 
 
 class VCLXRegion final : public cppu::WeakImplHelper<
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 9db6e7d51d24..3f64d104bbac 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -33,7 +33,6 @@ namespace com { namespace sun { namespace star { namespace awt { class XMenuBar;
 typedef ::cppu::ImplHelper2 <   css::awt::XTopWindow2, css::awt::XSystemDependentWindowPeer
                             >   VCLXTopWindow_XBase;
 
-//  class VCLXTopWindow
 
 class VCLXTopWindow: public VCLXTopWindow_XBase,
                      public VCLXContainer
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index fa76b5f253b5..2b6095b7c14e 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -53,7 +53,6 @@ namespace toolkit
     class IAccessibleFactory;
 }
 
-//  class VCLXWINDOW
 
 class UnoPropertyArrayHelper;
 class VCLXWindowImpl;
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 5a56b9b3a1f1..ae0b0b9ca9f5 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -43,7 +43,6 @@
 namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } }
 namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
-//  class ControlModelContainerBase
 
 typedef UnoControlModel     ControlModel_Base;
 typedef ::cppu::AggImplInheritanceHelper8   <   ControlModel_Base
diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx
index 2e071ae16f3c..21808db7f37a 100644
--- a/include/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
@@ -33,7 +33,6 @@ namespace com { namespace sun { namespace star { namespace awt { namespace tab {
 namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageContainerListener; } } } } }
 namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageModel; } } } } }
 
-//  class css::awt::tab::UnoControlTabPageContainerModel
 
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlModel
                                             ,   css::awt::tab::XTabPageContainerModel
diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index 49893cb805a7..862d690f0361 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -46,7 +46,6 @@ public:
 };
 
 
-//  class UnoTabPageControl
 
 typedef ::cppu::AggImplInheritanceHelper2   <   ControlContainerBase
                                             ,   css::awt::tab::XTabPage
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index 94b3f09a1999..cc83a6b7a934 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -58,7 +58,6 @@ struct UnoControlComponentInfos
 
 struct UnoControl_Data;
 
-//  class UnoControl
 
 typedef ::cppu::WeakAggImplHelper9  <   css::awt::XControl
                                     ,   css::awt::XWindow2
diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx
index 6c1dc600a7ea..c152fa5516df 100644
--- a/include/toolkit/controls/unocontrolbase.hxx
+++ b/include/toolkit/controls/unocontrolbase.hxx
@@ -27,7 +27,6 @@
 #include <toolkit/controls/unocontrol.hxx>
 
 
-//  class UnoControlBase
 
 
 class UnoControlBase : public UnoControl
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index 79da9c09489c..fde6df733173 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -34,7 +34,6 @@
 class UnoControlHolderList;
 
 
-//  class UnoControlContainer
 
 typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
                                             ,   css::awt::XUnoControlContainer
diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx
index f24015b3e9b2..e27e38730255 100644
--- a/include/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
@@ -24,7 +24,6 @@
 #include <toolkit/controls/unocontrolmodel.hxx>
 
 
-//  class css::awt::UnoControlContainerModel
 
 class UnoControlContainerModel final : public UnoControlModel
 {
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 34dbb3ce277e..69b5f121a0f6 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -45,7 +45,6 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponen
 typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable;
 
 
-//  class UnoControlModel
 
 
 typedef ::cppu::WeakAggImplHelper7  <   css::awt::XControlModel
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 6bc0fafb570a..683c6f1901e3 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -73,7 +73,6 @@ public:
 };
 
 
-//  class UnoControlEditModel
 
 class UnoControlEditModel final : public UnoControlModel
 {
@@ -100,7 +99,6 @@ public:
 };
 
 
-//  class UnoEditControl
 
 typedef ::cppu::ImplHelper4  <   css::awt::XTextComponent
                              ,   css::awt::XTextListener
@@ -178,7 +176,6 @@ public:
 };
 
 
-//  class UnoControlFileControlModel
 
 class UnoControlFileControlModel final : public UnoControlModel
 {
@@ -204,7 +201,6 @@ public:
 };
 
 
-//  class UnoFileControl
 
 class UnoFileControl final : public UnoEditControl
 {
@@ -219,7 +215,6 @@ public:
 };
 
 
-//  class GraphicControlModel
 
 class GraphicControlModel : public UnoControlModel
 {
@@ -247,7 +242,6 @@ private:
 };
 
 
-//  class UnoControlButtonModel
 
 class UnoControlButtonModel final : public GraphicControlModel
 {
@@ -273,7 +267,6 @@ public:
 };
 
 
-//  class UnoButtonControl
 
 typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
                                             ,   css::awt::XButton
@@ -325,7 +318,6 @@ public:
 };
 
 
-//  class UnoControlImageControlModel
 
 class UnoControlImageControlModel final : public GraphicControlModel
 {
@@ -357,7 +349,6 @@ public:
 };
 
 
-//  class UnoImageControlControl
 
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlBase
                                             ,   css::awt::XLayoutConstrains
@@ -389,7 +380,6 @@ public:
 };
 
 
-//  class UnoControlRadioButtonModel
 
 class UnoControlRadioButtonModel final : public GraphicControlModel
 {
@@ -415,7 +405,6 @@ public:
 };
 
 
-//  class UnoRadioButtonControl
 
 typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
                                             ,   css::awt::XButton
@@ -469,7 +458,6 @@ public:
 };
 
 
-//  class UnoControlCheckBoxModel
 
 class UnoControlCheckBoxModel final : public GraphicControlModel
 {
@@ -495,7 +483,6 @@ public:
 };
 
 
-//  class UnoCheckBoxControl
 
 typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
                                             ,   css::awt::XButton
@@ -551,7 +538,6 @@ public:
 };
 
 
-//  class UnoControlFixedTextModel
 
 class UnoControlFixedHyperlinkModel final : public UnoControlModel
 {
@@ -575,7 +561,6 @@ public:
 };
 
 
-//  class UnoFixedHyperlinkControl
 
 class UnoFixedHyperlinkControl final : public UnoControlBase,
                                  public css::awt::XFixedHyperlink,
@@ -624,7 +609,6 @@ public:
 };
 
 
-//  class UnoControlFixedTextModel
 
 class UnoControlFixedTextModel final : public UnoControlModel
 {
@@ -650,7 +634,6 @@ public:
 };
 
 
-//  class UnoFixedTextControl
 
 class UnoFixedTextControl final : public UnoControlBase,
                             public css::awt::XFixedText,
@@ -690,7 +673,6 @@ public:
 };
 
 
-//  class UnoControlGroupBoxModel
 
 class UnoControlGroupBoxModel final : public UnoControlModel
 {
@@ -716,7 +698,6 @@ public:
 };
 
 
-//  class UnoGroupBoxControl
 
 class UnoGroupBoxControl final : public UnoControlBase
 {
@@ -733,7 +714,6 @@ public:
 };
 
 
-//  class UnoControlListBoxModel
 
 struct UnoControlListBoxModel_Data;
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlModel
@@ -837,7 +817,6 @@ protected:
 };
 
 
-//  class UnoListBoxControl
 
 typedef ::cppu::AggImplInheritanceHelper5   <   UnoControlBase
                                             ,   css::awt::XListBox
@@ -916,7 +895,6 @@ private:
 };
 
 
-//  class UnoControlComboBoxModel
 
 class UnoControlComboBoxModel final : public UnoControlListBoxModel
 {
@@ -944,7 +922,6 @@ public:
 };
 
 
-//  class UnoComboBoxControl
 
 class UnoComboBoxControl final :  public UnoEditControl
                         ,   public css::awt::XComboBox
@@ -1011,7 +988,6 @@ private:
 };
 
 
-//  class UnoSpinFieldControl
 
 class UnoSpinFieldControl : public UnoEditControl,
                             public css::awt::XSpinField
@@ -1049,7 +1025,6 @@ public:
 };
 
 
-//  class UnoControlDateFieldModel
 
 class UnoControlDateFieldModel final : public UnoControlModel
 {
@@ -1075,7 +1050,6 @@ public:
 };
 
 
-//  class UnoDateFieldControl
 
 class UnoDateFieldControl final : public UnoSpinFieldControl,
                             public css::awt::XDateField
@@ -1127,7 +1101,6 @@ public:
 };
 
 
-//  class UnoControlTimeFieldModel
 
 class UnoControlTimeFieldModel final : public UnoControlModel
 {
@@ -1153,7 +1126,6 @@ public:
 };
 
 
-//  class UnoTimeFieldControl
 
 class UnoTimeFieldControl final : public UnoSpinFieldControl,
                             public css::awt::XTimeField
@@ -1203,7 +1175,6 @@ public:
 };
 
 
-//  class UnoControlNumericFieldModel
 
 class UnoControlNumericFieldModel final : public UnoControlModel
 {
@@ -1229,7 +1200,6 @@ public:
 };
 
 
-//  class UnoNumericFieldControl
 
 class UnoNumericFieldControl final : public UnoSpinFieldControl,
                                 public css::awt::XNumericField
@@ -1281,7 +1251,6 @@ public:
 };
 
 
-//  class UnoControlCurrencyFieldModel
 
 class UnoControlCurrencyFieldModel final : public UnoControlModel
 {
@@ -1307,7 +1276,6 @@ public:
 };
 
 
-//  class UnoCurrencyFieldControl
 
 class UnoCurrencyFieldControl final : public UnoSpinFieldControl,
                                 public css::awt::XCurrencyField
@@ -1359,7 +1327,6 @@ public:
 };
 
 
-//  class UnoControlPatternFieldModel
 
 class UnoControlPatternFieldModel final : public UnoControlModel
 {
@@ -1385,7 +1352,6 @@ public:
 };
 
 
-//  class UnoPatternFieldControl
 
 class UnoPatternFieldControl final : public UnoSpinFieldControl,
                                 public css::awt::XPatternField
@@ -1420,7 +1386,6 @@ public:
 };
 
 
-//  class UnoControlProgressBarModel
 
 class UnoControlProgressBarModel final : public UnoControlModel
 {
@@ -1446,7 +1411,6 @@ public:
 };
 
 
-//  class UnoProgressBarControl
 
 class UnoProgressBarControl final : public UnoControlBase,
                                 public css::awt::XProgressBar
@@ -1478,7 +1442,6 @@ public:
 };
 
 
-//  class UnoControlFixedLineModel
 
 class UnoControlFixedLineModel final : public UnoControlModel
 {
@@ -1504,7 +1467,6 @@ public:
 };
 
 
-//  class UnoFixedLineControl
 
 class UnoFixedLineControl final : public UnoControlBase
 {
diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx
index 9dc25084cf7c..28a1aa3c1f14 100644
--- a/include/toolkit/helper/emptyfontdescriptor.hxx
+++ b/include/toolkit/helper/emptyfontdescriptor.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/awt/FontStrikeout.hpp>
 
 
-//  class EmptyFontDescriptor
 
 class EmptyFontDescriptor : public css::awt::FontDescriptor
 {
diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx
index a43504c0a103..7c11d9b798e5 100644
--- a/include/toolkit/helper/mutexhelper.hxx
+++ b/include/toolkit/helper/mutexhelper.hxx
@@ -23,7 +23,6 @@
 #include <osl/mutex.hxx>
 
 
-//  class MutexHelper
 
 
 class MutexHelper
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index 19d9a6d21c22..8589ff9e7bd5 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -66,7 +66,6 @@ class MouseEvent;
 class KeyEvent;
 
 
-//  class VclUnoHelper
 
 class TOOLKIT_DLLPUBLIC VCLUnoHelper
 {
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 405b1057b3a3..485085db5e28 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -33,7 +33,6 @@ namespace com { namespace sun { namespace star { namespace ucb { class XCommandE
 namespace ucbhelper {
 
 
-// class PropertySetInfo.
 
 
 class ContentImplHelper;
@@ -77,7 +76,6 @@ public:
 };
 
 
-// class CommandProcessorInfo.
 
 
 /**
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index d9ed5b6c356f..3f4fdb55c947 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -31,7 +31,6 @@
 typedef std::unordered_map<OString, OString> OStringHashMap;
 
 
-// class CfgStackData
 
 
 class CfgStackData
@@ -60,7 +59,6 @@ public:
 };
 
 
-// class CfgStack
 
 
 class CfgStack
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index b6d958695b8d..1ca56e4fe75d 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -57,7 +57,6 @@ typedef std::unordered_map<OString, bool>
 #define X_COMMENT "x-comment"
 
 
-// class ResData
 
 
 /// Purpose: holds mandatory data to export a single res
@@ -76,12 +75,10 @@ public:
 };
 
 
-// class Export
 
 
 class ParserQueue;
 
-// class MergeEntrys
 
 
 /// Purpose: holds information of data to merge
@@ -119,7 +116,6 @@ public:
 
 };
 
-// class MergeDataFile
 
 
 /// Purpose: holds information of data to merge, read from PO file
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 755359b1fa24..ae75f973724f 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -85,7 +85,6 @@ void workOnTokenSet(int nTyp, char * pTokenText) {
 }
 
 
-// class CfgStackData
 
 
 CfgStackData* CfgStack::Push(const OString &rTag, const OString &rId)
@@ -96,7 +95,6 @@ CfgStackData* CfgStack::Push(const OString &rTag, const OString &rId)
 }
 
 
-// class CfgStack
 
 
 CfgStack::~CfgStack()
@@ -125,7 +123,6 @@ CfgStackData *CfgStack::GetStackData()
 }
 
 
-// class CfgParser
 
 
 CfgParser::CfgParser()
@@ -326,7 +323,6 @@ void CfgParser::Execute( int nToken, char * pToken )
 }
 
 
-// class CfgExport
 
 
 CfgExport::CfgExport(
@@ -385,7 +381,6 @@ void CfgExport::WorkOnText(
 }
 
 
-// class CfgMerge
 
 
 CfgMerge::CfgMerge(
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index fdb0cf90b176..777154f57f4d 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -52,7 +52,6 @@ void lcl_RemoveUTF8ByteOrderMarker( OString &rString )
 }
 
 
-// class LngParser
 
 LngParser::LngParser(const OString &rLngFile)
     : sSource( rLngFile )
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 5cf0972e645e..60d88b927c1b 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -56,7 +56,6 @@ namespace
 }
 
 
-//  class ResData
 
 
 ResData::ResData( const OString &rGId )
@@ -75,7 +74,6 @@ ResData::ResData( const OString &rGId, const OString &rFilename)
 }
 
 
-// class MergeEntrys
 
 
 bool MergeEntrys::GetText( OString &rReturn,
@@ -108,7 +106,6 @@ OString MergeEntrys::GetQTZText(const ResData& rResData, const OString& rOrigTex
     return sKey + GetDoubleBars() + rOrigText;
 }
 
-// class MergeDataFile
 
 
 MergeDataFile::MergeDataFile(
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 73fff95d831d..10852fa0f043 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -40,7 +40,6 @@ using namespace osl;
 #define ID          "id"
 
 
-// class XMLChildNode
 
 
 XMLChildNode::XMLChildNode( XMLParentNode *pPar )
@@ -67,7 +66,6 @@ XMLChildNode& XMLChildNode::operator=(const XMLChildNode& rObj)
 }
 
 
-// class XMLParentNode
 
 
 XMLParentNode::~XMLParentNode()
@@ -145,7 +143,6 @@ void XMLParentNode::RemoveAndDeleteAllChildren()
 }
 
 
-// class XMLFile
 
 
 void XMLFile::Write( OString const &aFilename )
@@ -739,7 +736,6 @@ void XMLElement::Print(XMLNode *pCur, OStringBuffer& rBuffer, bool bRootelement
 }
 
 
-// class SimpleXMLParser
 
 
 namespace
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 26dee6f4540c..b77e0138edb1 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -140,7 +140,6 @@ int GetError()
 }
 
 
-// class XRMResParser
 
 
 XRMResParser::XRMResParser()
@@ -278,7 +277,6 @@ void XRMResParser::Error( const OString &rError )
 }
 
 
-// class XMLResExport
 
 
 XRMResExport::XRMResExport(
@@ -350,7 +348,6 @@ void XRMResExport::EndOfText(
 }
 
 
-// class XRMResMerge
 
 
 XRMResMerge::XRMResMerge(
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 1843e83e3424..2247ad2fa8be 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -98,7 +98,6 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDe
     return aArgs;
 }
 
-// class OAddFieldWindowListBox
 
 
 OAddFieldWindowListBox::OAddFieldWindowListBox(Window *pParent, OAddFieldWindow* pFieldWindow)
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 9af13bc81b01..016aa868cbae 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -80,7 +80,6 @@ namespace rptui
         }
     }
 
-    // class ConditionalFormattingDialog
     ConditionalFormattingDialog::ConditionalFormattingDialog(
             weld::Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController)
         : GenericDialogController(_pParent, "modules/dbreport/ui/condformatdialog.ui", "CondFormat")
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 4d2be17a59b5..d68e201c80a9 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class ODateTimeDialog
 
 ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, const uno::Reference< report::XSection >& _xHoldAlive,
                                  OReportController* _pController)
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index b3219be00fe0..d7edc6622c2a 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -186,7 +186,6 @@ void OFieldExpressionControlContainerListener::elementRemoved(const css::contain
 { mpParent->elementRemoved(rEvent); }
 
 
-// class OFieldExpressionControl
 OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent)
     :EditBrowseBox( _pParent, EditBrowseBoxFlags::NONE, WB_TABSTOP,
                     BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::AUTOSIZE_LASTCOL |
@@ -793,7 +792,6 @@ Size OFieldExpressionControl::GetOptimalSize() const
     return LogicToPixel(Size(106, 75), MapMode(MapUnit::MapAppFont));
 }
 
-// class OGroupsSortingDialog
 OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window* _pParent, bool _bReadOnly,
                                            OReportController* _pController)
     : FloatingWindow(_pParent, "FloatingSort", "modules/dbreport/ui/floatingsort.ui")
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index ef09f4ae2455..e4b968acdc18 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -880,7 +880,6 @@ Size NavigatorTree::GetOptimalSize() const
     return LogicToPixel(Size(100, 70), MapMode(MapUnit::MapAppFont));
 }
 
-// class ONavigatorImpl
 class ONavigatorImpl
 {
 public:
@@ -905,7 +904,6 @@ ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pPar
     m_pNavigatorTree->_selectionChanged(aEvent);
 }
 
-// class ONavigator
 ONavigator::ONavigator(vcl::Window* _pParent ,OReportController& _rController)
     : FloatingWindow( _pParent, "FloatingNavigator", "modules/dbreport/ui/floatingnavigator.ui")
 {
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index da9faa591aae..f7768e9993b4 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// class OPageNumberDialog
 
 OPageNumberDialog::OPageNumberDialog(weld::Window* pParent,
                                      const uno::Reference< report::XReportDefinition >& _xHoldAlive,
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index a970d73b9873..f65c2ead1830 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -80,7 +80,6 @@ public:
 
 }
 
-// class ODesignView
 
 
 ODesignView::ODesignView(   vcl::Window* pParent,
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 78ce60cb7dbb..1d634ccea5b2 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -50,7 +50,6 @@ namespace rptui
 using namespace ::com::sun::star;
 using namespace ::comphelper;
 
-// class OReportWindow
 
 
 OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView)
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 690c033abf7c..a8e43efd0d04 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -94,7 +94,6 @@ struct ScFuncDescCore
 
 static void ScFuncRes(const ScFuncDescCore &rEntry, ScFuncDesc*, bool& rbSuppressed);
 
-// class ScFuncDesc:
 ScFuncDesc::ScFuncDesc() :
         pDefArgFlags    (nullptr),
         nFIndex         (0),
@@ -386,7 +385,6 @@ bool ScFuncDesc::compareByName(const ScFuncDesc* a, const ScFuncDesc* b)
 
 #define ENTRY(CODE) CODE, SAL_N_ELEMENTS(CODE)
 
-// class ScFunctionList:
 ScFunctionList::ScFunctionList()
 {
     sal_Int32  nMaxFuncNameLen = 0; // Length of longest function name
@@ -1009,7 +1007,6 @@ const ScFuncDesc* ScFunctionList::GetFunction( sal_uInt32 nIndex ) const
     return pDesc;
 }
 
-// class ScFunctionCategory:
 
 sal_uInt32 ScFunctionCategory::getCount() const
 {
@@ -1036,7 +1033,6 @@ sal_uInt32 ScFunctionCategory::getNumber() const
     return m_nCategory;
 }
 
-// class ScFunctionMgr:
 
 ScFunctionMgr::ScFunctionMgr() :
     pFuncList( ScGlobal::GetStarCalcFunctionList() )
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 95ad06cfa69f..3e532252d7df 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -35,7 +35,6 @@ using namespace utl;
 using namespace com::sun::star::uno;
 
 
-// class ScGridOptions
 
 void ScGridOptions::SetDefaults()
 {
@@ -76,7 +75,6 @@ bool ScGridOptions::operator==( const ScGridOptions& rCpy ) const
             && bEqualGrid       == rCpy.bEqualGrid );
 }
 
-// class ScViewOptions
 
 ScViewOptions::ScViewOptions()
 {
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index bef6e43756ef..879d5882d611 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -33,7 +33,6 @@ class XclExpStream;
 class XclExpXmlStream;
 class XclExpChangeTrack;
 
-// class ExcTable -
 
 class XclExpCellTable;
 
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index fc078b51ce16..d0ae16a87966 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -59,7 +59,6 @@ private:
     ExcScenarioList maScenList;
 };
 
-// classes AutoFilterData, AutoFilterBuffer
 
 class XclImpAutoFilterData : private ExcRoot
 {
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 615d82ffa4e7..d2f85df7bb6f 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -32,7 +32,6 @@
 #include <documentimport.hxx>
 #include <excdefs.hxx>
 
-// class XclImpChangeTrack
 
 XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ) :
     XclImpRoot( rRoot ),
@@ -498,7 +497,6 @@ void XclImpChangeTrack::Apply()
     }
 }
 
-// class XclImpChTrFmlConverter
 
 XclImpChTrFmlConverter::XclImpChTrFmlConverter(
     XclImpRoot& rRoot, XclImpChangeTrack& rXclChTr ) :
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b9ddf6219081..d3c254ddd518 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -116,7 +116,6 @@ ScTextWndBase::ScTextWndBase( vcl::Window* pParent,  WinBits nStyle )
     }
 }
 
-//  class ScInputWindowWrapper
 
 SFX_IMPL_CHILDWINDOW_WITHID(ScInputWindowWrapper,FID_INPUTLINE_STATUS)
 
@@ -146,7 +145,6 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const
     return aInfo;
 }
 
-//  class ScInputWindow
 
 static VclPtr<ScTextWndBase> lcl_chooseRuntimeImpl( vcl::Window* pParent, const SfxBindings* pBind )
 {
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index eecb56e2a023..6a6a76892704 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -24,7 +24,6 @@
 #include <vcl/settings.hxx>
 #include <cbutton.hxx>
 
-//  class ScDDComboBoxButton
 
 ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice )
     :   pOut( pOutputDevice )
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 3f2592516319..295f1d428927 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -54,7 +54,6 @@ namespace
         xBox->run();
     }
 
-//  class DBSaveData
 
 class DBSaveData
 {
@@ -126,7 +125,6 @@ void DBSaveData::Restore()
     }
 }
 
-//  class ScDbNameDlg
 
 ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent,
     ScViewData* ptrViewData)
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 36fad71fb953..b482588fbb18 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -50,7 +50,6 @@ namespace
     }
 }
 
-//  class ScSpecialFilterDialog
 
 ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent,
                                         const SfxItemSet&   rArgSet )
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 4220c2a1efea..8be5550add19 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -50,7 +50,6 @@ struct ScConflictsListEntry
 
 typedef ::std::vector< ScConflictsListEntry > ScConflictsList;
 
-// class ScConflictsListHelper
 
 class ScConflictsListHelper
 {
@@ -67,7 +66,6 @@ public:
                                         ScChangeActionMergeMap* pSharedMap, ScChangeActionMergeMap* pOwnMap );
 };
 
-// class ScConflictsFinder
 
 class ScConflictsFinder final
 {
@@ -91,7 +89,6 @@ public:
     bool                    Find();
 };
 
-// class ScConflictsResolver
 
 class ScConflictsResolver final
 {
@@ -107,7 +104,6 @@ public:
                             bool bHandleContentAction, bool bHandleNonContentAction );
 };
 
-// class ScConflictsDlg
 
 class ScConflictsDlg : public weld::GenericDialogController
 {
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index bda896e25a66..e49d4c32a24a 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -26,7 +26,6 @@
 class ScViewData;
 class ScDocShell;
 
-// class ScShareDocumentDlg
 
 class ScShareDocumentDlg : public weld::GenericDialogController
 {
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 1c3d839ea2d8..583733befb41 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -41,7 +41,6 @@
 #define RD_SPECIAL_CONTENT      1
 #define RD_SPECIAL_VISCONTENT   2
 
-//  class ScRedlinData
 
 ScRedlinData::ScRedlinData()
     :RedlinData()
@@ -67,7 +66,6 @@ ScRedlinData::~ScRedlinData()
     bIsAcceptable=false;
 }
 
-//  class ScAcceptChgDlg
 
 ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent,
     ScViewData* ptrViewData)
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 34a3a7a35b2f..44fa644df866 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -44,7 +44,6 @@ bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const
     return aItr != aEnd;
 }
 
-// class ScConflictsListHelper
 
 bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction )
 {
@@ -116,7 +115,6 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL
     }
 }
 
-// class ScConflictsFinder
 
 ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared,
         sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList )
@@ -233,7 +231,6 @@ bool ScConflictsFinder::Find()
     return bReturn;
 }
 
-// class ScConflictsResolver
 
 ScConflictsResolver::ScConflictsResolver( ScChangeTrack* pTrack, ScConflictsList& rConflictsList )
     :mpTrack ( pTrack )
@@ -327,7 +324,6 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA
     }
 }
 
-// class ScConflictsDlg
 
 ScConflictsDlg::ScConflictsDlg(weld::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList)
     : GenericDialogController(pParent, "modules/scalc/ui/conflictsdialog.ui", "ConflictsDialog")
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 8258dded0aab..2ad2a0605f18 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -52,7 +52,6 @@ const sal_uLong nEntryDataCol = 0;
 const sal_uLong nEntryDataRow = 1;
 const sal_uLong nEntryDataDelim = 2;
 
-//  class ScColRowNameRangesDlg
 
 // note: some of the initialisation is done in Init
 ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 09108cc64332..6bc71de946e1 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -29,7 +29,6 @@
 #include <filldlg.hxx>
 #include <scui_def.hxx>
 
-// class ScFillSeriesDlg
 
 ScFillSeriesDlg::ScFillSeriesDlg( weld::Window*       pParent,
                                   ScDocument&   rDocument,
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 33c8f29955c0..ee2cb04e43d0 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -24,7 +24,6 @@
 
 #include <highred.hxx>
 
-//  class ScHighlightChgDlg
 
 ScHighlightChgDlg::ScHighlightChgDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent,
                                      ScViewData* ptrViewData)
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 795cd6f0f20c..b3531383a206 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -148,7 +148,6 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM
 {
 }
 
-//  class ScOptSolverDlg
 
 ScOptSolverDlg::ScOptSolverDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent,
                                ScDocShell* pDocSh, const ScAddress& aCursorPos)
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 46631ba4d365..8e17ca55b073 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -44,7 +44,6 @@ IMPL_LINK(ScShareDocumentDlg, SizeAllocated, const Size&, rSize, void)
     m_xLbUsers->set_column_fixed_widths(aWidths);
 }
 
-// class ScShareDocumentDlg
 
 ScShareDocumentDlg::ScShareDocumentDlg(weld::Window* pParent, const ScViewData* pViewData)
     : GenericDialogController(pParent, "modules/scalc/ui/sharedocumentdlg.ui",
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index f3ba86e81f33..0dc518b37dd8 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -30,7 +30,6 @@
 
 #include <tabopdlg.hxx>
 
-//  class ScTabOpDlg
 
 ScTabOpDlg::ScTabOpDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent,
                        ScDocument* pDocument,
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 49bc0cbb54be..f37f0ef1022f 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -93,7 +93,6 @@ static void printAddressFlags(ScRefFlags nFlag)
 }
 #endif
 
-//  class ScPrintAreasDlg
 
 ScPrintAreasDlg::ScPrintAreasDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent)
     : ScAnyRefDlgController(pB, pCW, pParent, "modules/scalc/ui/printareasdialog.ui", "PrintAreasDialog")
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 239e7634f454..f0fb8dab9071 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -38,7 +38,6 @@
 #include <scuitphfedit.hxx>
 #include <memory>
 
-// class ScHFEditPage
 
 ScHFEditPage::ScHFEditPage(weld::Container* pPage, weld::DialogController* pController,
                            const SfxItemSet& rCoreAttrs,
@@ -778,7 +777,6 @@ IMPL_LINK(ScHFEditPage, MenuHdl, const OString&, rSelectedId, void)
     }
 }
 
-// class ScRightHeaderEditPage
 
 ScRightHeaderEditPage::ScRightHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
     : ScHFEditPage( pPage, pController,
@@ -792,7 +790,6 @@ std::unique_ptr<SfxTabPage> ScRightHeaderEditPage::Create( weld::Container* pPag
     return std::make_unique<ScRightHeaderEditPage>( pPage, pController, *rCoreSet );
 }
 
-// class ScLeftHeaderEditPage
 
 ScLeftHeaderEditPage::ScLeftHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
     : ScHFEditPage( pPage, pController,
@@ -806,7 +803,6 @@ std::unique_ptr<SfxTabPage> ScLeftHeaderEditPage::Create( weld::Container* pPage
     return std::make_unique<ScLeftHeaderEditPage>( pPage, pController, *rCoreSet );
 }
 
-// class ScRightFooterEditPage
 
 ScRightFooterEditPage::ScRightFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
     : ScHFEditPage( pPage, pController,
@@ -820,7 +816,6 @@ std::unique_ptr<SfxTabPage> ScRightFooterEditPage::Create( weld::Container* pPag
     return std::make_unique<ScRightFooterEditPage>( pPage, pController, *rCoreSet );
 }
 
-// class ScLeftFooterEditPage
 
 ScLeftFooterEditPage::ScLeftFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
     : ScHFEditPage( pPage, pController,
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index f63d7e884726..b4689f51197f 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -40,7 +40,6 @@
 #include <memory>
 #include <helpids.h>
 
-// class ScHFPage
 
 ScHFPage::ScHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId)
     : SvxHFPage(pPage, pController, rSet, nSetId)
@@ -205,7 +204,6 @@ IMPL_LINK_NOARG(ScHFPage, BtnHdl, weld::Button&, void)
     }
 }
 
-// class ScHeaderPage
 
 ScHeaderPage::ScHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
     : ScHFPage(pPage, pController, rSet, SID_ATTR_PAGE_HEADERSET)
@@ -222,7 +220,6 @@ const sal_uInt16* ScHeaderPage::GetRanges()
     return SvxHeaderPage::GetRanges();
 }
 
-// class ScFooterPage
 
 ScFooterPage::ScFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
     : ScHFPage( pPage, pController, rSet, SID_ATTR_PAGE_FOOTERSET )
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index d0cc03aadfb5..2c89c714b793 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -58,7 +58,6 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData )
     }
 }
 
-// class ScEditWindow
 
 ScEditWindow::ScEditWindow(ScEditWindowLocation eLoc, weld::Window* pDialog)
     : eLocation(eLoc)
diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx
index 229195c1f8b6..0d81c40a599e 100644
--- a/sc/source/ui/vba/vbaglobals.hxx
+++ b/sc/source/ui/vba/vbaglobals.hxx
@@ -28,7 +28,6 @@
 namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 namespace ooo { namespace vba { namespace excel { class XApplication; } } }
 
-    // class ScVbaGlobals
 
 typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE;
 
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index fc9e9e2efeaf..c44ce3a536b5 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -33,7 +33,6 @@ namespace basprov
 {
 
 
-    //  class BasicLibraryNodeImpl
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 9949620e2ca8..95741eb11798 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -38,7 +38,6 @@ namespace basprov
 {
 
 
-    //  class BasicMethodNodeImpl
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 569d218fab5e..6ef63b58ba84 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -32,7 +32,6 @@ namespace basprov
 {
 
 
-    //  class BasicModuleNodeImpl
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index d10f10e7e970..2e6dc93b4d22 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -38,7 +38,6 @@ namespace basprov
 {
 
 
-    //  class BasicProviderImpl
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 62a2d61e66da..820a172d99de 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -36,7 +36,6 @@ namespace basprov
 {
 
 
-    //  class BasicScriptImpl
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index f2e33d811c00..73a60706556d 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -36,7 +36,6 @@
 
 namespace dlgprov
 {
-    // class DialogEventsAttacherImpl
     typedef std::unordered_map< OUString,
         css::uno::Reference< css::script::XScriptListener > > ListenerHash;
 
@@ -74,7 +73,6 @@ namespace dlgprov
     };
 
 
-    // class DialogAllListenerImpl
 
 
     typedef ::cppu::WeakImplHelper<
@@ -104,7 +102,6 @@ namespace dlgprov
     };
 
 
-    // class DialogScriptListenerImpl
 
 
     typedef ::cppu::WeakImplHelper<
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index 521bf3f2e316..df3d37a7118c 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -50,7 +50,6 @@ namespace dlgprov
     ::osl::Mutex& getMutex();
 
 
-    // class DialogProviderImpl
 
     css::uno::Reference< css::container::XNameContainer > lcl_createControlModel(const css::uno::Reference< css::uno::XComponentContext >& i_xContext);
     css::uno::Reference< css::resource::XStringResourceManager > lcl_getStringResourceManager(const css::uno::Reference< css::uno::XComponentContext >& i_xContext,const OUString& i_sURL);
diff --git a/scripting/source/inc/bcholder.hxx b/scripting/source/inc/bcholder.hxx
index 67c139dc072b..822f65e705d8 100644
--- a/scripting/source/inc/bcholder.hxx
+++ b/scripting/source/inc/bcholder.hxx
@@ -28,7 +28,6 @@ namespace scripting_helper
 {
 
 
-    //  class OMutexHolder
 
 
     class OMutexHolder
@@ -38,7 +37,6 @@ namespace scripting_helper
     };
 
 
-    //  class OBroadcastHelperHolder
 
 
     class OBroadcastHelperHolder
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 8e8fa5413a9c..2b884dd5085d 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -324,7 +324,6 @@ static Sequence< OUString >  InsertSlideController_getSupportedServiceNames()
     return aSNS;
 }
 
-// class SlideLayoutController
 
 SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentContext >& rxContext, const OUString& sCommandURL, bool bInsertPage )
 : svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), sCommandURL )
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 1076cb88ac07..cd67f219ccaf 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -127,7 +127,6 @@ static const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap()
     return aPresentationPropertyMap_Impl;
 }
 
-// class SlideShow
 
 SlideShow::SlideShow( SdDrawDocument* pDoc )
 : SlideshowBase( m_aMutex )
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ca60d3821e88..be7c1c603b99 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2760,7 +2760,6 @@ void SAL_CALL SdXImpressDocument::dispose()
     mxDrawingPool = nullptr;
 }
 
-// class SdDrawPagesAccess
 
 SdDrawPagesAccess::SdDrawPagesAccess( SdXImpressDocument& rMyModel )  throw()
 :   mpModel( &rMyModel)
@@ -3006,7 +3005,6 @@ void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang
     OSL_FAIL( "not implemented!" );
 }
 
-// class SdMasterPagesAccess
 
 SdMasterPagesAccess::SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw()
 :   mpModel(&rMyModel)
@@ -3243,7 +3241,6 @@ uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames
     return { "com.sun.star.drawing.MasterPages" };
 }
 
-// class SdDocLinkTargets
 
 SdDocLinkTargets::SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw()
 : mpModel( &rMyModel )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 534bdbd29981..f478a828e8e5 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2612,7 +2612,6 @@ Any SdGenericDrawPage::getNavigationOrder()
     }
 }
 
-// class SdMasterPage
 SdMasterPage::SdMasterPage(SdXImpressDocument* pModel, SdPage* pPage)
     : SdGenericDrawPage(pModel, pPage, ImplGetMasterPagePropertySet(pPage->GetPageKind()))
 {
diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx
index 6289b8cf3d0c..bc615ce2b608 100644
--- a/sd/workben/custompanel/ctp_panel.hxx
+++ b/sd/workben/custompanel/ctp_panel.hxx
@@ -35,7 +35,6 @@
 namespace sd { namespace colortoolpanel
 {
 
-    // class SingleColorPanel
     typedef ::cppu::WeakComponentImplHelper    <   css::drawing::framework::XView
                                                 ,   css::ui::XToolPanel
                                                 ,   css::awt::XPaintListener
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 74a753d8da5c..8235433d0177 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -213,7 +213,6 @@ SfxFilterFlags getDontFlags( sal_Int16 nStoreMode )
 }
 
 
-// class DocumentSettingsGuard
 
 
 class DocumentSettingsGuard
@@ -273,7 +272,6 @@ public:
 } // anonymous namespace
 
 
-// class ModelData_Impl
 
 class ModelData_Impl
 {
@@ -1272,7 +1270,6 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con
 }
 
 
-// class SfxStoringHelper
 
 
 SfxStoringHelper::SfxStoringHelper()
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index d12a09a35a78..baa5bdf7658e 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -30,7 +30,6 @@
 
 #define WID_CHAOS_START 500
 
-// class CntStaticPoolDefaults_Impl
 
 namespace {
 
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx
index 1a3a6c493adb..09e1aeaa92e3 100644
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 
-// class declaration
 
 
 class CmdMailMsg :
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx
index abbcb6736208..43915d662e8c 100644
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
 
 
-// class declaration
 
 
 class CmdMailSuppl :
diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx
index 22b03ad76d3d..fd084a567f19 100644
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/system/XSystemShellExecute.hpp>
 
 
-// class declaration
 
 
 class ShellExec : public ::cppu::WeakImplHelper< css::system::XSystemShellExecute, css::lang::XServiceInfo >
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index 24051920b399..63069cc5e52f 100644
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/system/XSystemShellExecute.hpp>
 
 
-// class declaration
 
 
 class CSysShExecBase
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index 4797f4e81e2e..87269910bb19 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/system/XSimpleMailMessage2.hpp>
 
 
-// class declaration
 
 
 class CSmplMailMsg : public cppu::WeakImplHelper< css::system::XSimpleMailMessage2 >
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index b00e5878038d..fae29907f2cf 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -152,7 +152,6 @@ SmPrintUIOptions::SmPrintUIOptions()
 }
 
 
-// class SmModel
 
 namespace {
 
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 940a40c7950d..b3ccec4c4159 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -27,7 +27,6 @@
 #include <boost/property_tree/json_parser.hpp>
 
 
-//  class SfxByteItem
 
 
 SfxPoolItem* SfxByteItem::CreateDefault()
@@ -94,7 +93,6 @@ SfxPoolItem * SfxInt16Item::Clone(SfxItemPool *) const
     return new SfxInt16Item(*this);
 }
 
-//  class SfxUInt16Item
 SfxPoolItem* SfxUInt16Item::CreateDefault()
 {
     return new SfxUInt16Item();
@@ -116,7 +114,6 @@ boost::property_tree::ptree SfxUInt16Item::dumpAsJSON() const
 }
 
 
-//  class SfxInt32Item
 
 
 SfxPoolItem* SfxInt32Item::CreateDefault()
@@ -140,7 +137,6 @@ boost::property_tree::ptree SfxInt32Item::dumpAsJSON() const
 }
 
 
-//  class SfxUInt32Item
 
 
 SfxPoolItem* SfxUInt32Item::CreateDefault()
diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index 503c5d4083ac..85e7ec8d4ce2 100644
--- a/svl/source/items/stritem.cxx
+++ b/svl/source/items/stritem.cxx
@@ -20,7 +20,6 @@
 #include <svl/stritem.hxx>
 #include <libxml/xmlwriter.h>
 
-//  class SfxStringItem
 
 
 // virtual
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 01a70610cd04..d18d887c1075 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star { namespace util {
 class SvNumberFormatsSupplierObj;
 
 
-//  class VCLXMultiLineEdit
 
 class VCLXMultiLineEdit :   public css::awt::XTextComponent,
                             public css::awt::XTextArea,
@@ -103,7 +102,6 @@ public:
 };
 
 
-//  class VCLXFileControl
 
 class VCLXFileControl final : public css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow
 {
@@ -156,7 +154,6 @@ public:
 };
 
 
-//  class SVTXFormattedField
 
 
 class SVTXFormattedField : public VCLXSpinField
@@ -205,7 +202,6 @@ protected:
 };
 
 
-//  class SVTXNumericField
 
 class SVTXNumericField : public css::awt::XNumericField, public SVTXFormattedField
 {
@@ -244,7 +240,6 @@ public:
 };
 
 
-//  class VCLXCurrencyField
 
 class SVTXCurrencyField : public css::awt::XCurrencyField, public SVTXFormattedField
 {
@@ -288,7 +283,6 @@ public:
 };
 
 
-//  class SVTXDateField
 
 class SVTXDateField : public VCLXDateField
 {
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 14f1cfc382f5..c266600546d5 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -150,7 +150,6 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWin
 }
 
 
-// class PopupWindowController
 
 
 PopupWindowController::PopupWindowController( const Reference< uno::XComponentContext >& rxContext,
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index da477a40de78..1f67bbdd0af7 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1404,7 +1404,6 @@ bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage )
 }
 
 
-// class UnoTreeListBoxImpl
 
 
 UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pParent, WinBits nWinStyle )
@@ -1494,7 +1493,6 @@ bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& r
 }
 
 
-// class UnoTreeListItem
 
 
 UnoTreeListItem::UnoTreeListItem()
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 6814e69bd50b..d4ffbfe4f2e6 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -136,7 +136,6 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs
 }   // extern "C"
 
 
-//  class VCLXMultiLineEdit
 
 VCLXMultiLineEdit::VCLXMultiLineEdit()
     :maTextListeners( *this )
@@ -505,7 +504,6 @@ void VCLXMultiLineEdit::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
     VCLXWindow::ImplGetPropertyIds( rIds, true );
 }
 
-//  class VCLXFileControl
 
 VCLXFileControl::VCLXFileControl() : maTextListeners( *this )
 {
@@ -783,7 +781,6 @@ void VCLXFileControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 }
 
 
-//  class SVTXFormattedField
 
 
 SVTXFormattedField::SVTXFormattedField()
@@ -1361,7 +1358,6 @@ void SVTXFormattedField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 }
 
 
-//  class SVTXNumericField
 
 SVTXNumericField::SVTXNumericField()
 {
@@ -1535,7 +1531,6 @@ void SVTXNumericField::GetPropertyIds( std::vector< sal_uInt16 > &rIds )
 }
 
 
-//  class SVTXCurrencyField
 
 SVTXCurrencyField::SVTXCurrencyField()
 {
@@ -1774,7 +1769,6 @@ void SVTXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 }
 
 
-//  class SVTXDateField
 
 SVTXDateField::SVTXDateField()
     :VCLXDateField()
diff --git a/svx/inc/sxallitm.hxx b/svx/inc/sxallitm.hxx
index 440f727fe04e..3539a8ca6ded 100644
--- a/svx/inc/sxallitm.hxx
+++ b/svx/inc/sxallitm.hxx
@@ -50,7 +50,6 @@ public:
 };
 
 
-// class SdrAllSizeWidthItem
 
 class SdrAllSizeHeightItem: public SdrMetricItem {
 public:
diff --git a/svx/inc/sxlogitm.hxx b/svx/inc/sxlogitm.hxx
index 04c6d480a3b1..6a7db6e56340 100644
--- a/svx/inc/sxlogitm.hxx
+++ b/svx/inc/sxlogitm.hxx
@@ -32,7 +32,6 @@ public:
 };
 
 
-// class SdrLogicSizeWidthItem
 
 class SdrLogicSizeHeightItem: public SdrMetricItem {
 public:
diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx
index 2eed2e61bef2..741752b01f39 100644
--- a/svx/inc/sxmkitm.hxx
+++ b/svx/inc/sxmkitm.hxx
@@ -25,7 +25,6 @@
 enum SdrMeasureKind     {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i.
 
 
-// class SdrMeasureKindItem (n.i.)
 
 class SdrMeasureKindItem: public SfxEnumItem<SdrMeasureKind> {
 public:
diff --git a/svx/inc/sxoneitm.hxx b/svx/inc/sxoneitm.hxx
index 7d61cee77f81..0a368b471cf7 100644
--- a/svx/inc/sxoneitm.hxx
+++ b/svx/inc/sxoneitm.hxx
@@ -50,7 +50,6 @@ public:
 };
 
 
-// class SdrOneSizeWidthItem
 
 class SdrOneSizeHeightItem: public SdrMetricItem {
 public:
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a409731f18c0..83731935f006 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -308,7 +308,6 @@ namespace svxform
     }
 
 
-    // class XFormsPage
 
     VCL_BUILDER_FACTORY_ARGS(DataTreeListBox, WB_BORDER)
 
@@ -2180,7 +2179,6 @@ namespace svxform
     }
 
 
-    // class NavigatorFrameManager
 
 
     SFX_IMPL_DOCKINGWINDOW( DataNavigatorManager, SID_FM_SHOW_DATANAVIGATOR )
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 194c33719df3..de2495382db2 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -78,7 +78,6 @@ FmNavInsertedHint::~FmNavInsertedHint()
 }
 
 
-// class FmNavInsertedHint
 
 FmNavModelReplacedHint::FmNavModelReplacedHint( FmEntryData* pAffectedEntryData )
     :pEntryData( pAffectedEntryData )
@@ -558,7 +557,6 @@ namespace svxform
     }
 
 
-    // class NavigatorFrameManager
 
 
     SFX_IMPL_DOCKINGWINDOW( NavigatorFrameManager, SID_FM_SHOW_FMEXPLORER )
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 0a757b343c86..7460e002c86f 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -739,7 +739,6 @@ bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
 }
 
 
-// class SdrPercentItem
 
 
 SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const
@@ -763,7 +762,6 @@ bool SdrPercentItem::GetPresentation(
 }
 
 
-// class SdrAngleItem
 
 
 SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const
@@ -832,7 +830,6 @@ bool SdrAngleItem::GetPresentation(
 }
 
 
-// class SdrMetricItem
 
 
 SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const
@@ -1716,7 +1713,6 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 }
 
 
-// class SdrSignedPercentItem
 
 
 SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 2690e1d5062f..3b53fe2f7e61 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -150,7 +150,6 @@ void SAL_CALL SvxTableControllerModifyListener::disposing( const css::lang::Even
 }
 
 
-// class SvxTableController
 
 
 rtl::Reference< sdr::SelectionController > CreateTableController(
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 9ec03e787958..ddb1529f9f52 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -63,7 +63,6 @@ public:
 
 }
 
-//class NumberingPopup
 NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController,
                                 vcl::Window* pParent, NumberingPageType ePageType ) :
     ToolbarMenu( rController.getFrameInterface(), pParent, WB_STDPOPUP ),
@@ -191,7 +190,6 @@ void NumberingPopup::VSSelectHdl(void const * pControl)
 }
 
 
-//class NumberingToolBoxControl
 NumberingToolBoxControl::NumberingToolBoxControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ):
     svt::PopupWindowController( rxContext, css::uno::Reference< css::frame::XFrame >(), OUString() ),
     mePageType( NumberingPageType::SINGLENUM )
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 6a59871ce1d2..ee1440e33497 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -380,7 +380,6 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
     return new XFormTextShadowTranspItem(*this);
 }
 
-// class XFillGradientStepCountItem
 
 XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) :
     SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount )
@@ -437,7 +436,6 @@ void XFillBmpTileItem::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-// class XFillBmpTilePosItem
 
 
 XFillBmpPosItem::XFillBmpPosItem( RectPoint eRP ) :
@@ -475,7 +473,6 @@ void XFillBmpPosItem::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-// class XFillBmpTileSizeXItem
 
 XFillBmpSizeXItem::XFillBmpSizeXItem( long nSizeX ) :
             SfxMetricItem( XATTR_FILLBMP_SIZEX, nSizeX )
@@ -504,7 +501,6 @@ bool XFillBmpSizeXItem::HasMetrics() const
     return GetValue() > 0;
 }
 
-// class XFillBmpTileSizeYItem
 
 
 XFillBmpSizeYItem::XFillBmpSizeYItem( long nSizeY ) :
@@ -534,7 +530,6 @@ bool XFillBmpSizeYItem::HasMetrics() const
     return GetValue() > 0;
 }
 
-// class XFillBmpTileLogItem
 
 XFillBmpSizeLogItem::XFillBmpSizeLogItem( bool bLog ) :
             SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
@@ -558,7 +553,6 @@ bool XFillBmpSizeLogItem::GetPresentation
     return true;
 }
 
-// class XFillBmpTileOffXItem
 
 
 XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) :
@@ -583,7 +577,6 @@ bool XFillBmpTileOffsetXItem::GetPresentation
     return true;
 }
 
-// class XFillBmpTileOffYItem
 
 XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) :
             SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY )
@@ -637,7 +630,6 @@ void XFillBmpStretchItem::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-// class XFillBmpTileOffPosXItem
 
 XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) :
             SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX )
@@ -661,7 +653,6 @@ bool XFillBmpPosOffsetXItem::GetPresentation
     return true;
 }
 
-// class XFillBmpTileOffPosYItem
 
 XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) :
             SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY )
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index da52d06377f6..84d47253fce7 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -63,7 +63,6 @@ struct SwPosition;
 namespace sw { class DocumentContentOperationsManager; }
 namespace svt { class EmbeddedObjectRef; }
 
-// class SwNodes
 
 typedef SwNode * SwNodePtr;
 typedef bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 1db18cf71acd..9bedca2caee7 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3592,7 +3592,6 @@ const SwFormat* SwWW8ImplReader::GetStyleWithOrgWWName( OUString const & rName )
     return pRet;
 }
 
-//          class WW8RStyle
 
 SprmResult WW8RStyle::HasParaSprm(sal_uInt16 nId) const
 {
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 9fac7faa0e20..b9fe6d41e347 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1667,7 +1667,6 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
     return nRet;
 }
 
-//      class WW8ScannerBase
 std::unique_ptr<WW8PLCFpcd> WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF )
 {
     if ( ((8 > m_pWw8Fib->m_nVersion) && !pWwF->m_fComplex) || !pWwF->m_lcbClx )
diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx
index 420314e97640..6036901ac842 100644
--- a/toolkit/inc/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx
@@ -27,7 +27,6 @@
 #include <set>
 
 
-//  class UnoPropertyArrayHelper
 
 class UnoPropertyArrayHelper final : public ::cppu::IPropertyArrayHelper
 {
diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx
index 1c6c2a5e8a67..c095ef2f4f8b 100644
--- a/toolkit/inc/helper/unowrapper.hxx
+++ b/toolkit/inc/helper/unowrapper.hxx
@@ -30,7 +30,6 @@
 
 #include <helper/accessibilityclient.hxx>
 
-//  class UnoWrapper
 
 
 class UnoWrapper : public UnoWrapperBase
diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx
index bfd95f791404..397b1c0ef017 100644
--- a/toolkit/source/awt/vclxbitmap.cxx
+++ b/toolkit/source/awt/vclxbitmap.cxx
@@ -25,7 +25,6 @@
 #include <vcl/BitmapTools.hxx>
 
 
-//  class VCLXBitmap
 
 
 // css::lang::XUnoTunnel
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 4aeaf48791ed..541a9913440c 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -31,7 +31,6 @@
 #include <toolkit/helper/property.hxx>
 
 
-//  class VCLXContainer
 
 
 void VCLXContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 73dba634e9ff..5e88f31fb911 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -37,7 +37,6 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/metric.hxx>
 
-//  class VCLXDevice
 
 VCLXDevice::VCLXDevice()
 {
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 534732c121f7..5a3550c338da 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -29,7 +29,6 @@
 #include <vcl/svapp.hxx>
 
 
-//  class VCLXFont
 
 VCLXFont::VCLXFont()
 {
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 12f586a9a454..d0a25bfb6116 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -35,7 +35,6 @@
 using namespace com::sun::star;
 
 
-//  class VCLXGraphics
 
 // lang::XUnoTunnel
 UNO3_GETIMPLEMENTATION_IMPL( VCLXGraphics );
diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx
index 93298a1893a0..61b71e63b8e3 100644
--- a/toolkit/source/awt/vclxregion.cxx
+++ b/toolkit/source/awt/vclxregion.cxx
@@ -24,7 +24,6 @@
 #include <cppuhelper/queryinterface.hxx>
 
 
-//  class VCLXRegion
 
 VCLXRegion::VCLXRegion()
 {
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index c9514b2c2cf0..01026907396f 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -39,7 +39,6 @@
 #include <vcl/sysdata.hxx>
 
 
-//  class VCLXSystemDependentWindow
 
 VCLXSystemDependentWindow::VCLXSystemDependentWindow()
 {
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 81e6e9b51232..667797a47752 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::view;
 
-//  class VCLXTabPageContainer
 
 void VCLXTabPageContainer::GetPropertyIds( std::vector< sal_uInt16 > &rIds )
 {
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 2121e14c3e15..b3bf486c6f9d 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1082,7 +1082,6 @@ public:
     }
 };
 
-//  class SVTXRoadmap
 
 struct RMItemData
 {
@@ -1139,7 +1138,6 @@ private:
 
 
 
-//  class SVTXRoadmap
 
 SVTXRoadmap::SVTXRoadmap() : maItemListeners( *this )
 {
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 544cc60622ae..485e4e02cfd4 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -210,7 +210,6 @@ void SAL_CALL VCLXTopWindow::setDisplay( ::sal_Int32 _display )
 }
 
 
-//  class VCLXTopWindow
 
 
 void VCLXTopWindow::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 56133e58b034..4b2aaf8cde90 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -202,7 +202,6 @@ namespace toolkit
 }
 
 
-//  class VCLXGraphicControl
 
 
 void VCLXGraphicControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -333,7 +332,6 @@ css::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName )
 }
 
 
-//  class VCLXButton
 
 
 void VCLXButton::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -616,7 +614,6 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 }
 
 
-//  class VCLXImageControl
 
 
 void VCLXImageControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -747,7 +744,6 @@ css::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName )
 }
 
 
-//  class VCLXCheckBox
 
 
 void VCLXCheckBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -1055,7 +1051,6 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 }
 
 
-//  class VCLXRadioButton
 
 void VCLXRadioButton::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 {
@@ -1345,7 +1340,6 @@ void VCLXRadioButton::ImplClickedOrToggled( bool bToggled )
 }
 
 
-//  class VCLXSpinField
 
 void VCLXSpinField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 {
@@ -1486,7 +1480,6 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 }
 
 
-//  class VCLXListBox
 
 void VCLXListBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 {
@@ -2181,7 +2174,6 @@ void SAL_CALL VCLXListBox::disposing( const EventObject& i_rEvent )
 }
 
 
-//  class VCLXMessageBox
 
 
 void VCLXMessageBox::GetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -2270,7 +2262,6 @@ css::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize()
 }
 
 
-//  class VCLXDialog
 
 void VCLXDialog::GetPropertyIds( std::vector< sal_uInt16 > &rIds )
 {
@@ -2456,7 +2447,6 @@ void SAL_CALL VCLXDialog::setProperty(
 }
 
 
-//  class VCLXTabPage
 
 VCLXMultiPage::VCLXMultiPage() : maTabListeners( *this ), mTabId( 1 )
 {
@@ -2719,7 +2709,6 @@ void VCLXMultiPage::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 }
 
 
-//  class VCLXTabPage
 
 VCLXTabPage::VCLXTabPage()
 {
@@ -2833,7 +2822,6 @@ TabPage *VCLXTabPage::getTabPage() const
 }
 
 
-//  class VCLXFixedHyperlink
 
 
 VCLXFixedHyperlink::VCLXFixedHyperlink() :
@@ -3129,7 +3117,6 @@ void VCLXFixedHyperlink::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 }
 
 
-//  class VCLXFixedText
 
 void VCLXFixedText::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 {
@@ -3279,7 +3266,6 @@ css::awt::Size VCLXFixedText::calcAdjustedSize( const css::awt::Size& rMaxSize )
 }
 
 
-//  class VCLXScrollBar
 
 void VCLXScrollBar::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 {
@@ -3762,7 +3748,6 @@ css::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize()
 }
 
 
-//  class VCLXEdit
 
 
 void VCLXEdit::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -4146,7 +4131,6 @@ void VCLXEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 }
 
 
-//  class VCLXComboBox
 
 
 void VCLXComboBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -4641,7 +4625,6 @@ void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent )
 }
 
 
-//  class VCLXFormattedSpinField
 
 void VCLXFormattedSpinField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 {
@@ -4746,7 +4729,6 @@ css::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName
 }
 
 
-//  class VCLXDateField
 
 
 void VCLXDateField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -5102,7 +5084,6 @@ sal_Bool VCLXDateField::isStrictFormat()
 }
 
 
-//  class VCLXTimeField
 
 
 void VCLXTimeField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -5418,7 +5399,6 @@ css::uno::Any VCLXTimeField::getProperty( const OUString& PropertyName )
 }
 
 
-//  class VCLXNumericField
 
 
 void VCLXNumericField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -5769,7 +5749,6 @@ css::uno::Any VCLXNumericField::getProperty( const OUString& PropertyName )
 
 
 //    ----------------------------------------------------
-//    class VCLXMetricField
 //    ----------------------------------------------------
 
 void VCLXMetricField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -6024,7 +6003,6 @@ css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName )
 }
 
 
-//  class VCLXCurrencyField
 
 
 void VCLXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -6388,7 +6366,6 @@ css::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName )
 }
 
 
-//  class VCLXPatternField
 
 
 void VCLXPatternField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -6566,7 +6543,6 @@ css::uno::Any VCLXPatternField::getProperty( const OUString& PropertyName )
 }
 
 
-//  class VCLXToolBox
 
 VCLXToolBox::VCLXToolBox()
 {
@@ -6594,7 +6570,6 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXHeaderBar::Cre
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-//  class VCLXFrame
 
 VCLXFrame::VCLXFrame()
 {
@@ -6657,7 +6632,6 @@ void VCLXFrame::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     VCLXContainer::ProcessWindowEvent( rVclWindowEvent );
 }
 
-//  class VCLXProgressBar
 VCLXProgressBar::VCLXProgressBar()
             :m_nValue(0)
             ,m_nValueMin(0)
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index b8328104e518..fc0643a871d4 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -178,7 +178,6 @@ static OUString getStepPropertyName( )
 }
 
 
-//  class ControlModelContainerBase
 
 ControlModelContainerBase::ControlModelContainerBase( const Reference< XComponentContext >& rxContext )
     :ControlModelContainer_IBase( rxContext )
@@ -1265,7 +1264,6 @@ void SAL_CALL ResourceListener::disposing(
 }
 
 
-//  class DialogContainerControl
 
 ControlContainerBase::ControlContainerBase( const Reference< XComponentContext >& rxContext )
     :ContainerControl_IBase()
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index b1e944ddf697..d9b0580aca3e 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -642,7 +642,6 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang
 }
 
 
-//  class MultiPageControl
 
 UnoMultiPageControl::UnoMultiPageControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext), maTabListeners( *this )
 {
@@ -926,7 +925,6 @@ sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl(  )
 }
 
 
-//  class UnoPageControl
 
 UnoPageControl::UnoPageControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext)
 {
@@ -1020,7 +1018,6 @@ sal_Bool SAL_CALL UnoPageModel::getGroupControl(  )
 // Frame control
 
 
-//  class UnoFrameControl
 
 UnoFrameControl::UnoFrameControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext)
 {
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 358eb60a5082..8ef6d84302f3 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
 
-//  class StdTabController
 
 StdTabController::StdTabController()
 {
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index a6866aed9977..83f9d9f6bee1 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -31,7 +31,6 @@
 #define UNOCONTROL_STREAMVERSION    short(2)
 
 
-//  class UnoControlModelEntryList
 
 UnoControlModelEntryList::UnoControlModelEntryList()
 {
@@ -85,7 +84,6 @@ void UnoControlModelEntryList::insert( size_t i, UnoControlModelEntry* item ) {
 }
 
 
-//  class StdTabControllerModel
 
 StdTabControllerModel::StdTabControllerModel()
 {
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index b424b5757b9e..87d6203ca7bb 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -42,7 +42,6 @@ using ::com::sun::star::awt::tab::XTabPageModel;
 
 #define WRONG_TYPE_EXCEPTION "Type must be css::awt::tab::XTabPageModel!"
 
-//  class UnoControlTabPageContainerModel
 
 UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Reference< XComponentContext >& i_factory )
     :UnoControlTabPageContainerModel_Base( i_factory )
@@ -208,7 +207,6 @@ void UnoControlTabPageContainerModel::removeContainerListener( const Reference<
 }
 
 
-//  class UnoControlTabPageContainer
 
 UnoControlTabPageContainer::UnoControlTabPageContainer( const uno::Reference< uno::XComponentContext >& rxContext )
     :UnoControlTabPageContainer_Base(rxContext)
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 11c758473cad..81df5825804c 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star::view;
 namespace toolkit
 {
 
-//  class UnoTreeModel
 
 UnoTreeModel::UnoTreeModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory )
     :UnoControlModel( i_factory )
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx
index 43b1f7642bc4..86a5a65686f6 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -30,7 +30,6 @@
 using namespace com::sun::star;
 
 
-//  class UnoControlBase
 
 
 bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId )
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 11d8160dc505..8b01545601bf 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -38,7 +38,6 @@
 using namespace ::com::sun::star;
 
 
-//  class UnoControlHolder
 
 namespace {
 
@@ -324,7 +323,6 @@ static void implUpdateVisibility
 }
 
 
-//  class DialogStepChangedListener
 
 typedef ::cppu::WeakImplHelper< beans::XPropertyChangeListener > PropertyChangeListenerHelper;
 
@@ -363,7 +361,6 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const  beans::PropertyC
 }
 
 
-//  class UnoControlContainer
 
 UnoControlContainer::UnoControlContainer()
     :UnoControlContainer_Base()
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index ef00b644c84f..64b99a1ff8a6 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -24,7 +24,6 @@
 
 #include <helper/unopropertyarrayhelper.hxx>
 
-//  class UnoControlContainerModel
 
 UnoControlContainerModel::UnoControlContainerModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory )
     :UnoControlModel( i_factory )
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 7bdc01bdfdf6..4da894bfc299 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -106,7 +106,6 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId,
 }
 
 
-//  class UnoControlModel
 
 UnoControlModel::UnoControlModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel_Base()
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 554f08fb32df..81eab576bd30 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -87,7 +87,6 @@ ImageHelper::getGraphicFromURL_nothrow( const OUString& _rURL )
     return xGraphic;
 }
 
-//  class UnoControlEditModel
 
 UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -155,7 +154,6 @@ stardiv_Toolkit_UnoControlEditModel_get_implementation(
 }
 
 
-//  class UnoEditControl
 
 UnoEditControl::UnoEditControl()
     :UnoControlBase()
@@ -479,7 +477,6 @@ stardiv_Toolkit_UnoEditControl_get_implementation(
 }
 
 
-//  class UnoControlFileControlModel
 
 UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -555,7 +552,6 @@ stardiv_Toolkit_UnoControlFileControlModel_get_implementation(
 }
 
 
-//  class UnoFileControl
 
 UnoFileControl::UnoFileControl()
     :UnoEditControl()
@@ -590,7 +586,6 @@ stardiv_Toolkit_UnoFileControl_get_implementation(
 }
 
 
-//  class GraphicControlModel
 
 uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
@@ -661,7 +656,6 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
 }
 
 
-//  class UnoControlButtonModel
 
 UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext >& rxContext )
     :GraphicControlModel( rxContext )
@@ -735,7 +729,6 @@ stardiv_Toolkit_UnoControlButtonModel_get_implementation(
 }
 
 
-//  class UnoButtonControl
 
 UnoButtonControl::UnoButtonControl()
     :UnoButtonControl_Base()
@@ -893,7 +886,6 @@ stardiv_Toolkit_UnoButtonControl_get_implementation(
 }
 
 
-//  class UnoControlImageControlModel
 
 UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComponentContext >& rxContext )
     :GraphicControlModel( rxContext )
@@ -995,7 +987,6 @@ stardiv_Toolkit_UnoControlImageControlModel_get_implementation(
 }
 
 
-//  class UnoImageControlControl
 
 UnoImageControlControl::UnoImageControlControl()
     :UnoImageControlControl_Base()
@@ -1064,7 +1055,6 @@ stardiv_Toolkit_UnoImageControlControl_get_implementation(
 }
 
 
-//  class UnoControlRadioButtonModel
 
 UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XComponentContext >& rxContext )
     :GraphicControlModel( rxContext )
@@ -1128,7 +1118,6 @@ stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation(
 }
 
 
-//  class UnoRadioButtonControl
 
 UnoRadioButtonControl::UnoRadioButtonControl()
     :UnoRadioButtonControl_Base()
@@ -1306,7 +1295,6 @@ stardiv_Toolkit_UnoRadioButtonControl_get_implementation(
 }
 
 
-//  class UnoControlCheckBoxModel
 
 UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentContext >& rxContext )
     :GraphicControlModel( rxContext )
@@ -1369,7 +1357,6 @@ stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation(
 }
 
 
-//  class UnoCheckBoxControl
 
 UnoCheckBoxControl::UnoCheckBoxControl()
     :UnoCheckBoxControl_Base()
@@ -1520,7 +1507,6 @@ stardiv_Toolkit_UnoCheckBoxControl_get_implementation(
 }
 
 
-//  class UnoControlFixedHyperlinkModel
 
 UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -1573,7 +1559,6 @@ stardiv_Toolkit_UnoControlFixedHyperlinkModel_get_implementation(
 }
 
 
-//  class UnoFixedHyperlinkControl
 
 UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
     :UnoControlBase()
@@ -1713,7 +1698,6 @@ stardiv_Toolkit_UnoFixedHyperlinkControl_get_implementation(
 }
 
 
-//  class UnoControlFixedTextModel
 
 UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -1777,7 +1761,6 @@ stardiv_Toolkit_UnoControlFixedTextModel_get_implementation(
 }
 
 
-//  class UnoFixedTextControl
 
 UnoFixedTextControl::UnoFixedTextControl()
     :UnoControlBase()
@@ -1883,7 +1866,6 @@ stardiv_Toolkit_UnoFixedTextControl_get_implementation(
 }
 
 
-//  class UnoControlGroupBoxModel
 
 UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -1950,7 +1932,6 @@ stardiv_Toolkit_UnoControlGroupBoxModel_get_implementation(
 }
 
 
-//  class UnoGroupBoxControl
 
 UnoGroupBoxControl::UnoGroupBoxControl()
     :UnoControlBase()
@@ -2550,7 +2531,6 @@ stardiv_Toolkit_UnoControlListBoxModel_get_implementation(
 }
 
 
-//  class UnoListBoxControl
 
 UnoListBoxControl::UnoListBoxControl()
     :UnoListBoxControl_Base()
@@ -2967,7 +2947,6 @@ stardiv_Toolkit_UnoListBoxControl_get_implementation(
 }
 
 
-//  class UnoControlComboBoxModel
 
 UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentContext >& rxContext )
     :UnoControlListBoxModel( rxContext, ConstructWithoutProperties )
@@ -3056,7 +3035,6 @@ stardiv_Toolkit_UnoControlComboBoxModel_get_implementation(
 }
 
 
-//  class UnoComboBoxControl
 
 UnoComboBoxControl::UnoComboBoxControl()
     :UnoEditControl()
@@ -3472,7 +3450,6 @@ void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat )
 }
 
 
-//  class UnoControlDateFieldModel
 
 UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -3532,7 +3509,6 @@ stardiv_Toolkit_UnoControlDateFieldModel_get_implementation(
 }
 
 
-//  class UnoDateFieldControl
 
 UnoDateFieldControl::UnoDateFieldControl()
     :UnoSpinFieldControl()
@@ -3749,7 +3725,6 @@ stardiv_Toolkit_UnoDateFieldControl_get_implementation(
 }
 
 
-//  class UnoControlTimeFieldModel
 
 UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -3809,7 +3784,6 @@ stardiv_Toolkit_UnoControlTimeFieldModel_get_implementation(
 }
 
 
-//  class UnoTimeFieldControl
 
 UnoTimeFieldControl::UnoTimeFieldControl()
     :UnoSpinFieldControl()
@@ -3985,7 +3959,6 @@ stardiv_Toolkit_UnoTimeFieldControl_get_implementation(
 }
 
 
-//  class UnoControlNumericFieldModel
 
 UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -4045,7 +4018,6 @@ stardiv_Toolkit_UnoControlNumericFieldModel_get_implementation(
 }
 
 
-//  class UnoNumericFieldControl
 
 UnoNumericFieldControl::UnoNumericFieldControl()
     :UnoSpinFieldControl()
@@ -4212,7 +4184,6 @@ stardiv_Toolkit_UnoNumericFieldControl_get_implementation(
 }
 
 
-//  class UnoControlCurrencyFieldModel
 
 UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -4276,7 +4247,6 @@ stardiv_Toolkit_UnoControlCurrencyFieldModel_get_implementation(
 }
 
 
-//  class UnoCurrencyFieldControl
 
 UnoCurrencyFieldControl::UnoCurrencyFieldControl()
     :UnoSpinFieldControl()
@@ -4443,7 +4413,6 @@ stardiv_Toolkit_UnoCurrencyFieldControl_get_implementation(
 }
 
 
-//  class UnoControlPatternFieldModel
 
 UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -4502,7 +4471,6 @@ stardiv_Toolkit_UnoControlPatternFieldModel_get_implementation(
 }
 
 
-//  class UnoPatternFieldControl
 
 UnoPatternFieldControl::UnoPatternFieldControl()
     :UnoSpinFieldControl()
@@ -4615,7 +4583,6 @@ stardiv_Toolkit_UnoPatternFieldControl_get_implementation(
 }
 
 
-//  class UnoControlProgressBarModel
 
 UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -4687,7 +4654,6 @@ stardiv_Toolkit_UnoControlProgressBarModel_get_implementation(
 }
 
 
-//  class UnoProgressBarControl
 
 UnoProgressBarControl::UnoProgressBarControl()
     :UnoControlBase()
@@ -4786,7 +4752,6 @@ stardiv_Toolkit_UnoProgressBarControl_get_implementation(
 }
 
 
-//  class UnoControlFixedLineModel
 
 UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel( rxContext )
@@ -4854,7 +4819,6 @@ stardiv_Toolkit_UnoControlFixedLineModel_get_implementation(
 }
 
 
-//  class UnoFixedLineControl
 
 UnoFixedLineControl::UnoFixedLineControl()
     :UnoControlBase()
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx
index 16413d9a1e9b..0a36f4bf31a7 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -23,7 +23,6 @@
 
 #include <helper/unopropertyarrayhelper.hxx>
 
-//  class UnoPropertyArrayHelper
 
 
 UnoPropertyArrayHelper::UnoPropertyArrayHelper( const css::uno::Sequence<sal_Int32>& rIDs )
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 13fa5aeb7537..ae6ba9ed801e 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -113,7 +113,6 @@ static css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window c
 }
 
 
-//  class UnoWrapper
 
 
 extern "C" {
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index c10dad0457fa..06b09c2a4a6d 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -173,7 +173,6 @@ void SvStream::writeNumberWithoutSwap_(const void * pDataSrc, int nDataSize)
     }
 }
 
-//  class SvLockBytes
 
 void SvLockBytes::close()
 {
@@ -260,7 +259,6 @@ ErrCode SvLockBytes::Stat(SvLockBytesStat * pStat) const
     return ERRCODE_NONE;
 }
 
-//  class SvStream
 
 std::size_t SvStream::GetData( void* pData, std::size_t nSize )
 {
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 152ed9b10274..1b02435db0a3 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -29,7 +29,6 @@
 #include <osl/thread.h>
 #include <sal/log.hxx>
 
-// class FileBase
 #include <osl/file.hxx>
 #include <osl/detail/file.h>
 #include <rtl/instance.hxx>
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index a0aa5c769b1c..fc28dad43514 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -33,7 +33,6 @@
 #include <tools/stream.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 
-// class FileBase
 #include <osl/file.hxx>
 using namespace osl;
 
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 20b355769754..2d3e0cfc592e 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -359,7 +359,6 @@ Reference< XContent > CachedContentResultSet::CCRS_Cache
 }
 
 
-// class CCRS_PropertySetInfo
 
 
 class CCRS_PropertySetInfo :
@@ -619,7 +618,6 @@ sal_Int32 CCRS_PropertySetInfo
 }
 
 
-// class CachedContentResultSet
 
 
 CachedContentResultSet::CachedContentResultSet(
@@ -2051,7 +2049,6 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter()
 }
 
 
-// class CachedContentResultSetFactory
 
 
 CachedContentResultSetFactory::CachedContentResultSetFactory(
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 3e450f4d01ea..e2e6ec2c4d26 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -51,7 +51,6 @@ class CachedContentResultSet
                 , public css::lang::XServiceInfo
 {
 
-    // class CCRS_Cache
 
     class CCRS_Cache
     {
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index bf4651f79694..942fc1983346 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -495,7 +495,6 @@ FetchResult SAL_CALL CachedContentResultSetStub
 }
 
 
-// class CachedContentResultSetStubFactory
 
 
 CachedContentResultSetStubFactory::CachedContentResultSetStubFactory()
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index f513bd79f3b9..089d78c5061e 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -145,7 +145,6 @@ void CachedDynamicResultSet
 }
 
 
-// class CachedDynamicResultSetFactory
 
 
 CachedDynamicResultSetFactory::CachedDynamicResultSetFactory(
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index f3799f4c3f92..53e0ef034389 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -137,7 +137,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSetStub::getSupported
 
 
 
-// class CachedDynamicResultSetStubFactory
 
 
 CachedDynamicResultSetStubFactory::CachedDynamicResultSetStubFactory(
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 3bb8bb4ed924..d6a6cdf1727c 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -35,7 +35,6 @@ using namespace comphelper;
 using namespace cppu;
 
 
-// class ContentResultSetWrapper
 
 
 ContentResultSetWrapper::ContentResultSetWrapper(
@@ -1216,7 +1215,6 @@ Reference< XArray > SAL_CALL ContentResultSetWrapper::getArray( sal_Int32 column
 }
 
 
-// class ContentResultSetWrapperListener
 
 
 ContentResultSetWrapperListener::ContentResultSetWrapperListener(
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index ad1f580bf1fa..28dc828944a2 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -35,7 +35,6 @@ using namespace com::sun::star::uno;
 using namespace comphelper;
 
 
-// class DynamicResultSetWrapper
 
 
 DynamicResultSetWrapper::DynamicResultSetWrapper(
@@ -417,7 +416,6 @@ sal_Int16 SAL_CALL DynamicResultSetWrapper::getCapabilities()
 }
 
 
-// class DynamicResultSetWrapperListener
 
 
 DynamicResultSetWrapperListener::DynamicResultSetWrapperListener(
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 574e13288cd0..dea286b10639 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -33,7 +33,6 @@
 #include <cppuhelper/implbase.hxx>
 
 
-// class UcbContentProviderProxyFactory.
 
 
 class UcbContentProviderProxyFactory : public cppu::WeakImplHelper <
@@ -66,7 +65,6 @@ public:
 };
 
 
-// class UcbContentProviderProxy.
 
 
 class UcbContentProviderProxy :
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index c53890d6bd84..41f79907a029 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -90,7 +90,6 @@ struct TransferCommandContext
 };
 
 
-// class InteractionHandlerProxy.
 
 
 class InteractionHandlerProxy :
@@ -160,7 +159,6 @@ void SAL_CALL InteractionHandlerProxy::handle(
 }
 
 
-// class ActiveDataSink.
 
 
 class ActiveDataSink : public cppu::WeakImplHelper< io::XActiveDataSink >
@@ -190,7 +188,6 @@ uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream()
 }
 
 
-// class CommandProcessorInfo.
 
 
 class CommandProcessorInfo :
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 1829403609eb..1dcb45a752c3 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -30,7 +30,6 @@
 #define PROPERTIES_MANAGER_SERVICE_NAME "com.sun.star.ucb.PropertiesManager"
 
 
-// class UcbPropertiesManager.
 
 
 class UcbPropertiesManager : public cppu::WeakImplHelper <
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index b36fc0e8ca78..58b40331f210 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -112,7 +112,6 @@ typedef std::unordered_map< OUString, PersistentPropertySet*> PropertySetMap_Imp
 
 namespace {
 
-// class PropertySetInfo_Impl
 class PropertySetInfo_Impl : public cppu::WeakImplHelper < XPropertySetInfo >
 {
     std::unique_ptr<Sequence< Property >>
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 6069808ccff9..dd72d5a33a42 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -75,7 +75,6 @@ struct SortListData
 };
 
 
-// class SRSPropertySetInfo.
 
 
 class SRSPropertySetInfo : public cppu::WeakImplHelper <
@@ -1762,7 +1761,6 @@ sal_IntPtr SortedEntryList::operator [] ( sal_IntPtr nPos ) const
     }
 }
 
-// class SRSPropertySetInfo.
 
 SRSPropertySetInfo::SRSPropertySetInfo()
 {
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 609ce5b40671..f364c9060d30 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -45,7 +45,6 @@ namespace package_ucp
 {
 
 
-// class Package.
 
 namespace {
 
diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
index 6359c6d8c37c..a92720b50b74 100644
--- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
@@ -38,7 +38,6 @@ namespace webdav_ucp
 {
 
 
-// class DAVAuthListenerImpl.
 
 
     class DAVAuthListener_Impl : public DAVAuthListener
diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
index f33436a54e3e..fc3f9a845928 100644
--- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
@@ -29,7 +29,6 @@ namespace http_dav_ucp
 {
 
 
-// class DAVAuthListenerImpl.
 
 
     class DAVAuthListener_Impl : public DAVAuthListener
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 5c698a2d7ba6..0de94810ed29 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -118,7 +118,6 @@ void EmptyInputStream::closeInput()
 }
 
 
-// class ContentEventListener_Impl.
 
 namespace {
 
@@ -147,7 +146,6 @@ public:
 
 }
 
-// class Content_Impl.
 
 
 class Content_Impl : public salhelper::SimpleReferenceObject
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index e1be42d2a39d..7c3be538dce8 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -124,7 +124,6 @@ using namespace ucbhelper_impl;
 namespace ucbhelper
 {
 
-// class PropertyValues.
 class PropertyValues : public std::vector< ucbhelper_impl::PropertyValue > {};
 
 } // namespace ucbhelper
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index de8f868c8445..468bf2392a80 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -82,7 +82,6 @@ static const PropertyInfo aPropertyTable[] =
 #define RESULTSET_PROPERTY_COUNT 2
 
 
-// class PropertySetInfo
 
 namespace {
 
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 4ea07ea99c67..7ea340b8cc9d 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -528,7 +528,6 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im
     return eErrCode;
 }
 
-// class Bootstrap
 
 OUString Bootstrap::getProductKey()
 {
@@ -640,7 +639,6 @@ Bootstrap::Status Bootstrap::checkBootstrapStatus(OUString& _rDiagnosticMessage,
     return result;
 }
 
-// class Bootstrap::Impl
 
 bool Bootstrap::Impl::initBaseInstallationData(rtl::Bootstrap const & _rData)
 {
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
index db471d5e5c6c..39bb6815be11 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
@@ -39,7 +39,6 @@
 struct FilterEntry;
 struct ElementEntry_Impl;
 
-// class declaration
 
 typedef cppu::WeakComponentImplHelper<
         css::ui::dialogs::XFilePickerControlAccess,
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx
index ca57c4b0360b..aa24829aff32 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -27,7 +27,6 @@ namespace writerfilter
 {
 
 #ifdef DBG_UTIL
-// class: LoggedResourcesHelper
 
 LoggedResourcesHelper::LoggedResourcesHelper(const std::string & sPrefix)
 : msPrefix(sPrefix)
@@ -70,7 +69,6 @@ void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nVal
 
 #endif
 
-// class: LoggedStream
 
 LoggedStream::LoggedStream(
 #ifdef DBG_UTIL
@@ -324,7 +322,6 @@ void LoggedStream::endGlossaryEntry()
 #endif
 }
 
-// class LoggedProperties
 LoggedProperties::LoggedProperties(
 #ifdef DBG_UTIL
     const std::string & sPrefix
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index d98d22db485b..fde5ccc0b425 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -27,13 +27,11 @@ namespace ooxml {
 
 using namespace com::sun::star;
 
-// class OOXMLFactory_ns
 
 OOXMLFactory_ns::~OOXMLFactory_ns()
 {
 }
 
-// class OOXMLFactory
 
 void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler,
                               const uno::Reference< xml::sax::XFastAttributeList > & xAttribs)
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index bf45b130a40e..0c02bdf1c466 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -1072,7 +1072,6 @@ void Databases::setInstallPath( const OUString& aInstDir )
         m_aInstallDirectory += "/";
 }
 
-// class ExtensionIteratorBase
 
 ExtensionHelpExistenceMap ExtensionIteratorBase::aHelpExistenceMap;
 
@@ -1323,7 +1322,6 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUS
     }
 }
 
-// class DataBaseIterator
 
 helpdatafileproxy::Hdf* DataBaseIterator::nextHdf( OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath )
 {
@@ -1432,7 +1430,6 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( const Reference
     return pRetHdf;
 }
 
-// class KeyDataBaseFileIterator
 
 //returns a file URL
 OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
@@ -1512,7 +1509,6 @@ OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
     return aExpandedURL;
 }
 
-// class JarFileIterator
 
 Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile
     ( Reference< deployment::XPackage >& o_xParentPackageBundle,
@@ -1631,7 +1627,6 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
     return xNA;
 }
 
-// class IndexFolderIterator
 
 OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary )
 {
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 922a418d401f..e71f24b4f6ad 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -825,7 +825,6 @@ void TVChildTarget::subst( OUString& instpath )
     instpath = aOptions.SubstituteVariable( instpath );
 }
 
-// class TreeFileIterator
 
 static const char aHelpMediaType[] = "application/vnd.sun.star.help";
 
@@ -1022,7 +1021,6 @@ void TreeFileIterator::implGetLanguageVectorFromPackage( ::std::vector< OUString
     }
 }
 
-// class TreeFileIterator
 
 OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize )
 {
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index f659f05b8f75..053229741c10 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 
-// class XMLBasicExportFilter
 
 typedef ::cppu::WeakImplHelper<
     css::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 4dd2bc43b6c8..a25f51edaec7 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -123,7 +123,6 @@ namespace
     };
 }
 
-// class SchXMLExportHelper_Impl
 
 class SchXMLExportHelper_Impl
 {
@@ -962,7 +961,6 @@ bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequen
 
 } // anonymous namespace
 
-// class SchXMLExportHelper
 
 SchXMLExportHelper::SchXMLExportHelper( SvXMLExport& rExport, SvXMLAutoStylePoolP& rASPool )
     : m_pImpl( new SchXMLExportHelper_Impl( rExport, rASPool ) )
@@ -3481,7 +3479,6 @@ void SchXMLExportHelper_Impl::exportText( const OUString& rText )
     SchXMLTools::exportText( mrExport, rText, false/*bConvertTabsLFs*/ );
 }
 
-// class SchXMLExport
 
 SchXMLExport::SchXMLExport(const Reference<uno::XComponentContext>& xContext,
                            OUString const& implementationName, SvXMLExportFlags nExportFlags)
diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx
index c5c171fcd65f..078ef4826084 100644
--- a/xmloff/source/draw/numithdl.cxx
+++ b/xmloff/source/draw/numithdl.cxx
@@ -22,7 +22,6 @@
 using namespace ::com::sun::star;
 
 
-// class XMLNumRulePropHdl
 
 
 XMLNumRulePropHdl::XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > const & xNumRuleCompare )
diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx
index ac85c18fc372..9dd452e3b0c8 100644
--- a/xmloff/source/script/xmlbasici.hxx
+++ b/xmloff/source/script/xmlbasici.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/document/XXMLOasisBasicImporter.hpp>
 #include <xmloff/xmlictxt.hxx>
 
-// class XMLBasicImportContext
 
 class XMLBasicImportContext : public SvXMLImportContext
 {
@@ -48,7 +47,6 @@ public:
     virtual void Characters( const OUString& rChars ) override;
 };
 
-// class XMLBasicImportChildContext
 
 class XMLBasicImportChildContext : public SvXMLImportContext
 {
diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx
index 8e006b71f0c3..17dc4391eca7 100644
--- a/xmloff/source/style/AttributeContainerHandler.cxx
+++ b/xmloff/source/style/AttributeContainerHandler.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 
 
-// class XMLAttributeContainerHandler
 
 
 XMLAttributeContainerHandler::~XMLAttributeContainerHandler()
diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index de05888a9bdc..903ac3914dcb 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -27,7 +27,6 @@
 using namespace ::com::sun::star::uno;
 
 
-// class XMLEnumPropertyHdl
 
 XMLEnumPropertyHdl::~XMLEnumPropertyHdl()
 {
diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx
index 507bb1b8da69..be74fa4b7c42 100644
--- a/xmloff/source/style/NamedBoolPropertyHdl.cxx
+++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx
@@ -26,7 +26,6 @@
 using namespace ::com::sun::star::uno;
 
 
-// class XMLNamedBoolPropertyHdl
 
 
 XMLNamedBoolPropertyHdl::~XMLNamedBoolPropertyHdl()
diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx
index 2a43ece76e6d..1d857b850621 100644
--- a/xmloff/source/style/WordWrapPropertyHdl.cxx
+++ b/xmloff/source/style/WordWrapPropertyHdl.cxx
@@ -28,7 +28,6 @@
 using namespace ::com::sun::star::uno;
 
 
-// class XMLWordWrapPropertyHdl
 
 
 XMLWordWrapPropertyHdl::XMLWordWrapPropertyHdl( SvXMLImport* pImport )
diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx
index 250063f15858..f577c70bbc79 100644
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star::text;
 using namespace ::xmloff::token;
 
 
-// class XMLMeasurePropHdl
 
 
 XMLClipPropertyHandler::XMLClipPropertyHandler( bool bODF11 ) :
diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx
index 17662dd4bcb4..41a93d57f6f0 100644
--- a/xmloff/source/style/adjushdl.cxx
+++ b/xmloff/source/style/adjushdl.cxx
@@ -51,7 +51,6 @@ SvXMLEnumMapEntry<style::ParagraphAdjust> const pXML_Para_Align_Last_Enum[] =
 };
 
 
-// class XMLParaAdjustPropHdl
 
 
 XMLParaAdjustPropHdl::~XMLParaAdjustPropHdl()
@@ -86,7 +85,6 @@ bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
 }
 
 
-// class XMLLastLineAdjustPropHdl
 
 
 XMLLastLineAdjustPropHdl::~XMLLastLineAdjustPropHdl()
diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index e7c3bbb331f2..63c74306104a 100644
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
@@ -44,7 +44,6 @@ SvXMLEnumMapEntry<style::GraphicLocation> const pXML_BrushVerticalPos[] =
 };
 
 
-// class XMLBackGraphicPositionPropHdl
 
 
 XMLBackGraphicPositionPropHdl::~XMLBackGraphicPositionPropHdl()
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 4ede3a9b196d..0f9f18d6c070 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -85,7 +85,6 @@ static void lcl_frmitems_setXMLBorderStyle( table::BorderLine2 & rBorderLine, sa
 }
 
 
-// class XMLEscapementPropHdl
 
 
 XMLBorderWidthHdl::~XMLBorderWidthHdl()
@@ -169,7 +168,6 @@ bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValu
 }
 
 
-// class XMLEscapementHeightPropHdl
 
 
 XMLBorderHdl::~XMLBorderHdl()
diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx
index 9a42e8c83f52..d1490881f38f 100644
--- a/xmloff/source/style/breakhdl.cxx
+++ b/xmloff/source/style/breakhdl.cxx
@@ -39,7 +39,6 @@ SvXMLEnumMapEntry<sal_uInt16> const pXML_BreakTypes[] =
 };
 
 
-// class XMLFmtBreakBeforePropHdl
 
 
 XMLFmtBreakBeforePropHdl::~XMLFmtBreakBeforePropHdl()
@@ -109,7 +108,6 @@ bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno::Any
 }
 
 
-// class XMLFmtBreakBeforePropHdl
 
 
 XMLFmtBreakAfterPropHdl::~XMLFmtBreakAfterPropHdl()
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index 0da645b390cf..98fcf264026a 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -73,7 +73,6 @@ SvXMLEnumMapEntry<sal_uInt16> const pXML_CrossedoutWidth_Enum[] =
     { XML_TOKEN_INVALID,        0 }
 };
 
-// class XMLCrossedOutTypePropHdl
 
 XMLCrossedOutTypePropHdl::~XMLCrossedOutTypePropHdl()
 {
@@ -148,7 +147,6 @@ bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any
     return bRet;
 }
 
-// class XMLCrossedOutStylePropHdl
 
 XMLCrossedOutStylePropHdl::~XMLCrossedOutStylePropHdl()
 {
@@ -196,7 +194,6 @@ bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno::An
     return bRet;
 }
 
-// class XMLCrossedOutWidthPropHdl
 
 XMLCrossedOutWidthPropHdl::~XMLCrossedOutWidthPropHdl()
 {
@@ -266,7 +263,6 @@ bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::An
     return bRet;
 }
 
-// class XMLCrossedOutTextPropHdl
 
 XMLCrossedOutTextPropHdl::~XMLCrossedOutTextPropHdl()
 {
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx
index bb44b32f8817..c6f04f34008f 100644
--- a/xmloff/source/style/chrhghdl.cxx
+++ b/xmloff/source/style/chrhghdl.cxx
@@ -30,7 +30,6 @@
 using namespace ::com::sun::star;
 
 
-// class XMLEscapementPropHdl
 
 
 XMLCharHeightHdl::~XMLCharHeightHdl()
@@ -76,7 +75,6 @@ bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue
 }
 
 
-// class XMLEscapementHeightPropHdl
 
 
 XMLCharHeightPropHdl::~XMLCharHeightPropHdl()
@@ -114,7 +112,6 @@ bool XMLCharHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
 }
 
 
-// class XMLEscapementPropHdl
 
 
 XMLCharHeightDiffHdl::~XMLCharHeightDiffHdl()
diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx
index a205b4d881c3..7c90b9f0a946 100644
--- a/xmloff/source/style/csmaphdl.cxx
+++ b/xmloff/source/style/csmaphdl.cxx
@@ -37,7 +37,6 @@ static const SvXMLEnumMapEntry<sal_uInt16> pXML_Casemap_Enum[] =
     { XML_TOKEN_INVALID,        0 }
 };
 
-// class XMLPosturePropHdl
 
 XMLCaseMapPropHdl::~XMLCaseMapPropHdl()
 {
@@ -72,7 +71,6 @@ bool XMLCaseMapPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValu
     return bRet;
 }
 
-// class XMLCaseMapVariantHdl
 
 XMLCaseMapVariantHdl::~XMLCaseMapVariantHdl()
 {
diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index 76b4d95fd967..5be03b9000ac 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
 
-// class XMLEscapementPropHdl
 
 
 XMLEscapementPropHdl::~XMLEscapementPropHdl()
@@ -95,7 +94,6 @@ bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
 }
 
 
-// class XMLEscapementHeightPropHdl
 
 
 XMLEscapementHeightPropHdl::~XMLEscapementHeightPropHdl()
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 679bf39b3239..ca172f234758 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -58,7 +58,6 @@ static SvXMLEnumMapEntry<FontPitch> const aFontPitchMapping[] =
     { XML_TOKEN_INVALID,    FontPitch(0)    }
 };
 
-// class XMLFontFamilyNamePropHdl
 
 XMLFontFamilyNamePropHdl::~XMLFontFamilyNamePropHdl()
 {
@@ -189,7 +188,6 @@ bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any
     return bRet;
 }
 
-// class XMLFontFamilyPropHdl
 
 XMLFontFamilyPropHdl::~XMLFontFamilyPropHdl()
 {
@@ -224,7 +222,6 @@ bool XMLFontFamilyPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
     return bRet;
 }
 
-// class XMLFontEncodingPropHdl
 
 XMLFontEncodingPropHdl::~XMLFontEncodingPropHdl()
 {
@@ -258,7 +255,6 @@ bool XMLFontEncodingPropHdl::exportXML( OUString& rStrExpValue, const uno::Any&
     return bRet;
 }
 
-// class XMLFontPitchPropHdl
 
 XMLFontPitchPropHdl::~XMLFontPitchPropHdl()
 {
diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx
index de8de592fc83..ddf79150cdf5 100644
--- a/xmloff/source/style/kernihdl.cxx
+++ b/xmloff/source/style/kernihdl.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::xmloff::token;
 
 
-// class XMLKerningPropHdl
 
 
 XMLKerningPropHdl::~XMLKerningPropHdl()
diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx
index 534d62fadfe0..29ad95b81d75 100644
--- a/xmloff/source/style/lspachdl.cxx
+++ b/xmloff/source/style/lspachdl.cxx
@@ -31,7 +31,6 @@ using ::xmloff::token::IsXMLToken;
 using ::xmloff::token::XML_CASEMAP_NORMAL;
 
 
-// class XMLEscapementPropHdl
 
 
 XMLLineHeightHdl::~XMLLineHeightHdl()
@@ -94,7 +93,6 @@ bool XMLLineHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue
 }
 
 
-// class XMLLineHeightAtLeastHdl
 
 
 XMLLineHeightAtLeastHdl::~XMLLineHeightAtLeastHdl()
@@ -134,7 +132,6 @@ bool XMLLineHeightAtLeastHdl::exportXML( OUString& rStrExpValue, const uno::Any&
 }
 
 
-// class XMLLineSpacingHdl
 
 
 XMLLineSpacingHdl::~XMLLineSpacingHdl()
diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx
index 131c2fe01278..f662794b4c49 100644
--- a/xmloff/source/style/opaquhdl.cxx
+++ b/xmloff/source/style/opaquhdl.cxx
@@ -26,7 +26,6 @@
 using namespace ::com::sun::star::uno;
 using namespace ::xmloff::token;
 
-// class XMLOpaquePropHdl
 
 XMLOpaquePropHdl::~XMLOpaquePropHdl()
 {
diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx
index f7e6c72345dd..ed4bec56aec4 100644
--- a/xmloff/source/style/postuhdl.cxx
+++ b/xmloff/source/style/postuhdl.cxx
@@ -39,7 +39,6 @@ SvXMLEnumMapEntry<FontItalic> const aPostureGenericMapping[] =
 };
 
 
-// class XMLPosturePropHdl
 
 
 XMLPosturePropHdl::~XMLPosturePropHdl()
diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx
index 278692040b8a..60db10a44f15 100644
--- a/xmloff/source/style/shadwhdl.cxx
+++ b/xmloff/source/style/shadwhdl.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
 
-// class XMLMeasurePropHdl
 
 
 XMLShadowPropHdl::~XMLShadowPropHdl()
diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx
index 2ad44c833c8a..41b1b4574c13 100644
--- a/xmloff/source/style/shdwdhdl.cxx
+++ b/xmloff/source/style/shdwdhdl.cxx
@@ -27,7 +27,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::xmloff::token;
 
 
-// class XMLFmtSplitPropHdl
 
 
 XMLShadowedPropHdl::~XMLShadowedPropHdl()
diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx
index bb110477e896..fc1edd5aa2b5 100644
--- a/xmloff/source/style/tabsthdl.cxx
+++ b/xmloff/source/style/tabsthdl.cxx
@@ -24,7 +24,6 @@
 using namespace ::com::sun::star;
 
 
-// class XMLFontFamilyNamePropHdl
 
 
 XMLTabStopPropHdl::~XMLTabStopPropHdl()
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index 57159c1ca27e..0e610442febb 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -103,7 +103,6 @@ SvXMLEnumMapEntry<sal_uInt16> const pXML_UnderlineWidth_Enum[] =
 };
 
 
-// class XMLUnderlineTypePropHdl
 
 
 XMLUnderlineTypePropHdl::~XMLUnderlineTypePropHdl()
@@ -185,7 +184,6 @@ bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any&
 }
 
 
-// class XMLUnderlineStylePropHdl
 
 
 XMLUnderlineStylePropHdl::~XMLUnderlineStylePropHdl()
@@ -275,7 +273,6 @@ bool XMLUnderlineStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any
 }
 
 
-// class XMLUnderlineWidthPropHdl
 
 
 XMLUnderlineWidthPropHdl::~XMLUnderlineWidthPropHdl()
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index b1b671d56efe..bc81d3ca3522 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -57,7 +57,6 @@ FontWeightMapper const aFontWeightMap[] =
     { css::awt::FontWeight::DONTKNOW,             1000 }
 };
 
-// class XMLFmtBreakBeforePropHdl
 
 XMLFontWeightPropHdl::~XMLFontWeightPropHdl()
 {
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 695d78f087f6..90cbbf04eafd 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -85,7 +85,6 @@ static bool lcl_xmloff_getAny( const Any& rValue, sal_Int32& nValue,
     return bRet;
 }
 
-// class XMLNumberPropHdl
 
 XMLNumberPropHdl::~XMLNumberPropHdl()
 {
@@ -116,7 +115,6 @@ bool XMLNumberPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, con
     return bRet;
 }
 
-// class XMLNumberNonePropHdl
 
 XMLNumberNonePropHdl::XMLNumberNonePropHdl( sal_Int8 nB ) :
     sZeroStr( GetXMLToken(XML_NO_LIMIT) ),
@@ -175,7 +173,6 @@ bool XMLNumberNonePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
     return bRet;
 }
 
-// class XMLMeasurePropHdl
 
 XMLMeasurePropHdl::~XMLMeasurePropHdl()
 {
@@ -207,7 +204,6 @@ bool XMLMeasurePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, co
     return bRet;
 }
 
-// class XMLBoolFalsePropHdl
 
 XMLBoolFalsePropHdl::~XMLBoolFalsePropHdl()
 {
@@ -224,7 +220,6 @@ bool XMLBoolFalsePropHdl::exportXML( OUString& rStrExpValue, const Any& /*rValue
     return XMLBoolPropHdl::exportXML( rStrExpValue, makeAny( false ), rCnv );
 }
 
-// class XMLBoolPropHdl
 
 XMLBoolPropHdl::~XMLBoolPropHdl()
 {
@@ -257,7 +252,6 @@ bool XMLBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const
     return bRet;
 }
 
-// class XMLNBoolPropHdl
 
 XMLNBoolPropHdl::~XMLNBoolPropHdl()
 {
@@ -290,7 +284,6 @@ bool XMLNBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, cons
     return bRet;
 }
 
-// class XMLPercentPropHdl
 
 XMLPercentPropHdl::~XMLPercentPropHdl()
 {
@@ -323,7 +316,6 @@ bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, co
     return bRet;
 }
 
-// class XMLDoublePercentPropHdl
 
 bool XMLDoublePercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
 {
@@ -368,7 +360,6 @@ bool XMLDoublePercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal
     return bRet;
 }
 
-// class XMLNegPercentPropHdl
 
 XMLNegPercentPropHdl::~XMLNegPercentPropHdl()
 {
@@ -403,7 +394,6 @@ bool XMLNegPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
     return bRet;
 }
 
-// class XMLMeasurePxPropHdl
 XMLMeasurePxPropHdl::~XMLMeasurePxPropHdl()
 {
     // nothing to do
@@ -434,7 +424,6 @@ bool XMLMeasurePxPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
     return bRet;
 }
 
-// class XMLColorPropHdl
 
 XMLColorPropHdl::~XMLColorPropHdl()
 {
@@ -505,7 +494,6 @@ bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, cons
     return bRet;
 }
 
-// class XMLHexPropHdl
 
 XMLHexPropHdl::~XMLHexPropHdl()
 {
@@ -542,7 +530,6 @@ bool XMLHexPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const
     return bRet;
 }
 
-// class XMLStringPropHdl
 
 XMLStringPropHdl::~XMLStringPropHdl()
 {
@@ -565,7 +552,6 @@ bool XMLStringPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, con
     return bRet;
 }
 
-// class XMLStyleNamePropHdl
 
 XMLStyleNamePropHdl::~XMLStyleNamePropHdl()
 {
@@ -585,7 +571,6 @@ bool XMLStyleNamePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
     return bRet;
 }
 
-// class XMLDoublePropHdl
 
 XMLDoublePropHdl::~XMLDoublePropHdl()
 {
@@ -617,7 +602,6 @@ bool XMLDoublePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, con
     return bRet;
 }
 
-// class XMLColorTransparentPropHdl
 
 XMLColorTransparentPropHdl::XMLColorTransparentPropHdl(
     enum XMLTokenEnum eTransparent ) :
@@ -665,7 +649,6 @@ bool XMLColorTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& r
     return bRet;
 }
 
-// class XMLIsTransparentPropHdl
 
 XMLIsTransparentPropHdl::XMLIsTransparentPropHdl(
     enum XMLTokenEnum eTransparent, bool bTransPropVal ) :
@@ -707,7 +690,6 @@ bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal
     return bRet;
 }
 
-// class XMLColorAutoPropHdl
 
 XMLColorAutoPropHdl::XMLColorAutoPropHdl()
 {
@@ -753,7 +735,6 @@ bool XMLColorAutoPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
     return bRet;
 }
 
-// class XMLIsAutoColorPropHdl
 
 XMLIsAutoColorPropHdl::XMLIsAutoColorPropHdl()
 {
@@ -792,7 +773,6 @@ bool XMLIsAutoColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue
     return bRet;
 }
 
-// class XMLCompareOnlyPropHdl
 
 XMLCompareOnlyPropHdl::~XMLCompareOnlyPropHdl()
 {
@@ -811,7 +791,6 @@ bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUnitCon
     return false;
 }
 
-// class XMLNumberWithoutZeroPropHdl
 
 XMLNumberWithoutZeroPropHdl::XMLNumberWithoutZeroPropHdl( sal_Int8 nB ) :
     nBytes( nB )
@@ -849,7 +828,6 @@ bool XMLNumberWithoutZeroPropHdl::exportXML( OUString& rStrExpValue, const Any&
     return bRet;
 }
 
-// class XMLNumberWithAutoInsteadZeroPropHdl
 
 XMLNumberWithAutoInsteadZeroPropHdl::~XMLNumberWithAutoInsteadZeroPropHdl()
 {
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 1154ef82fe98..2b9480a96842 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -142,7 +142,6 @@ sal_Int32 StringStatisticHelper::getModeString( OUString& rStyleName )
     return nMax;
 }
 
-// class XMLTableExport
 
 XMLTableExport::XMLTableExport(SvXMLExport& rExp, const rtl::Reference< SvXMLExportPropertyMapper  >& xExportPropertyMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef )
 : mrExport( rExp )
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 1dd094c16c8a..0da1812c7d58 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -170,7 +170,6 @@ private:
 
 }
 
-// class XMLProxyContext
 
 XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, sal_uInt16 nPrfx, const OUString& rLName )
 : SvXMLImportContext( rImport, nPrfx, rLName )
@@ -186,7 +185,6 @@ SvXMLImportContextRef XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, c
         return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
 }
 
-// class XMLTableImport
 
 XMLTableImport::XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef )
 : mrImport( rImport )
@@ -357,7 +355,6 @@ void XMLTableImport::finishStyles()
     }
 }
 
-// class XMLTableImport
 
 XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, sal_uInt16 nPrfx, const OUString& rLName,  Reference< XColumnRowRange > const & xColumnRowRange )
 : SvXMLImportContext( xImporter->mrImport, nPrfx, rLName )
@@ -744,7 +741,6 @@ void XMLCellImportContext::EndElement()
     }
 }
 
-// class XMLTableTemplateContext
 
 XMLTableTemplateContext::XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
 : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_TABLE_TEMPLATE_ID, false )
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index fbd31aa66bf0..df9b5baa7c53 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
@@ -31,7 +31,6 @@
 namespace xmlscript
 {
 
-    // class XMLBasicExporterBase
 
     typedef ::cppu::WeakImplHelper<
         css::lang::XServiceInfo,
@@ -64,7 +63,6 @@ namespace xmlscript
         virtual void SAL_CALL cancel() override;
     };
 
-    // class XMLBasicExporter
 
     class XMLBasicExporter : public XMLBasicExporterBase
     {
@@ -77,7 +75,6 @@ namespace xmlscript
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     };
 
-    // class XMLOasisBasicExporter
 
     class XMLOasisBasicExporter : public XMLBasicExporterBase
     {
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
index bb8737f5cff9..2a27c76d6d7f 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
@@ -34,7 +34,6 @@
 namespace xmlscript
 {
 
-    // class BasicElementBase
 
     class BasicImport;
 
@@ -77,7 +76,6 @@ namespace xmlscript
         virtual void SAL_CALL endElement() override;
     };
 
-    // class BasicLibrariesElement
 
     class BasicLibrariesElement : public BasicElementBase
     {
@@ -97,7 +95,6 @@ namespace xmlscript
         virtual void SAL_CALL endElement() override;
     };
 
-    // class BasicEmbeddedLibraryElement
 
     class BasicEmbeddedLibraryElement : public BasicElementBase
     {
@@ -121,7 +118,6 @@ namespace xmlscript
         virtual void SAL_CALL endElement() override;
     };
 
-    // class BasicModuleElement
 
     class BasicModuleElement : public BasicElementBase
     {
@@ -143,7 +139,6 @@ namespace xmlscript
         virtual void SAL_CALL endElement() override;
     };
 
-    // class BasicSourceCodeElement
 
     class BasicSourceCodeElement : public BasicElementBase
     {
@@ -164,7 +159,6 @@ namespace xmlscript
         virtual void SAL_CALL endElement() override;
     };
 
-    // class BasicImport
 
     typedef ::cppu::WeakImplHelper<
         css::xml::input::XRoot > BasicImport_BASE;
@@ -199,7 +193,6 @@ namespace xmlscript
             const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override;
     };
 
-    // class XMLBasicImporterBase
 
     typedef ::cppu::WeakImplHelper<
         css::lang::XServiceInfo,
@@ -237,7 +230,6 @@ namespace xmlscript
         virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
     };
 
-    // class XMLBasicImporter
 
     class XMLBasicImporter : public XMLBasicImporterBase
     {
@@ -251,7 +243,6 @@ namespace xmlscript
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     };
 
-    // class XMLOasisBasicImporter
 
     class XMLOasisBasicImporter : public XMLBasicImporterBase
     {
author	Noel Grandin <noel.grandin@collabora.co.uk>	2019-12-03 09:28:27 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2019-12-03 12:46:27 +0100
commit	f656547d4d41091b5ccb729838e7355554a453cd (patch)
tree	baab3db9b9287d11133c5f4495b3ed4b812f0c17
parent	f51fddc2e7cfa2a2118610a3fc4b02886544d0a9 (diff)