tdf#62475: partial handmade fixes

Change-Id: Ib9af202c43b916b9af4b4e18db35d470a8692fe4
Reviewed-on: https://gerrit.libreoffice.org/15712
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

32 files changed, 1 insertions, 265 deletions

diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx
index 7f677790e454..8758b4271225 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.cxx
@@ -28,10 +28,6 @@ namespace comphelper
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::container;
 
-
-    //= OContainerListener
-
-
     OContainerListener::OContainerListener(::osl::Mutex& _rMutex)
         :m_pAdapter(NULL)
         ,m_rMutex(_rMutex)
@@ -90,10 +86,6 @@ namespace comphelper
         }
     }
 
-
-    //= OContainerListenerAdapter
-
-
     OContainerListenerAdapter::OContainerListenerAdapter(OContainerListener* _pListener,
             const  Reference< XContainer >& _rxContainer)
         :m_xContainer(_rxContainer)
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 763e31f6ff50..9338d711f807 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -83,9 +83,6 @@ namespace comphelper
     using ::com::sun::star::lang::WrappedTargetException;
     using ::com::sun::star::lang::DisposedException;
 
-
-    //= MapData
-
     class IMapModificationListener;
     typedef ::std::vector< IMapModificationListener* > MapListeners;
 
@@ -118,8 +115,6 @@ namespace comphelper
     };
 
 
-    //= IMapModificationListener
-
     /** implemented by components who want to be notified of modifications in the MapData they work with
     */
     class SAL_NO_VTABLE IMapModificationListener
@@ -132,10 +127,6 @@ namespace comphelper
         }
     };
 
-
-    //= MapData helpers
-
-
     static void lcl_registerMapModificationListener( MapData& _mapData, IMapModificationListener& _listener )
     {
     #if OSL_DEBUG_LEVEL > 0
@@ -180,7 +171,7 @@ namespace comphelper
     }
 
 
-    //= EnumerableMap
+    // EnumerableMap
 
     typedef ::cppu::WeakAggComponentImplHelper3 <   XInitialization
                                                 ,   XEnumerableMap
@@ -245,16 +236,12 @@ namespace comphelper
     };
 
 
-    //= EnumerationType
-
     enum EnumerationType
     {
         eKeys, eValues, eBoth
     };
 
 
-    //= MapEnumerator
-
     class MapEnumerator:
         public IMapModificationListener, private boost::noncopyable
     {
@@ -299,8 +286,6 @@ namespace comphelper
     };
 
 
-    //= MapEnumeration
-
     typedef ::cppu::WeakImplHelper1 <   XEnumeration
                                     >   MapEnumeration_Base;
     class MapEnumeration :public ComponentBase
@@ -339,9 +324,6 @@ namespace comphelper
     };
 
 
-    //= EnumerableMap
-
-
     EnumerableMap::EnumerableMap()
         :Map_IFace( m_aMutex )
         ,ComponentBase( Map_IFace::rBHelper )
@@ -721,9 +703,6 @@ namespace comphelper
     }
 
 
-    //= MapEnumerator
-
-
     bool MapEnumerator::hasMoreElements()
     {
         if ( m_disposed )
@@ -757,9 +736,6 @@ namespace comphelper
     }
 
 
-    //= MapEnumeration - implementation
-
-
     sal_Bool SAL_CALL MapEnumeration::hasMoreElements(  ) throw (RuntimeException, std::exception)
     {
         ComponentMethodGuard aGuard( *this );
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index 46f9a137a5b6..7a7b07725584 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -24,11 +24,6 @@
 namespace comphelper
 {
 
-
-
-//= OEnumerationByName
-
-
 OEnumerationByName::OEnumerationByName(const css::uno::Reference<css::container::XNameAccess>& _rxAccess)
     :m_aNames(_rxAccess->getElementNames())
     ,m_nPos(0)
@@ -140,10 +135,6 @@ void OEnumerationByName::impl_stopDisposeListening()
     --m_refCount;
 }
 
-
-//= OEnumerationByIndex
-
-
 OEnumerationByIndex::OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess)
     :m_nPos(0)
     ,m_xAccess(_rxAccess)
@@ -243,11 +234,6 @@ void OEnumerationByIndex::impl_stopDisposeListening()
     --m_refCount;
 }
 
-
-//= OAnyEnumeration
-
-
-
 OAnyEnumeration::OAnyEnumeration(const css::uno::Sequence< css::uno::Any >& lItems)
     :m_nPos(0)
     ,m_lItems(lItems)
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx
index c01135ead098..bff3e33819fa 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -30,10 +30,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::view;
 
-
-//= OSelectionChangeListener
-
-
 OSelectionChangeListener::~OSelectionChangeListener()
 {
     if (m_pAdapter)
@@ -65,10 +61,6 @@ void OSelectionChangeListener::setAdapter(OSelectionChangeMultiplexer* pAdapter)
     }
 }
 
-
-//= OSelectionChangeMultiplexer
-
-
 OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const  Reference< XSelectionSupplier>& _rxSet, bool _bAutoReleaseSet)
             :m_xSet(_rxSet)
             ,m_pListener(_pListener)
diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx
index 61b94e427b62..4e8488d376a1 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.cxx
@@ -29,10 +29,6 @@ namespace comphelper
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::accessibility;
 
-
-    //= OCommonAccessibleComponent
-
-
     OCommonAccessibleComponent::OCommonAccessibleComponent( IMutex* _pExternalLock )
         :OAccessibleContextHelper( _pExternalLock )
     {
@@ -97,10 +93,6 @@ namespace comphelper
         return implGetBounds();
     }
 
-
-    //= OAccessibleComponentHelper
-
-
     OAccessibleComponentHelper::OAccessibleComponentHelper( IMutex* _pExternalLock )
         :OCommonAccessibleComponent( _pExternalLock )
     {
@@ -141,10 +133,6 @@ namespace comphelper
         return OCommonAccessibleComponent::getBounds( );
     }
 
-
-    //= OAccessibleExtendedComponentHelper
-
-
     OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper( IMutex* _pExternalLock )
         :OCommonAccessibleComponent( _pExternalLock )
     {
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 718c83a78449..de3209f0eb4d 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -35,9 +35,6 @@ namespace comphelper
 
     IMutex::~IMutex() {}
 
-
-    //= OContextHelper_Impl
-
     /** implementation class for OAccessibleContextHelper. No own thread safety!
     */
     class OContextHelper_Impl
@@ -75,10 +72,6 @@ namespace comphelper
         m_aCreator = _rAcc;
     }
 
-
-    //= OAccessibleContextHelper
-
-
     OAccessibleContextHelper::OAccessibleContextHelper( IMutex* _pExternalLock )
         :OAccessibleContextHelper_Base( GetMutex() )
         ,m_pImpl( NULL )
diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index 2282c9f81729..d8a3b36253e8 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.cxx
@@ -31,10 +31,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
-
-//= AccessibleEventNotifier
-
-
 namespace
 {
     typedef ::std::pair< AccessibleEventNotifier::TClientId,
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx
index df9d92bcd3e0..5daa1c2264d1 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -29,10 +29,6 @@ namespace comphelper
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::accessibility;
 
-
-    //= OCommonAccessibleSelection
-
-
     OCommonAccessibleSelection::OCommonAccessibleSelection( )
     {
     }
@@ -105,10 +101,6 @@ namespace comphelper
         implSelect( nSelectedChildIndex, false );
     }
 
-
-    //= OAccessibleSelectionHelper
-
-
     OAccessibleSelectionHelper::OAccessibleSelectionHelper( IMutex* _pExternalLock ) : OAccessibleComponentHelper(_pExternalLock)
     {
     }
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 22e01edc2b85..a73134a33663 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -33,11 +33,6 @@ using namespace ::com::sun::star::lang;
 namespace comphelper
 {
 
-
-
-    //= OWrappedAccessibleChildrenManager
-
-
     struct RemoveEventListener
             : public ::std::unary_function< AccessibleMap::value_type, void >
     {
@@ -295,10 +290,6 @@ namespace comphelper
         }
     }
 
-
-    //= OAccessibleWrapper (implementation)
-
-
     OAccessibleWrapper::OAccessibleWrapper( const Reference< XComponentContext >& _rxContext,
             const Reference< XAccessible >& _rxInnerAccessible, const Reference< XAccessible >& _rxParentAccessible )
         :OAccessibleWrapper_Base( )
@@ -365,10 +356,6 @@ namespace comphelper
         return xContext;
     }
 
-
-    //= OAccessibleWrapper (implementation)
-
-
     OAccessibleContextWrapperHelper::OAccessibleContextWrapperHelper(
                 const Reference< XComponentContext >& _rxContext,
                 ::cppu::OBroadcastHelper& _rBHelper,
@@ -517,10 +504,6 @@ namespace comphelper
         OComponentProxyAggregationHelper::disposing( _rEvent );
     }
 
-
-    //= OAccessibleContextWrapper
-
-
     IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleContextWrapper, OAccessibleContextWrapper_CBase, OAccessibleContextWrapperHelper )
 
 
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index d40a2a078215..9042b371b6a8 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -40,20 +40,12 @@ namespace comphelper
     using ::com::sun::star::accessibility::XAccessible;
     using ::com::sun::star::accessibility::XAccessibleContext;
 
-
-    //= OAccImpl_Impl
-
     struct OAccImpl_Impl
     {
         Reference< XAccessible >    m_xAccParent;
         sal_Int64                   m_nForeignControlledStates;
     };
 
-
-
-    //= OAccessibleImplementationAccess
-
-
     OAccessibleImplementationAccess::OAccessibleImplementationAccess( )
         :m_pImpl( new OAccImpl_Impl )
     {
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index e4f038d3f665..f08a65f4dfbd 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -57,9 +57,6 @@ namespace comphelper
     using ::com::sun::star::util::Time;
     using ::com::sun::star::util::DateTime;
 
-
-    //= DatePredicateLess
-
     class DatePredicateLess : public IKeyPredicateLess
     {
     public:
@@ -88,9 +85,6 @@ namespace comphelper
         }
     };
 
-
-    //= TimePredicateLess
-
     class TimePredicateLess : public IKeyPredicateLess
     {
     public:
@@ -124,9 +118,6 @@ namespace comphelper
         }
     };
 
-
-    //= DateTimePredicateLess
-
     class DateTimePredicateLess : public IKeyPredicateLess
     {
     public:
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index d9ecbcbe2e50..3c15ce6f8f0e 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -30,7 +30,6 @@
 
 namespace comphelper
 {
-    //= AnyEvent
     AnyEvent::AnyEvent()
     {
     }
@@ -39,8 +38,6 @@ namespace comphelper
     {
     }
 
-    //= ProcessableEvent
-
     struct ProcessableEvent
     {
         AnyEventRef                         aEvent;
@@ -73,8 +70,6 @@ namespace comphelper
     };
 
 
-    //= EventNotifierImpl
-
     struct EventNotifierImpl
     {
         ::osl::Mutex        aMutex;
@@ -88,10 +83,6 @@ namespace comphelper
         }
     };
 
-
-    //= AsyncEventNotifier
-
-
     AsyncEventNotifier::AsyncEventNotifier(char const * name):
         Thread(name), m_xImpl(new EventNotifierImpl)
     {
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index 7b0b8201e490..c8ce6baec423 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -33,10 +33,6 @@ namespace comphelper
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
 
-
-    //= ComponentBase
-
-
     void ComponentBase::impl_checkDisposed_throw() const
     {
         if ( m_rBHelper.bDisposed )
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index c43db98d9e19..dd1b2bdfd7b2 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -40,9 +40,6 @@ namespace comphelper
 
     typedef ::std::vector< ComponentDescription >   ComponentDescriptions;
 
-
-    //= OModuleImpl
-
     /** implementation for <type>OModule</type>. not threadsafe, has to be guarded by its owner
     */
     class OModuleImpl
@@ -64,10 +61,6 @@ namespace comphelper
     {
     }
 
-
-    //= OModule
-
-
     OModule::OModule()
         : m_nClients(0)
         , m_pImpl(new OModuleImpl)
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 6e72b7335068..9a75a6fbf85b 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -54,9 +54,6 @@ namespace comphelper {
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::frame::XFrame;
 
-
-    //= helper
-
     namespace
     {
         OUString lcl_getTitle( const Reference< XInterface >& _rxComponent )
@@ -68,10 +65,6 @@ namespace comphelper {
         }
     }
 
-
-    //= DocumentInfo
-
-
     OUString DocumentInfo::getDocumentTitle( const Reference< XModel >& _rxDocument )
     {
         OUString sTitle;
diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx
index db0c965d58ce..9c96c3e526bc 100644
--- a/comphelper/source/misc/interaction.cxx
+++ b/comphelper/source/misc/interaction.cxx
@@ -28,10 +28,6 @@ namespace comphelper
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::task;
 
-
-    //= OInteractionPassword
-
-
     void SAL_CALL OInteractionPassword::setPassword( const OUString& _Password ) throw (RuntimeException, std::exception)
     {
         m_sPassword = _Password;
@@ -43,10 +39,6 @@ namespace comphelper
         return m_sPassword;
     }
 
-
-    //= OInteractionRequest
-
-
     OInteractionRequest::OInteractionRequest(const Any& _rRequestDescription)
         :m_aRequest(_rRequestDescription)
     {
diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx
index 481821dc0dc3..7dc4332ff43e 100644
--- a/comphelper/source/misc/listenernotification.cxx
+++ b/comphelper/source/misc/listenernotification.cxx
@@ -29,10 +29,6 @@ namespace comphelper
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
 
-
-    //= OListenerContainer
-
-
     OListenerContainer::OListenerContainer( ::osl::Mutex& _rMutex )
         :m_aListeners( _rMutex )
     {
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 4c4d56d443f3..801b5225a541 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -47,9 +47,6 @@ namespace comphelper
 
     namespace LogLevel = ::com::sun::star::logging::LogLevel;
 
-
-    //= EventLogger_Impl - declaration
-
     class EventLogger_Impl
     {
     private:
@@ -73,10 +70,6 @@ namespace comphelper
         void    impl_createLogger_nothrow();
     };
 
-
-    //= EventLogger_Impl - implementation
-
-
     void EventLogger_Impl::impl_createLogger_nothrow()
     {
         try
@@ -94,10 +87,6 @@ namespace comphelper
         }
     }
 
-
-    //= EventLogger
-
-
     EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName )
         :m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) )
     {
@@ -194,9 +183,6 @@ namespace comphelper
         return false;
     }
 
-
-    //= ResourceBasedEventLogger_Data
-
     struct ResourceBasedEventLogger_Data
     {
         /// the base name of the resource bundle
@@ -259,10 +245,6 @@ namespace comphelper
         return sMessage;
     }
 
-
-    //= ResourceBasedEventLogger
-
-
     ResourceBasedEventLogger::ResourceBasedEventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pResourceBundleBaseName,
         const sal_Char* _pAsciiLoggerName )
         :EventLogger( _rxContext, _pAsciiLoggerName )
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index a5670f050e2c..ee4ac571b2aa 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -46,9 +46,6 @@ namespace comphelper
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::beans::PropertyState_DIRECT_VALUE;
 
-
-    //= NamedValueCollection_Impl
-
     typedef std::unordered_map< OUString, Any, OUStringHash >    NamedValueRepository;
 
     struct NamedValueCollection_Impl
@@ -56,10 +53,6 @@ namespace comphelper
         NamedValueRepository    aValues;
     };
 
-
-    //= NamedValueCollection
-
-
     NamedValueCollection::NamedValueCollection()
         :m_pImpl( new NamedValueCollection_Impl )
     {
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index 5d9032a87481..535a20793cd0 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.cxx
@@ -39,9 +39,6 @@ namespace comphelper
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::Any;
 
-
-    //= ResourceBundle_Impl
-
     class ResourceBundle_Impl
     {
     private:
@@ -183,9 +180,6 @@ namespace comphelper
     }
 
 
-    //= OfficeResourceBundle
-
-
     OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName )
         :m_pImpl( new ResourceBundle_Impl( _context, OUString::createFromAscii( _bundleBaseAsciiName ) ) )
     {
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index 1bcf8ef40d41..eca8a8aeaad1 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -33,10 +33,6 @@ namespace comphelper
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::reflection;
 
-
-    //= OProxyAggregation
-
-
     OProxyAggregation::OProxyAggregation( const Reference< XComponentContext >& _rxContext )
         :m_xContext( _rxContext )
     {
@@ -97,10 +93,6 @@ namespace comphelper
             // ourself) to this proxy, and thus delete it
     }
 
-
-    //= OComponentProxyAggregationHelper
-
-
     OComponentProxyAggregationHelper::OComponentProxyAggregationHelper( const Reference< XComponentContext >& _rxContext,
         ::cppu::OBroadcastHelper& _rBHelper )
         :OProxyAggregation( _rxContext )
@@ -185,10 +177,6 @@ namespace comphelper
         }
     }
 
-
-    //= OComponentProxyAggregation
-
-
     OComponentProxyAggregation::OComponentProxyAggregation( const Reference< XComponentContext >& _rxContext,
             const Reference< XComponent >& _rxComponent )
         :WeakComponentImplHelperBase( m_aMutex )
diff --git a/comphelper/source/misc/sharedmutex.cxx b/comphelper/source/misc/sharedmutex.cxx
index 3998e92fe18e..21188c3cfe01 100644
--- a/comphelper/source/misc/sharedmutex.cxx
+++ b/comphelper/source/misc/sharedmutex.cxx
@@ -24,11 +24,6 @@
 namespace comphelper
 {
 
-
-
-    //= SharedMutex
-
-
     SharedMutex::SharedMutex()
         :m_pMutexImpl( new ::osl::Mutex )
     {
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index 9c73ebbca434..7e650b8aa3e0 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.cxx
@@ -34,10 +34,6 @@ namespace comphelper
 
 using namespace ::com::sun::star;
 
-
-//= SynchronousDispatch
-
-
 uno::Reference< lang::XComponent > SynchronousDispatch::dispatch(
         const uno::Reference< uno::XInterface > &xStartPoint,
         const OUString &sURL,
diff --git a/comphelper/source/misc/weakeventlistener.cxx b/comphelper/source/misc/weakeventlistener.cxx
index 0c594a421c8b..039897fa4d5f 100644
--- a/comphelper/source/misc/weakeventlistener.cxx
+++ b/comphelper/source/misc/weakeventlistener.cxx
@@ -29,18 +29,10 @@ namespace comphelper
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
 
-
-    //= OWeakListenerAdapter
-
-
     OWeakListenerAdapterBase::~OWeakListenerAdapterBase()
     {
     }
 
-
-    //= OWeakEventListenerAdapter
-
-
     OWeakEventListenerAdapter::OWeakEventListenerAdapter( Reference< XWeak > _rxListener, Reference< XComponent > _rxBroadcaster )
         :OWeakEventListenerAdapter_Base( _rxListener, _rxBroadcaster )
     {
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 1ef446d6b6ba..6f37c1e78448 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -56,10 +56,6 @@ namespace comphelper
     using namespace ::com::sun::star::util;
     using namespace ::com::sun::star::container;
 
-
-    //= OPropertyBag
-
-
     OPropertyBag::OPropertyBag()
         :OPropertyBag_PBase( GetBroadcastHelper(), this )
         ,::cppu::IEventNotificationHook()
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 02145997dc35..48db10e1344e 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -58,9 +58,6 @@ namespace comphelper
     typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any >     MapInt2Any;
     typedef ::std::set< ::com::sun::star::uno::Type, UnoTypeLess >  TypeBag;
 
-
-    //= OPropertyBag
-
     typedef ::cppu::WeakAggImplHelper5  <   ::com::sun::star::beans::XPropertyBag
                                         ,   ::com::sun::star::util::XModifiable
                                         ,   ::com::sun::star::lang::XServiceInfo
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 9edc06400a32..7abb03d31e59 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -59,10 +59,6 @@ namespace comphelper
         }
     }
 
-//= OPropertyArrayAggregationHelper
-
-
-
 OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
         const  Sequence< Property >& _rProperties, const  Sequence< Property >& _rAggProperties,
         IPropertyInfoService* _pInfoService, sal_Int32 _nFirstAggregateId )
@@ -350,9 +346,6 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles(
     return nHitCount;
 }
 
-
-//= PropertyForwarder
-
 namespace internal
 {
     class PropertyForwarder
@@ -436,11 +429,6 @@ namespace internal
     }
 }
 
-
-//= OPropertySetAggregationHelper
-
-
-
 OPropertySetAggregationHelper::OPropertySetAggregationHelper( ::cppu::OBroadcastHelper& rBHlp )
     :OPropertyStateHelper( rBHlp )
     ,m_bListening( false )
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index a822fdd4e078..daa05cd58935 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -46,9 +46,6 @@ namespace comphelper
 
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
 
-
-    //= PropertyBag_Impl
-
     typedef ::std::map< sal_Int32, Any >    MapInt2Any;
     struct PropertyBag_Impl
     {
@@ -57,10 +54,6 @@ namespace comphelper
         bool m_bAllowEmptyPropertyName;
     };
 
-
-    //= PropertyBag
-
-
     PropertyBag::PropertyBag()
         :m_pImpl( new PropertyBag_Impl )
     {
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index 1cd3fcd9e68c..8d2cdde76b90 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -37,10 +37,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
-
-//= OPropertyContainer
-
-
 OPropertyContainer::OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper)
     :OPropertySetHelper(_rBHelper)
 {
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 4cb185a32da1..8b8f7a691a5a 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -61,10 +61,6 @@ namespace
     };
 }
 
-
-//= OPropertyContainerHelper
-
-
 OPropertyContainerHelper::OPropertyContainerHelper()
 {
 }
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 4e41561ed4b0..db12ef5d585e 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -45,10 +45,6 @@ namespace comphelper
         }
     }
 
-
-    //= OPropertyStateContainer
-
-
     OPropertyStateContainer::OPropertyStateContainer( ::cppu::OBroadcastHelper& _rBHelper )
         :OPropertyContainer( _rBHelper )
     {
diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index 22224cf96e10..51613c7b45f1 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.cxx
@@ -29,10 +29,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
-
-//= OPropertyChangeListener
-
-
 OPropertyChangeListener::~OPropertyChangeListener()
 {
     if (m_pAdapter)
@@ -74,10 +70,6 @@ void OPropertyChangeListener::setAdapter(OPropertyChangeMultiplexer* pAdapter)
     }
 }
 
-
-//= OPropertyChangeMultiplexer
-
-
 OPropertyChangeMultiplexer::OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const  Reference< XPropertySet>& _rxSet, bool _bAutoReleaseSet)
             :m_xSet(_rxSet)
             ,m_pListener(_pListener)