Create OOO310_m16 milestone tag from branches/OOO310@274155 ooo/OOO310_m16

author: Release Engineers <releng@openoffice.org> 2009-07-20 22:54:23 +0000
committer: Release Engineers <releng@openoffice.org> 2009-07-20 22:54:23 +0000
commit: 38ab8a5ee995f10d952b4adbb3245fcf6c1260ea (patch)
tree: c21cbf2612b74b7ac5a76c6811cdd05f39836310
parent: 83817cc577d6f22b7f1a9155319437b2ecab60db (diff)
0 files changed, 0 insertions, 0 deletions
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 93f7cc209b0c..ae63f0b57730 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -21,9 +21,9 @@
 
 #include <cppuhelper/typeprovider.hxx>
 
-//____________________________________________________________________________________________________________
+
 //  namespaces
-//____________________________________________________________________________________________________________
+
 
 using namespace ::cppu                      ;
 using namespace ::osl                       ;
@@ -35,9 +35,9 @@ using namespace ::com::sun::star::container ;
 
 namespace unocontrols{
 
-//____________________________________________________________________________________________________________
+
 //  construct/destruct
-//____________________________________________________________________________________________________________
+
 
 BaseContainerControl::BaseContainerControl( const Reference< XComponentContext >& rxContext )
     : BaseControl   ( rxContext  )
@@ -50,9 +50,9 @@ BaseContainerControl::~BaseContainerControl()
     impl_cleanMemory();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException )
 {
@@ -75,9 +75,9 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru
     return aReturn ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTypeProvider
-//____________________________________________________________________________________________________________
+
 
 Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException )
 {
@@ -107,9 +107,9 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti
     return pTypeCollection->getTypes();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XAggregation
-//____________________________________________________________________________________________________________
+
 
 Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException )
 {
@@ -134,9 +134,9 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw(
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControl
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
                                                 const   Reference< XWindowPeer >&   xParent     ) throw( RuntimeException )
@@ -161,9 +161,9 @@ void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControl
-//____________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException )
 {
@@ -171,9 +171,9 @@ sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel
     return sal_False ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControl
-//____________________________________________________________________________________________________________
+
 
 Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException )
 {
@@ -182,9 +182,9 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt
     return Reference< XControlModel >();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XComponent
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
 {
@@ -223,9 +223,9 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
     BaseControl::dispose();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XEventListener
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException )
 {
@@ -235,9 +235,9 @@ void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw
     removeControl( xControl );
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControlContainer
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException )
 {
@@ -294,9 +294,9 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControlContainer
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
 {
@@ -306,9 +306,9 @@ void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XCon
     m_aListeners.addInterface ( ::getCppuType((const Reference< XContainerListener >*)0), rListener ) ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControlContainer
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException )
 {
@@ -359,9 +359,9 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControlContainer
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
 {
@@ -371,9 +371,9 @@ void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< X
     m_aListeners.removeInterface ( ::getCppuType((const Reference< XContainerListener >*)0), rListener ) ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControlContainer
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException )
 {
@@ -386,9 +386,9 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControlContainer
-//____________________________________________________________________________________________________________
+
 
 Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException )
 {
@@ -414,9 +414,9 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString
     return Reference< XControl >  () ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControlContainer
-//____________________________________________________________________________________________________________
+
 
 Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException )
 {
@@ -439,9 +439,9 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls ()
     return aDescriptor ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XUnoControlContainer
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
 {
@@ -465,9 +465,9 @@ void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabCont
     m_xTabControllerList = aNewList ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XUnoControlContainer
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
 {
@@ -489,9 +489,9 @@ void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabC
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XUnoControlContainer
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::setTabControllers ( const Sequence< Reference< XTabController >  >& rTabControllers ) throw( RuntimeException )
 {
@@ -509,9 +509,9 @@ Sequence<Reference< XTabController > > SAL_CALL BaseContainerControl::getTabCont
     return m_xTabControllerList ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XWindow
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException )
 {
@@ -526,9 +526,9 @@ void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( Runt
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  protected method
-//____________________________________________________________________________________________________________
+
 
 WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Reference< XWindowPeer > & rParentPeer )
 {
@@ -548,17 +548,17 @@ WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Referen
     return aDescriptor ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  protected method
-//____________________________________________________________________________________________________________
+
 
 void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, const Reference< XGraphics > & /*rGraphics*/ )
 {
 }
 
-//____________________________________________________________________________________________________________
+
 //  private method
-//____________________________________________________________________________________________________________
+
 
 void BaseContainerControl::impl_activateTabControllers ()
 {
@@ -575,9 +575,9 @@ void BaseContainerControl::impl_activateTabControllers ()
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  private method
-//____________________________________________________________________________________________________________
+
 
 void BaseContainerControl::impl_cleanMemory ()
 {
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 416042bd970c..0dd2bc41cfe5 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -29,9 +29,9 @@ using namespace ::com::sun::star::lang  ;
 
 namespace unocontrols{
 
-//____________________________________________________________________________________________________________
+
 //  macros
-//____________________________________________________________________________________________________________
+
 
 #define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT )                                                                             \
                                                                                                                                     \
@@ -63,9 +63,9 @@ namespace unocontrols{
         }                                                                                                                           \
     }
 
-//____________________________________________________________________________________________________________
+
 //  construct/destruct
-//____________________________________________________________________________________________________________
+
 
 OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper(   const   Reference< XWindow >&   xControl    ,
                                                                 const   Reference< XWindow >&   xPeer       )
@@ -92,9 +92,9 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper()
 {
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException )
 {
@@ -128,9 +128,9 @@ Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType )
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL OMRCListenerMultiplexerHelper::acquire() throw()
 {
@@ -141,9 +141,9 @@ void SAL_CALL OMRCListenerMultiplexerHelper::acquire() throw()
     OWeakObject::acquire();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL OMRCListenerMultiplexerHelper::release() throw()
 {
@@ -154,18 +154,18 @@ void SAL_CALL OMRCListenerMultiplexerHelper::release() throw()
     OWeakObject::release();
 }
 
-//____________________________________________________________________________________________________________
+
 //  operator
-//____________________________________________________________________________________________________________
+
 
 OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
 {
     return ((OWeakObject*)this) ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  container method
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
 {
@@ -196,9 +196,9 @@ void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  container method
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::disposeAndClear()
 {
@@ -207,9 +207,9 @@ void OMRCListenerMultiplexerHelper::disposeAndClear()
     m_aListenerHolder.disposeAndClear( aEvent );
 }
 
-//____________________________________________________________________________________________________________
+
 //  container method
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::advise( const   Type&                       aType       ,
                                             const   Reference< XInterface >&    xListener   )
@@ -225,9 +225,9 @@ void OMRCListenerMultiplexerHelper::advise( const   Type&
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  container method
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::unadvise(   const   Type&                       aType       ,
                                                 const   Reference< XInterface >&    xListener   )
@@ -243,9 +243,9 @@ void OMRCListenerMultiplexerHelper::unadvise(   const   Type&
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XEventListener
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
 {
@@ -254,207 +254,207 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo
     m_xPeer.clear();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XFcousListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XFcousListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XKeyListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XKeyListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XMouseListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XMouseListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XMouseListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XMouseListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XMouseMotionListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XMouseMotionListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XPaintListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTopWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException )
 {
     MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTopWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTopWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTopWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTopWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTopWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTopWindowListener
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException )
 {
     MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent )
 }
 
-//____________________________________________________________________________________________________________
+
 //  protected method
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::impl_adviseToPeer(  const   Reference< XWindow >&   xPeer   ,
                                                         const   Type&                   aType   )
@@ -484,9 +484,9 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer(  const   Reference< XWind
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  protected method
-//____________________________________________________________________________________________________________
+
 
 void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer(  const   Reference< XWindow >&   xPeer   ,
                                                             const   Type&                   aType   )
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index 9759347fa067..c0d82b585b57 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -21,9 +21,9 @@
 
 #include "OConnectionPointContainerHelper.hxx"
 
-//______________________________________________________________________________________________________________
+
 //  namespaces
-//______________________________________________________________________________________________________________
+
 
 using namespace ::rtl                   ;
 using namespace ::osl                   ;
@@ -33,9 +33,9 @@ using namespace ::com::sun::star::lang  ;
 
 namespace unocontrols{
 
-//______________________________________________________________________________________________________________
+
 //  construct/destruct
-//______________________________________________________________________________________________________________
+
 
 OConnectionPointHelper::OConnectionPointHelper(
     Mutex&                              aMutex                      ,
@@ -52,9 +52,9 @@ OConnectionPointHelper::~OConnectionPointHelper()
 {
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException )
 {
@@ -77,9 +77,9 @@ Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw(
     return aReturn ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL OConnectionPointHelper::acquire() throw()
 {
@@ -90,9 +90,9 @@ void SAL_CALL OConnectionPointHelper::acquire() throw()
     OWeakObject::acquire();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL OConnectionPointHelper::release() throw()
 {
@@ -103,9 +103,9 @@ void SAL_CALL OConnectionPointHelper::release() throw()
     OWeakObject::release();
 }
 
-//______________________________________________________________________________________________________________
+
 //  XConnectionPoint
-//______________________________________________________________________________________________________________
+
 
 Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException )
 {
@@ -127,9 +127,9 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio
     return aReturnType;
 }
 
-//______________________________________________________________________________________________________________
+
 //  XConnectionPoint
-//______________________________________________________________________________________________________________
+
 
 Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException )
 {
@@ -139,9 +139,9 @@ Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConne
     return Reference< XConnectionPointContainer >( m_oContainerWeakReference.get(), UNO_QUERY );
 }
 
-//______________________________________________________________________________________________________________
+
 //  XConnectionPoint
-//______________________________________________________________________________________________________________
+
 
 void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw( ListenerExistException      ,
                                                                                                 InvalidListenerException    ,
@@ -174,9 +174,9 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi
     impl_UnlockContainer();
 }
 
-//______________________________________________________________________________________________________________
+
 //  XConnectionPoint
-//______________________________________________________________________________________________________________
+
 
 void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException )
 {
@@ -195,9 +195,9 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x
     impl_UnlockContainer();
 }
 
-//______________________________________________________________________________________________________________
+
 //  XConnectionPoint
-//______________________________________________________________________________________________________________
+
 
 Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException )
 {
@@ -226,9 +226,9 @@ Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnecti
     return seqReturnConnections;
 }
 
-//______________________________________________________________________________________________________________
+
 //  private method
-//______________________________________________________________________________________________________________
+
 
 bool OConnectionPointHelper::impl_LockContainer()
 {
@@ -239,9 +239,9 @@ bool OConnectionPointHelper::impl_LockContainer()
     return m_xLock.is();
 }
 
-//______________________________________________________________________________________________________________
+
 //  private method
-//______________________________________________________________________________________________________________
+
 
 void OConnectionPointHelper::impl_UnlockContainer()
 {
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 49f76053e63b..91d1b286d76f 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -36,9 +36,9 @@ using namespace ::com::sun::star::task  ;
 
 namespace unocontrols{
 
-//____________________________________________________________________________________________________________
+
 //  construct/destruct
-//____________________________________________________________________________________________________________
+
 
 StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext >& rxContext )
     : BaseContainerControl  ( rxContext  )
@@ -69,9 +69,9 @@ StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext >
 
 StatusIndicator::~StatusIndicator() {}
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException )
 {
@@ -94,9 +94,9 @@ Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( Runtime
     return aReturn ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::acquire() throw()
 {
@@ -107,9 +107,9 @@ void SAL_CALL StatusIndicator::acquire() throw()
     BaseControl::acquire();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XInterface
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::release() throw()
 {
@@ -120,9 +120,9 @@ void SAL_CALL StatusIndicator::release() throw()
     BaseControl::release();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XTypeProvider
-//____________________________________________________________________________________________________________
+
 
 Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException )
 {
@@ -152,9 +152,9 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException )
     return pTypeCollection->getTypes();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XAggregation
-//____________________________________________________________________________________________________________
+
 
 Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException )
 {
@@ -176,9 +176,9 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti
     return aReturn ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XStatusIndicator
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException )
 {
@@ -192,9 +192,9 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange )
     impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,impl_getWidth(),impl_getHeight(),0,0,0,0) ) ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XStatusIndicator
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::end() throw( RuntimeException )
 {
@@ -207,9 +207,9 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException )
     setVisible( sal_False );
 }
 
-//____________________________________________________________________________________________________________
+
 //  XStatusIndicator
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException )
 {
@@ -220,9 +220,9 @@ void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeEx
     m_xText->setText( sText );
 }
 
-//____________________________________________________________________________________________________________
+
 //  XStatusIndicator
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException )
 {
@@ -233,9 +233,9 @@ void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeExcept
     m_xProgressBar->setValue( nValue );
 }
 
-//____________________________________________________________________________________________________________
+
 //  XStatusIndicator
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::reset() throw( RuntimeException )
 {
@@ -248,18 +248,18 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException )
     m_xProgressBar->setValue( 0 );
 }
 
-//____________________________________________________________________________________________________________
+
 //  XLayoutConstrains
-//____________________________________________________________________________________________________________
+
 
 Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException )
 {
     return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT) ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XLayoutConstrains
-//____________________________________________________________________________________________________________
+
 
 Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
 {
@@ -290,18 +290,18 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
     return Size ( nWidth, nHeight ) ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XLayoutConstrains
-//____________________________________________________________________________________________________________
+
 
 Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
 {
     return getPreferredSize () ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControl
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::createPeer (
     const css::uno::Reference< XToolkit > & rToolkit,
@@ -320,9 +320,9 @@ void SAL_CALL StatusIndicator::createPeer (
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControl
-//____________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
 {
@@ -330,9 +330,9 @@ sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XContro
     return sal_False ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XControl
-//____________________________________________________________________________________________________________
+
 
 css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException )
 {
@@ -341,9 +341,9 @@ css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw
     return css::uno::Reference< XControlModel >  () ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  XComponent
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
 {
@@ -363,9 +363,9 @@ void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
     BaseContainerControl::dispose();
 }
 
-//____________________________________________________________________________________________________________
+
 //  XWindow
-//____________________________________________________________________________________________________________
+
 
 void SAL_CALL StatusIndicator::setPosSize (
     sal_Int32 nX,
@@ -394,27 +394,27 @@ void SAL_CALL StatusIndicator::setPosSize (
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  impl but public method to register service
-//____________________________________________________________________________________________________________
+
 
 const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames()
 {
     return css::uno::Sequence<OUString>();
 }
 
-//____________________________________________________________________________________________________________
+
 //  impl but public method to register service
-//____________________________________________________________________________________________________________
+
 
 const OUString StatusIndicator::impl_getStaticImplementationName()
 {
     return OUString("stardiv.UnoControls.StatusIndicator");
 }
 
-//____________________________________________________________________________________________________________
+
 //  protected method
-//____________________________________________________________________________________________________________
+
 
 WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const css::uno::Reference< XWindowPeer >& xParentPeer )
 {
@@ -433,9 +433,9 @@ WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const css::uno::Ref
     return pDescriptor ;
 }
 
-//____________________________________________________________________________________________________________
+
 //  protected method
-//____________________________________________________________________________________________________________
+
 
 void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::Reference< XGraphics > & rGraphics )
 {
@@ -472,9 +472,9 @@ void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::R
     }
 }
 
-//____________________________________________________________________________________________________________
+
 //  protected method
-//____________________________________________________________________________________________________________
+
 
 void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
 {
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
index b79b89cf378e..14ca94741d6f 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
@@ -44,7 +44,7 @@ namespace accessibility
         /** Grabs the focus to the GridControl. */
         virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException );
 
-        // XInterface -------------------------------------------------------------
+        // XInterface
 
         /** Queries for a new interface. */
         ::com::sun::star::uno::Any SAL_CALL queryInterface(
@@ -56,14 +56,14 @@ namespace accessibility
 
         /** Releases the object (calls release() on base class). */
         virtual void SAL_CALL release() throw ();
-        // XAccessible ------------------------------------------------------------
+        // XAccessible
 
         /** @return  The XAccessibleContext interface of this object. */
         virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL
         getAccessibleContext()
             throw ( ::com::sun::star::uno::RuntimeException );
-        //-------------------------------------------------------------------------
+
         inline sal_Bool isRowBarCell() const
         {
             return getType() == ::svt::table::TCTYPE_ROWHEADERCELL;
diff --git a/accessibility/inc/accessibility/helper/accessiblestrings.hrc b/accessibility/inc/accessibility/helper/accessiblestrings.hrc
index 03815d8dd3c0..12454d4c3696 100644
--- a/accessibility/inc/accessibility/helper/accessiblestrings.hrc
+++ b/accessibility/inc/accessibility/helper/accessiblestrings.hrc
@@ -20,14 +20,10 @@
 #ifndef ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
 #define ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
 
-
-//------------------------------------------------------------------------------
-
 #define RID_TK_ACC_START        1000
 
 
-// Accessible Action Id's ------------------------------------------------------
-
+// Accessible Action Id's
 #define RID_STR_ACC_ACTION_CLICK            ( RID_TK_ACC_START +    0 )
 #define RID_STR_ACC_ACTION_TOGGLEPOPUP      ( RID_TK_ACC_START +    1 )
 #define RID_STR_ACC_ACTION_SELECT           ( RID_TK_ACC_START +    2 )
@@ -51,8 +47,6 @@
 #define RID_STR_ACC_NAME_BROWSEBUTTON       ( RID_TK_ACC_START + 100 )
 #define RID_STR_ACC_DESC_PANELDECL_TABBAR   ( RID_TK_ACC_START + 101 )
 
-// -----------------------------------------------------------------------------
-
 #endif          // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index ad850610ebb6..0432aa9868e1 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -72,7 +72,7 @@ AccessibleBrowseBox::AccessibleBrowseBox(
 
     m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance());
 }
-// -----------------------------------------------------------------------------
+
 void AccessibleBrowseBox::setCreator( const Reference< XAccessible >& _rxCreator )
 {
 #if OSL_DEBUG_LEVEL > 0
@@ -82,11 +82,11 @@ void AccessibleBrowseBox::setCreator( const Reference< XAccessible >& _rxCreator
     m_pImpl->m_aCreator = _rxCreator;
 }
 
-// -----------------------------------------------------------------------------
+
 AccessibleBrowseBox::~AccessibleBrowseBox()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleBrowseBox::disposing()
 {
@@ -111,7 +111,7 @@ void SAL_CALL AccessibleBrowseBox::disposing()
 
     AccessibleBrowseBoxBase::disposing();
 }
-// -----------------------------------------------------------------------------
+
 
 // XAccessibleContext ---------------------------------------------------------
 
@@ -123,7 +123,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount()
     ensureIsAlive();
     return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount();
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL
 AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex )
@@ -184,7 +184,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
     }
     return xChild;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleBrowseBox::grabFocus()
     throw ( uno::RuntimeException )
@@ -194,7 +194,7 @@ void SAL_CALL AccessibleBrowseBox::grabFocus()
     ensureIsAlive();
     mpBrowseBox->GrabFocus();
 }
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL AccessibleBrowseBox::getAccessibleKeyBinding()
     throw ( uno::RuntimeException )
@@ -202,7 +202,7 @@ Any SAL_CALL AccessibleBrowseBox::getAccessibleKeyBinding()
     ensureIsAlive();
     return Any();
 }
-// -----------------------------------------------------------------------------
+
 
 // XServiceInfo ---------------------------------------------------------------
 
@@ -211,7 +211,7 @@ OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
 {
     return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBox" );
 }
-// -----------------------------------------------------------------------------
+
 
 // internal virtual methods ---------------------------------------------------
 
@@ -221,13 +221,13 @@ Rectangle AccessibleBrowseBox::implGetBoundingBox()
     OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
     return mpBrowseBox->GetWindowExtentsRelative( pParent );
 }
-// -----------------------------------------------------------------------------
+
 
 Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
 {
     return mpBrowseBox->GetWindowExtentsRelative( NULL );
 }
-// -----------------------------------------------------------------------------
+
 
 // internal helper methods ----------------------------------------------------
 
@@ -241,7 +241,7 @@ Reference< XAccessible > AccessibleBrowseBox::implGetTable()
     }
     return m_pImpl->mxTable;
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible >
 AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
@@ -272,7 +272,7 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
     }
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible >
 AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
@@ -292,14 +292,14 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
     }
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable()
 {
     Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator;
     OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" );
     return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox );
 }
-// -----------------------------------------------------------------------------
+
 void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue)
 {
     if ( m_pImpl->mxTable.is() )
@@ -307,7 +307,7 @@ void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewV
         m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
     }
 }
-// -----------------------------------------------------------------------------
+
 void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId,
                                                 const Any& _rNewValue,
                                                 const Any& _rOldValue,sal_Bool _bColumnHeaderBar)
@@ -328,12 +328,12 @@ AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const Reference< XAccessib
 {
 }
 
-// -----------------------------------------------------------------------------
+
 AccessibleBrowseBoxAccess::~AccessibleBrowseBoxAccess()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 void AccessibleBrowseBoxAccess::dispose()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -342,7 +342,7 @@ void AccessibleBrowseBoxAccess::dispose()
     ::comphelper::disposeComponent( m_xContext );
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -361,7 +361,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibl
     return m_xContext;
 }
 
-// -----------------------------------------------------------------------------
+
 bool AccessibleBrowseBoxAccess::isContextAlive() const
 {
     return  ( NULL != m_pContext ) && m_pContext->isAlive();
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index ab6f9acb4351..b707f8dd0877 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -276,7 +276,7 @@ void SAL_CALL AccessibleBrowseBoxBase::focusGained( const ::com::sun::star::awt:
 
     commitEvent(AccessibleEventId::STATE_CHANGED,aFocused,aEmpty);
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleBrowseBoxBase::focusLost( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -513,24 +513,24 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
     }
     return nRole;
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL AccessibleBrowseBoxBase::getAccessibleKeyBinding()
         throw ( uno::RuntimeException )
 {
     return Any();
 }
-// -----------------------------------------------------------------------------
+
 Reference<XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& )
         throw ( uno::RuntimeException )
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL AccessibleBrowseBoxBase::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
 {
     m_xFocusWindow = NULL;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -556,7 +556,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(  ) throw (::com::sun:
 
     return nColor;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -590,14 +590,14 @@ Reference< XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessib
     return this;
 }
 
-// ----------------------------------------------------------------------------
+
 BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox,
         const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  eObjType )
     :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType )
 {
 }
 
-// ----------------------------------------------------------------------------
+
 BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox,
         const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  eObjType,
         const OUString& rName, const OUString& rDescription )
@@ -605,7 +605,7 @@ BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccess
 {
 }
 
-// ----------------------------------------------------------------------------
+
 BrowseBoxAccessibleElement::~BrowseBoxAccessibleElement( )
 {
 }
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index 7e35230abeae..f23f472e1e53 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -40,17 +40,16 @@ namespace accessibility
         ,m_bIsTriState(_bIsTriState)
     {
     }
-    // -----------------------------------------------------------------------------
     IMPLEMENT_FORWARD_XINTERFACE2( AccessibleCheckBoxCell, AccessibleBrowseBoxCell, AccessibleCheckBoxCell_BASE )
-        // -----------------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleCheckBoxCell, AccessibleBrowseBoxCell, AccessibleCheckBoxCell_BASE )
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleContext > SAL_CALL AccessibleCheckBoxCell::getAccessibleContext(  ) throw (RuntimeException)
     {
         ensureIsAlive();
         return this;
     }
-    // -----------------------------------------------------------------------------
+
     ::utl::AccessibleStateSetHelper* AccessibleCheckBoxCell::implCreateStateSetHelper()
     {
         ::utl::AccessibleStateSetHelper* pStateSetHelper =
@@ -64,10 +63,8 @@ namespace accessibility
         }
         return pStateSetHelper;
     }
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
+
     // XAccessibleValue
-    // -----------------------------------------------------------------------------
 
     Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue(  ) throw (RuntimeException)
     {
@@ -89,15 +86,11 @@ namespace accessibility
         return makeAny(nValue);
     }
 
-    // -----------------------------------------------------------------------------
-
     sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& ) throw (RuntimeException)
     {
         return sal_False;
     }
 
-    // -----------------------------------------------------------------------------
-
     Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( getOslMutex() );
@@ -112,8 +105,6 @@ namespace accessibility
         return aValue;
     }
 
-    // -----------------------------------------------------------------------------
-
     Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue(  ) throw (RuntimeException)
     {
         Any aValue;
@@ -121,23 +112,23 @@ namespace accessibility
 
         return aValue;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleContext
     sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException)
     {
         return 0;
     }
-    // -----------------------------------------------------------------------------
+
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
     {
         throw ::com::sun::star::lang::IndexOutOfBoundsException();
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException )
     {
         return OUString( "com.sun.star.comp.svtools.TableCheckBoxCell" );
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent()
             throw ( ::com::sun::star::uno::RuntimeException )
     {
@@ -145,7 +136,7 @@ namespace accessibility
 
         return ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos();
     }
-    // -----------------------------------------------------------------------------
+
     void AccessibleCheckBoxCell::SetChecked( sal_Bool _bChecked )
     {
         m_eState = _bChecked ? STATE_CHECK : STATE_NOCHECK;
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 270f05704c9f..2a11f6b069ed 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -76,7 +76,7 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR
 
     return pStateSetHelper;
 }
-// -----------------------------------------------------------------------------
+
 /** @return
         The count of visible children.
 */
@@ -85,7 +85,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount()
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 
 /** @return
         The XAccessible interface of the specified child.
@@ -95,7 +95,7 @@ Reference<XAccessible > SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChi
 {
     throw IndexOutOfBoundsException();
 }
-// -----------------------------------------------------------------------------
+
 
 /** Grabs the focus to the column header. */
 void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus()
@@ -109,7 +109,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus()
     else
         mpBrowseBox->SelectColumn(static_cast<sal_uInt16>(m_nColumnRowId)); //!!!
 }
-// -----------------------------------------------------------------------------
+
 /** @return
         The name of this class.
 */
@@ -118,7 +118,7 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName()
 {
     return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderCell" );
 }
-// -----------------------------------------------------------------------------
+
 namespace
 {
     Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, sal_Bool _bOnScreen,sal_Bool _bRowBar)
@@ -140,13 +140,13 @@ Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBox()
 {
     return getRectangle(mpBrowseBox,m_nColumnRowId,sal_False,isRowBarCell());
 }
-// -----------------------------------------------------------------------------
+
 
 Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen()
 {
     return getRectangle(mpBrowseBox,m_nColumnRowId,sal_True,isRowBarCell());
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
     throw ( RuntimeException )
 {
@@ -157,9 +157,9 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
         --nIndex;
     return nIndex;
 }
-// -----------------------------------------------------------------------------
+
 } // namespace accessibility
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 5ee23f662eb6..5538833441a1 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -79,11 +79,11 @@ AccessibleGridControl::AccessibleGridControl(
     m_pImpl->m_aCreator = _rxCreator;
 }
 
-// -----------------------------------------------------------------------------
+
 AccessibleGridControl::~AccessibleGridControl()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleGridControl::disposing()
 {
@@ -114,7 +114,7 @@ void SAL_CALL AccessibleGridControl::disposing()
     ::comphelper::disposeComponent(m_pImpl->m_xColumnHeaderBar);
     AccessibleGridControlBase::disposing();
 }
-// -----------------------------------------------------------------------------
+
 
 // XAccessibleContext ---------------------------------------------------------
 
@@ -125,7 +125,7 @@ sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount()
     ensureIsAlive();
     return m_aTable.GetAccessibleControlCount();
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL
 AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
@@ -170,7 +170,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
     }
     return xChild;
 }
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole()
     throw ( uno::RuntimeException )
@@ -180,7 +180,7 @@ sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole()
     ensureIsAlive();
     return AccessibleRole::PANEL;
 }
-// -----------------------------------------------------------------------------
+
 
 // XAccessibleComponent -------------------------------------------------------
 
@@ -213,7 +213,7 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
     }
     return xChild;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleGridControl::grabFocus()
     throw ( uno::RuntimeException )
@@ -222,7 +222,7 @@ void SAL_CALL AccessibleGridControl::grabFocus()
     ensureIsAlive();
         m_aTable.GrabFocus();
 }
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL AccessibleGridControl::getAccessibleKeyBinding()
     throw ( uno::RuntimeException )
@@ -232,7 +232,7 @@ Any SAL_CALL AccessibleGridControl::getAccessibleKeyBinding()
     ensureIsAlive();
     return Any();
 }
-// -----------------------------------------------------------------------------
+
 
 // XServiceInfo ---------------------------------------------------------------
 
@@ -241,7 +241,7 @@ OUString SAL_CALL AccessibleGridControl::getImplementationName()
 {
     return OUString( "com.sun.star.accessibility.AccessibleGridControl" );
 }
-// -----------------------------------------------------------------------------
+
 
 // internal virtual methods ---------------------------------------------------
 
@@ -251,7 +251,7 @@ Rectangle AccessibleGridControl::implGetBoundingBox()
     OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
     return m_aTable.GetWindowExtentsRelative( pParent );
 }
-// -----------------------------------------------------------------------------
+
 
 Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
 {
@@ -268,7 +268,7 @@ Reference< XAccessible > AccessibleGridControl::implGetTable()
     }
     return m_pImpl->m_xTable;
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible >
 AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType )
@@ -299,7 +299,7 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType
     }
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible >
 AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
 {
@@ -318,14 +318,14 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
     }
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
 {
     Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator;
         OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGirdControl::createAccessibleTable: my creator died - how this?" );
     return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
 }
-// -----------------------------------------------------------------------------
+
 void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue)
 {
     sal_Int32 nChildCount = getAccessibleChildCount();
@@ -406,7 +406,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe
 // = AccessibleGridControlAccess
 // ============================================================================
 
-// -----------------------------------------------------------------------------
+
 AccessibleGridControlAccess::AccessibleGridControlAccess(
         const Reference< XAccessible >& rxParent, IAccessibleTable& rTable )
     : m_xParent( rxParent )
@@ -415,12 +415,12 @@ AccessibleGridControlAccess::AccessibleGridControlAccess(
 {
 }
 
-// -----------------------------------------------------------------------------
+
 AccessibleGridControlAccess::~AccessibleGridControlAccess()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 void AccessibleGridControlAccess::DisposeAccessImpl()
 {
     SolarMutexGuard g;
@@ -430,7 +430,7 @@ void AccessibleGridControlAccess::DisposeAccessImpl()
     ::comphelper::disposeComponent( m_xContext );
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException )
 {
     SolarMutexGuard g;
@@ -450,7 +450,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessi
     return m_xContext;
 }
 
-// -----------------------------------------------------------------------------
+
 bool AccessibleGridControlAccess::isContextAlive() const
 {
     return  ( NULL != m_pContext ) && m_pContext->isAlive();
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 8df5cf657956..ebe621522e2d 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -434,19 +434,19 @@ sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole()
     }
     return nRole;
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL AccessibleGridControlBase::getAccessibleKeyBinding()
         throw ( uno::RuntimeException )
 {
     return Any();
 }
-// -----------------------------------------------------------------------------
+
 Reference<XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& )
         throw ( uno::RuntimeException )
 {
     return NULL;
 }
-//// -----------------------------------------------------------------------------
+//
 sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -471,7 +471,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  ) throw (::com::su
     }
     return nColor;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -512,7 +512,7 @@ Reference< XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccess
     ensureIsAlive();
     return this;
 }
-// ----------------------------------------------------------------------------
+
 GridControlAccessibleElement::~GridControlAccessibleElement( )
 {
 }
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index f716a8aade25..8965d9d13346 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -67,7 +67,7 @@ AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nCol
 
     return pStateSetHelper;
 }
-// -----------------------------------------------------------------------------
+
 /** @return
         The count of visible children.
 */
@@ -76,7 +76,7 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount()
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 
 /** @return
         The XAccessible interface of the specified child.
@@ -115,14 +115,14 @@ Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC
         return this;
     }
 
-// -----------------------------------------------------------------------------
+
 
 /** Grabs the focus to the column header. */
 void SAL_CALL AccessibleGridControlHeaderCell::grabFocus()
     throw ( ::com::sun::star::uno::RuntimeException )
 {
 }
-// -----------------------------------------------------------------------------
+
 /** @return
         The name of this class.
 */
@@ -131,7 +131,7 @@ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName()
 {
     return OUString( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" );
 }
-// -----------------------------------------------------------------------------
+
 Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
 {
     Window* pParent = m_aTable.GetAccessibleParentWindow();
@@ -144,7 +144,7 @@ Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
         aCellRect = m_aTable.calcHeaderCellRect(false, nIndex);
     return Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize());
 }
-// -----------------------------------------------------------------------------
+
 
 Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
 {
@@ -157,7 +157,7 @@ Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
         aCellRect = m_aTable.calcHeaderCellRect(false, nIndex);
     return Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize());
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent()
     throw ( RuntimeException )
 {
@@ -167,9 +167,9 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent()
     sal_Int32 nIndex = m_nColumnRowId;
     return nIndex;
 }
-// -----------------------------------------------------------------------------
+
 } // namespace accessibility
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 84fdb1aaf146..ffbba4a6e4ea 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -51,7 +51,7 @@ namespace accessibility
     // =============================================================================
     // = AccessibleGridControlCell
     // =============================================================================
-    // -----------------------------------------------------------------------------
+
     AccessibleGridControlCell::AccessibleGridControlCell(
             const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable,
             sal_Int32 _nRowPos, sal_uInt16 _nColPos, AccessibleTableControlObjType _eType )
@@ -71,19 +71,19 @@ namespace accessibility
         implSetName( aAccName );
     }
 
-    // -----------------------------------------------------------------------------
+
     AccessibleGridControlCell::~AccessibleGridControlCell()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleGridControlCell::grabFocus() throw ( RuntimeException )
     {
         SolarMutexGuard aSolarGuard;
 
         m_aTable.GoToCell( m_nColPos, m_nRowPos );
     }
-    //// -----------------------------------------------------------------------------
+    //
     // implementation of a table cell
     OUString AccessibleGridControlTableCell::implGetText()
     {
@@ -352,7 +352,7 @@ namespace accessibility
         Rectangle aCell( Point( nX, nY ), aCellRect.GetSize());
         return aCell;
     }
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleGridControlTableCell::implGetBoundingBoxOnScreen()
     {
         Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( NULL );
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index e5279f3c0481..7014211050fc 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "accessibility/extended/AccessibleToolPanelDeck.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -35,11 +34,9 @@
 
 #include <boost/noncopyable.hpp>
 
-//......................................................................................................................
+
 namespace accessibility
 {
-//......................................................................................................................
-
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -67,9 +64,7 @@ namespace accessibility
 
     typedef ::com::sun::star::awt::Point        UnoPoint;
 
-    //==================================================================================================================
-    //= AccessibleToolPanelDeck_Impl - declaration
-    //==================================================================================================================
+    // AccessibleToolPanelDeck_Impl - declaration
     class AccessibleToolPanelDeck_Impl  :public ::boost::noncopyable
                                         ,public ::svt::IToolPanelDeckListener
     {
@@ -105,9 +100,7 @@ namespace accessibility
         Reference< XAccessible >        m_xActivePanelAccessible;
     };
 
-    //==================================================================================================================
-    //= MethodGuard
-    //==================================================================================================================
+    // MethodGuard
     namespace
     {
         class MethodGuard
@@ -127,10 +120,7 @@ namespace accessibility
         };
     }
 
-    //==================================================================================================================
-    //= AccessibleToolPanelDeck_Impl - implementation
-    //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+    // AccessibleToolPanelDeck_Impl - implementation
     AccessibleToolPanelDeck_Impl::AccessibleToolPanelDeck_Impl( AccessibleToolPanelDeck& i_rAntiImpl, const Reference< XAccessible >& i_rAccessibleParent,
             ::svt::ToolPanelDeck& i_rPanelDeck )
         :m_rAntiImpl( i_rAntiImpl )
@@ -141,14 +131,12 @@ namespace accessibility
         m_pPanelDeck->AddListener( *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     AccessibleToolPanelDeck_Impl::~AccessibleToolPanelDeck_Impl()
     {
         if ( !isDisposed() )
             dispose();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeck_Impl::dispose()
     {
         ENSURE_OR_RETURN_VOID( !isDisposed(), "disposed twice" );
@@ -157,14 +145,12 @@ namespace accessibility
         m_xAccessibleParent.clear();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeck_Impl::checkDisposed()
     {
         if ( isDisposed() )
             throw DisposedException( OUString(), *&m_rAntiImpl );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > AccessibleToolPanelDeck_Impl::getOwnAccessible() const
     {
         Reference< XAccessible > xOwnAccessible( static_cast< XAccessible* >( m_rAntiImpl.GetVCLXWindow() ) );
@@ -173,7 +159,6 @@ namespace accessibility
         return xOwnAccessible;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > AccessibleToolPanelDeck_Impl::getActivePanelAccessible()
     {
         ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: already disposed!", NULL );
@@ -191,20 +176,17 @@ namespace accessibility
         return m_xActivePanelAccessible;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeck_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         (void)i_pPanel;
         (void)i_nPosition;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeck_Impl::PanelRemoved( const size_t i_nPosition )
     {
         (void)i_nPosition;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeck_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
     {
         if ( !!i_rOldActive )
@@ -229,7 +211,6 @@ namespace accessibility
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeck_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
     {
         MethodGuard aGuard( *this );
@@ -238,17 +219,13 @@ namespace accessibility
         m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeck_Impl::Dying()
     {
         // the tool panel deck is dying, so dispose ourself
         m_rAntiImpl.dispose();
     }
 
-    //==================================================================================================================
-    //= AccessibleToolPanelDeck
-    //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+    // AccessibleToolPanelDeck
     AccessibleToolPanelDeck::AccessibleToolPanelDeck( const Reference< XAccessible >& i_rAccessibleParent,
             ::svt::ToolPanelDeck& i_rPanelDeck )
         :AccessibleToolPanelDeck_Base( i_rPanelDeck.GetWindowPeer() )
@@ -256,12 +233,10 @@ namespace accessibility
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     AccessibleToolPanelDeck::~AccessibleToolPanelDeck()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     sal_Int32 SAL_CALL AccessibleToolPanelDeck::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
@@ -275,7 +250,6 @@ namespace accessibility
         return nChildCount;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
@@ -296,7 +270,6 @@ namespace accessibility
         return m_pImpl->getActivePanelAccessible();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleParent(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
@@ -306,14 +279,12 @@ namespace accessibility
         return m_pImpl->m_xAccessibleParent;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     sal_Int16 SAL_CALL AccessibleToolPanelDeck::getAccessibleRole(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
         return AccessibleRole::PANEL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
@@ -351,21 +322,18 @@ namespace accessibility
         return NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelDeck::grabFocus(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
         m_pImpl->m_pPanelDeck->GrabFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelDeck::disposing()
     {
         AccessibleToolPanelDeck_Base::disposing();
         m_pImpl->dispose();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > AccessibleToolPanelDeck::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent )
     {
         // don't let the base class generate any A11Y events from VclWindowEvent, we completely manage those
@@ -374,7 +342,6 @@ namespace accessibility
         return NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeck::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
     {
         AccessibleToolPanelDeck_Base::FillAccessibleStateSet( i_rStateSet );
@@ -387,9 +354,6 @@ namespace accessibility
             i_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
         }
     }
-
-//......................................................................................................................
 } // namespace accessibility
-//......................................................................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index fc83bd59a865..0253b577d6c8 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "accessibility/extended/AccessibleToolPanelDeckTabBar.hxx"
 #include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx"
 #include "accessibility/helper/accresmgr.hxx"
@@ -40,11 +39,8 @@
 
 #include <vector>
 
-//......................................................................................................................
 namespace accessibility
 {
-//......................................................................................................................
-
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
@@ -67,9 +63,7 @@ namespace accessibility
 
     typedef ::com::sun::star::awt::Point        UnoPoint;
 
-    //==================================================================================================================
-    //= AccessibleWrapper
-    //==================================================================================================================
+    // AccessibleWrapper
     typedef ::cppu::WeakImplHelper1< XAccessible > AccessibleWrapper_Base;
     class AccessibleWrapper : public AccessibleWrapper_Base
     {
@@ -89,9 +83,7 @@ namespace accessibility
         const Reference< XAccessibleContext >   m_xContext;
     };
 
-    //==================================================================================================================
-    //= AccessibleToolPanelTabBar_Impl
-    //==================================================================================================================
+    // AccessibleToolPanelTabBar_Impl
     class AccessibleToolPanelTabBar_Impl    :public ::boost::noncopyable
                                             ,public ::svt::IToolPanelDeckListener
     {
@@ -132,7 +124,6 @@ namespace accessibility
         ::std::vector< Reference< XAccessible > >   m_aChildren;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
     AccessibleToolPanelTabBar_Impl::AccessibleToolPanelTabBar_Impl( AccessibleToolPanelTabBar& i_rAntiImpl,
             const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
         :m_rAntiImpl( i_rAntiImpl )
@@ -152,21 +143,18 @@ namespace accessibility
         i_rTabBar.GetScrollButton( false ).AddEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelTabBar_Impl::checkDisposed()
     {
         if ( isDisposed() )
             throw DisposedException( OUString(), *&m_rAntiImpl );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     AccessibleToolPanelTabBar_Impl::~AccessibleToolPanelTabBar_Impl()
     {
         if ( !isDisposed() )
             dispose();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelTabBar_Impl::dispose()
     {
         ENSURE_OR_RETURN_VOID( !isDisposed(), "disposed twice" );
@@ -180,7 +168,6 @@ namespace accessibility
         m_xAccessibleParent.clear();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem( size_t i_nPosition )
     {
         ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem: already disposed!", NULL );
@@ -197,7 +184,6 @@ namespace accessibility
         return rAccessibleChild;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > AccessibleToolPanelTabBar_Impl::getOwnAccessible() const
     {
         Reference< XAccessible > xOwnAccessible( static_cast< XAccessible* >( m_rAntiImpl.GetVCLXWindow() ) );
@@ -206,7 +192,6 @@ namespace accessibility
         return xOwnAccessible;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelTabBar_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         ENSURE_OR_RETURN_VOID( i_nPosition <= m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::PanelInserted: illegal position (or invalid cache!)" );
@@ -215,7 +200,6 @@ namespace accessibility
         m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny( getAccessiblePanelItem( i_nPosition ) ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelTabBar_Impl::PanelRemoved( const size_t i_nPosition )
     {
         ENSURE_OR_RETURN_VOID( i_nPosition < m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::PanelInserted: illegal position (or invalid cache!)" );
@@ -225,27 +209,23 @@ namespace accessibility
         m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, makeAny( xOldChild ), Any() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelTabBar_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
     {
         (void)i_rOldActive;
         (void)i_rNewActive;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelTabBar_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
     {
         (void)i_rNewLayouter;
         m_rAntiImpl.dispose();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelTabBar_Impl::Dying()
     {
         m_rAntiImpl.dispose();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     IMPL_LINK( AccessibleToolPanelTabBar_Impl, OnWindowEvent, const VclSimpleEvent*, i_pEvent )
     {
         ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelTabBar_Impl::OnWindowEvent: already disposed!", 0L );
@@ -272,9 +252,7 @@ namespace accessibility
         return 1L;
     }
 
-    //==================================================================================================================
-    //= MethodGuard
-    //==================================================================================================================
+    // MethodGuard
     namespace
     {
         class MethodGuard
@@ -294,10 +272,7 @@ namespace accessibility
         };
     }
 
-    //==================================================================================================================
-    //= AccessibleToolPanelTabBar
-    //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+    // AccessibleToolPanelTabBar
     AccessibleToolPanelTabBar::AccessibleToolPanelTabBar( const Reference< XAccessible >& i_rAccessibleParent,
             ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
         :AccessibleToolPanelTabBar_Base( i_rTabBar.GetWindowPeer() )
@@ -305,12 +280,10 @@ namespace accessibility
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     AccessibleToolPanelTabBar::~AccessibleToolPanelTabBar()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     sal_Int32 SAL_CALL AccessibleToolPanelTabBar::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
@@ -323,7 +296,6 @@ namespace accessibility
             +   ( bHasScrollForward ? 1 : 0 );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
@@ -351,21 +323,18 @@ namespace accessibility
         return m_pImpl->getAccessiblePanelItem( i_nIndex - ( bHasScrollBack ? 1 : 0 ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleParent(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
         return m_pImpl->getAccessibleParent();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     sal_Int16 SAL_CALL AccessibleToolPanelTabBar::getAccessibleRole(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
         return AccessibleRole::PAGE_TAB_LIST;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     namespace
     {
         bool lcl_covers( const ::Window& i_rWindow, const ::Point& i_rPoint )
@@ -375,7 +344,6 @@ namespace accessibility
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
@@ -406,14 +374,12 @@ namespace accessibility
         return NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelTabBar::disposing()
     {
         AccessibleToolPanelTabBar_Base::disposing();
         m_pImpl->dispose();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessible > AccessibleToolPanelTabBar::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent )
     {
         // don't let the base class generate any A11Y events from VclWindowEvent, we completely manage those
@@ -422,7 +388,6 @@ namespace accessibility
         return NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelTabBar::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
     {
         AccessibleToolPanelTabBar_Base::FillAccessibleStateSet( i_rStateSet );
@@ -434,9 +399,6 @@ namespace accessibility
         else
             i_rStateSet.AddState( AccessibleStateType::HORIZONTAL );
     }
-
-//......................................................................................................................
 } // namespace accessibility
-//......................................................................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index 8b7a2fdb0bdf..f5ef6d74ddcb 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -34,11 +33,8 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
-//......................................................................................................................
 namespace accessibility
 {
-//......................................................................................................................
-
     typedef ::com::sun::star::awt::Rectangle    UnoRectangle;
     typedef ::com::sun::star::awt::Point        UnoPoint;
 
@@ -66,9 +62,7 @@ namespace accessibility
     namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleStateType;
     namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId;
 
-    //==================================================================================================================
-    //= AccessibleToolPanelDeckTabBarItem_Impl
-    //==================================================================================================================
+    // AccessibleToolPanelDeckTabBarItem_Impl
     class AccessibleToolPanelDeckTabBarItem_Impl : public ::svt::IToolPanelDeckListener
     {
     public:
@@ -115,10 +109,7 @@ namespace accessibility
         size_t                              m_nItemPos;
     };
 
-    //==================================================================================================================
-    //= AccessibleToolPanelDeckTabBarItem_Impl
-    //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+    // AccessibleToolPanelDeckTabBarItem_Impl
     AccessibleToolPanelDeckTabBarItem_Impl::AccessibleToolPanelDeckTabBarItem_Impl( AccessibleToolPanelDeckTabBarItem& i_rAntiImpl,
             const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar,
             const size_t i_nItemPos )
@@ -131,19 +122,16 @@ namespace accessibility
         m_pPanelDeck->AddListener( *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     AccessibleToolPanelDeckTabBarItem_Impl::~AccessibleToolPanelDeckTabBarItem_Impl()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::checkDisposed() const
     {
         if ( isDisposed() )
             throw DisposedException( OUString(), *&m_rAntiImpl );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::dispose()
     {
         ENSURE_OR_RETURN_VOID( !isDisposed(), "AccessibleToolPanelDeckTabBarItem_Impl::dispose: disposed twice!" );
@@ -154,14 +142,12 @@ namespace accessibility
         m_pTabBar = NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessibleComponent > AccessibleToolPanelDeckTabBarItem_Impl::getParentAccessibleComponent() const
     {
         Reference< XAccessible > xAccessibleParent( m_rAntiImpl.getAccessibleParent(), UNO_QUERY_THROW );
         return Reference< XAccessibleComponent >( xAccessibleParent->getAccessibleContext(), UNO_QUERY );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     OUString AccessibleToolPanelDeckTabBarItem_Impl::getPanelDisplayName()
     {
         const ::svt::PToolPanel pPanel( m_pPanelDeck->GetPanel( getItemPos() ) );
@@ -170,13 +156,11 @@ namespace accessibility
         return pPanel->GetDisplayName();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::impl_notifyBoundRectChanges()
     {
         m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::impl_notifyStateChange( const sal_Int16 i_nLostState, const sal_Int16 i_nGainedState )
     {
         m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
@@ -185,7 +169,6 @@ namespace accessibility
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         (void)i_pPanel;
@@ -194,7 +177,6 @@ namespace accessibility
         impl_notifyBoundRectChanges();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::PanelRemoved( const size_t i_nPosition )
     {
         if ( i_nPosition == m_nItemPos )
@@ -208,7 +190,6 @@ namespace accessibility
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
     {
         if ( m_nItemPos == i_rOldActive )
@@ -223,7 +204,6 @@ namespace accessibility
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
     {
         (void)i_rNewLayouter;
@@ -232,16 +212,12 @@ namespace accessibility
         dispose();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     void AccessibleToolPanelDeckTabBarItem_Impl::Dying()
     {
         // if the tool panel deck is dying, then its layouter dies, so should we.
         dispose();
     }
 
-    //==================================================================================================================
-    //= ItemMethodGuard
-    //==================================================================================================================
     class ItemMethodGuard
     {
     public:
@@ -258,10 +234,6 @@ namespace accessibility
         SolarMutexGuard  m_aGuard;
     };
 
-    //==================================================================================================================
-    //= AccessibleToolPanelDeckTabBarItem
-    //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
     AccessibleToolPanelDeckTabBarItem::AccessibleToolPanelDeckTabBarItem( const Reference< XAccessible >& i_rAccessibleParent,
             ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar, const size_t i_nItemPos )
         : ::comphelper::OAccessibleExtendedComponentHelper(
@@ -271,52 +243,44 @@ namespace accessibility
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
     AccessibleToolPanelDeckTabBarItem::~AccessibleToolPanelDeckTabBarItem()
     {
     }
 
-    //--------------------------------------------------------------------
     sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         return 0;
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         (void)i;
         throw IndexOutOfBoundsException( OUString(), *this );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getAccessibleParent();
     }
 
-    //--------------------------------------------------------------------
     sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole(  ) throw (RuntimeException)
     {
         return AccessibleRole::PAGE_TAB;
     }
 
-    //--------------------------------------------------------------------
     OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getPanelDisplayName();
     }
 
-    //--------------------------------------------------------------------
     OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getPanelDisplayName();
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
@@ -324,7 +288,6 @@ namespace accessibility
         return pRelationSet;
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
@@ -355,8 +318,6 @@ namespace accessibility
         return pStateSet;
     }
 
-
-    //--------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
@@ -365,14 +326,12 @@ namespace accessibility
         return NULL;
     }
 
-    //--------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         m_pImpl->getTabBar()->FocusPanelItem( m_pImpl->getItemPos() );
     }
 
-    //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
@@ -380,7 +339,6 @@ namespace accessibility
         return xParentComponent->getForeground();
     }
 
-    //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
@@ -388,7 +346,6 @@ namespace accessibility
         return xParentComponent->getBackground();
     }
 
-    //--------------------------------------------------------------------
     Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
@@ -398,7 +355,6 @@ namespace accessibility
         return xParentComponent->getFont();
     }
 
-    //--------------------------------------------------------------------
     OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
@@ -406,14 +362,12 @@ namespace accessibility
         return OUString();
     }
 
-    //--------------------------------------------------------------------
     OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getPanelDisplayName();
     }
 
-    //--------------------------------------------------------------------
     UnoRectangle SAL_CALL AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
@@ -430,15 +384,11 @@ namespace accessibility
         );
     }
 
-    //--------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelDeckTabBarItem::disposing()
     {
         ItemMethodGuard aGuard( *m_pImpl );
         m_pImpl->dispose();
     }
-
-//......................................................................................................................
 } // namespace accessibility
-//......................................................................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index f0c49de44251..1056de2e988b 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -20,19 +20,14 @@
 #include "accessibility/extended/accessiblebrowseboxcell.hxx"
 #include <svtools/accessibletableprovider.hxx>
 
-// .................................................................................
 namespace accessibility
 {
-// .................................................................................
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::accessibility;
     using namespace ::svt;
 
-    // =============================================================================
-    // = AccessibleBrowseBoxCell
-    // =============================================================================
+    // AccessibleBrowseBoxCell
     AccessibleBrowseBoxCell::AccessibleBrowseBoxCell(
             const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
             const Reference< XWindow >& _xFocusWindow,
@@ -48,32 +43,25 @@ namespace accessibility
         implSetName( aAccName );
     }
 
-    // -----------------------------------------------------------------------------
     AccessibleBrowseBoxCell::~AccessibleBrowseBoxCell()
     {
     }
 
-    // -----------------------------------------------------------------------------
     void SAL_CALL AccessibleBrowseBoxCell::grabFocus() throw ( RuntimeException )
     {
         SolarMethodGuard aGuard( *this );
         mpBrowseBox->GoToCell( m_nRowPos, m_nColPos );
     }
-    // -----------------------------------------------------------------------------
+
     ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox()
     {
         return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False, sal_False );
     }
 
-    // -----------------------------------------------------------------------------
     ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen()
     {
         return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False );
     }
-
-// .................................................................................
 }   // namespace accessibility
-// .................................................................................
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index de61a4a059d5..c58ef312544c 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -23,12 +23,8 @@
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
-
-// .................................................................................
 namespace accessibility
 {
-// .................................................................................
-
     using namespace com::sun::star::accessibility;
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
@@ -36,7 +32,6 @@ namespace accessibility
     using namespace ::comphelper;
     using namespace ::svt;
 
-    // -----------------------------------------------------------------------------
     EditBrowseBoxTableCell::EditBrowseBoxTableCell(
                 const com::sun::star::uno::Reference< XAccessible >& _rxParent,
                 const com::sun::star::uno::Reference< XAccessible >& _rxOwningAccessible,
@@ -51,7 +46,6 @@ namespace accessibility
         aggregateProxy( m_refCount, *this );
     }
 
-    // -----------------------------------------------------------------------------
     EditBrowseBoxTableCell::~EditBrowseBoxTableCell()
     {
         if ( !rBHelper.bDisposed )
@@ -61,26 +55,21 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
     OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException )
     {
         return OUString( "com.sun.star.comp.svtools.TableCellProxy" );
     }
 
-    // -----------------------------------------------------------------------------
     IMPLEMENT_FORWARD_XINTERFACE2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper )
 
-    // -----------------------------------------------------------------------------
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper )
 
-    // -----------------------------------------------------------------------------
     void EditBrowseBoxTableCell::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException)
     {
         commitEvent( _rEvent.EventId, _rEvent.NewValue, _rEvent.OldValue );
     }
 
     // XAccessibleComponent
-    // -----------------------------------------------------------------------------
     sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground(  ) throw (RuntimeException)
     {
         SolarMethodGuard aGuard( *this );
@@ -90,7 +79,6 @@ namespace accessibility
         return 0;
     }
 
-    // -----------------------------------------------------------------------------
     sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground(  ) throw (RuntimeException)
     {
         SolarMethodGuard aGuard( *this );
@@ -100,20 +88,17 @@ namespace accessibility
         return 0;
     }
 
-    // -----------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent(  ) throw (RuntimeException)
     {
         return m_xParentAccessible;
     }
 
-    // -----------------------------------------------------------------------------
     OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException )
     {
         SolarMethodGuard aGuard( *this );
         return m_xInnerContext->getAccessibleDescription();
     }
 
-    // -----------------------------------------------------------------------------
     OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException )
     {
         SolarMethodGuard aGuard( *this );
@@ -122,14 +107,12 @@ namespace accessibility
         return "Column " + OUString::number(getColumnPos()-1) + ", Row " + OUString::number(getRowPos());
     }
 
-    // -----------------------------------------------------------------------------
     Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException )
     {
         SolarMethodGuard aGuard( *this );
         return OAccessibleContextWrapperHelper::getAccessibleRelationSet( );
     }
 
-    // -----------------------------------------------------------------------------
     Reference<XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException )
     {
         SolarMethodGuard aGuard( *this );
@@ -137,27 +120,24 @@ namespace accessibility
             // TODO: shouldn't we add an ACTIVE here? Isn't the EditBrowseBoxTableCell always ACTIVE?
     }
 
-    // -----------------------------------------------------------------------------
     sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         SolarMethodGuard aGuard( *this );
         return OAccessibleContextWrapperHelper::getAccessibleChildCount();
     }
 
-    // -----------------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
     {
         SolarMethodGuard aGuard( *this );
         return OAccessibleContextWrapperHelper::getAccessibleChild( i );
     }
 
-    // -----------------------------------------------------------------------------
     sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() throw ( RuntimeException )
     {
         SolarMethodGuard aGuard( *this );
         return m_xInnerContext->getAccessibleRole( );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL EditBrowseBoxTableCell::dispose() throw( RuntimeException )
     {
         // simply disambiguate. Note that the OComponentHelper base in AccessibleBrowseBoxCell
@@ -165,13 +145,13 @@ namespace accessibility
         // so there is no need to do this here.
         AccessibleBrowseBoxCell::dispose();
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL EditBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         AccessibleBrowseBoxCell::disposing( _rSource );
         OAccessibleContextWrapperHelper::disposing( _rSource );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL EditBrowseBoxTableCell::disposing()
     {
         SolarMethodGuard aGuard( *this, false );
@@ -179,9 +159,8 @@ namespace accessibility
             // TODO: do we need to dispose our inner object? The base class does this, but is it a good idea?
         AccessibleBrowseBoxCell::disposing();
     }
-    // =============================================================================
-    // = EditBrowseBoxTableCell
-    // =============================================================================
+
+    // EditBrowseBoxTableCell
     EditBrowseBoxTableCellAccess::EditBrowseBoxTableCellAccess(
             const Reference< XAccessible >& _rxParent, const Reference< XAccessible > _rxControlAccessible,
             const Reference< XWindow >& _rxFocusWindow,
@@ -195,11 +174,11 @@ namespace accessibility
         ,m_nColPos( _nColPos )
     {
     }
-    // -----------------------------------------------------------------------------
+
     EditBrowseBoxTableCellAccess::~EditBrowseBoxTableCellAccess( )
     {
     }
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext(  ) throw (RuntimeException)
     {
         if ( !m_pBrowseBox || !m_xControlAccessible.is() )
@@ -215,7 +194,7 @@ namespace accessibility
         }
         return xMyContext;
     }
-    //--------------------------------------------------------------------
+
     void SAL_CALL EditBrowseBoxTableCellAccess::disposing()
     {
         // dispose our context, if it still alive
@@ -239,8 +218,6 @@ namespace accessibility
         // NO dispose of the inner object there: it is the XAccessible of an window, and disposing
         // it would delete the respective VCL window
     }
-// .................................................................................
 } // namespace accessibility
-// .................................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 460ee4dafa75..8b2fd453c3bf 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -40,23 +40,23 @@ namespace accessibility
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star;
 
-    // -----------------------------------------------------------------------------
+
     // Ctor() and Dtor()
-    // -----------------------------------------------------------------------------
+
     AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) :
 
         VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ),
         m_xParent       ( _xParent )
     {
     }
-    // -----------------------------------------------------------------------------
+
     AccessibleIconChoiceCtrl::~AccessibleIconChoiceCtrl()
     {
     }
-    // -----------------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2(AccessibleIconChoiceCtrl, VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
     IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleIconChoiceCtrl, VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
-    // -----------------------------------------------------------------------------
+
     void AccessibleIconChoiceCtrl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
         if ( isAlive() )
@@ -116,35 +116,35 @@ namespace accessibility
             }
         }
     }
-    // -----------------------------------------------------------------------------
+
     // XComponent
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrl::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         m_xParent = NULL;
     }
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException)
     {
         return getImplementationName_Static();
     }
-    // -----------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
     {
         return cppu::supportsService(this, _rServiceName);
     }
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo - static methods
-    // -----------------------------------------------------------------------------
+
     Sequence< OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static(void) throw (RuntimeException)
     {
         Sequence< OUString > aSupported(3);
@@ -153,22 +153,22 @@ namespace accessibility
         aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControl";
         return aSupported;
     }
-    // -----------------------------------------------------------------------------
+
     OUString AccessibleIconChoiceCtrl::getImplementationName_Static(void) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControl" );
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessible
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext(  ) throw (RuntimeException)
     {
         ensureAlive();
         return this;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleContext
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -176,7 +176,7 @@ namespace accessibility
         ensureAlive();
         return getCtrl()->GetEntryCount();
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, IndexOutOfBoundsException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -189,7 +189,7 @@ namespace accessibility
 
         return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this );
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -197,13 +197,13 @@ namespace accessibility
         ensureAlive();
         return m_xParent;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole(  ) throw (RuntimeException)
     {
         //return AccessibleRole::TREE;
         return AccessibleRole::LIST;
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -211,7 +211,7 @@ namespace accessibility
         ensureAlive();
         return getCtrl()->GetAccessibleDescription();
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -223,9 +223,9 @@ namespace accessibility
             sName = "IconChoiceControl";
         return sName;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleSelection
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -239,7 +239,7 @@ namespace accessibility
 
         pCtrl->SetCursor( pEntry );
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -253,7 +253,7 @@ namespace accessibility
 
         return ( pCtrl->GetCursor() == pEntry );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -261,7 +261,7 @@ namespace accessibility
         ensureAlive();
         getCtrl()->SetNoSelection();
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -277,7 +277,7 @@ namespace accessibility
                 pCtrl->SetCursor( pEntry );
         }
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -296,7 +296,7 @@ namespace accessibility
 
         return nSelCount;
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -325,7 +325,7 @@ namespace accessibility
 
         return xChild;
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -355,7 +355,7 @@ namespace accessibility
         if ( 1 == nSelCount && bFound )
             pCtrl->SetNoSelection();
     }
-    // -----------------------------------------------------------------------------
+
     void AccessibleIconChoiceCtrl::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
     {
         VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
@@ -366,7 +366,7 @@ namespace accessibility
             rStateSet.AddState( AccessibleStateType::SELECTABLE );
         }
     }
-    // -----------------------------------------------------------------------------
+
     SvtIconChoiceCtrl* AccessibleIconChoiceCtrl::getCtrl()
     {
         return static_cast<SvtIconChoiceCtrl*>(GetWindow());
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index acbda971a2a9..6fc8a1e183e8 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -61,9 +61,9 @@ namespace accessibility
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star;
 
-    // -----------------------------------------------------------------------------
+
     // Ctor() and Dtor()
-    // -----------------------------------------------------------------------------
+
     AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
                                                                   sal_uLong _nPos,
                                                                   const Reference< XAccessible >& _xParent ) :
@@ -84,7 +84,7 @@ namespace accessibility
         }
         osl_atomic_decrement( &m_refCount );
     }
-    // -----------------------------------------------------------------------------
+
     void AccessibleIconChoiceCtrlEntry::disposing( const EventObject& _rSource )
 throw(RuntimeException)
     {
@@ -94,7 +94,7 @@ throw(RuntimeException)
             OSL_ENSURE( !m_xParent.is() && ( NULL == m_pIconCtrl ), "" );
         }
     }
-    // -----------------------------------------------------------------------------
+
     AccessibleIconChoiceCtrlEntry::~AccessibleIconChoiceCtrlEntry()
     {
         if ( IsAlive_Impl() )
@@ -104,7 +104,7 @@ throw(RuntimeException)
             dispose();
         }
     }
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const
     {
         Rectangle aRect;
@@ -114,7 +114,7 @@ throw(RuntimeException)
 
         return aRect;
     }
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen_Impl() const
     {
         Rectangle aRect;
@@ -129,12 +129,12 @@ throw(RuntimeException)
 
         return aRect;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool AccessibleIconChoiceCtrlEntry::IsAlive_Impl() const
     {
         return ( !rBHelper.bDisposed && !rBHelper.bInDispose && m_pIconCtrl );
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool AccessibleIconChoiceCtrlEntry::IsShowing_Impl() const
     {
         sal_Bool bShowing = sal_False;
@@ -149,7 +149,7 @@ throw(RuntimeException)
 
         return bShowing;
     }
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox()
         throw (lang::DisposedException, uno::RuntimeException)
     {
@@ -159,7 +159,7 @@ throw(RuntimeException)
         EnsureIsAlive();
         return GetBoundingBox_Impl();
     }
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen()
         throw (lang::DisposedException, uno::RuntimeException)
     {
@@ -169,13 +169,13 @@ throw(RuntimeException)
         EnsureIsAlive();
         return GetBoundingBoxOnScreen_Impl();
     }
-    // -----------------------------------------------------------------------------
+
     void AccessibleIconChoiceCtrlEntry::EnsureIsAlive() const throw ( lang::DisposedException )
     {
         if ( !IsAlive_Impl() )
             throw lang::DisposedException();
     }
-    // -----------------------------------------------------------------------------
+
     OUString AccessibleIconChoiceCtrlEntry::implGetText()
     {
         OUString sRet;
@@ -184,7 +184,7 @@ throw(RuntimeException)
             sRet = pEntry->GetDisplayText();
         return sRet;
     }
-    // -----------------------------------------------------------------------------
+
     Locale AccessibleIconChoiceCtrlEntry::implGetLocale()
     {
         Locale aLocale;
@@ -197,10 +197,10 @@ throw(RuntimeException)
         nStartIndex = 0;
         nEndIndex = 0;
     }
-    // -----------------------------------------------------------------------------
+
     // XTypeProvider
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
+
+
     Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() throw (RuntimeException)
     {
         static ::cppu::OImplementationId* pId = NULL;
@@ -217,9 +217,9 @@ throw(RuntimeException)
         }
         return pId->getImplementationId();
     }
-    // -----------------------------------------------------------------------------
+
     // XComponent
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrlEntry::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -239,26 +239,26 @@ throw(RuntimeException)
         m_pIconCtrl = NULL;
         m_xParent = NULL;
     }
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
-    // -----------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
     {
         return cppu::supportsService(this, _rServiceName);
     }
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo - static methods
-    // -----------------------------------------------------------------------------
+
     Sequence< OUString > AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static(void) throw( RuntimeException )
     {
         Sequence< OUString > aSupported(3);
@@ -267,32 +267,32 @@ throw(RuntimeException)
         aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControlEntry";
         return aSupported;
     }
-    // -----------------------------------------------------------------------------
+
     OUString AccessibleIconChoiceCtrlEntry::getImplementationName_Static(void) throw( RuntimeException )
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControlEntry" );
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessible
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext(  ) throw (RuntimeException)
     {
         EnsureIsAlive();
         return this;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleContext
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         return 0; // no children
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException,RuntimeException)
     {
         throw IndexOutOfBoundsException();
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -300,26 +300,26 @@ throw(RuntimeException)
         EnsureIsAlive();
         return m_xParent;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return m_nIndex;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole(  ) throw (RuntimeException)
     {
         //return AccessibleRole::LABEL;
         return AccessibleRole::LIST_ITEM;
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription(  ) throw (RuntimeException)
     {
         // no description for every item
         return OUString();
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -327,12 +327,12 @@ throw(RuntimeException)
         EnsureIsAlive();
         return implGetText();
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
         return new utl::AccessibleRelationSetHelper;
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -361,7 +361,7 @@ throw(RuntimeException)
 
         return xStateSet;
     }
-    // -----------------------------------------------------------------------------
+
     Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -369,44 +369,44 @@ throw(RuntimeException)
 
         return implGetLocale();
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleComponent
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException)
     {
         return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
     {
         return Reference< XAccessible >();
     }
-    // -----------------------------------------------------------------------------
+
     awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds(  ) throw (RuntimeException)
     {
         return AWTRectangle( GetBoundingBox() );
     }
-    // -----------------------------------------------------------------------------
+
     awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation(  ) throw (RuntimeException)
     {
         return AWTPoint( GetBoundingBox().TopLeft() );
     }
-    // -----------------------------------------------------------------------------
+
     awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen(  ) throw (RuntimeException)
     {
         return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
     }
-    // -----------------------------------------------------------------------------
+
     awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize(  ) throw (RuntimeException)
     {
         return AWTSize( GetBoundingBox().GetSize() );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus(  ) throw (RuntimeException)
     {
         // do nothing, because no focus for each item
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -423,7 +423,7 @@ throw(RuntimeException)
 
         return nColor;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -440,10 +440,10 @@ throw(RuntimeException)
 
         return nColor;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleText
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
+
+
     awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -463,7 +463,7 @@ throw(RuntimeException)
 
         return aBounds;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -492,7 +492,7 @@ throw(RuntimeException)
 
         return nIndex;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -508,9 +508,9 @@ throw(RuntimeException)
 
         return sal_True;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleEventBroadcaster
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
     {
         if (xListener.is())
@@ -521,7 +521,7 @@ throw(RuntimeException)
             comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener );
         }
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
     {
         if (xListener.is())
@@ -654,9 +654,9 @@ throw(RuntimeException)
         return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleAction
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -664,7 +664,7 @@ throw(RuntimeException)
         // three actions supported
         return ACCESSIBLE_ACTION_COUNT;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -684,7 +684,7 @@ throw(RuntimeException)
 
         return bRet;
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -696,7 +696,7 @@ throw(RuntimeException)
         static const OUString sActionDesc( "Select" );
         return sActionDesc;
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 795e66a610b0..df275ccf46c2 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -45,16 +45,16 @@ namespace accessibility
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star;
 
-    // -----------------------------------------------------------------------------
+
     // Ctor() and Dtor()
-    // -----------------------------------------------------------------------------
+
     AccessibleListBox::AccessibleListBox( SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) :
 
         VCLXAccessibleComponent( _rListBox.GetWindowPeer() ),
         m_xParent( _xParent )
     {
     }
-    // -----------------------------------------------------------------------------
+
     AccessibleListBox::~AccessibleListBox()
     {
         if ( isAlive() )
@@ -66,12 +66,12 @@ namespace accessibility
     }
     IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_BASE)
     IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_BASE)
-    // -----------------------------------------------------------------------------
+
     SvTreeListBox* AccessibleListBox::getListBox() const
     {
         return  static_cast< SvTreeListBox* >( const_cast<AccessibleListBox*>(this)->GetWindow() );
     }
-    // -----------------------------------------------------------------------------
+
     void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
         if ( isAlive() )
@@ -291,7 +291,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     void AccessibleListBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
     {
         switch ( rVclWindowEvent.GetId() )
@@ -309,9 +309,9 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XComponent
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBox::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -320,26 +320,26 @@ namespace accessibility
         VCLXAccessibleComponent::disposing();
         m_xParent = NULL;
     }
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
-    // -----------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
     {
         return cppu::supportsService(this, _rServiceName);
     }
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo - static methods
-    // -----------------------------------------------------------------------------
+
     Sequence< OUString > AccessibleListBox::getSupportedServiceNames_Static(void) throw( RuntimeException )
     {
         Sequence< OUString > aSupported(3);
@@ -348,22 +348,22 @@ namespace accessibility
         aSupported[2] = "com.sun.star.awt.AccessibleTreeListBox";
         return aSupported;
     }
-    // -----------------------------------------------------------------------------
+
     OUString AccessibleListBox::getImplementationName_Static(void) throw( RuntimeException )
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBox" );
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessible
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext(  ) throw (RuntimeException)
     {
         ensureAlive();
         return this;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleContext
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -377,7 +377,7 @@ namespace accessibility
 
         return nCount;
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -391,7 +391,7 @@ namespace accessibility
         //return new AccessibleListBoxEntry( *getListBox(), pEntry, this );
         return new AccessibleListBoxEntry( *getListBox(), pEntry, NULL );
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -399,7 +399,7 @@ namespace accessibility
         ensureAlive();
         return m_xParent;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 AccessibleListBox::GetRoleType()
     {
         sal_Int32 nCase = 0;
@@ -453,7 +453,7 @@ namespace accessibility
             else
             return AccessibleRole::TREE;
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleListBox::getAccessibleDescription(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -461,7 +461,7 @@ namespace accessibility
         ensureAlive();
         return getListBox()->GetAccessibleDescription();
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleListBox::getAccessibleName(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -469,9 +469,9 @@ namespace accessibility
         ensureAlive();
         return getListBox()->GetAccessibleName();
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleSelection
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -484,7 +484,7 @@ namespace accessibility
 
         getListBox()->Select( pEntry, sal_True );
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -497,7 +497,7 @@ namespace accessibility
 
         return getListBox()->IsSelected( pEntry );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBox::clearAccessibleSelection(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -512,7 +512,7 @@ namespace accessibility
                 getListBox()->Select( pEntry, sal_False );
         }
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBox::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -527,7 +527,7 @@ namespace accessibility
                 getListBox()->Select( pEntry, sal_True );
         }
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -536,7 +536,7 @@ namespace accessibility
 
         return getListBox()->GetSelectionCount();
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -566,7 +566,7 @@ namespace accessibility
 
         return xChild;
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
@@ -579,7 +579,7 @@ namespace accessibility
 
         getListBox()->Select( pEntry, sal_False );
     }
-    // -----------------------------------------------------------------------------
+
     void AccessibleListBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
     {
         VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index eb6b9f23b232..1dcdb0fc04bd 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -66,9 +66,9 @@ namespace accessibility
     using namespace ::com::sun::star;
     using namespace ::comphelper;
 
-    // -----------------------------------------------------------------------------
+
     // Ctor() and Dtor()
-    // -----------------------------------------------------------------------------
+
     AccessibleListBoxEntry::AccessibleListBoxEntry( SvTreeListBox& _rListBox,
                                                     SvTreeListEntry* _pEntry,
                                                     const Reference< XAccessible >& _xParent ) :
@@ -83,7 +83,7 @@ namespace accessibility
     {
         _rListBox.FillEntryPath( _pEntry, m_aEntryPath );
     }
-    // -----------------------------------------------------------------------------
+
     AccessibleListBoxEntry::~AccessibleListBoxEntry()
     {
         if ( IsAlive_Impl() )
@@ -106,7 +106,7 @@ namespace accessibility
     }
 
 
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const
     {
         Rectangle aRect;
@@ -126,7 +126,7 @@ namespace accessibility
 
         return aRect;
     }
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen_Impl() const
     {
         Rectangle aRect;
@@ -141,12 +141,12 @@ namespace accessibility
 
         return aRect;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool AccessibleListBoxEntry::IsAlive_Impl() const
     {
         return ( !rBHelper.bDisposed && !rBHelper.bInDispose && isAlive() );
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool AccessibleListBoxEntry::IsShowing_Impl() const
     {
         Reference< XAccessible > xParent = implGetParentAccessible( );
@@ -163,7 +163,7 @@ namespace accessibility
 
         return bShowing;
     }
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleListBoxEntry::GetBoundingBox()
         throw (lang::DisposedException, uno::RuntimeException)
     {
@@ -173,7 +173,7 @@ namespace accessibility
         EnsureIsAlive();
         return GetBoundingBox_Impl();
     }
-    // -----------------------------------------------------------------------------
+
     Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen()
         throw (lang::DisposedException, uno::RuntimeException)
     {
@@ -183,13 +183,13 @@ namespace accessibility
         EnsureIsAlive();
         return GetBoundingBoxOnScreen_Impl();
     }
-    // -----------------------------------------------------------------------------
+
     void AccessibleListBoxEntry::EnsureIsAlive() const throw ( lang::DisposedException )
     {
         if ( !IsAlive_Impl() )
             throw lang::DisposedException();
     }
-    // -----------------------------------------------------------------------------
+
     OUString AccessibleListBoxEntry::implGetText()
     {
         OUString sRet;
@@ -198,7 +198,7 @@ namespace accessibility
             sRet = getListBox()->SearchEntryTextWithHeadTitle( pEntry );
         return sRet;
     }
-    // -----------------------------------------------------------------------------
+
     Locale AccessibleListBoxEntry::implGetLocale()
     {
         Locale aLocale;
@@ -211,10 +211,10 @@ namespace accessibility
         nStartIndex = 0;
         nEndIndex = 0;
     }
-    // -----------------------------------------------------------------------------
+
     // XTypeProvider
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
+
+
     Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() throw (RuntimeException)
     {
         static ::cppu::OImplementationId* pId = NULL;
@@ -232,17 +232,17 @@ namespace accessibility
         return pId->getImplementationId();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XComponent/ListBoxAccessibleBase
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::dispose() throw ( uno::RuntimeException )
     {
         AccessibleListBoxEntry_BASE::dispose();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XComponent
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::disposing()
     {
         SolarMutexGuard();
@@ -265,26 +265,26 @@ namespace accessibility
         }
         m_aParent = WeakReference< XAccessible >();
     }
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
-    // -----------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
     {
         return cppu::supportsService(this, _rServiceName);
     }
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo - static methods
-    // -----------------------------------------------------------------------------
+
     Sequence< OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static(void) throw( RuntimeException )
     {
         Sequence< OUString > aSupported(3);
@@ -293,22 +293,22 @@ namespace accessibility
         aSupported[2] = "com.sun.star.awt.AccessibleTreeListBoxEntry";
         return aSupported;
     }
-    // -----------------------------------------------------------------------------
+
     OUString AccessibleListBoxEntry::getImplementationName_Static(void) throw( RuntimeException )
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBoxEntry" );
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessible
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext(  ) throw (RuntimeException)
     {
         EnsureIsAlive();
         return this;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleContext
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -322,7 +322,7 @@ namespace accessibility
 
         return nCount;
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -336,7 +336,7 @@ namespace accessibility
         return new AccessibleListBoxEntry( *getListBox(), pEntry, this );
     }
 
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > AccessibleListBoxEntry::implGetParentAccessible( ) const
     {
         Reference< XAccessible > xParent = (Reference< XAccessible >)m_aParent;
@@ -373,7 +373,7 @@ namespace accessibility
         return xParent;
     }
 
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -382,7 +382,7 @@ namespace accessibility
 
         return implGetParentAccessible( );
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -390,7 +390,7 @@ namespace accessibility
         OSL_ENSURE( !m_aEntryPath.empty(), "empty path" );
         return m_aEntryPath.empty() ? -1 : m_aEntryPath.back();
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 AccessibleListBoxEntry::GetRoleType()
     {
         sal_Int32 nCase = 0;
@@ -419,7 +419,7 @@ namespace accessibility
         }
         return nCase;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -457,7 +457,7 @@ namespace accessibility
         }
         return AccessibleRole::UNKNOWN;
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -492,7 +492,7 @@ namespace accessibility
             return getListBox()->SearchEntryTextWithHeadTitle( pEntry );
         }
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -512,7 +512,7 @@ namespace accessibility
 
         return sRet;
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
         Reference< XAccessibleRelationSet > xRelSet;
@@ -530,7 +530,7 @@ namespace accessibility
         }
         return xRelSet;
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -567,7 +567,7 @@ namespace accessibility
 
         return xStateSet;
     }
-    // -----------------------------------------------------------------------------
+
     Locale SAL_CALL AccessibleListBoxEntry::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -575,14 +575,14 @@ namespace accessibility
 
         return implGetLocale();
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleComponent
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException)
     {
         return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -600,32 +600,32 @@ namespace accessibility
             xAcc = pAccEntry;
         return xAcc;
     }
-    // -----------------------------------------------------------------------------
+
     awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds(  ) throw (RuntimeException)
     {
         return AWTRectangle( GetBoundingBox() );
     }
-    // -----------------------------------------------------------------------------
+
     awt::Point SAL_CALL AccessibleListBoxEntry::getLocation(  ) throw (RuntimeException)
     {
         return AWTPoint( GetBoundingBox().TopLeft() );
     }
-    // -----------------------------------------------------------------------------
+
     awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen(  ) throw (RuntimeException)
     {
         return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
     }
-    // -----------------------------------------------------------------------------
+
     awt::Size SAL_CALL AccessibleListBoxEntry::getSize(  ) throw (RuntimeException)
     {
         return AWTSize( GetBoundingBox().GetSize() );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::grabFocus(  ) throw (RuntimeException)
     {
         // do nothing, because no focus for each item
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 AccessibleListBoxEntry::getForeground(    ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -642,7 +642,7 @@ namespace accessibility
 
         return nColor;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 AccessibleListBoxEntry::getBackground(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -659,10 +659,10 @@ namespace accessibility
 
         return nColor;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleText
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
+
+
     awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -687,7 +687,7 @@ namespace accessibility
 
         return aBounds;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -709,7 +709,7 @@ namespace accessibility
 
         return nIndex;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -726,9 +726,9 @@ namespace accessibility
 
         return sal_True;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleEventBroadcaster
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
     {
         if (xListener.is())
@@ -739,7 +739,7 @@ namespace accessibility
             comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener );
         }
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
     {
         if (xListener.is())
@@ -760,9 +760,9 @@ namespace accessibility
             }
         }
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleAction
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -783,7 +783,7 @@ namespace accessibility
             return ACCESSIBLE_ACTION_COUNT;
         return 0;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -821,7 +821,7 @@ namespace accessibility
 
         return bRet;
     }
-    // -----------------------------------------------------------------------------
+
     OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -861,7 +861,7 @@ namespace accessibility
         }
         throw IndexOutOfBoundsException();
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -871,9 +871,9 @@ namespace accessibility
         // ... which key?
         return xRet;
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleSelection
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -887,7 +887,7 @@ namespace accessibility
 
         getListBox()->Select( pEntry, sal_True );
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -902,7 +902,7 @@ namespace accessibility
 
         return getListBox()->IsSelected( pEntry );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -921,7 +921,7 @@ namespace accessibility
                 getListBox()->Select( pEntry, sal_False );
         }
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -940,7 +940,7 @@ namespace accessibility
                 getListBox()->Select( pEntry, sal_True );
         }
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -963,7 +963,7 @@ namespace accessibility
 
         return nSelCount;
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -996,7 +996,7 @@ namespace accessibility
 
         return xChild;
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -1122,9 +1122,9 @@ namespace accessibility
 
         return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleValue
-    // -----------------------------------------------------------------------------
+
 
     Any AccessibleListBoxEntry::getCurrentValue(  ) throw (RuntimeException)
     {
@@ -1136,7 +1136,7 @@ namespace accessibility
         return aValue;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
     {
@@ -1168,7 +1168,7 @@ namespace accessibility
         return bReturn;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Any AccessibleListBoxEntry::getMaximumValue(  ) throw (RuntimeException)
     {
@@ -1189,7 +1189,7 @@ namespace accessibility
         return aValue;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Any AccessibleListBoxEntry::getMinimumValue(  ) throw (RuntimeException)
     {
@@ -1210,7 +1210,7 @@ namespace accessibility
         return aValue;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     SvTreeListEntry* AccessibleListBoxEntry::GetRealChild(sal_Int32 nIndex)
     {
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 96812ccfc22c..d80ffc5b1b63 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -56,13 +56,13 @@ namespace accessibility
             m_aAccessibleChildren.assign( m_pTabBar->GetAccessibleChildWindowCount() + 1, Reference< XAccessible >() );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     AccessibleTabBar::~AccessibleTabBar()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
@@ -118,7 +118,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
     {
@@ -145,9 +145,9 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // OCommonAccessibleComponent
-    // -----------------------------------------------------------------------------
+
 
     awt::Rectangle AccessibleTabBar::implGetBounds() throw (RuntimeException)
     {
@@ -158,21 +158,21 @@ namespace accessibility
         return aBounds;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInterface
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE )
 
-    // -----------------------------------------------------------------------------
+
     // XTypeProvider
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE )
 
-    // -----------------------------------------------------------------------------
+
     // XComponent
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBar::disposing()
     {
@@ -188,23 +188,23 @@ namespace accessibility
         m_aAccessibleChildren.clear();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBar::getImplementationName() throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTabBar" );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) throw (RuntimeException)
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException)
     {
@@ -213,9 +213,9 @@ namespace accessibility
         return aNames;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessible
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext(  ) throw (RuntimeException)
     {
@@ -224,9 +224,9 @@ namespace accessibility
         return this;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleContext
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBar::getAccessibleChildCount() throw (RuntimeException)
     {
@@ -235,7 +235,7 @@ namespace accessibility
         return m_aAccessibleChildren.size();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -270,7 +270,7 @@ namespace accessibility
         return xChild;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBar::getAccessibleParent(  ) throw (RuntimeException)
     {
@@ -287,7 +287,7 @@ namespace accessibility
         return xParent;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBar::getAccessibleIndexInParent(  ) throw (RuntimeException)
     {
@@ -314,7 +314,7 @@ namespace accessibility
         return nIndexInParent;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int16 AccessibleTabBar::getAccessibleRole(  ) throw (RuntimeException)
     {
@@ -323,7 +323,7 @@ namespace accessibility
         return AccessibleRole::PANEL;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException)
     {
@@ -336,7 +336,7 @@ namespace accessibility
         return sDescription;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBar::getAccessibleName(  ) throw (RuntimeException)
     {
@@ -349,7 +349,7 @@ namespace accessibility
         return sName;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
@@ -360,7 +360,7 @@ namespace accessibility
         return xSet;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet(  ) throw (RuntimeException)
     {
@@ -381,7 +381,7 @@ namespace accessibility
         return xSet;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Locale AccessibleTabBar::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
     {
@@ -390,9 +390,9 @@ namespace accessibility
         return Application::GetSettings().GetLanguageTag().getLocale();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleComponent
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
     {
@@ -421,7 +421,7 @@ namespace accessibility
         return xChild;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBar::grabFocus(  ) throw (RuntimeException)
     {
@@ -431,7 +431,7 @@ namespace accessibility
             m_pTabBar->GrabFocus();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBar::getForeground(  ) throw (RuntimeException)
     {
@@ -456,7 +456,7 @@ namespace accessibility
         return nColor;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBar::getBackground(  ) throw (RuntimeException)
     {
@@ -474,9 +474,9 @@ namespace accessibility
         return nColor;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleExtendedComponent
-    // -----------------------------------------------------------------------------
+
 
     Reference< awt::XFont > AccessibleTabBar::getFont(  ) throw (RuntimeException)
     {
@@ -502,7 +502,7 @@ namespace accessibility
         return xFont;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBar::getTitledBorderText(  ) throw (RuntimeException)
     {
@@ -515,7 +515,7 @@ namespace accessibility
         return sText;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBar::getToolTipText(  ) throw (RuntimeException)
     {
@@ -528,7 +528,7 @@ namespace accessibility
         return sText;
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace accessibility
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 090e0bf5f49d..34a687bf1554 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -41,9 +41,9 @@ namespace accessibility
     using namespace ::com::sun::star;
     using namespace ::comphelper;
 
-    // -----------------------------------------------------------------------------
+
     // class AccessibleTabBarPage
-    // -----------------------------------------------------------------------------
+
 
     AccessibleTabBarPage::AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId, const Reference< XAccessible >& rxParent )
         :AccessibleTabBarBase( pTabBar )
@@ -58,13 +58,13 @@ namespace accessibility
             m_sPageText = m_pTabBar->GetPageText( m_nPageId );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     AccessibleTabBarPage::~AccessibleTabBarPage()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool AccessibleTabBarPage::IsEnabled()
     {
@@ -77,7 +77,7 @@ namespace accessibility
         return bEnabled;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool AccessibleTabBarPage::IsShowing()
     {
@@ -89,7 +89,7 @@ namespace accessibility
         return bShowing;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool AccessibleTabBarPage::IsSelected()
     {
@@ -101,7 +101,7 @@ namespace accessibility
         return bSelected;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPage::SetEnabled( sal_Bool bEnabled )
     {
@@ -125,7 +125,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPage::SetShowing( sal_Bool bShowing )
     {
@@ -141,7 +141,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPage::SetSelected( sal_Bool bSelected )
     {
@@ -157,7 +157,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPage::SetPageText( const OUString& sPageText )
     {
@@ -171,7 +171,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
     {
@@ -192,9 +192,9 @@ namespace accessibility
             rStateSet.AddState( AccessibleStateType::SELECTED );
     }
 
-    // -----------------------------------------------------------------------------
+
     // OCommonAccessibleComponent
-    // -----------------------------------------------------------------------------
+
 
     awt::Rectangle AccessibleTabBarPage::implGetBounds() throw (RuntimeException)
     {
@@ -223,21 +223,21 @@ namespace accessibility
         return aBounds;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInterface
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPage, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPage_BASE )
 
-    // -----------------------------------------------------------------------------
+
     // XTypeProvider
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPage, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPage_BASE )
 
-    // -----------------------------------------------------------------------------
+
     // XComponent
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPage::disposing()
     {
@@ -245,23 +245,23 @@ namespace accessibility
         m_sPageText = OUString();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPage" );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) throw (RuntimeException)
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException)
     {
@@ -270,9 +270,9 @@ namespace accessibility
         return aNames;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessible
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext(  ) throw (RuntimeException)
     {
@@ -281,9 +281,9 @@ namespace accessibility
         return this;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleContext
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() throw (RuntimeException)
     {
@@ -292,7 +292,7 @@ namespace accessibility
         return 0;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -304,7 +304,7 @@ namespace accessibility
         return Reference< XAccessible >();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent(  ) throw (RuntimeException)
     {
@@ -313,7 +313,7 @@ namespace accessibility
         return m_xParent;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent(  ) throw (RuntimeException)
     {
@@ -326,7 +326,7 @@ namespace accessibility
         return nIndexInParent;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int16 AccessibleTabBarPage::getAccessibleRole(  ) throw (RuntimeException)
     {
@@ -335,7 +335,7 @@ namespace accessibility
         return AccessibleRole::PAGE_TAB;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException)
     {
@@ -348,7 +348,7 @@ namespace accessibility
         return sDescription;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPage::getAccessibleName(  ) throw (RuntimeException)
     {
@@ -357,7 +357,7 @@ namespace accessibility
         return m_sPageText;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
@@ -368,7 +368,7 @@ namespace accessibility
         return xSet;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet(  ) throw (RuntimeException)
     {
@@ -389,7 +389,7 @@ namespace accessibility
         return xSet;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Locale AccessibleTabBarPage::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
     {
@@ -398,9 +398,9 @@ namespace accessibility
         return Application::GetSettings().GetLanguageTag().getLocale();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleComponent
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
     {
@@ -409,14 +409,14 @@ namespace accessibility
         return Reference< XAccessible >();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPage::grabFocus(  ) throw (RuntimeException)
     {
         // no focus
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPage::getForeground(  ) throw (RuntimeException)
     {
@@ -434,7 +434,7 @@ namespace accessibility
         return nColor;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPage::getBackground(  ) throw (RuntimeException)
     {
@@ -452,9 +452,9 @@ namespace accessibility
         return nColor;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleExtendedComponent
-    // -----------------------------------------------------------------------------
+
 
     Reference< awt::XFont > AccessibleTabBarPage::getFont(  ) throw (RuntimeException)
     {
@@ -472,7 +472,7 @@ namespace accessibility
         return xFont;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPage::getTitledBorderText(  ) throw (RuntimeException)
     {
@@ -481,7 +481,7 @@ namespace accessibility
         return m_sPageText;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPage::getToolTipText(  ) throw (RuntimeException)
     {
@@ -490,7 +490,7 @@ namespace accessibility
         return OUString();
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace accessibility
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 57c054db528d..b7a87b073161 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -42,9 +42,9 @@ namespace accessibility
     using namespace ::com::sun::star;
     using namespace ::comphelper;
 
-    // -----------------------------------------------------------------------------
+
     // class AccessibleTabBarPageList
-    // -----------------------------------------------------------------------------
+
 
     AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent )
         :AccessibleTabBarBase( pTabBar )
@@ -54,13 +54,13 @@ namespace accessibility
             m_aAccessibleChildren.assign( m_pTabBar->GetPageCount(), Reference< XAccessible >() );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     AccessibleTabBarPageList::~AccessibleTabBarPageList()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled )
     {
@@ -76,7 +76,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::UpdateShowing( sal_Bool bShowing )
     {
@@ -92,7 +92,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::UpdateSelected( sal_Int32 i, sal_Bool bSelected )
     {
@@ -110,7 +110,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::UpdatePageText( sal_Int32 i )
     {
@@ -132,7 +132,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::InsertChild( sal_Int32 i )
     {
@@ -152,7 +152,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::RemoveChild( sal_Int32 i )
     {
@@ -178,7 +178,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::MoveChild( sal_Int32 i, sal_Int32 j )
     {
@@ -199,7 +199,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
@@ -346,7 +346,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
     {
@@ -365,9 +365,9 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // OCommonAccessibleComponent
-    // -----------------------------------------------------------------------------
+
 
     awt::Rectangle AccessibleTabBarPageList::implGetBounds() throw (RuntimeException)
     {
@@ -378,21 +378,21 @@ namespace accessibility
         return aBounds;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInterface
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPageList, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPageList_BASE )
 
-    // -----------------------------------------------------------------------------
+
     // XTypeProvider
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPageList, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPageList_BASE )
 
-    // -----------------------------------------------------------------------------
+
     // XComponent
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::disposing()
     {
@@ -408,23 +408,23 @@ namespace accessibility
         m_aAccessibleChildren.clear();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPageList" );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) throw (RuntimeException)
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException)
     {
@@ -433,9 +433,9 @@ namespace accessibility
         return aNames;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessible
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext(  ) throw (RuntimeException)
     {
@@ -444,9 +444,9 @@ namespace accessibility
         return this;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleContext
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() throw (RuntimeException)
     {
@@ -455,7 +455,7 @@ namespace accessibility
         return m_aAccessibleChildren.size();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -481,7 +481,7 @@ namespace accessibility
         return xChild;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent(  ) throw (RuntimeException)
     {
@@ -494,7 +494,7 @@ namespace accessibility
         return xParent;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent(  ) throw (RuntimeException)
     {
@@ -503,7 +503,7 @@ namespace accessibility
         return m_nIndexInParent;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int16 AccessibleTabBarPageList::getAccessibleRole(  ) throw (RuntimeException)
     {
@@ -512,7 +512,7 @@ namespace accessibility
         return AccessibleRole::PAGE_TAB_LIST;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException)
     {
@@ -521,7 +521,7 @@ namespace accessibility
         return OUString();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPageList::getAccessibleName(  ) throw (RuntimeException)
     {
@@ -530,7 +530,7 @@ namespace accessibility
         return OUString();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
@@ -541,7 +541,7 @@ namespace accessibility
         return xSet;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet(  ) throw (RuntimeException)
     {
@@ -562,7 +562,7 @@ namespace accessibility
         return xSet;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Locale AccessibleTabBarPageList::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
     {
@@ -571,9 +571,9 @@ namespace accessibility
         return Application::GetSettings().GetLanguageTag().getLocale();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleComponent
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
     {
@@ -602,14 +602,14 @@ namespace accessibility
         return xChild;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::grabFocus(  ) throw (RuntimeException)
     {
         // no focus
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPageList::getForeground(  ) throw (RuntimeException)
     {
@@ -627,7 +627,7 @@ namespace accessibility
         return nColor;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPageList::getBackground(  ) throw (RuntimeException)
     {
@@ -645,9 +645,9 @@ namespace accessibility
         return nColor;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleExtendedComponent
-    // -----------------------------------------------------------------------------
+
 
     Reference< awt::XFont > AccessibleTabBarPageList::getFont(  ) throw (RuntimeException)
     {
@@ -665,7 +665,7 @@ namespace accessibility
         return xFont;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPageList::getTitledBorderText(  ) throw (RuntimeException)
     {
@@ -674,7 +674,7 @@ namespace accessibility
         return OUString();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString AccessibleTabBarPageList::getToolTipText(  ) throw (RuntimeException)
     {
@@ -683,9 +683,9 @@ namespace accessibility
         return OUString();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleSelection
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -703,7 +703,7 @@ namespace accessibility
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -719,14 +719,14 @@ namespace accessibility
         return bSelected;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::clearAccessibleSelection(  ) throw (RuntimeException)
     {
         // This method makes no sense in a TabBar, and so does nothing.
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
@@ -735,7 +735,7 @@ namespace accessibility
         selectAccessibleChild( 0 );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
     {
@@ -744,7 +744,7 @@ namespace accessibility
         return 1;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -767,7 +767,7 @@ namespace accessibility
         return xChild;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -779,7 +779,7 @@ namespace accessibility
         // This method makes no sense in a TabBar, and so does nothing.
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace accessibility
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index a277a447f1aa..82d71cf3b5c6 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -35,9 +35,9 @@ namespace accessibility
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star;
 
-    // -----------------------------------------------------------------------------
+
     // Ctor() and Dtor()
-    // -----------------------------------------------------------------------------
+
     AccessibleTabListBox::AccessibleTabListBox( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox )
         :AccessibleBrowseBox( rxParent, NULL, rBox )
         ,m_pTabListBox( &rBox )
@@ -50,7 +50,7 @@ namespace accessibility
         osl_atomic_decrement( &m_refCount );
     }
 
-    // -----------------------------------------------------------------------------
+
     AccessibleTabListBox::~AccessibleTabListBox()
     {
         if ( isAlive() )
@@ -60,7 +60,7 @@ namespace accessibility
             dispose();
         }
     }
-    // -----------------------------------------------------------------------------
+
     AccessibleBrowseBoxTable* AccessibleTabListBox::createAccessibleTable()
     {
         return new AccessibleTabListBoxTable( this, *m_pTabListBox );
@@ -80,13 +80,13 @@ namespace accessibility
         return 2; // header and table
     }
 
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() throw ( RuntimeException )
     {
         return this;
     }
 
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL
     AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex )
         throw ( IndexOutOfBoundsException, RuntimeException )
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index a61e37a01fe4..b316a4a39d17 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -36,9 +36,9 @@ namespace accessibility
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star;
 
-    // -----------------------------------------------------------------------------
+
     // Ctor() and Dtor()
-    // -----------------------------------------------------------------------------
+
     AccessibleTabListBoxTable::AccessibleTabListBoxTable( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) :
 
         AccessibleBrowseBoxTable( rxParent, rBox ),
@@ -48,7 +48,7 @@ namespace accessibility
     {
         m_pTabListBox->AddEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) );
     }
-    // -----------------------------------------------------------------------------
+
     AccessibleTabListBoxTable::~AccessibleTabListBoxTable()
     {
         if ( isAlive() )
@@ -60,7 +60,7 @@ namespace accessibility
             dispose();
         }
     }
-    // -----------------------------------------------------------------------------
+
     void AccessibleTabListBoxTable::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
         if ( isAlive() )
@@ -250,7 +250,7 @@ namespace accessibility
             }
         }
     }
-    // -----------------------------------------------------------------------------
+
     IMPL_LINK( AccessibleTabListBoxTable, WindowEventListener, VclSimpleEvent*, pEvent )
     {
         OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
@@ -313,21 +313,21 @@ namespace accessibility
 
         return 0;
     }
-    // -----------------------------------------------------------------------------
+
     // XInterface & XTypeProvider
-    // -----------------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2(AccessibleTabListBoxTable, AccessibleBrowseBoxTable, AccessibleTabListBoxTableImplHelper)
     IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleTabListBoxTable, AccessibleBrowseBoxTable, AccessibleTabListBoxTableImplHelper)
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
     OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" );
     }
-    // -----------------------------------------------------------------------------
+
     // XAccessibleSelection
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -338,7 +338,7 @@ namespace accessibility
 
         implSelectRow( implGetRow( nChildIndex ), sal_True );
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -349,7 +349,7 @@ namespace accessibility
 
         return implIsRowSelected( implGetRow( nChildIndex ) );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -359,7 +359,7 @@ namespace accessibility
 
         m_pTabListBox->SetNoSelection();
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -369,7 +369,7 @@ namespace accessibility
 
         m_pTabListBox->SelectAll();
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -379,7 +379,7 @@ namespace accessibility
 
         return implGetColumnCount() * implGetSelRowCount();
     }
-    // -----------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -395,7 +395,7 @@ namespace accessibility
         sal_Int32 nColumn = nSelectedChildIndex / nRows;
         return getAccessibleCellAt( nRow, nColumn );
     }
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index d5ea35feebb6..e02a1d638225 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -20,22 +20,15 @@
 #include <accessibility/extended/listboxaccessible.hxx>
 #include <svtools/treelistbox.hxx>
 
-//........................................................................
 namespace accessibility
 {
-//........................................................................
-
-    //====================================================================
-    //= ListBoxAccessibleBase
-    //====================================================================
-    //--------------------------------------------------------------------
+    // ListBoxAccessibleBase
     ListBoxAccessibleBase::ListBoxAccessibleBase( SvTreeListBox& _rWindow )
         :m_pWindow( &_rWindow )
     {
         m_pWindow->AddEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
     }
 
-    //--------------------------------------------------------------------
     ListBoxAccessibleBase::~ListBoxAccessibleBase( )
     {
         if ( m_pWindow )
@@ -47,7 +40,6 @@ namespace accessibility
         }
     }
 
-    //--------------------------------------------------------------------
     IMPL_LINK( ListBoxAccessibleBase, WindowEventListener, VclSimpleEvent*, pEvent )
     {
         OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ), "ListBoxAccessibleBase::WindowEventListener: unexpected WindowEvent!" );
@@ -61,7 +53,6 @@ namespace accessibility
         return 0;
     }
 
-    // -----------------------------------------------------------------------------
     void ListBoxAccessibleBase::disposing()
     {
         if ( m_pWindow )
@@ -69,7 +60,6 @@ namespace accessibility
         m_pWindow = NULL;
     }
 
-    // -----------------------------------------------------------------------------
     void ListBoxAccessibleBase::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
     {
         if ( isAlive() )
@@ -87,9 +77,6 @@ namespace accessibility
             }
         }
     }
-
-//........................................................................
 }   // namespace accessibility
-//........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 640c2d58be79..f59ffe627643 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -63,7 +63,6 @@
 
 #include "floatingwindowaccessible.hxx"
 
-//........................................................................
 namespace accessibility
 {
 
@@ -76,7 +75,6 @@ inline bool hasFloatingChild(Window *pWindow)
     return false;
 }
 
-//........................................................................
 
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
@@ -84,9 +82,7 @@ inline bool hasFloatingChild(Window *pWindow)
     using namespace ::svt;
     using namespace ::svt::table;
 
-    //================================================================
-    //= IAccessibleFactory
-    //================================================================
+    // IAccessibleFactory
     class AccessibleFactory :public ::toolkit::IAccessibleFactory
                             ,public ::svt::IAccessibleFactory
     {
@@ -230,25 +226,20 @@ inline bool hasFloatingChild(Window *pWindow)
         virtual ~AccessibleFactory();
     };
 
-
-    //--------------------------------------------------------------------
     AccessibleFactory::AccessibleFactory()
         :m_refCount( 0 )
     {
     }
 
-    //--------------------------------------------------------------------
     AccessibleFactory::~AccessibleFactory()
     {
     }
 
-    //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL AccessibleFactory::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL AccessibleFactory::release()
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
@@ -256,10 +247,10 @@ inline bool hasFloatingChild(Window *pWindow)
             delete this;
             return 0;
         }
+
         return m_refCount;
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar )
     {
         OAccessibleMenuBaseComponent* pAccessible;
@@ -271,25 +262,21 @@ inline bool hasFloatingChild(Window *pWindow)
         return pAccessible;
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXButton* _pXWindow )
     {
         return new VCLXAccessibleButton( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXCheckBox* _pXWindow )
     {
         return new VCLXAccessibleCheckBox( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXRadioButton* _pXWindow )
     {
         return new VCLXAccessibleRadioButton( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXListBox* _pXWindow )
     {
         sal_Bool bIsDropDownBox = sal_False;
@@ -303,31 +290,26 @@ inline bool hasFloatingChild(Window *pWindow)
             return new VCLXAccessibleListBox( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedText* _pXWindow )
     {
         return new VCLXAccessibleFixedText( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedHyperlink* _pXWindow )
     {
         return new VCLXAccessibleFixedHyperlink( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXScrollBar* _pXWindow )
     {
         return new VCLXAccessibleScrollBar( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXEdit* _pXWindow )
     {
         return new VCLXAccessibleEdit( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXComboBox* _pXWindow )
     {
         sal_Bool bIsDropDownBox = sal_False;
@@ -341,7 +323,6 @@ inline bool hasFloatingChild(Window *pWindow)
             return new VCLXAccessibleComboBox( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXWindow* _pXWindow )
     {
         Reference< XAccessibleContext > xContext;
@@ -364,22 +345,27 @@ inline bool hasFloatingChild(Window *pWindow)
                     }
                 }
             }
+
             else if ( nType == WINDOW_STATUSBAR )
             {
                 xContext = (XAccessibleContext*) new VCLXAccessibleStatusBar( _pXWindow );
             }
+
             else if ( nType == WINDOW_TABCONTROL )
             {
                 xContext = (XAccessibleContext*) new VCLXAccessibleTabControl( _pXWindow );
             }
+
             else if ( nType == WINDOW_TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WINDOW_TABCONTROL )
             {
                 xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
             }
+
             else if ( nType == WINDOW_FLOATINGWINDOW )
             {
                 xContext = new FloatingWindowAccessible( _pXWindow );
             }
+
             else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
             {
                 // The logic here has to match that of Window::GetAccessibleParentWindow in
@@ -396,6 +382,7 @@ inline bool hasFloatingChild(Window *pWindow)
                 else
                     xContext = new FloatingWindowAccessible( _pXWindow );
             }
+
             else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == WINDOW_FIXEDLINE ) )
             {
                xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow );
@@ -405,65 +392,55 @@ inline bool hasFloatingChild(Window *pWindow)
                xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleComponent( _pXWindow );
             }
         }
-
         return xContext;
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXToolBox* _pXWindow )
     {
         return new VCLXAccessibleToolBox( _pXWindow );
     }
 
-    //--------------------------------------------------------------------
     IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox(
         const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const
     {
         return new AccessibleTabListBox( rxParent, rBox );
     }
 
-    //--------------------------------------------------------------------
     IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox(
         const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) const
     {
         return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox );
     }
 
-    //--------------------------------------------------------------------
     IAccessibleTableControl* AccessibleFactory::createAccessibleTableControl(
         const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable ) const
     {
         return new AccessibleGridControlAccess( _rxParent, _rTable );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessibleIconChoiceCtrl(
         SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) const
     {
         return new AccessibleIconChoiceCtrl( _rIconCtrl, _xParent );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessibleTabBar( TabBar& _rTabBar ) const
     {
         return new AccessibleTabBar( &_rTabBar );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext(
         VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const
     {
         return new Document( pVclXWindow, rEngine, rView );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox(
         SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const
     {
         return new AccessibleListBox( _rListBox, _xParent );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar(
         const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable,
         AccessibleBrowseBoxObjType _eObjType ) const
@@ -471,7 +448,6 @@ inline bool hasFloatingChild(Window *pWindow)
         return new AccessibleBrowseBoxHeaderBar( rxParent, _rOwningTable, _eObjType );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell(
         const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
         const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const
@@ -480,7 +456,6 @@ inline bool hasFloatingChild(Window *pWindow)
             _nRowId, _nColId, _nOffset );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell(
         sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rBrowseBox,
         const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  _eObjType ) const
@@ -489,7 +464,6 @@ inline bool hasFloatingChild(Window *pWindow)
             _xFocusWindow, _eObjType );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell(
         const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
         const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos,
@@ -499,7 +473,6 @@ inline bool hasFloatingChild(Window *pWindow)
             _nRowPos, _nColPos, _eState, _bIsTriState );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess(
         const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible,
         const Reference< XWindow >& _rxFocusWindow, IAccessibleTableProvider& _rBrowseBox,
@@ -509,27 +482,21 @@ inline bool hasFloatingChild(Window *pWindow)
             _rxFocusWindow, _rBrowseBox, _nRowPos, _nColPos );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelDeck(
             const Reference< XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck )
     {
         return new AccessibleToolPanelDeck( i_rAccessibleParent, i_rPanelDeck );
     }
 
-    //--------------------------------------------------------------------
     Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelTabBar(
         const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
     {
         return new AccessibleToolPanelTabBar( i_rAccessibleParent, i_rPanelDeck, i_rTabBar );
     }
 
-//........................................................................
 }   // namespace accessibility
-//........................................................................
 
-//========================================================================
-
-/** this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied
+/* this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied
     by this library
 
     This function implements the factory function needed in toolkit
@@ -545,6 +512,7 @@ extern "C"
     }
 }
 
+
 /** this is the entry point to retrieve a factory for the svtools-level Accessible/Contexts supplied
     by this library
 
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index 2251266df119..e05cea6c38ad 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -24,20 +24,20 @@
 #include <vcl/settings.hxx>
 
 using namespace accessibility;
-// -----------------------------------------------------------------------------
+
 // TkResMgr
-// -----------------------------------------------------------------------------
+
 
 SimpleResMgr* TkResMgr::m_pImpl = NULL;
 
-// -----------------------------------------------------------------------------
+
 
 TkResMgr::EnsureDelete::~EnsureDelete()
 {
     delete TkResMgr::m_pImpl;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TkResMgr::ensureImplExists()
 {
@@ -53,7 +53,7 @@ void TkResMgr::ensureImplExists()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString TkResMgr::loadString( sal_uInt16 nResId )
 {
@@ -66,6 +66,6 @@ OUString TkResMgr::loadString( sal_uInt16 nResId )
     return sReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index b4d4dd953cf7..20783a889125 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -40,9 +40,9 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // OAccessibleMenuBaseComponent
-// -----------------------------------------------------------------------------
+
 
 OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu )
     :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
@@ -62,7 +62,7 @@ OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent()
 {
@@ -73,42 +73,42 @@ OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent()
     m_pExternalLock = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsEnabled()
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsFocused()
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsVisible()
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsSelected()
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsChecked()
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::SetStates()
 {
@@ -119,7 +119,7 @@ void OAccessibleMenuBaseComponent::SetStates()
     m_bChecked = IsChecked();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled )
 {
@@ -147,7 +147,7 @@ void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused )
 {
@@ -163,7 +163,7 @@ void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible )
 {
@@ -179,7 +179,7 @@ void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected )
 {
@@ -195,7 +195,7 @@ void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked )
 {
@@ -211,7 +211,7 @@ void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled )
 {
@@ -227,7 +227,7 @@ void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, sal_Bool bFocused )
 {
@@ -243,7 +243,7 @@ void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, sal_Bool bFocused
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::UpdateVisible()
 {
@@ -260,7 +260,7 @@ void OAccessibleMenuBaseComponent::UpdateVisible()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelected )
 {
@@ -278,7 +278,7 @@ void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelect
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, sal_Bool bChecked )
 {
@@ -294,7 +294,7 @@ void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, sal_Bool bChecked
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::UpdateAccessibleName( sal_Int32 i )
 {
@@ -310,7 +310,7 @@ void OAccessibleMenuBaseComponent::UpdateAccessibleName( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::UpdateItemText( sal_Int32 i )
 {
@@ -326,14 +326,14 @@ void OAccessibleMenuBaseComponent::UpdateItemText( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuBaseComponent::GetChildCount()
 {
     return m_aAccessibleChildren.size();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i )
 {
@@ -376,7 +376,7 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i )
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Point& rPoint )
 {
@@ -403,7 +403,7 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Po
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i )
 {
@@ -438,7 +438,7 @@ void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i )
 {
@@ -476,14 +476,14 @@ void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsHighlighted()
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted()
 {
@@ -506,7 +506,7 @@ sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted()
     return bChildHighlighted;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i )
 {
@@ -519,7 +519,7 @@ void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i )
         m_pMenu->HighlightItem( (sal_uInt16)i );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::DeSelectAll()
 {
@@ -527,7 +527,7 @@ void OAccessibleMenuBaseComponent::DeSelectAll()
         m_pMenu->DeHighlight();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i )
 {
@@ -539,32 +539,32 @@ sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i )
     return bSelected;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::Select()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::DeSelect()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::Click()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsPopupMenuOpen()
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclSimpleEvent*, pEvent )
 {
@@ -577,7 +577,7 @@ IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclSimpleEvent*, pEv
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent )
 {
@@ -686,21 +686,21 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuBaseComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleMenuBaseComponent_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuBaseComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleMenuBaseComponent_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuBaseComponent::disposing()
 {
@@ -723,18 +723,18 @@ void OAccessibleMenuBaseComponent::disposing()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName ) throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessible
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext(  ) throw (RuntimeException)
 {
@@ -743,9 +743,9 @@ Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleConte
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet(  ) throw (RuntimeException)
 {
@@ -766,7 +766,7 @@ Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStat
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuBaseComponent::IsMenuHideDisabledEntries()
 {
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 1db0ff737867..2edd76c018fb 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -43,29 +43,29 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class OAccessibleMenuComponent
-// -----------------------------------------------------------------------------
+
 
 OAccessibleMenuComponent::OAccessibleMenuComponent( Menu* pMenu )
     :OAccessibleMenuBaseComponent( pMenu )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 OAccessibleMenuComponent::~OAccessibleMenuComponent()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuComponent::IsEnabled()
 {
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuComponent::IsVisible()
 {
@@ -77,7 +77,7 @@ sal_Bool OAccessibleMenuComponent::IsVisible()
     return bVisible;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -101,9 +101,9 @@ void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHe
     rStateSet.AddState( AccessibleStateType::OPAQUE );
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException)
 {
@@ -138,21 +138,21 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -161,7 +161,7 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeExce
     return GetChildCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -173,7 +173,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32
     return GetChild( i );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent(  ) throw (RuntimeException)
 {
@@ -195,7 +195,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent(  ) throw
     return xParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 OAccessibleMenuComponent::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -204,7 +204,7 @@ sal_Int16 OAccessibleMenuComponent::getAccessibleRole(  ) throw (RuntimeExceptio
     return AccessibleRole::UNKNOWN;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException)
 {
@@ -221,7 +221,7 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc
     return sDescription;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuComponent::getAccessibleName(  ) throw (RuntimeException)
 {
@@ -230,7 +230,7 @@ OUString OAccessibleMenuComponent::getAccessibleName(  ) throw (RuntimeException
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
@@ -241,7 +241,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelat
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale OAccessibleMenuComponent::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -250,9 +250,9 @@ Locale OAccessibleMenuComponent::getLocale(  ) throw (IllegalAccessibleComponent
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
 {
@@ -261,7 +261,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const a
     return GetChildAt( rPoint );
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point OAccessibleMenuComponent::getLocationOnScreen(  ) throw (RuntimeException)
 {
@@ -282,7 +282,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen(  ) throw (RuntimeExcep
     return aPos;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuComponent::grabFocus(  ) throw (RuntimeException)
 {
@@ -296,7 +296,7 @@ void OAccessibleMenuComponent::grabFocus(  ) throw (RuntimeException)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuComponent::getForeground(  ) throw (RuntimeException)
 {
@@ -308,7 +308,7 @@ sal_Int32 OAccessibleMenuComponent::getForeground(  ) throw (RuntimeException)
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuComponent::getBackground(  ) throw (RuntimeException)
 {
@@ -317,9 +317,9 @@ sal_Int32 OAccessibleMenuComponent::getBackground(  ) throw (RuntimeException)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< awt::XFont > OAccessibleMenuComponent::getFont(  ) throw (RuntimeException)
 {
@@ -346,7 +346,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont(  ) throw (RuntimeExce
     return xFont;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuComponent::getTitledBorderText(  ) throw (RuntimeException)
 {
@@ -355,7 +355,7 @@ OUString OAccessibleMenuComponent::getTitledBorderText(  ) throw (RuntimeExcepti
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuComponent::getToolTipText(  ) throw (RuntimeException)
 {
@@ -364,9 +364,9 @@ OUString OAccessibleMenuComponent::getToolTipText(  ) throw (RuntimeException)
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleSelection
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -378,7 +378,7 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) th
     SelectChild( nChildIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -390,7 +390,7 @@ sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIn
     return IsChildSelected( nChildIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuComponent::clearAccessibleSelection(  ) throw (RuntimeException)
 {
@@ -399,14 +399,14 @@ void OAccessibleMenuComponent::clearAccessibleSelection(  ) throw (RuntimeExcept
     DeSelectAll();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuComponent::selectAllAccessibleChildren(  ) throw (RuntimeException)
 {
     // This method makes no sense in a menu, and so does nothing.
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
 {
@@ -423,7 +423,7 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount(  ) throw (R
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -446,7 +446,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -458,6 +458,6 @@ void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex )
     DeSelectAll();
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 1e0cdbca8f8c..6a3fea7ad38e 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -51,9 +51,9 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class OAccessibleMenuItemComponent
-// -----------------------------------------------------------------------------
+
 
 OAccessibleMenuItemComponent::OAccessibleMenuItemComponent( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
     :OAccessibleMenuBaseComponent( pMenu )
@@ -64,13 +64,13 @@ OAccessibleMenuItemComponent::OAccessibleMenuItemComponent( Menu* pParent, sal_u
     m_sItemText = GetItemText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OAccessibleMenuItemComponent::~OAccessibleMenuItemComponent()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuItemComponent::IsEnabled()
 {
@@ -83,7 +83,7 @@ sal_Bool OAccessibleMenuItemComponent::IsEnabled()
     return bEnabled;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuItemComponent::IsVisible()
 {
@@ -95,7 +95,7 @@ sal_Bool OAccessibleMenuItemComponent::IsVisible()
     return bVisible;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuItemComponent::Select()
 {
@@ -113,7 +113,7 @@ void OAccessibleMenuItemComponent::Select()
         m_pParent->HighlightItem( m_nItemPos );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuItemComponent::DeSelect()
 {
@@ -121,7 +121,7 @@ void OAccessibleMenuItemComponent::DeSelect()
         m_pParent->DeHighlight();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuItemComponent::Click()
 {
@@ -169,14 +169,14 @@ void OAccessibleMenuItemComponent::Click()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuItemComponent::SetItemPos( sal_uInt16 nItemPos )
 {
     m_nItemPos = nItemPos;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuItemComponent::SetAccessibleName( const OUString& sAccessibleName )
 {
@@ -190,7 +190,7 @@ void OAccessibleMenuItemComponent::SetAccessibleName( const OUString& sAccessibl
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuItemComponent::GetAccessibleName()
 {
@@ -207,7 +207,7 @@ OUString OAccessibleMenuItemComponent::GetAccessibleName()
     return sName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuItemComponent::SetItemText( const OUString& sItemText )
 {
@@ -219,7 +219,7 @@ void OAccessibleMenuItemComponent::SetItemText( const OUString& sItemText )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuItemComponent::GetItemText()
 {
@@ -230,7 +230,7 @@ OUString OAccessibleMenuItemComponent::GetItemText()
     return sText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -250,9 +250,9 @@ void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateS
     rStateSet.AddState( AccessibleStateType::OPAQUE );
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeException)
 {
@@ -290,9 +290,9 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeExcep
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OAccessibleMenuItemComponent::disposing()
 {
@@ -303,9 +303,9 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing()
     m_sItemText = OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -314,7 +314,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (Runtime
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -326,7 +326,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_I
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent(  ) throw (RuntimeException)
 {
@@ -335,7 +335,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent(  ) t
     return m_pParent->GetAccessible();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
@@ -344,7 +344,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent(  ) throw (Ru
     return m_nItemPos;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -353,7 +353,7 @@ sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole(  ) throw (RuntimeExce
     return AccessibleRole::UNKNOWN;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException)
 {
@@ -366,7 +366,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (Runtim
     return sDescription;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuItemComponent::getAccessibleName(  ) throw (RuntimeException)
 {
@@ -375,7 +375,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleName(  ) throw (RuntimeExcep
     return m_sAccessibleName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
@@ -386,7 +386,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleR
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale OAccessibleMenuItemComponent::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -395,9 +395,9 @@ Locale OAccessibleMenuItemComponent::getLocale(  ) throw (IllegalAccessibleCompo
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
 {
@@ -406,14 +406,14 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( con
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OAccessibleMenuItemComponent::grabFocus(  ) throw (RuntimeException)
 {
     // no focus for items
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuItemComponent::getForeground(  ) throw (RuntimeException)
 {
@@ -431,7 +431,7 @@ sal_Int32 OAccessibleMenuItemComponent::getForeground(  ) throw (RuntimeExceptio
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OAccessibleMenuItemComponent::getBackground(  ) throw (RuntimeException)
 {
@@ -449,9 +449,9 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground(  ) throw (RuntimeExceptio
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< awt::XFont > OAccessibleMenuItemComponent::getFont(  ) throw (RuntimeException)
 {
@@ -469,7 +469,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont(  ) throw (Runtime
     return xFont;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuItemComponent::getTitledBorderText(  ) throw (RuntimeException)
 {
@@ -478,7 +478,7 @@ OUString OAccessibleMenuItemComponent::getTitledBorderText(  ) throw (RuntimeExc
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OAccessibleMenuItemComponent::getToolTipText(  ) throw (RuntimeException)
 {
@@ -491,7 +491,7 @@ OUString OAccessibleMenuItemComponent::getToolTipText(  ) throw (RuntimeExceptio
     return sRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OAccessibleMenuItemComponent::IsMenuHideDisabledEntries()
 {
diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx
index be71fab38334..f75e7ce5b15a 100644
--- a/accessibility/source/standard/floatingwindowaccessible.cxx
+++ b/accessibility/source/standard/floatingwindowaccessible.cxx
@@ -19,7 +19,6 @@
 
 #include <floatingwindowaccessible.hxx>
 
-
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <vcl/window.hxx>
@@ -28,22 +27,14 @@ namespace uno = ::com::sun::star::uno;
 
 using ::com::sun::star::accessibility::AccessibleRelation;
 namespace AccessibleRelationType = ::com::sun::star::accessibility::AccessibleRelationType;
-
-//-------------------------------------------------------------------
-
 FloatingWindowAccessible::FloatingWindowAccessible(VCLXWindow* pWindow) :
     VCLXAccessibleComponent(pWindow)
 {
 }
-
-//-------------------------------------------------------------------
-
 FloatingWindowAccessible::~FloatingWindowAccessible()
 {
 }
 
-//-------------------------------------------------------------------
-
 void FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& rRelationSet)
 {
     Window* pWindow = GetWindow();
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index d3509018a901..9bf3b8169647 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -39,22 +39,22 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // VCLXAccessibleButton
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleButton::VCLXAccessibleButton( VCLXWindow* pVCLWindow )
     :VCLXAccessibleTextComponent( pVCLWindow )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleButton::~VCLXAccessibleButton()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -79,7 +79,7 @@ void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowE
    }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -108,28 +108,28 @@ void VCLXAccessibleButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleButton" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -138,9 +138,9 @@ Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (Run
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleButton::getAccessibleName(  ) throw (RuntimeException)
 {
@@ -176,9 +176,9 @@ OUString VCLXAccessibleButton::getAccessibleName(  ) throw (RuntimeException)
     return aName;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeException)
 {
@@ -187,7 +187,7 @@ sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeExcept
     return 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -203,7 +203,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (In
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -215,7 +215,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex
     return OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -254,9 +254,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB
     return xKeyBinding;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleValue
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleButton::getCurrentValue(  ) throw (RuntimeException)
 {
@@ -271,7 +271,7 @@ Any VCLXAccessibleButton::getCurrentValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
 {
@@ -297,7 +297,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleButton::getMaximumValue(  ) throw (RuntimeException)
 {
@@ -309,7 +309,7 @@ Any VCLXAccessibleButton::getMaximumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleButton::getMinimumValue(  ) throw (RuntimeException)
 {
@@ -321,6 +321,6 @@ Any VCLXAccessibleButton::getMinimumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index fa59bcd4cf62..eaa7cc6e8f5c 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -41,9 +41,9 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // VCLXAccessibleCheckBox
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
     :VCLXAccessibleTextComponent( pVCLWindow )
@@ -52,13 +52,13 @@ VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
     m_bIndeterminate = IsIndeterminate();
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleCheckBox::~VCLXAccessibleCheckBox()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool VCLXAccessibleCheckBox::IsChecked()
 {
@@ -71,7 +71,7 @@ bool VCLXAccessibleCheckBox::IsChecked()
     return bChecked;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool VCLXAccessibleCheckBox::IsIndeterminate()
 {
@@ -84,7 +84,7 @@ bool VCLXAccessibleCheckBox::IsIndeterminate()
     return bIndeterminate;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleCheckBox::SetChecked( bool bChecked )
 {
@@ -100,7 +100,7 @@ void VCLXAccessibleCheckBox::SetChecked( bool bChecked )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleCheckBox::SetIndeterminate( bool bIndeterminate )
 {
@@ -116,7 +116,7 @@ void VCLXAccessibleCheckBox::SetIndeterminate( bool bIndeterminate )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -133,7 +133,7 @@ void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindo
    }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleCheckBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -148,28 +148,28 @@ void VCLXAccessibleCheckBox::FillAccessibleStateSet( utl::AccessibleStateSetHelp
         rStateSet.AddState( AccessibleStateType::INDETERMINATE );
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleCheckBox, VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleCheckBox" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -178,9 +178,9 @@ Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (R
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeException)
 {
@@ -189,7 +189,7 @@ sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeExce
     return 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -221,7 +221,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -236,7 +236,7 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd
         return TK_RES_STRING( RID_STR_ACC_ACTION_CHECK );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -275,9 +275,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe
     return xKeyBinding;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleValue
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleCheckBox::getCurrentValue(  ) throw (RuntimeException)
 {
@@ -292,7 +292,7 @@ Any VCLXAccessibleCheckBox::getCurrentValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
 {
@@ -320,7 +320,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleCheckBox::getMaximumValue(  ) throw (RuntimeException)
 {
@@ -337,7 +337,7 @@ Any VCLXAccessibleCheckBox::getMaximumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleCheckBox::getMinimumValue(  ) throw (RuntimeException)
 {
@@ -349,6 +349,6 @@ Any VCLXAccessibleCheckBox::getMinimumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index b7e53761aa85..be40d5c43d1d 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -49,9 +49,9 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // VCLXAccessibleEdit
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow )
     :VCLXAccessibleTextComponent( pVCLWindow )
@@ -60,13 +60,13 @@ VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow )
     m_nCaretPosition = getCaretPosition();
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleEdit::~VCLXAccessibleEdit()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -109,7 +109,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
    }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleEdit::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -125,9 +125,9 @@ void VCLXAccessibleEdit::FillAccessibleStateSet( utl::AccessibleStateSetHelper&
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleText
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleEdit::implGetText()
 {
@@ -152,7 +152,7 @@ OUString VCLXAccessibleEdit::implGetText()
     return aText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleEdit::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
 {
@@ -165,28 +165,28 @@ void VCLXAccessibleEdit::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nE
     nEndIndex = aSelection.Max;
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleEdit, VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleEdit" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -195,9 +195,9 @@ Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (Runti
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -206,7 +206,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -218,7 +218,7 @@ Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) t
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleEdit::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -234,9 +234,9 @@ sal_Int16 VCLXAccessibleEdit::getAccessibleRole(  ) throw (RuntimeException)
     return nRole;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeException)
 {
@@ -246,7 +246,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeExceptio
     return 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -266,7 +266,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde
     return bDoAction;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -279,7 +279,7 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex )
     return sAction;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -291,23 +291,23 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBin
     return Reference< XAccessibleKeyBinding >();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleText
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleEdit::getCaretPosition(  ) throw (RuntimeException)
 {
     return getSelectionEnd();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return setSelection( nIndex, nIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -316,7 +316,7 @@ sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOut
     return VCLXAccessibleTextComponent::getCharacter( nIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -325,7 +325,7 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32
     return VCLXAccessibleTextComponent::getCharacterAttributes( nIndex, aRequestedAttributes );
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -368,7 +368,7 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleEdit::getCharacterCount(  ) throw (RuntimeException)
 {
@@ -377,7 +377,7 @@ sal_Int32 VCLXAccessibleEdit::getCharacterCount(  ) throw (RuntimeException)
     return VCLXAccessibleTextComponent::getCharacterCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
@@ -386,7 +386,7 @@ sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw
     return VCLXAccessibleTextComponent::getIndexAtPoint( aPoint );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleEdit::getSelectedText(  ) throw (RuntimeException)
 {
@@ -395,7 +395,7 @@ OUString VCLXAccessibleEdit::getSelectedText(  ) throw (RuntimeException)
     return VCLXAccessibleTextComponent::getSelectedText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleEdit::getSelectionStart(  ) throw (RuntimeException)
 {
@@ -404,7 +404,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionStart(  ) throw (RuntimeException)
     return VCLXAccessibleTextComponent::getSelectionStart();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleEdit::getSelectionEnd(  ) throw (RuntimeException)
 {
@@ -413,7 +413,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionEnd(  ) throw (RuntimeException)
     return VCLXAccessibleTextComponent::getSelectionEnd();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -436,7 +436,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleEdit::getText(  ) throw (RuntimeException)
 {
@@ -445,7 +445,7 @@ OUString VCLXAccessibleEdit::getText(  ) throw (RuntimeException)
     return VCLXAccessibleTextComponent::getText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -454,7 +454,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd
     return VCLXAccessibleTextComponent::getTextRange( nStartIndex, nEndIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -463,7 +463,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd
     return VCLXAccessibleTextComponent::getTextAtIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -472,7 +472,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd
     return VCLXAccessibleTextComponent::getTextBeforeIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -481,7 +481,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd
     return VCLXAccessibleTextComponent::getTextBehindIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -490,9 +490,9 @@ sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndInde
     return VCLXAccessibleTextComponent::copyText( nStartIndex, nEndIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleEditableText
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -501,7 +501,7 @@ sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex
     return copyText( nStartIndex, nEndIndex ) && deleteText( nStartIndex, nEndIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -535,7 +535,7 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -544,7 +544,7 @@ sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIn
     return replaceText( nStartIndex, nEndIndex, OUString() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -553,7 +553,7 @@ sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex
     return replaceText( nIndex, nIndex, sText );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -580,7 +580,7 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence<PropertyValue>& ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -592,7 +592,7 @@ sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEn
     return sal_False;   // attributes cannot be set for an edit
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeException)
 {
@@ -610,6 +610,6 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeExce
     return bSuccess;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
index 827ef624f97b..05035338b9cf 100644
--- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
@@ -21,29 +21,29 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------------
+
 // VCLXAccessibleFixedHyperlink
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleFixedHyperlink::VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLWindow )
     :VCLXAccessibleTextComponent( pVCLWindow )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleFixedHyperlink::~VCLXAccessibleFixedHyperlink()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleFixedHyperlink::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
     VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
 {
@@ -51,16 +51,16 @@ void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundar
     OCommonAccessibleText::implGetLineBoundary( rBoundary, nIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleFixedHyperlink" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException)
 {
@@ -69,6 +69,6 @@ uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
index 786ca60b48fc..e5c64f31596b 100644
--- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
@@ -30,22 +30,22 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::accessibility;
 
 
-// -----------------------------------------------------------------------------
+
 // VCLXAccessibleFixedText
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleFixedText::VCLXAccessibleFixedText( VCLXWindow* pVCLWindow )
     :VCLXAccessibleTextComponent( pVCLWindow )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleFixedText::~VCLXAccessibleFixedText()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -55,7 +55,7 @@ void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHel
         rStateSet.AddState( AccessibleStateType::MULTI_LINE );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
 {
@@ -63,16 +63,16 @@ void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sa
     OCommonAccessibleText::implGetLineBoundary( rBoundary, nIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleFixedText" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -81,6 +81,6 @@ Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 44fb488b5698..91a44409be9e 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -94,19 +94,19 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
     sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount());
     m_aAccessibleChildren.reserve(nCount);
 }
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleList::~VCLXAccessibleList (void)
 {
     delete m_pListBoxHelper;
 }
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleList::SetIndexInParent (sal_Int32 nIndex)
 {
     m_nIndexInParent = nIndex;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL VCLXAccessibleList::disposing (void)
 {
@@ -118,14 +118,14 @@ void SAL_CALL VCLXAccessibleList::disposing (void)
     delete m_pListBoxHelper;
     m_pListBoxHelper = NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleList::clearItems()
 {
     // Clear the list itself and delete all the rest.
     ListItems().swap(m_aAccessibleChildren); // clear and minimize
 }
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet)
 {
@@ -154,7 +154,7 @@ void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper&
         rStateSet.AddState (AccessibleStateType::MANAGES_DESCENDANTS);
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew )
 {
     m_bVisible = _bSetNew ? true : false;
@@ -184,7 +184,7 @@ void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew )
 
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleList::UpdateSelection_Acc (::rtl::OUString sTextOfSelectedItem, bool b_IsDropDownList)
 {
     if ( m_aBoxType == COMBOBOX )
@@ -202,7 +202,7 @@ void VCLXAccessibleList::UpdateSelection_Acc (::rtl::OUString sTextOfSelectedIte
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool b_IsDropDownList)
 {
     uno::Any aOldValue, aNewValue;
@@ -340,7 +340,7 @@ void VCLXAccessibleList::UpdateFocus_Impl_Acc (sal_uInt16 nPos ,bool b_IsDropDow
             aNewValue );
 }
 
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent,  bool b_IsDropDownList)
 {
     switch ( rVclWindowEvent.GetId() )
@@ -390,7 +390,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
     }
 
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
 {
     // Create a reference to this object to prevent an early release of the
@@ -483,7 +483,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
         VCLXAccessibleComponent::FillAccessibleRelationSet(rRelationSet);
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /** To find out which item is currently selected and to update the SELECTED
     state of the associated accessibility objects accordingly we exploit the
@@ -506,7 +506,7 @@ void VCLXAccessibleList::UpdateSelection (OUString sTextOfSelectedItem)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
 {
@@ -554,7 +554,7 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
 
     return xChild;
 }
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleList::HandleChangedItemList (bool /*bItemInserted*/, sal_Int32 /*nIndex*/)
 {
@@ -563,7 +563,7 @@ void VCLXAccessibleList::HandleChangedItemList (bool /*bItemInserted*/, sal_Int3
         AccessibleEventId::INVALIDATE_ALL_CHILDREN,
         Any(), Any());
 }
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleList, VCLXAccessibleComponent, VCLXAccessibleList_BASE)
 IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, VCLXAccessibleList_BASE)
@@ -576,7 +576,7 @@ Reference<XAccessibleContext> SAL_CALL
 {
     return this;
 }
-// -----------------------------------------------------------------------------
+
 
 //=====  XAccessibleContext  ==================================================
 
@@ -592,7 +592,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void)
 
     return nCount;
 }
-// -----------------------------------------------------------------------------
+
 
 Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i)
     throw (IndexOutOfBoundsException, RuntimeException)
@@ -616,7 +616,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3
     OSL_ENSURE( xChild.is(), "VCLXAccessibleList::getAccessibleChild: returning empty child!" );
     return xChild;
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent(  )
     throw (RuntimeException)
@@ -625,7 +625,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent(  )
 
     return m_xParent;
 }
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void)
     throw (::com::sun::star::uno::RuntimeException)
@@ -635,14 +635,14 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void)
     else
         return VCLXAccessibleComponent::getAccessibleIndexInParent();
 }
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void)
     throw (RuntimeException)
 {
     return AccessibleRole::LIST;
 }
-// -----------------------------------------------------------------------------
+
 
 //=====  XAccessibleComponent  ================================================
 
@@ -662,7 +662,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw
 
     return bInside;
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt::Point& rPoint )
     throw (RuntimeException)
@@ -691,7 +691,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt
 
     return xChild;
 }
-// -----------------------------------------------------------------------------
+
 
 //===== XServiceInfo ==========================================================
 
@@ -700,7 +700,7 @@ OUString VCLXAccessibleList::getImplementationName (void)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleList" );
 }
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void)
     throw (RuntimeException)
@@ -711,7 +711,7 @@ Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void)
     aNames[nLength] = "com.sun.star.accessibility.AccessibleList";
     return aNames;
 }
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleList::UpdateVisibleLineCount()
 {
@@ -729,7 +729,7 @@ void VCLXAccessibleList::UpdateVisibleLineCount()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleList::UpdateEntryRange_Impl()
 {
     SolarMutexGuard aSolarGuard;
@@ -760,7 +760,7 @@ void VCLXAccessibleList::UpdateEntryRange_Impl()
 
     m_nLastTopEntry = nTop;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc)
 {
     OSL_ENSURE(m_pListBoxHelper,"Helper is not valid!");
@@ -776,7 +776,7 @@ sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue
     }
     return bNowSelected;
 }
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16)
 {
@@ -844,9 +844,9 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleSelection
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     sal_Bool bNotify = sal_False;
@@ -871,7 +871,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex )
     if ( bNotify )
         UpdateSelection_Impl();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -886,7 +886,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil
     }
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleList::clearAccessibleSelection(  ) throw (RuntimeException)
 {
     sal_Bool bNotify = sal_False;
@@ -905,7 +905,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection(  ) throw (RuntimeExc
     if ( bNotify )
         UpdateSelection_Impl();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren(  ) throw (RuntimeException)
 {
     sal_Bool bNotify = sal_False;
@@ -930,7 +930,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren(  ) throw (Runtime
     if ( bNotify )
         UpdateSelection_Impl();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -941,7 +941,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount(  ) throw
            nCount = m_pListBoxHelper->GetSelectEntryCount();
     return nCount;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -955,7 +955,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild
 
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     sal_Bool bNotify = sal_False;
@@ -980,7 +980,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh
     if ( bNotify )
         UpdateSelection_Impl();
 }
-// -----------------------------------------------------------------------------
+
 awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException)
 {
     awt::Rectangle aBounds ( 0, 0, 0, 0 );
@@ -1009,7 +1009,7 @@ awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException)
     }
     return aBounds;
 }
-// -----------------------------------------------------------------------------
+
 
 awt::Point VCLXAccessibleList::getLocationOnScreen(  ) throw (uno::RuntimeException)
 {
@@ -1038,14 +1038,14 @@ awt::Point VCLXAccessibleList::getLocationOnScreen(  ) throw (uno::RuntimeExcept
     return aPos;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleList::IsInDropDown()
 {
     return m_pListBoxHelper->IsInDropDown();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleList::HandleDropOpen()
 {
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 21e1d45da04e..b1e4c6dce484 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -58,9 +58,9 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------------
+
 // Ctor() and Dtor()
-// -----------------------------------------------------------------------------
+
 VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper, sal_Int32 _nIndexInParent, const Reference< XAccessible >& _xParent ) :
 
     VCLXAccessibleListItem_BASE ( m_aMutex ),
@@ -79,11 +79,11 @@ VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHe
     if ( m_pListBoxHelper )
         m_sEntryText = m_pListBoxHelper->GetEntry( (sal_uInt16)_nIndexInParent );
 }
-// -----------------------------------------------------------------------------
+
 VCLXAccessibleListItem::~VCLXAccessibleListItem()
 {
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected )
 {
     if ( m_bSelected != _bSelected )
@@ -98,7 +98,7 @@ void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected )
         NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleListItem::SetVisible( sal_Bool _bVisible )
 {
     if ( m_bVisible != _bVisible )
@@ -111,7 +111,7 @@ void VCLXAccessibleListItem::SetVisible( sal_Bool _bVisible )
         NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleListItem::NotifyAccessibleEvent( sal_Int16 _nEventId,
                                                     const ::com::sun::star::uno::Any& _aOldValue,
                                                     const ::com::sun::star::uno::Any& _aNewValue )
@@ -125,49 +125,49 @@ void VCLXAccessibleListItem::NotifyAccessibleEvent( sal_Int16 _nEventId,
     if (m_nClientId)
         comphelper::AccessibleEventNotifier::addEvent( m_nClientId, aEvt );
 }
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleText
-// -----------------------------------------------------------------------------
+
 OUString VCLXAccessibleListItem::implGetText()
 {
     return m_sEntryText;
 }
-// -----------------------------------------------------------------------------
+
 Locale VCLXAccessibleListItem::implGetLocale()
 {
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleListItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
 {
     nStartIndex = 0;
     nEndIndex = 0;
 }
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL VCLXAccessibleListItem::queryInterface( Type const & rType ) throw (RuntimeException)
 {
     return VCLXAccessibleListItem_BASE::queryInterface( rType );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleListItem::acquire() throw ()
 {
     VCLXAccessibleListItem_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleListItem::release() throw ()
 {
     VCLXAccessibleListItem_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL VCLXAccessibleListItem::getTypes(  ) throw (RuntimeException)
 {
     return VCLXAccessibleListItem_BASE::getTypes();
 }
-// -----------------------------------------------------------------------------
+
 Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (RuntimeException)
 {
     static ::cppu::OImplementationId* pId = NULL;
@@ -184,9 +184,9 @@ Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (Runtim
     }
     return pId->getImplementationId();
 }
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleListItem::disposing()
 {
     comphelper::AccessibleEventNotifier::TClientId nId( 0 );
@@ -210,19 +210,19 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
     if ( nId )
             comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
 }
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleListItem" );
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
-// -----------------------------------------------------------------------------
+
 Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< OUString > aNames(3);
@@ -231,51 +231,51 @@ Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (R
     aNames[2] = "com.sun.star.accessibility.AccessibleListItem";
     return aNames;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessible
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext(  ) throw (RuntimeException)
 {
     return this;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount(  ) throw (RuntimeException)
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) throw (RuntimeException)
 {
     return Reference< XAccessible >();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_xParent;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_nIndexInParent;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole(  ) throw (RuntimeException)
 {
     return AccessibleRole::LIST_ITEM;
     //  return AccessibleRole::LABEL;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription(  ) throw (RuntimeException)
 {
     // no description for every item
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -283,14 +283,14 @@ OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName(  ) throw (RuntimeEx
     // entry text == accessible name
     return implGetText();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
     utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
     Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
     return xSet;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -322,7 +322,7 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleS
 
     return xStateSet;
 }
-// -----------------------------------------------------------------------------
+
 Locale SAL_CALL VCLXAccessibleListItem::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -330,9 +330,9 @@ Locale SAL_CALL VCLXAccessibleListItem::getLocale(  ) throw (IllegalAccessibleCo
 
     return implGetLocale();
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -347,12 +347,12 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi
     }
     return bInside;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
 {
     return Reference< XAccessible >();
 }
-// -----------------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds(  ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -364,7 +364,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds(  ) throw (RuntimeExce
 
     return aRect;
 }
-// -----------------------------------------------------------------------------
+
 awt::Point SAL_CALL VCLXAccessibleListItem::getLocation(  ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -378,7 +378,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation(  ) throw (RuntimeExcept
     }
     return AWTPoint( aPoint );
 }
-// -----------------------------------------------------------------------------
+
 awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -393,7 +393,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  ) throw (Runti
     }
     return AWTPoint( aPoint );
 }
-// -----------------------------------------------------------------------------
+
 awt::Size SAL_CALL VCLXAccessibleListItem::getSize(  ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -405,19 +405,19 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize(  ) throw (RuntimeException)
 
     return AWTSize( aSize );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleListItem::grabFocus(  ) throw (RuntimeException)
 {
     // no focus for each item
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleText
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() throw (RuntimeException)
 {
     return -1;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -428,7 +428,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) t
 
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -436,7 +436,7 @@ sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) th
 
     return OCommonAccessibleText::getCharacter( nIndex );
 }
-// -----------------------------------------------------------------------------
+
 Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -448,7 +448,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttribute
 
     return Sequence< PropertyValue >();
 }
-// -----------------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -469,7 +469,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI
 
     return aBounds;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -477,7 +477,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeExc
 
     return OCommonAccessibleText::getCharacterCount();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -496,7 +496,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP
     }
     return nIndex;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -504,7 +504,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeExcept
 
     return OCommonAccessibleText::getSelectedText();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -512,7 +512,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeExc
 
     return OCommonAccessibleText::getSelectionStart();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -520,7 +520,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeExcep
 
     return OCommonAccessibleText::getSelectionEnd();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -531,7 +531,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s
 
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -539,7 +539,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException)
 
     return OCommonAccessibleText::getText();
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -547,7 +547,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s
 
     return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -555,7 +555,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s
 
     return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -563,7 +563,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s
 
     return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -571,7 +571,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s
 
     return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -602,9 +602,9 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I
 
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleEventBroadcaster
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
     if (xListener.is())
@@ -614,7 +614,7 @@ void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Referenc
         comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener );
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
     if ( xListener.is() && m_nClientId )
@@ -635,7 +635,7 @@ void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Refer
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 
 
@@ -656,6 +656,6 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground (void)
 {
     return COL_WHITE;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx
index 3ccbf7c2cfe1..8dba21b894f4 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -30,22 +30,22 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // VCLXAccessibleMenu
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleMenu::VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
     :VCLXAccessibleMenuItem( pParent, nItemPos, pMenu )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleMenu::~VCLXAccessibleMenu()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenu::IsFocused()
 {
@@ -57,7 +57,7 @@ sal_Bool VCLXAccessibleMenu::IsFocused()
     return bFocused;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenu::IsPopupMenuOpen()
 {
@@ -73,28 +73,28 @@ sal_Bool VCLXAccessibleMenu::IsPopupMenuOpen()
     return bPopupMenuOpen;
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VCLXAccessibleMenu_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VCLXAccessibleMenu_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleMenu" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -103,9 +103,9 @@ Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (Runti
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount(  ) throw (RuntimeException)
 {
@@ -114,7 +114,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount(  ) throw (RuntimeExceptio
     return GetChildCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -126,7 +126,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) t
     return GetChild( i );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleMenu::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -135,9 +135,9 @@ sal_Int16 VCLXAccessibleMenu::getAccessibleRole(  ) throw (RuntimeException)
     return AccessibleRole::MENU;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
 {
@@ -146,9 +146,9 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Po
     return GetChildAt( rPoint );
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleSelection
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -160,7 +160,7 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (I
     SelectChild( nChildIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -172,7 +172,7 @@ sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex )
     return IsChildSelected( nChildIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleMenu::clearAccessibleSelection(  ) throw (RuntimeException)
 {
@@ -181,14 +181,14 @@ void VCLXAccessibleMenu::clearAccessibleSelection(  ) throw (RuntimeException)
     DeSelectAll();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleMenu::selectAllAccessibleChildren(  ) throw (RuntimeException)
 {
     // This method makes no sense in a menu, and so does nothing.
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
 {
@@ -205,7 +205,7 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount(  ) throw (Runtime
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -228,7 +228,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -240,7 +240,7 @@ void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw
     DeSelectAll();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 740ce1a5804e..3ba4c19eb30c 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -31,9 +31,9 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class VCLXAccessibleMenuBar
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu )
     :OAccessibleMenuComponent( pMenu )
@@ -51,7 +51,7 @@ VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar()
 {
@@ -59,7 +59,7 @@ VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar()
         m_pWindow->RemoveEventListener( LINK( this, VCLXAccessibleMenuBar, WindowEventListener ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuBar::IsFocused()
 {
@@ -71,7 +71,7 @@ sal_Bool VCLXAccessibleMenuBar::IsFocused()
     return bFocused;
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclSimpleEvent*, pEvent )
 {
@@ -87,7 +87,7 @@ IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclSimpleEvent*, pEvent )
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -115,9 +115,9 @@ void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindow
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleMenuBar::disposing()
 {
@@ -130,16 +130,16 @@ void VCLXAccessibleMenuBar::disposing()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleMenuBar" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -148,9 +148,9 @@ Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (Ru
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
@@ -182,7 +182,7 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent(  ) throw (RuntimeEx
     return nIndexInParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -191,9 +191,9 @@ sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole(  ) throw (RuntimeException)
     return AccessibleRole::MENU_BAR;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenuBar::getBackground(  ) throw (RuntimeException)
 {
@@ -202,6 +202,6 @@ sal_Int32 VCLXAccessibleMenuBar::getBackground(  ) throw (RuntimeException)
     return Application::GetSettings().GetStyleSettings().GetMenuBarColor().GetColor();
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index c72ae8e1e041..488befd799e4 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -45,36 +45,36 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class VCLXAccessibleMenuItem
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleMenuItem::VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
     :OAccessibleMenuItemComponent( pParent, nItemPos, pMenu )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleMenuItem::~VCLXAccessibleMenuItem()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::IsFocused()
 {
     return IsHighlighted();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::IsSelected()
 {
     return IsHighlighted();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::IsChecked()
 {
@@ -90,7 +90,7 @@ sal_Bool VCLXAccessibleMenuItem::IsChecked()
     return bChecked;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::IsHighlighted()
 {
@@ -102,7 +102,7 @@ sal_Bool VCLXAccessibleMenuItem::IsHighlighted()
     return bHighlighted;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleMenuItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -122,23 +122,23 @@ void VCLXAccessibleMenuItem::FillAccessibleStateSet( utl::AccessibleStateSetHelp
         rStateSet.AddState( AccessibleStateType::CHECKED );
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleText
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenuItem::implGetText()
 {
     return m_sItemText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale VCLXAccessibleMenuItem::implGetLocale()
 {
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleMenuItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
 {
@@ -146,28 +146,28 @@ void VCLXAccessibleMenuItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32
     nEndIndex = 0;
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenuItem, OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleMenuItem" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -176,9 +176,9 @@ Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (R
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -198,9 +198,9 @@ sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole(  ) throw (RuntimeException)
     return nRole;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleText
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException)
 {
@@ -209,7 +209,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException)
     return -1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -222,7 +222,7 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (Ind
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -231,7 +231,7 @@ sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (Inde
     return OCommonAccessibleText::getCharacter( nIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -249,7 +249,7 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In
         .GetCharacterAttributes( aRequestedAttributes );
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -271,7 +271,7 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) th
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException)
 {
@@ -280,7 +280,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException)
     return OCommonAccessibleText::getCharacterCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
@@ -301,7 +301,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th
     return nIndex;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException)
 {
@@ -310,7 +310,7 @@ OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException)
     return OCommonAccessibleText::getSelectedText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException)
 {
@@ -319,7 +319,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException)
     return OCommonAccessibleText::getSelectionStart();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException)
 {
@@ -328,7 +328,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException)
     return OCommonAccessibleText::getSelectionEnd();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -340,7 +340,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException)
 {
@@ -349,7 +349,7 @@ OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException)
     return OCommonAccessibleText::getText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -358,7 +358,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32
     return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -367,7 +367,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32
     return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -376,7 +376,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32
     return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -385,7 +385,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32
     return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -421,9 +421,9 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeException)
 {
@@ -432,7 +432,7 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeExce
     return 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -446,7 +446,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -458,7 +458,7 @@ OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nInd
     return TK_RES_STRING( RID_STR_ACC_ACTION_SELECT );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -535,9 +535,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe
     return xKeyBinding;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleValue
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleMenuItem::getCurrentValue(  ) throw (RuntimeException)
 {
@@ -552,7 +552,7 @@ Any VCLXAccessibleMenuItem::getCurrentValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
 {
@@ -576,7 +576,7 @@ sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (Ru
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleMenuItem::getMaximumValue(  ) throw (RuntimeException)
 {
@@ -588,7 +588,7 @@ Any VCLXAccessibleMenuItem::getMaximumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleMenuItem::getMinimumValue(  ) throw (RuntimeException)
 {
@@ -600,6 +600,6 @@ Any VCLXAccessibleMenuItem::getMinimumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
index 633bdf1e5fac..52c8fb440894 100644
--- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
@@ -28,31 +28,31 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class VCLXAccessibleMenuSeparator
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleMenuSeparator::VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
     :OAccessibleMenuItemComponent( pParent, nItemPos, pMenu )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleMenuSeparator" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -61,9 +61,9 @@ Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() thr
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -72,6 +72,6 @@ sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole(  ) throw (RuntimeExcep
     return AccessibleRole::SEPARATOR;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index 3db137b25e4b..e12ece7b6990 100644
--- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -28,38 +28,38 @@ using namespace ::com::sun::star::uno;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class VCLXAccessiblePopupMenu
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessiblePopupMenu::VCLXAccessiblePopupMenu( Menu* pMenu )
     :OAccessibleMenuComponent( pMenu )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessiblePopupMenu::IsFocused()
 {
     return !IsChildHighlighted();
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessiblePopupMenu" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -68,9 +68,9 @@ Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
@@ -79,7 +79,7 @@ sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent(  ) throw (Runtime
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -88,9 +88,9 @@ sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole(  ) throw (RuntimeException
     return AccessibleRole::POPUP_MENU;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessiblePopupMenu::getBackground(  ) throw (RuntimeException)
 {
@@ -99,6 +99,6 @@ sal_Int32 VCLXAccessiblePopupMenu::getBackground(  ) throw (RuntimeException)
     return Application::GetSettings().GetStyleSettings().GetMenuColor().GetColor();
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 7e8b948ad3c9..0b272cb3d0a9 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -44,22 +44,22 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // VCLXAccessibleRadioButton
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleRadioButton::VCLXAccessibleRadioButton( VCLXWindow* pVCLWindow )
     :VCLXAccessibleTextComponent( pVCLWindow )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleRadioButton::~VCLXAccessibleRadioButton()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -84,7 +84,7 @@ void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWi
    }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet )
 {
@@ -108,7 +108,7 @@ void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelati
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleRadioButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -123,28 +123,28 @@ void VCLXAccessibleRadioButton::FillAccessibleStateSet( utl::AccessibleStateSetH
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleRadioButton" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -153,9 +153,9 @@ Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeException)
 {
@@ -164,7 +164,7 @@ sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE
     return 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -180,7 +180,7 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) thro
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -192,7 +192,7 @@ OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 n
     return TK_RES_STRING( RID_STR_ACC_ACTION_SELECT );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -231,9 +231,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio
     return xKeyBinding;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleValue
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleRadioButton::getCurrentValue(  ) throw (RuntimeException)
 {
@@ -248,7 +248,7 @@ Any VCLXAccessibleRadioButton::getCurrentValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
 {
@@ -274,7 +274,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleRadioButton::getMaximumValue(  ) throw (RuntimeException)
 {
@@ -286,7 +286,7 @@ Any VCLXAccessibleRadioButton::getMaximumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleRadioButton::getMinimumValue(  ) throw (RuntimeException)
 {
@@ -298,6 +298,6 @@ Any VCLXAccessibleRadioButton::getMinimumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 3ef392199f41..6148824809a9 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -39,22 +39,22 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
-// -----------------------------------------------------------------------------
+
 // VCLXAccessibleScrollBar
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleScrollBar::VCLXAccessibleScrollBar( VCLXWindow* pVCLWindow )
     :VCLXAccessibleComponent( pVCLWindow )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleScrollBar::~VCLXAccessibleScrollBar()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -70,7 +70,7 @@ void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
    }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleScrollBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -88,28 +88,28 @@ void VCLXAccessibleScrollBar::FillAccessibleStateSet( utl::AccessibleStateSetHel
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleScrollBar" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -118,9 +118,9 @@ Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeException)
 {
@@ -129,7 +129,7 @@ sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeExc
     return 4;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -158,7 +158,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -181,7 +181,7 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn
     return sDescription;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -193,9 +193,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionK
     return Reference< XAccessibleKeyBinding >();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleValue
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleScrollBar::getCurrentValue(  ) throw (RuntimeException)
 {
@@ -210,7 +210,7 @@ Any VCLXAccessibleScrollBar::getCurrentValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
 {
@@ -238,7 +238,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleScrollBar::getMaximumValue(  ) throw (RuntimeException)
 {
@@ -253,7 +253,7 @@ Any VCLXAccessibleScrollBar::getMaximumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any VCLXAccessibleScrollBar::getMinimumValue(  ) throw (RuntimeException)
 {
@@ -265,7 +265,7 @@ Any VCLXAccessibleScrollBar::getMinimumValue(  ) throw (RuntimeException)
     return aValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleScrollBar::getAccessibleName(  ) throw (uno::RuntimeException)
 {
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index e120fc00b60c..c05c3c6257e6 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -44,13 +44,13 @@ VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow )
         m_aAccessibleChildren.assign( m_pStatusBar->GetItemCount(), Reference< XAccessible >() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleStatusBar::~VCLXAccessibleStatusBar()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, sal_Bool bShowing )
 {
@@ -66,7 +66,7 @@ void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, sal_Bool bShowing )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i )
 {
@@ -85,7 +85,7 @@ void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i )
 {
@@ -104,7 +104,7 @@ void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i )
 {
@@ -124,7 +124,7 @@ void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i )
 {
@@ -150,7 +150,7 @@ void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -255,9 +255,9 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
    }
 }
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBar::disposing()
 {
@@ -278,16 +278,16 @@ void VCLXAccessibleStatusBar::disposing()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBar" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -296,9 +296,9 @@ Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -307,7 +307,7 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep
     return m_aAccessibleChildren.size();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -333,9 +333,9 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
 {
@@ -353,6 +353,6 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const aw
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 7659f31b4e85..66d9f7838c73 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -44,9 +44,9 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class VCLXAccessibleStatusBarItem
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId )
     :AccessibleTextHelper_BASE( new VCLExternalSolarLock() )
@@ -60,7 +60,7 @@ VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar,
     m_bShowing  = IsShowing();
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem()
 {
@@ -68,7 +68,7 @@ VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem()
     m_pExternalLock = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleStatusBarItem::IsShowing()
 {
@@ -80,7 +80,7 @@ sal_Bool VCLXAccessibleStatusBarItem::IsShowing()
     return bShowing;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBarItem::SetShowing( sal_Bool bShowing )
 {
@@ -96,7 +96,7 @@ void VCLXAccessibleStatusBarItem::SetShowing( sal_Bool bShowing )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBarItem::SetItemName( const OUString& sItemName )
 {
@@ -110,7 +110,7 @@ void VCLXAccessibleStatusBarItem::SetItemName( const OUString& sItemName )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBarItem::GetItemName()
 {
@@ -121,7 +121,7 @@ OUString VCLXAccessibleStatusBarItem::GetItemName()
     return sName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBarItem::SetItemText( const OUString& sItemText )
 {
@@ -133,7 +133,7 @@ void VCLXAccessibleStatusBarItem::SetItemText( const OUString& sItemText )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBarItem::GetItemText()
 {
@@ -149,7 +149,7 @@ OUString VCLXAccessibleStatusBarItem::GetItemText()
     return sText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -162,9 +162,9 @@ void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSe
         rStateSet.AddState( AccessibleStateType::SHOWING );
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeException)
 {
@@ -176,23 +176,23 @@ awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeExcept
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleText
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBarItem::implGetText()
 {
     return GetItemText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 lang::Locale VCLXAccessibleStatusBarItem::implGetLocale()
 {
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
 {
@@ -200,21 +200,21 @@ void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_
     nEndIndex = 0;
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBarItem::disposing()
 {
@@ -225,23 +225,23 @@ void VCLXAccessibleStatusBarItem::disposing()
     m_sItemText = OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBarItem" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -250,9 +250,9 @@ Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() thr
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessible
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext(  ) throw (RuntimeException)
 {
@@ -261,9 +261,9 @@ Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContex
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -272,7 +272,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeE
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -284,7 +284,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_In
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent(  ) throw (RuntimeException)
 {
@@ -297,7 +297,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent(  ) th
     return xParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
@@ -310,7 +310,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent(  ) throw (Run
     return nIndexInParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -319,7 +319,7 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole(  ) throw (RuntimeExcep
     return AccessibleRole::LABEL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBarItem::getAccessibleDescription(  ) throw (RuntimeException)
 {
@@ -332,7 +332,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleDescription(  ) throw (Runtim
     return sDescription;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBarItem::getAccessibleName(  ) throw (RuntimeException)
 {
@@ -341,7 +341,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleName(  ) throw (RuntimeExcept
     return GetItemName();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
@@ -352,7 +352,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRe
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet(  ) throw (RuntimeException)
 {
@@ -373,7 +373,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleState
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale VCLXAccessibleStatusBarItem::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -382,9 +382,9 @@ Locale VCLXAccessibleStatusBarItem::getLocale(  ) throw (IllegalAccessibleCompon
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
 {
@@ -393,14 +393,14 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( cons
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleStatusBarItem::grabFocus(  ) throw (RuntimeException)
 {
     // no focus for status bar items
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleStatusBarItem::getForeground(   ) throw (RuntimeException)
 {
@@ -418,7 +418,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground(   ) throw (RuntimeExceptio
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleStatusBarItem::getBackground(  ) throw (RuntimeException)
 {
@@ -436,9 +436,9 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground(  ) throw (RuntimeException
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont(  ) throw (RuntimeException)
 {
@@ -456,7 +456,7 @@ Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont(  ) throw (RuntimeE
     return xFont;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBarItem::getTitledBorderText(  ) throw (RuntimeException)
 {
@@ -465,7 +465,7 @@ OUString VCLXAccessibleStatusBarItem::getTitledBorderText(  ) throw (RuntimeExce
     return GetItemText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleStatusBarItem::getToolTipText(  ) throw (RuntimeException)
 {
@@ -474,9 +474,9 @@ OUString VCLXAccessibleStatusBarItem::getToolTipText(  ) throw (RuntimeException
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleText
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeException)
 {
@@ -485,7 +485,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeExceptio
     return -1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -497,7 +497,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -521,7 +521,7 @@ Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( s
     return aValues;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -544,7 +544,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
@@ -564,7 +564,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint
     return nIndex;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -576,7 +576,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_I
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -608,6 +608,6 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index ecd6a9df48d1..0ee4bb4be010 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -49,13 +49,13 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
         m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference< XAccessible >() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleTabControl::~VCLXAccessibleTabControl()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::UpdateFocused()
 {
@@ -71,7 +71,7 @@ void VCLXAccessibleTabControl::UpdateFocused()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected )
 {
@@ -87,7 +87,7 @@ void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i )
 {
@@ -103,7 +103,7 @@ void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, bool bNew )
 {
@@ -119,7 +119,7 @@ void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, bool bNew )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::InsertChild( sal_Int32 i )
 {
@@ -139,7 +139,7 @@ void VCLXAccessibleTabControl::InsertChild( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i )
 {
@@ -165,7 +165,7 @@ void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -260,7 +260,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
    }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -291,7 +291,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -301,21 +301,21 @@ void VCLXAccessibleTabControl::FillAccessibleStateSet( utl::AccessibleStateSetHe
         rStateSet.AddState( AccessibleStateType::FOCUSABLE );
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabControl, VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabControl, VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::disposing()
 {
@@ -336,16 +336,16 @@ void VCLXAccessibleTabControl::disposing()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleTabControl" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -354,9 +354,9 @@ Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -365,7 +365,7 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce
     return m_aAccessibleChildren.size();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -391,7 +391,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleTabControl::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -400,7 +400,7 @@ sal_Int16 VCLXAccessibleTabControl::getAccessibleRole(  ) throw (RuntimeExceptio
     return AccessibleRole::PAGE_TAB_LIST;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabControl::getAccessibleName(  ) throw (RuntimeException)
 {
@@ -409,9 +409,9 @@ OUString VCLXAccessibleTabControl::getAccessibleName(  ) throw (RuntimeException
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleSelection
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -424,7 +424,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th
         m_pTabControl->SelectTabPage( m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -440,14 +440,14 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn
     return bSelected;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::clearAccessibleSelection(  ) throw (RuntimeException)
 {
     // This method makes no sense in a tab control, and so does nothing.
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::selectAllAccessibleChildren(  ) throw (RuntimeException)
 {
@@ -456,7 +456,7 @@ void VCLXAccessibleTabControl::selectAllAccessibleChildren(  ) throw (RuntimeExc
     selectAccessibleChild( 0 );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
 {
@@ -465,7 +465,7 @@ sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount(  ) throw (R
     return 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -488,7 +488,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -500,6 +500,6 @@ void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex )
     // This method makes no sense in a tab control, and so does nothing.
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index a1b2646fbbb8..147747de1741 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -44,9 +44,9 @@ using namespace ::com::sun::star;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class VCLXAccessibleTabPage
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId )
     :AccessibleTextHelper_BASE( new VCLExternalSolarLock() )
@@ -59,7 +59,7 @@ VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt1
     m_sPageText = GetPageText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleTabPage::~VCLXAccessibleTabPage()
 {
@@ -67,7 +67,7 @@ VCLXAccessibleTabPage::~VCLXAccessibleTabPage()
     m_pExternalLock = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool VCLXAccessibleTabPage::IsFocused()
 {
@@ -79,7 +79,7 @@ bool VCLXAccessibleTabPage::IsFocused()
     return bFocused;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool VCLXAccessibleTabPage::IsSelected()
 {
@@ -91,7 +91,7 @@ bool VCLXAccessibleTabPage::IsSelected()
     return bSelected;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPage::SetFocused( bool bFocused )
 {
@@ -107,7 +107,7 @@ void VCLXAccessibleTabPage::SetFocused( bool bFocused )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPage::SetSelected( bool bSelected )
 {
@@ -123,7 +123,7 @@ void VCLXAccessibleTabPage::SetSelected( bool bSelected )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPage::SetPageText( const OUString& sPageText )
 {
@@ -139,7 +139,7 @@ void VCLXAccessibleTabPage::SetPageText( const OUString& sPageText )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabPage::GetPageText()
 {
@@ -150,7 +150,7 @@ OUString VCLXAccessibleTabPage::GetPageText()
     return sText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPage::Update( bool bNew )
 {
@@ -173,7 +173,7 @@ void VCLXAccessibleTabPage::Update( bool bNew )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -195,9 +195,9 @@ void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelpe
         rStateSet.AddState( AccessibleStateType::SELECTED );
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException)
 {
@@ -209,23 +209,23 @@ awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException)
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleText
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabPage::implGetText()
 {
     return GetPageText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 lang::Locale VCLXAccessibleTabPage::implGetLocale()
 {
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
 {
@@ -233,21 +233,21 @@ void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32&
     nEndIndex = 0;
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPage::disposing()
 {
@@ -257,23 +257,23 @@ void VCLXAccessibleTabPage::disposing()
     m_sPageText = OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleTabPage" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException)
 {
@@ -282,9 +282,9 @@ Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (Ru
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessible
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext(  ) throw (RuntimeException)
 {
@@ -293,9 +293,9 @@ Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext(  )
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -312,7 +312,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeExcepti
     return nCount;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -332,7 +332,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent(  ) throw (RuntimeException)
 {
@@ -345,7 +345,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent(  ) throw (R
     return xParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
@@ -358,7 +358,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent(  ) throw (RuntimeEx
     return nIndexInParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleTabPage::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -367,7 +367,7 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole(  ) throw (RuntimeException)
     return AccessibleRole::PAGE_TAB;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabPage::getAccessibleDescription(    ) throw (RuntimeException)
 {
@@ -380,7 +380,7 @@ OUString VCLXAccessibleTabPage::getAccessibleDescription(    ) throw (RuntimeExc
     return sDescription;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabPage::getAccessibleName(  ) throw (RuntimeException)
 {
@@ -389,7 +389,7 @@ OUString VCLXAccessibleTabPage::getAccessibleName(  ) throw (RuntimeException)
     return GetPageText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
@@ -400,7 +400,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelation
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet(  ) throw (RuntimeException)
 {
@@ -421,7 +421,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet(
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale VCLXAccessibleTabPage::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -430,9 +430,9 @@ Locale VCLXAccessibleTabPage::getLocale(  ) throw (IllegalAccessibleComponentSta
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
 {
@@ -461,7 +461,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPage::grabFocus(  ) throw (RuntimeException)
 {
@@ -474,7 +474,7 @@ void VCLXAccessibleTabPage::grabFocus(  ) throw (RuntimeException)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException)
 {
@@ -492,7 +492,7 @@ sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException)
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabPage::getBackground(  ) throw (RuntimeException)
 {
@@ -510,9 +510,9 @@ sal_Int32 VCLXAccessibleTabPage::getBackground(  ) throw (RuntimeException)
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< awt::XFont > VCLXAccessibleTabPage::getFont(  ) throw (RuntimeException)
 {
@@ -530,7 +530,7 @@ Reference< awt::XFont > VCLXAccessibleTabPage::getFont(  ) throw (RuntimeExcepti
     return xFont;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabPage::getTitledBorderText(  ) throw (RuntimeException)
 {
@@ -539,7 +539,7 @@ OUString VCLXAccessibleTabPage::getTitledBorderText(  ) throw (RuntimeException)
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTabPage::getToolTipText(  ) throw (RuntimeException)
 {
@@ -548,9 +548,9 @@ OUString VCLXAccessibleTabPage::getToolTipText(  ) throw (RuntimeException)
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleText
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException)
 {
@@ -559,7 +559,7 @@ sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException)
     return -1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -571,7 +571,7 @@ sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (Inde
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -595,7 +595,7 @@ Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int
     return aValues;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -616,7 +616,7 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) thr
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
@@ -637,7 +637,7 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) thr
     return nIndex;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -649,7 +649,7 @@ sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 n
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -681,6 +681,6 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index f63e266da231..5ba6d5b8c6f3 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -58,15 +58,15 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeException)
 {
@@ -86,9 +86,9 @@ awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeExcept
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTabPageWindow::disposing()
 {
@@ -98,9 +98,9 @@ void VCLXAccessibleTabPageWindow::disposing()
     m_pTabPage = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent(  ) throw (RuntimeException)
 {
@@ -129,7 +129,7 @@ Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent(  ) th
     return xParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
@@ -138,6 +138,6 @@ sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent(  ) throw (Run
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 598ac7e1dde5..ea2070aa3ec5 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -54,13 +54,13 @@ VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindo
         m_sText = OutputDevice::GetNonMnemonicString( GetWindow()->GetText() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleTextComponent::~VCLXAccessibleTextComponent()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTextComponent::SetText( const OUString& sText )
 {
@@ -72,7 +72,7 @@ void VCLXAccessibleTextComponent::SetText( const OUString& sText )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -89,9 +89,9 @@ void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVcl
    }
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleText
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTextComponent::implGetText()
 {
@@ -102,14 +102,14 @@ OUString VCLXAccessibleTextComponent::implGetText()
     return aText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 lang::Locale VCLXAccessibleTextComponent::implGetLocale()
 {
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTextComponent::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
 {
@@ -117,9 +117,9 @@ void VCLXAccessibleTextComponent::implGetSelection( sal_Int32& nStartIndex, sal_
     nEndIndex = 0;
 }
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleTextComponent::disposing()
 {
@@ -128,21 +128,21 @@ void VCLXAccessibleTextComponent::disposing()
     m_sText = OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTextComponent, VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTextComponent, VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleText
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeException)
 {
@@ -151,7 +151,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeExceptio
     return -1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -160,7 +160,7 @@ sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw
     return setSelection( nIndex, nIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -169,7 +169,7 @@ sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw
     return OCommonAccessibleText::getCharacter( nIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -244,7 +244,7 @@ Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( s
     return aValues;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -261,7 +261,7 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex
     return aRect;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException)
 {
@@ -270,7 +270,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeExcepti
     return OCommonAccessibleText::getCharacterCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
@@ -284,7 +284,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint
     return nIndex;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException)
 {
@@ -293,7 +293,7 @@ OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException)
     return OCommonAccessibleText::getSelectedText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException)
 {
@@ -302,7 +302,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeExcepti
     return OCommonAccessibleText::getSelectionStart();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException)
 {
@@ -311,7 +311,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException
     return OCommonAccessibleText::getSelectionEnd();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -323,7 +323,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException)
 {
@@ -332,7 +332,7 @@ OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException)
     return OCommonAccessibleText::getText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -341,7 +341,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I
     return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -350,7 +350,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I
     return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -359,7 +359,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I
     return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -368,7 +368,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I
     return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -400,6 +400,6 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 4492fde91d86..a748f7319093 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -63,7 +63,7 @@ namespace
         virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
     };
 
-    // -------------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -119,18 +119,15 @@ namespace
         static Sequence< sal_Int8 > getUnoTunnelImplementationId();
     };
 
-    // -------------------------------------------------------------------------
     IMPLEMENT_FORWARD_XINTERFACE2( OToolBoxWindowItem, OAccessibleWrapper, OToolBoxWindowItem_Base )
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OToolBoxWindowItem, OAccessibleWrapper, OToolBoxWindowItem_Base )
 
-    // -------------------------------------------------------------------------
     OAccessibleContextWrapper* OToolBoxWindowItem::createAccessibleContext(
             const Reference< XAccessibleContext >& _rxInnerContext )
     {
         return new OToolBoxWindowItemContext( m_nIndexInParent, getComponentContext(), _rxInnerContext, this, getParent() );
     }
 
-    //--------------------------------------------------------------------
     sal_Bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation )
     {
         OToolBoxWindowItem* pImplementation = NULL;
@@ -145,7 +142,6 @@ namespace
         return NULL != pImplementation;
     }
 
-    //--------------------------------------------------------------------
     Sequence< sal_Int8 > OToolBoxWindowItem::getUnoTunnelImplementationId()
     {
         static ::cppu::OImplementationId * pId = 0;
@@ -161,7 +157,6 @@ namespace
         return pId->getImplementationId();
     }
 
-    //--------------------------------------------------------------------
     sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException)
     {
         if  (   ( 16 == _rId.getLength() )
@@ -173,20 +168,19 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
 // VCLXAccessibleToolBox
-// -----------------------------------------------------------------------------
+
 VCLXAccessibleToolBox::VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow ) :
 
     VCLXAccessibleComponent( pVCLXWindow )
 
 {
 }
-// -----------------------------------------------------------------------------
+
 VCLXAccessibleToolBox::~VCLXAccessibleToolBox()
 {
 }
-// -----------------------------------------------------------------------------
+
 VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus )
 {
     VCLXAccessibleToolBoxItem* pItem = NULL;
@@ -201,7 +195,6 @@ VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos,
 
     return pItem;
 }
-// -----------------------------------------------------------------------------
 
 void VCLXAccessibleToolBox::UpdateFocus_Impl()
 {
@@ -254,7 +247,7 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::ReleaseFocus_Impl( sal_Int32 _nPos )
 {
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
@@ -270,7 +263,7 @@ void VCLXAccessibleToolBox::ReleaseFocus_Impl( sal_Int32 _nPos )
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos )
 {
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
@@ -295,7 +288,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos )
             pFocusItem->SetFocus( sal_True );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( sal_Int32 _nPos )
 {
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
@@ -313,7 +306,7 @@ void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( sal_Int32 _nPos )
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _rMapPos,
         bool _bNotifyRemoval, bool _bDispose )
 {
@@ -346,7 +339,6 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _
     }
 }
 
-// -----------------------------------------------------------------------------
 void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded )
 {
     if ( _nPos < sal_Int32( m_aAccessibleChildren.size() ) )
@@ -408,7 +400,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdd
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::UpdateAllItems_Impl()
 {
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
@@ -433,8 +425,6 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl()
     }
 }
 
-// -----------------------------------------------------------------------------
-
 void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen )
 {
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
@@ -452,21 +442,20 @@ void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( Window* pWindow, bool b
     }
 }
 
-// -----------------------------------------------------------------------------
 void VCLXAccessibleToolBox::UpdateItemName_Impl( sal_Int32 _nPos )
 {
     VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos, false );
     if ( pItem )
         pItem->NameChanged();
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::UpdateItemEnabled_Impl( sal_Int32 _nPos )
 {
     VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos, false );
     if ( pItem )
         pItem->ToggleEnableState();
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow )
 {
     Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
@@ -488,7 +477,7 @@ void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWin
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::ReleaseSubToolBox( ToolBox* _pSubToolBox )
 {
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
@@ -512,7 +501,7 @@ void VCLXAccessibleToolBox::ReleaseSubToolBox( ToolBox* _pSubToolBox )
         pItem->NotifyChildEvent( xChild, false );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
     VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
@@ -527,7 +516,7 @@ void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelpe
             rStateSet.AddState( AccessibleStateType::VERTICAL );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
     // to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING)
@@ -648,7 +637,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
             VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
 {
     switch ( rVclWindowEvent.GetId() )
@@ -668,17 +657,14 @@ void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclW
 
     }
 }
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE )
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE )
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
 void SAL_CALL VCLXAccessibleToolBox::disposing()
 {
     VCLXAccessibleComponent::disposing();
@@ -691,14 +677,13 @@ void SAL_CALL VCLXAccessibleToolBox::disposing()
     }
     m_aAccessibleChildren.clear();
 }
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
 OUString VCLXAccessibleToolBox::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleToolBox" );
 }
-// -----------------------------------------------------------------------------
+
 Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames();
@@ -707,9 +692,8 @@ Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (Ru
     aNames[nLength] = "com.sun.star.accessibility.AccessibleToolBox";
     return aNames;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
 sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount(  ) throw (RuntimeException)
 {
     comphelper::OExternalLockGuard aGuard( this );
@@ -721,7 +705,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount(  ) throw (Run
 
     return nCount;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     if ( i < 0 || i >= getAccessibleChildCount() )
@@ -768,7 +752,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
 
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) throw (RuntimeException)
 {
     comphelper::OExternalLockGuard aGuard( this );
@@ -784,7 +768,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c
 
     return xAccessible;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const VclWindowEvent& rVclWindowEvent )
 {
     Reference< XAccessible > xReturn;
@@ -803,7 +787,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V
     }
     return xReturn;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWindowEvent& rVclWindowEvent )
 {
     Reference< XAccessible > xReturn = GetItemWindowAccessible(rVclWindowEvent);
@@ -812,9 +796,8 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWin
         xReturn = VCLXAccessibleComponent::GetChildAccessible(rVclWindowEvent);
     return xReturn;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleSelection
-// -----------------------------------------------------------------------------
 void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -824,7 +807,7 @@ void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw
     sal_uInt16 nPos = static_cast < sal_uInt16 > (nChildIndex);
     pToolBox->ChangeHighlight( nPos );
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -837,20 +820,20 @@ sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex
     else
         return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::clearAccessibleSelection(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() );
     pToolBox -> LoseFocus();
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::selectAllAccessibleChildren(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     // intentionally empty. makes no sense for a toolbox
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -865,7 +848,7 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount(  ) throw (Runt
     }
     return nRet;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -882,7 +865,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_
     }
     return xChild;
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -890,6 +873,5 @@ void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) thr
         throw IndexOutOfBoundsException();
     clearAccessibleSelection(); // a toolbox can only have (n)one selected child
 }
-// -----------------------------------------------------------------------------
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index f32aab008385..2ec93928f258 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -54,9 +54,9 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star;
 using namespace ::comphelper;
 
-// -----------------------------------------------------------------------------
+
 // Ctor() and Dtor()
-// -----------------------------------------------------------------------------
+
 VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos ) :
 
     AccessibleTextHelper_BASE( new VCLExternalSolarLock() ),
@@ -112,13 +112,13 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
 {
     delete m_pExternalLock;
     m_pExternalLock = NULL;
 }
-// -----------------------------------------------------------------------------
+
 OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName )
 {
     OUString sRet;
@@ -141,7 +141,7 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName )
     }
     return sRet;
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus )
 {
     if ( m_bHasFocus != _bFocus )
@@ -156,7 +156,7 @@ void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus )
          NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck )
 {
     if( m_nRole == AccessibleRole::PANEL)
@@ -173,7 +173,7 @@ void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck )
         NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBoxItem::SetIndeterminate( bool _bIndeterminate )
 {
     if ( m_bIndeterminate != _bIndeterminate )
@@ -187,7 +187,7 @@ void VCLXAccessibleToolBoxItem::SetIndeterminate( bool _bIndeterminate )
         NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBoxItem::NameChanged()
 {
     OUString sNewName = implGetText();
@@ -201,19 +201,19 @@ void VCLXAccessibleToolBoxItem::NameChanged()
         NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
     }
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBoxItem::SetChild( const Reference< XAccessible >& _xChild )
 {
     m_xChild = _xChild;
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBoxItem::NotifyChildEvent( const Reference< XAccessible >& _xChild, bool _bShow )
 {
     Any aOld = _bShow ? Any() : makeAny( _xChild );
     Any aNew = _bShow ? makeAny( _xChild ) : Any();
     NotifyAccessibleEvent( AccessibleEventId::CHILD, aOld, aNew );
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBoxItem::ToggleEnableState()
 {
     Any aOldValue[2], aNewValue[2];
@@ -231,7 +231,7 @@ void VCLXAccessibleToolBoxItem::ToggleEnableState()
     NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] );
     NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] );
 }
-// -----------------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::implGetBounds(  ) throw (RuntimeException)
 {
     awt::Rectangle aRect;
@@ -240,25 +240,25 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::implGetBounds(  ) throw (Runt
 
     return aRect;
 }
-// -----------------------------------------------------------------------------
+
 OUString VCLXAccessibleToolBoxItem::implGetText()
 {
     return GetText (true);
 }
-// -----------------------------------------------------------------------------
+
 Locale VCLXAccessibleToolBoxItem::implGetLocale()
 {
     return Application::GetSettings().GetUILanguageTag().getLocale();
 }
-// -----------------------------------------------------------------------------
+
 void VCLXAccessibleToolBoxItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
 {
     nStartIndex = 0;
     nEndIndex = 0;
 }
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE )
 Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) throw (RuntimeException)
 {
@@ -272,31 +272,31 @@ Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) thr
         aReturn = VCLXAccessibleToolBoxItem_BASE::queryInterface( _rType );
     return aReturn;
 }
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE, VCLXAccessibleToolBoxItem_BASE )
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleToolBoxItem::disposing()
 {
     AccessibleTextHelper_BASE::disposing();
     m_pToolBox = NULL;
 }
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleToolBoxItem" );
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName ) throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
-// -----------------------------------------------------------------------------
+
 Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< OUString > aNames(4);
@@ -306,23 +306,23 @@ Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw
     aNames[3] = "com.sun.star.accessibility.AccessibleToolBoxItem";
     return aNames;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessible
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext(  ) throw (RuntimeException)
 {
     return this;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount(  ) throw (RuntimeException)
 {
     OContextEntryGuard aGuard( this );
 
     return m_xChild.is() ? 1 : 0;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) throw (RuntimeException,  com::sun::star::lang::IndexOutOfBoundsException)
 {
     OContextEntryGuard aGuard( this );
@@ -333,28 +333,28 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild(
 
     return m_xChild;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent(  ) throw (RuntimeException)
 {
     OContextEntryGuard aGuard( this );
 
     return m_pToolBox->GetAccessible();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
     OContextEntryGuard aGuard( this );
 
     return m_nIndexInParent;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole(  ) throw (RuntimeException)
 {
     OContextEntryGuard aGuard( this );
 
     return m_nRole;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -371,7 +371,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription(  ) throw
         return sDescription;
     }
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -379,7 +379,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName(  ) throw (Runtim
     // entry text == accessible name
     return GetText( true );
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
     OContextEntryGuard aGuard( this );
@@ -388,7 +388,7 @@ Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAcces
     Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
     return xSet;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -420,14 +420,14 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessib
 
     return xStateSet;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleText
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition() throw (RuntimeException)
 {
     return -1;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -437,7 +437,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex
 
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -449,7 +449,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttrib
 
     return Sequence< PropertyValue >();
 }
-// -----------------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -470,7 +470,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32
 
     return aBounds;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -489,7 +489,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point&
 
     return nIndex;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -499,7 +499,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex
 
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -532,14 +532,14 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa
 
     return bReturn;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
 {
     return Reference< XAccessible >();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus(  ) throw (RuntimeException)
 {
     Reference< XAccessible > xParent(getAccessibleParent());
@@ -554,7 +554,7 @@ void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus(  ) throw (RuntimeException)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -565,7 +565,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground(  ) throw (RuntimeEx
 
     return nColor;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -576,19 +576,19 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground(  ) throw (RuntimeEx
 
     return nColor;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont(    ) throw (RuntimeException)
 {
     return uno::Reference< awt::XFont >();
 }
-// -----------------------------------------------------------------------------
+
 awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Reference< awt::XFont >& xFont ) throw (RuntimeException)
 {
     return xFont->getFontDescriptor();
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -599,7 +599,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText(  ) throw (Runt
 
     return sRet;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -617,15 +617,15 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText(  ) throw (RuntimeEx
     }
     return sRet;
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( ) throw (RuntimeException)
 {
     // only one action -> "Click"
     return 1;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -638,7 +638,7 @@ sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) thro
 
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -648,7 +648,7 @@ OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 n
 
     return OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OContextEntryGuard aGuard( this );
@@ -658,9 +658,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActio
 
     return Reference< XAccessibleKeyBinding >();
 }
-// -----------------------------------------------------------------------------
+
 // XAccessibleValue
-// -----------------------------------------------------------------------------
+
 Any VCLXAccessibleToolBoxItem::getCurrentValue(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -673,7 +673,7 @@ Any VCLXAccessibleToolBoxItem::getCurrentValue(  ) throw (RuntimeException)
         aValue <<= (sal_Int32)0;
     return aValue;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -696,17 +696,17 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw
 
     return bReturn;
 }
-// -----------------------------------------------------------------------------
+
 Any VCLXAccessibleToolBoxItem::getMaximumValue(  ) throw (RuntimeException)
 {
     return makeAny((sal_Int32)1);
 }
-// -----------------------------------------------------------------------------
+
 Any VCLXAccessibleToolBoxItem::getMinimumValue(  ) throw (RuntimeException)
 {
     return makeAny((sal_Int32)0);
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index b5e3cd5a18e5..b199af33103f 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -510,7 +510,7 @@ AnimationNode::~AnimationNode()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 #define IMPL_NODE_FACTORY(N,IN,SN)\
 Reference< XInterface > SAL_CALL createInstance_##N( const Reference< XComponentContext > &  ) throw (Exception)\
@@ -540,7 +540,7 @@ IMPL_NODE_FACTORY( TRANSITIONFILTER, "animcore::TransitionFilter", "com.sun.star
 IMPL_NODE_FACTORY( AUDIO, "animcore::Audio", "com.sun.star.animations.Audio" );
 IMPL_NODE_FACTORY( COMMAND, "animcore::Command", "com.sun.star.animations.Command" );
 
-// --------------------------------------------------------------------
+
 
 // XInterface
 Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeException)
@@ -635,7 +635,7 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeEx
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( aType );
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw()
 {
@@ -716,7 +716,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< Type > AnimationNode::getTypes() throw (RuntimeException)
 {
@@ -724,7 +724,7 @@ Sequence< Type > AnimationNode::getTypes() throw (RuntimeException)
         initTypeProvider(mnNodeType);
     return *mpTypes[mnNodeType];
 }
-// --------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeException)
 {
@@ -733,7 +733,7 @@ Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeExceptio
     return *mpId[mnNodeType];
 }
 
-// --------------------------------------------------------------------
+
 
 // XInterface
 void SAL_CALL AnimationNode::acquire(  ) throw ()
@@ -741,7 +741,7 @@ void SAL_CALL AnimationNode::acquire(  ) throw ()
     OWeakObject::acquire();
 }
 
-// --------------------------------------------------------------------
+
 
 // XInterface
 void SAL_CALL AnimationNode::release(  ) throw ()
@@ -749,7 +749,7 @@ void SAL_CALL AnimationNode::release(  ) throw ()
     OWeakObject::release();
 }
 
-// --------------------------------------------------------------------
+
 
 // XServiceInfo
 OUString AnimationNode::getImplementationName() throw()
@@ -817,7 +817,7 @@ Sequence< OUString > AnimationNode::getSupportedServiceNames(void) throw()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException)
@@ -826,7 +826,7 @@ sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException)
     return mnNodeType;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException)
@@ -835,7 +835,7 @@ Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException)
     return maBegin;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeException)
@@ -848,7 +848,7 @@ void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeExcepti
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException)
@@ -857,7 +857,7 @@ Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException)
     return maDuration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeException)
@@ -870,7 +870,7 @@ void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeE
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException)
@@ -879,7 +879,7 @@ Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException)
     return maEnd;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException)
@@ -892,7 +892,7 @@ void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException)
@@ -901,7 +901,7 @@ Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException)
     return maEndSync;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException)
@@ -914,7 +914,7 @@ void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeExc
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException)
@@ -923,7 +923,7 @@ Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException)
     return maRepeatCount;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException)
@@ -936,7 +936,7 @@ void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (Ru
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException)
@@ -945,7 +945,7 @@ Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException)
     return maRepeatDuration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException)
@@ -958,7 +958,7 @@ void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) thr
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException)
@@ -967,7 +967,7 @@ sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException)
     return mnFill;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException)
@@ -980,7 +980,7 @@ void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException)
@@ -989,7 +989,7 @@ sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException)
     return mnFillDefault;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException)
@@ -1002,7 +1002,7 @@ void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (Run
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException)
@@ -1011,7 +1011,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException)
     return mnRestart;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException)
@@ -1024,7 +1024,7 @@ void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeExce
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException)
@@ -1033,7 +1033,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException)
     return mnRestartDefault;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException)
@@ -1046,7 +1046,7 @@ void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) thro
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException)
@@ -1055,7 +1055,7 @@ double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException)
     return mfAcceleration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException)
@@ -1068,7 +1068,7 @@ void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (Runt
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException)
@@ -1077,7 +1077,7 @@ double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException)
     return mfDecelerate;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException)
@@ -1090,7 +1090,7 @@ void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeE
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException)
@@ -1099,7 +1099,7 @@ sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException)
     return mbAutoReverse;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException)
@@ -1112,7 +1112,7 @@ void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (Runt
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeException)
 {
@@ -1120,7 +1120,7 @@ Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeExcep
     return maUserData;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException)
 {
@@ -1129,7 +1129,7 @@ void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdat
     fireChangeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 // XChild
 Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException)
@@ -1138,7 +1138,7 @@ Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeExcept
     return mxParent.get();
 }
 
-// --------------------------------------------------------------------
+
 
 // XChild
 void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException)
@@ -1157,7 +1157,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XCloneable
 Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeException)
@@ -1201,7 +1201,7 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeExce
     return xNewNode;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 Any SAL_CALL AnimationNode::getTarget()
@@ -1211,7 +1211,7 @@ Any SAL_CALL AnimationNode::getTarget()
     return maTarget;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setTarget( const Any& _target )
@@ -1225,7 +1225,7 @@ void SAL_CALL AnimationNode::setTarget( const Any& _target )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException)
@@ -1234,7 +1234,7 @@ OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException)
     return maAttributeName;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute )
@@ -1248,7 +1248,7 @@ void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 Sequence< Any > SAL_CALL AnimationNode::getValues()
@@ -1258,7 +1258,7 @@ Sequence< Any > SAL_CALL AnimationNode::getValues()
     return maValues;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values )
@@ -1269,7 +1269,7 @@ void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values )
     fireChangeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException)
@@ -1278,7 +1278,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException)
     return mnSubItem;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeException)
@@ -1291,7 +1291,7 @@ void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeExce
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException)
@@ -1300,7 +1300,7 @@ Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException
     return maKeyTimes;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException)
@@ -1310,7 +1310,7 @@ void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes )
     fireChangeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException)
@@ -1319,7 +1319,7 @@ sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException)
     return mnValueType;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (RuntimeException)
 {
@@ -1331,7 +1331,7 @@ void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (Runtime
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getCalcMode()
@@ -1341,7 +1341,7 @@ sal_Int16 SAL_CALL AnimationNode::getCalcMode()
     return mnCalcMode;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode )
@@ -1355,7 +1355,7 @@ void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 sal_Bool SAL_CALL AnimationNode::getAccumulate()
@@ -1365,7 +1365,7 @@ sal_Bool SAL_CALL AnimationNode::getAccumulate()
     return mbAccumulate;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
@@ -1379,7 +1379,7 @@ void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getAdditive()
@@ -1389,7 +1389,7 @@ sal_Int16 SAL_CALL AnimationNode::getAdditive()
     return mnAdditive;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive )
@@ -1403,7 +1403,7 @@ void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 Any SAL_CALL AnimationNode::getFrom()
@@ -1413,7 +1413,7 @@ Any SAL_CALL AnimationNode::getFrom()
     return maFrom;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setFrom( const Any& _from )
@@ -1427,7 +1427,7 @@ void SAL_CALL AnimationNode::setFrom( const Any& _from )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 Any SAL_CALL AnimationNode::getTo()
@@ -1437,7 +1437,7 @@ Any SAL_CALL AnimationNode::getTo()
     return maTo;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setTo( const Any& _to )
@@ -1451,7 +1451,7 @@ void SAL_CALL AnimationNode::setTo( const Any& _to )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 Any SAL_CALL AnimationNode::getBy()
@@ -1461,7 +1461,7 @@ Any SAL_CALL AnimationNode::getBy()
     return maBy;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setBy( const Any& _by )
@@ -1475,7 +1475,7 @@ void SAL_CALL AnimationNode::setBy( const Any& _by )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter()
@@ -1485,7 +1485,7 @@ Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter()
     return maTimeFilter;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimate
 void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _timefilter )
@@ -1496,7 +1496,7 @@ void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _t
     fireChangeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException)
 {
@@ -1504,7 +1504,7 @@ OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException)
     return maFormula;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (RuntimeException)
 {
@@ -1516,7 +1516,7 @@ void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (Runti
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateColor
 sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeException)
@@ -1525,7 +1525,7 @@ sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeExceptio
     return mnColorSpace;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateColor
 void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException)
@@ -1538,7 +1538,7 @@ void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) thro
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateColor
 sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException)
@@ -1547,7 +1547,7 @@ sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException)
     return mbDirection;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateColor
 void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException)
@@ -1560,7 +1560,7 @@ void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeE
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateMotion
 Any SAL_CALL AnimationNode::getPath() throw (RuntimeException)
@@ -1569,7 +1569,7 @@ Any SAL_CALL AnimationNode::getPath() throw (RuntimeException)
     return maPath;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateMotion
 void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException)
@@ -1579,7 +1579,7 @@ void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException
     fireChangeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateMotion
 Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException)
@@ -1588,7 +1588,7 @@ Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException)
     return maOrigin;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateMotion
 void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeException)
@@ -1598,7 +1598,7 @@ void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeExcep
     fireChangeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateTransform
 sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException)
@@ -1607,7 +1607,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException)
     return mnTransformType;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimateTransform
 void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw (RuntimeException)
@@ -1620,7 +1620,7 @@ void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XTransitionFilter
 sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException)
@@ -1629,7 +1629,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException)
     return mnTransition;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTransitionFilter
 void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (RuntimeException)
@@ -1642,7 +1642,7 @@ void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (Runti
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XTransitionFilter
 sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException)
@@ -1651,7 +1651,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException)
     return mnSubtype;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTransitionFilter
 void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeException)
@@ -1664,7 +1664,7 @@ void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeExce
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XTransitionFilter
 sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException)
@@ -1673,7 +1673,7 @@ sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException)
     return mbMode;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTransitionFilter
 void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException)
@@ -1686,7 +1686,7 @@ void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XTransitionFilter
 sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException)
@@ -1695,7 +1695,7 @@ sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException)
     return mnFadeColor;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTransitionFilter
 void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException)
@@ -1708,7 +1708,7 @@ void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (Runtime
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XAudio
 Any SAL_CALL AnimationNode::getSource() throw (RuntimeException)
@@ -1717,7 +1717,7 @@ Any SAL_CALL AnimationNode::getSource() throw (RuntimeException)
     return maTarget;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAudio
 void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeException)
@@ -1727,7 +1727,7 @@ void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeExcep
     fireChangeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 // XAudio
 double SAL_CALL AnimationNode::getVolume() throw (RuntimeException)
@@ -1736,7 +1736,7 @@ double SAL_CALL AnimationNode::getVolume() throw (RuntimeException)
     return mfVolume;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAudio
 void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException)
@@ -1749,7 +1749,7 @@ void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XCommand
 sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException)
@@ -1758,7 +1758,7 @@ sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException)
     return mnCommand;
 }
 
-// --------------------------------------------------------------------
+
 
 // XCommand
 void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeException)
@@ -1771,7 +1771,7 @@ void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeExce
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XCommand
 Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException)
@@ -1780,7 +1780,7 @@ Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException)
     return maParameter;
 }
 
-// --------------------------------------------------------------------
+
 
 // XCommand
 void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (RuntimeException)
@@ -1790,7 +1790,7 @@ void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (Runtim
     fireChangeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 // XElementAccess
 Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException)
@@ -1798,7 +1798,7 @@ Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException)
     return ::getCppuType((const Reference< XAnimationNode >*)0);
 }
 
-// --------------------------------------------------------------------
+
 
 // XElementAccess
 sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException)
@@ -1807,7 +1807,7 @@ sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException)
     return !maChildren.empty();
 }
 
-// --------------------------------------------------------------------
+
 
 // XEnumerationAccess
 Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
@@ -1818,7 +1818,7 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
     return new TimeContainerEnumeration( maChildren);
 }
 
-// --------------------------------------------------------------------
+
 
 
 // XTimeContainer
@@ -1845,7 +1845,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Referenc
     return newChild;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
@@ -1875,7 +1875,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference
     return newChild;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild )
@@ -1904,7 +1904,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc
     return newChild;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference< XAnimationNode >& oldChild )
@@ -1927,7 +1927,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference
     return oldChild;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference< XAnimationNode >& newChild )
@@ -1954,7 +1954,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference
     return newChild;
 }
 
-// --------------------------------------------------------------------
+
 
 // XIterateContainer
 sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException)
@@ -1963,7 +1963,7 @@ sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException)
     return mnIterateType;
 }
 
-// --------------------------------------------------------------------
+
 
 // XIterateContainer
 void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException)
@@ -1976,7 +1976,7 @@ void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (Run
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XIterateContainer
 double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException)
@@ -1985,7 +1985,7 @@ double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException)
     return mfIterateInterval;
 }
 
-// --------------------------------------------------------------------
+
 
 // XIterateContainer
 void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw (RuntimeException)
@@ -1998,7 +1998,7 @@ void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // XChangesNotifier
 void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException)
@@ -2006,7 +2006,7 @@ void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListen
     maChangeListener.addInterface( aListener );
 }
 
-// --------------------------------------------------------------------
+
 
 // XChangesNotifier
 void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException)
@@ -2014,7 +2014,7 @@ void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesLis
     maChangeListener.removeInterface(aListener);
 }
 
-// --------------------------------------------------------------------
+
 
 // XUnoTunnel
 ::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException)
@@ -2040,7 +2040,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelI
     return theAnimationNodeUnoTunnelId::get().getSeq();
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationNode::fireChangeListener()
 {
@@ -2069,7 +2069,7 @@ void AnimationNode::fireChangeListener()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 } // namespace animcore
 
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index d0525d2a6eba..2a6e66d0167a 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -59,9 +59,9 @@
 namespace avmedia
 {
 
-// ----------------
+
 // - MediaControl -
-// ---------------
+
 
 MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     Control( pParent ),
@@ -194,7 +194,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     maTimer.Start();
 }
 
-// ------------------------------------------------------------------------------
+
 
 MediaControl::~MediaControl()
 {
@@ -202,14 +202,14 @@ MediaControl::~MediaControl()
     delete mpZoomListBox;
 }
 
-// ------------------------------------------------------------------------------
+
 
 const Size& MediaControl::getMinSizePixel() const
 {
     return maMinSize;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void MediaControl::Resize()
 {
@@ -267,7 +267,7 @@ void MediaControl::Resize()
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void MediaControl::setState( const MediaItem& rItem )
 {
@@ -282,7 +282,7 @@ void MediaControl::setState( const MediaItem& rItem )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void MediaControl::implUpdateToolboxes()
 {
@@ -361,7 +361,7 @@ void MediaControl::implUpdateToolboxes()
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void MediaControl::implUpdateTimeSlider()
 {
@@ -388,7 +388,7 @@ void MediaControl::implUpdateTimeSlider()
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void MediaControl::implUpdateVolumeSlider()
 {
@@ -405,7 +405,7 @@ void MediaControl::implUpdateVolumeSlider()
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void MediaControl::implUpdateTimeField( double fCurTime )
 {
@@ -425,14 +425,14 @@ void MediaControl::implUpdateTimeField( double fCurTime )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 Image MediaControl::implGetImage( sal_Int32 nImageId ) const
 {
     return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
 }
 
-// ------------------------------------------------------------------------------
+
 
 IMPL_LINK( MediaControl, implTimeHdl, Slider*, p )
 {
@@ -443,7 +443,7 @@ IMPL_LINK( MediaControl, implTimeHdl, Slider*, p )
     return 0;
 }
 
-// ------------------------------------------------------------------------------
+
 
 IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p )
 {
@@ -458,7 +458,7 @@ IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p )
     return 0;
 }
 
-// ------------------------------------------------------------------------------
+
 
 IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p )
 {
@@ -471,14 +471,14 @@ IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p )
     return 0;
 }
 
-// ------------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MediaControl, implVolumeEndHdl)
 {
     return 0;
 }
 
-// ------------------------------------------------------------------------------
+
 
 IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p )
 {
@@ -569,7 +569,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p )
     return 0;
 }
 
-// ------------------------------------------------------------------------------
+
 
 IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
 {
@@ -597,7 +597,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
     return 0;
 }
 
-// ------------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MediaControl, implTimeoutHdl)
 {
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index f8e0f434e7f0..b9ab635cdc72 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -43,10 +43,7 @@ using namespace ::com::sun::star;
 namespace avmedia
 {
 
-// -------------
 // - MediaItem -
-// -------------
-
 TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
 
 struct MediaItem::Impl
@@ -90,30 +87,22 @@ struct MediaItem::Impl
     }
 };
 
-// ------------------------------------------------------------------------------
-
 MediaItem::MediaItem( sal_uInt16 const i_nWhich, sal_uInt32 const nMaskSet )
     : SfxPoolItem( i_nWhich )
     , m_pImpl( new Impl(nMaskSet) )
 {
 }
 
-// ------------------------------------------------------------------------------
-
 MediaItem::MediaItem( const MediaItem& rItem )
     : SfxPoolItem( rItem )
     , m_pImpl( new Impl(*rItem.m_pImpl) )
 {
 }
 
-// ------------------------------------------------------------------------------
-
 MediaItem::~MediaItem()
 {
 }
 
-// ------------------------------------------------------------------------------
-
 bool MediaItem::operator==( const SfxPoolItem& rItem ) const
 {
     assert( SfxPoolItem::operator==(rItem));
@@ -130,15 +119,11 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const
         && m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom;
 }
 
-// ------------------------------------------------------------------------------
-
 SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
 {
     return new MediaItem( *this );
 }
 
-//------------------------------------------------------------------------
-
 SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
                                                   SfxMapUnit,
                                                   SfxMapUnit,
@@ -149,8 +134,6 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-//------------------------------------------------------------------------
-
 bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
 {
     uno::Sequence< uno::Any > aSeq( 9 );
@@ -170,8 +153,6 @@ bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
     return true;
 }
 
-//------------------------------------------------------------------------
-
 bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
 {
     uno::Sequence< uno::Any >   aSeq;
@@ -198,8 +179,6 @@ bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
     return bRet;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::merge( const MediaItem& rMediaItem )
 {
     const sal_uInt32 nMaskSet = rMediaItem.getMaskSet();
@@ -229,15 +208,11 @@ void MediaItem::merge( const MediaItem& rMediaItem )
         setZoom( rMediaItem.getZoom() );
 }
 
-//------------------------------------------------------------------------
-
 sal_uInt32 MediaItem::getMaskSet() const
 {
     return m_pImpl->m_nMaskSet;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OUString& rReferer )
 {
     m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_URL;
@@ -246,8 +221,6 @@ void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OU
     m_pImpl->m_Referer = rReferer;
 }
 
-//------------------------------------------------------------------------
-
 const OUString& MediaItem::getURL() const
 {
     return m_pImpl->m_URL;
@@ -263,113 +236,83 @@ const OUString& MediaItem::getReferer() const
     return m_pImpl->m_Referer;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::setState( MediaState eState )
 {
     m_pImpl->m_eState = eState;
     m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_STATE;
 }
 
-//------------------------------------------------------------------------
-
 MediaState MediaItem::getState() const
 {
     return m_pImpl->m_eState;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::setDuration( double fDuration )
 {
     m_pImpl->m_fDuration = fDuration;
     m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_DURATION;
 }
 
-//------------------------------------------------------------------------
-
 double MediaItem::getDuration() const
 {
     return m_pImpl->m_fDuration;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::setTime( double fTime )
 {
     m_pImpl->m_fTime = fTime;
     m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_TIME;
 }
 
-//------------------------------------------------------------------------
-
 double MediaItem::getTime() const
 {
     return m_pImpl->m_fTime;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::setLoop( bool bLoop )
 {
     m_pImpl->m_bLoop = bLoop;
     m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_LOOP;
 }
 
-//------------------------------------------------------------------------
-
 bool MediaItem::isLoop() const
 {
     return m_pImpl->m_bLoop;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::setMute( bool bMute )
 {
     m_pImpl->m_bMute = bMute;
     m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_MUTE;
 }
 
-//------------------------------------------------------------------------
-
 bool MediaItem::isMute() const
 {
     return m_pImpl->m_bMute;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::setVolumeDB( sal_Int16 nDB )
 {
     m_pImpl->m_nVolumeDB = nDB;
     m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_VOLUMEDB;
 }
 
-//------------------------------------------------------------------------
-
 sal_Int16 MediaItem::getVolumeDB() const
 {
     return m_pImpl->m_nVolumeDB;
 }
 
-//------------------------------------------------------------------------
-
 void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom )
 {
     m_pImpl->m_eZoom = eZoom;
     m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_ZOOM;
 }
 
-//------------------------------------------------------------------------
-
 ::com::sun::star::media::ZoomLevel MediaItem::getZoom() const
 {
     return m_pImpl->m_eZoom;
 }
 
-//------------------------------------------------------------------------
-
 static OUString lcl_GetFilename(OUString const& rSourceURL)
 {
     uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
@@ -488,7 +431,6 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
     }
     return false;
 }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index bef6fc6cdef7..cc592c2caf8d 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -33,9 +33,9 @@
 namespace avmedia
 {
 
-// ---------------
+
 // - MediaPlayer -
-// ---------------
+
 
 MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
@@ -45,19 +45,19 @@ MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindi
     static_cast< MediaFloater* >( pWindow )->Initialize( pInfo );
 };
 
-// -----------------------------------------------------------------------------
+
 
 MediaPlayer::~MediaPlayer()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER )
 
-// ----------------
+
 // - MediaFloater -
-// ----------------
+
 
 MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window* pParent ) :
     SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
@@ -71,7 +71,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window
     mpMediaWindow->show();
 }
 
-// -----------------------------------------------------------------------------
+
 
 MediaFloater::~MediaFloater()
 {
@@ -79,7 +79,7 @@ MediaFloater::~MediaFloater()
     mpMediaWindow = NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaFloater::Resize()
 {
@@ -89,7 +89,7 @@ void MediaFloater::Resize()
         mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MediaFloater::ToggleFloatingMode()
 {
@@ -114,7 +114,7 @@ void MediaFloater::ToggleFloatingMode()
     mpMediaWindow->show();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately )
 {
@@ -127,7 +127,7 @@ void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MediaFloater::dispatchCurrentURL()
 {
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index b0d859a4033b..c90eb5919e29 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -31,9 +31,9 @@ using namespace ::com::sun::star;
 namespace avmedia
 {
 
-// -----------------------
+
 // - MediaToolboxControl -
-// -----------------------
+
 
 class MediaToolBoxControl_Impl : public MediaControl
 {
@@ -50,7 +50,7 @@ private:
     MediaToolBoxControl*    mpToolBoxControl;
 };
 
-// ---------------------------------------------------------------------
+
 
 MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl ) :
     MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ),
@@ -59,33 +59,33 @@ MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( Window& rParent, MediaToolBo
     SetSizePixel( getMinSizePixel() );
 }
 
-// ---------------------------------------------------------------------
+
 
 MediaToolBoxControl_Impl::~MediaToolBoxControl_Impl()
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaToolBoxControl_Impl::update()
 {
     mpToolBoxControl->implUpdateMediaControl();
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaToolBoxControl_Impl::execute( const MediaItem& rItem )
 {
     mpToolBoxControl->implExecuteMediaControl( rItem );
 }
 
-// -----------------------
+
 // - MediaToolBoxControl -
-// -----------------------
+
 
 SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem );
 
-// -----------------------------------------------------------------------------
+
 
 MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -93,13 +93,13 @@ MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, To
         rTbx.Invalidate();
 }
 
-// -----------------------------------------------------------------------------
+
 
 MediaToolBoxControl::~MediaToolBoxControl()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
 
@@ -127,21 +127,21 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Window* MediaToolBoxControl::CreateItemWindow( Window *pParent )
 {
     return( pParent ? new MediaToolBoxControl_Impl( *pParent, *this ) : NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MediaToolBoxControl::implUpdateMediaControl()
 {
     updateStatus( ".uno:AVMediaToolBox" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
 {
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 6673674fe5fa..2d0772029184 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -69,20 +69,14 @@ class SoundHandler  :   // interfaces
                     ,   private ThreadHelpBase
                     ,   public  ::cppu::OWeakObject
 {
-    //-------------------------------------------------------------------------------------------------------------
-    //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+    // public methods
     public:
 
-        //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+        // constructor / destructor
                  SoundHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
         virtual ~SoundHandler(                                                                        );
 
-        //---------------------------------------------------------------------------------------------------------
         //  XInterface, XTypeProvider, XServiceInfo
-        //---------------------------------------------------------------------------------------------------------
         virtual css::uno::Any  SAL_CALL queryInterface( const css::uno::Type& aType   ) throw( css::uno::RuntimeException );
         virtual void SAL_CALL acquire() throw();
         virtual void SAL_CALL release() throw();
@@ -102,16 +96,12 @@ class SoundHandler  :   // interfaces
     /* Helper for initialization of service by using own reference! */
        virtual void                                                   SAL_CALL impl_initService                   (                                                                               );
 
-        //---------------------------------------------------------------------------------------------------------
         //  XNotifyingDispatch
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                        const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException);
 
-        //---------------------------------------------------------------------------------------------------------
         //  XDispatch
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL dispatch              (   const   css::util::URL&                                     aURL        ,
                                                         const   css::uno::Sequence< css::beans::PropertyValue >&    lArguments  ) throw( css::uno::RuntimeException );
         // not supported !
@@ -120,32 +110,24 @@ class SoundHandler  :   // interfaces
         virtual void SAL_CALL removeStatusListener  (   const   css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
                                                         const   css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException ) {};
 
-        //---------------------------------------------------------------------------------------------------------
         //  XExtendedFilterDetection
-        //---------------------------------------------------------------------------------------------------------
         virtual OUString SAL_CALL detect           (           css::uno::Sequence< css::beans::PropertyValue >&    lDescriptor ) throw( css::uno::RuntimeException );
 
-    //-------------------------------------------------------------------------------------------------------------
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
     protected:
 
-    //-------------------------------------------------------------------------------------------------------------
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
     private:
         DECL_LINK( implts_PlayerNotify, void* );
 
-    //-------------------------------------------------------------------------------------------------------------
     //  variables
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
     private:
 
         bool m_bError;
-        css::uno::Reference< css::lang::XMultiServiceFactory >     m_xFactory          ;   /// global uno service factory to create new services
-        css::uno::Reference< css::uno::XInterface >                m_xSelfHold         ;   /// we must protect us against dieing during async(!) dispatch() call!
-        css::uno::Reference< css::media::XPlayer >                 m_xPlayer           ;   /// uses avmedia player to play sounds ...
+        css::uno::Reference< css::lang::XMultiServiceFactory >     m_xFactory          ;   // global uno service factory to create new services
+        css::uno::Reference< css::uno::XInterface >                m_xSelfHold         ;   // we must protect us against dieing during async(!) dispatch() call!
+        css::uno::Reference< css::media::XPlayer >                 m_xPlayer           ;   // uses avmedia player to play sounds...
 
         css::uno::Reference< css::frame::XDispatchResultListener > m_xListener         ;
         Timer m_aUpdateTimer;
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index a9aafca288e4..96ecc4c1831c 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -38,9 +38,9 @@
 using namespace ::com::sun::star;
 
 namespace avmedia { namespace gstreamer {
-// ----------------
+
 // - Manager -
-// ----------------
+
 
 Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr )
@@ -48,13 +48,13 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     DBG( "avmediagst: Manager::Manager" );
 }
 
-// ------------------------------------------------------------------------------
+
 
 Manager::~Manager()
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
     throw (uno::RuntimeException)
@@ -71,7 +71,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString SAL_CALL Manager::getImplementationName(  )
     throw (uno::RuntimeException)
@@ -79,7 +79,7 @@ OUString SAL_CALL Manager::getImplementationName(  )
     return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME );
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
@@ -87,7 +87,7 @@ sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
     return cppu::supportsService(this, ServiceName);
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 17fffe0ec595..f5e34e9ad95b 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -56,9 +56,9 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace gstreamer {
 
-// ----------------
+
 // - Player -
-// ----------------
+
 
 Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     GstPlayer_BASE( m_aMutex ),
@@ -95,7 +95,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 Player::~Player()
 {
@@ -130,7 +130,7 @@ void SAL_CALL Player::disposing()
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data )
 {
@@ -394,7 +394,7 @@ bool Player::create( const OUString& rURL )
     return bRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Player::start()
     throw (uno::RuntimeException)
@@ -409,7 +409,7 @@ void SAL_CALL Player::start()
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Player::stop()
     throw (uno::RuntimeException)
@@ -424,7 +424,7 @@ void SAL_CALL Player::stop()
     DBG( "stop %p", mpPlaybin );
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL Player::isPlaying()
     throw (uno::RuntimeException)
@@ -444,7 +444,7 @@ sal_Bool SAL_CALL Player::isPlaying()
     return bRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 double SAL_CALL Player::getDuration()
     throw (uno::RuntimeException)
@@ -461,7 +461,7 @@ double SAL_CALL Player::getDuration()
     return duration;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Player::setMediaTime( double fTime )
     throw (uno::RuntimeException)
@@ -483,7 +483,7 @@ void SAL_CALL Player::setMediaTime( double fTime )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 double SAL_CALL Player::getMediaTime()
     throw (uno::RuntimeException)
@@ -502,7 +502,7 @@ double SAL_CALL Player::getMediaTime()
     return position;
 }
 
-// ------------------------------------------------------------------------------
+
 
 double SAL_CALL Player::getRate()
     throw (uno::RuntimeException)
@@ -517,7 +517,7 @@ double SAL_CALL Player::getRate()
     return rate;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
     throw (uno::RuntimeException)
@@ -527,7 +527,7 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
     mbLooping = bSet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL Player::isPlaybackLoop()
     throw (uno::RuntimeException)
@@ -537,7 +537,7 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
     return mbLooping;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Player::setMute( sal_Bool bSet )
     throw (uno::RuntimeException)
@@ -561,7 +561,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL Player::isMute()
     throw (uno::RuntimeException)
@@ -571,7 +571,7 @@ sal_Bool SAL_CALL Player::isMute()
     return mbMuted;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
     throw (uno::RuntimeException)
@@ -589,7 +589,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
      }
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL Player::getVolumeDB()
     throw (uno::RuntimeException)
@@ -609,7 +609,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
     return nVolumeDB;
 }
 
-// ------------------------------------------------------------------------------
+
 
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
     throw (uno::RuntimeException)
@@ -642,7 +642,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
     return aSize;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
     throw (uno::RuntimeException)
@@ -684,7 +684,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
     throw (uno::RuntimeException)
@@ -700,7 +700,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
     return pFrameGrabber;
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString SAL_CALL Player::getImplementationName()
     throw (uno::RuntimeException)
@@ -708,7 +708,7 @@ OUString SAL_CALL Player::getImplementationName()
     return OUString( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME );
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
@@ -716,7 +716,7 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
     return cppu::supportsService(this, ServiceName);
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
     throw (uno::RuntimeException)
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 9357a5d6db7f..e3b0bebcf13f 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -22,9 +22,9 @@
 
 using namespace ::com::sun::star;
 
-// -------------------
+
 // - factory methods -
-// -------------------
+
 
 #ifdef AVMEDIA_GST_0_10
 #  define IMPL_NAME    "com.sun.star.comp.media.Manager_GStreamer_0_10"
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 39da016e26c5..fee4626f071d 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -50,7 +50,7 @@ static ::osl::Mutex& ImplGetOwnStaticMutex()
 }
 
 // Window
-// ------------------------------------------------------------------------------
+
 
 Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) :
     mxMgr( rxMgr ),
@@ -67,7 +67,7 @@ Window::~Window()
 }
 
 // XPlayerWindow
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Window::update(  )
     throw (uno::RuntimeException)
@@ -106,7 +106,7 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
 }
 
 // XWindow
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ )
     throw (uno::RuntimeException)
@@ -201,7 +201,7 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
 }
 
 // XComponent
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Window::dispose(  )
     throw (uno::RuntimeException)
@@ -219,7 +219,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
 }
 
 // XServiceInfo
-// ------------------------------------------------------------------------------
+
 
 OUString SAL_CALL Window::getImplementationName(  )
     throw (uno::RuntimeException)
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index cfe96099c422..966d83a026d0 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -26,22 +26,22 @@
 using namespace ::com::sun::star;
 
 namespace avmedia { namespace priv {
-// ---------------------------
+
 // - MediaEventListenersImpl -
-// ---------------------------
+
 
 MediaEventListenersImpl::MediaEventListenersImpl( Window& rEventWindow ) :
     mpNotifyWindow( &rEventWindow )
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 MediaEventListenersImpl::~MediaEventListenersImpl()
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaEventListenersImpl::cleanUp()
 {
@@ -49,14 +49,14 @@ void MediaEventListenersImpl::cleanUp()
     mpNotifyWindow = NULL;
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
     throw (::com::sun::star::uno::RuntimeException)
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e )
     throw (::com::sun::star::uno::RuntimeException)
@@ -76,7 +76,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e )
     throw (::com::sun::star::uno::RuntimeException)
@@ -95,7 +95,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt:
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e )
     throw (::com::sun::star::uno::RuntimeException)
@@ -137,7 +137,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ )
     throw (::com::sun::star::uno::RuntimeException)
@@ -150,7 +150,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ )
     throw (::com::sun::star::uno::RuntimeException)
@@ -163,7 +163,7 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt:
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e )
     throw (::com::sun::star::uno::RuntimeException)
@@ -178,7 +178,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e )
     throw (::com::sun::star::uno::RuntimeException)
@@ -193,14 +193,14 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ )
     throw (::com::sun::star::uno::RuntimeException)
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ )
     throw (::com::sun::star::uno::RuntimeException)
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 3835bc1e13ba..992bb40a3460 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -41,9 +41,9 @@ using namespace ::com::sun::star;
 
 namespace avmedia {
 
-// ---------------
+
 // - MediaWindow -
-// ---------------
+
 
 MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) :
     mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) )
@@ -51,151 +51,151 @@ MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) :
     mpImpl->Show();
 }
 
-// -------------------------------------------------------------------------
+
 
 MediaWindow::~MediaWindow() {}
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::setURL( const OUString& rURL, const OUString& rReferer )
 {
     mpImpl->setURL( rURL, OUString(), rReferer );
 }
 
-// -------------------------------------------------------------------------
+
 
 const OUString& MediaWindow::getURL() const
 {
     return mpImpl->getURL();
 }
 
-// -------------------------------------------------------------------------
+
 
 bool MediaWindow::isValid() const
 {
     return mpImpl->isValid();
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::MouseMove( const MouseEvent& /* rMEvt */ )
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindow::MouseButtonDown( const MouseEvent& /* rMEvt */ )
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::KeyInput( const KeyEvent& /* rKEvt */ )
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::KeyUp( const KeyEvent& /* rKEvt */ )
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::Command( const CommandEvent& /* rCEvt */ )
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
 {
     return 0;
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& /* rEvt */ )
 {
     return 0;
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel */ )
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 Size MediaWindow::getPreferredSize() const
 {
     return mpImpl->getPreferredSize();
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::setPosSize( const Rectangle& rNewRect )
 {
     mpImpl->setPosSize( rNewRect );
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::setPointer( const Pointer& rPointer )
 {
     mpImpl->setPointer( rPointer );
 }
 
-// -------------------------------------------------------------------------
+
 
 bool MediaWindow::start()
 {
     return mpImpl->start();
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::updateMediaItem( MediaItem& rItem ) const
 {
     mpImpl->updateMediaItem( rItem );
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::executeMediaItem( const MediaItem& rItem )
 {
     mpImpl->executeMediaItem( rItem );
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::show()
 {
     mpImpl->Show();
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::hide()
 {
     mpImpl->Hide();
 }
 
-// -------------------------------------------------------------------------
+
 
 Window* MediaWindow::getWindow() const
 {
     return mpImpl.get();
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
 {
@@ -229,7 +229,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
         OUString& rURL, bool *const o_pbLink)
@@ -318,7 +318,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
     return !rURL.isEmpty();
 }
 
-// -------------------------------------------------------------------------
+
 
 void MediaWindow::executeFormatErrorBox( Window* pParent )
 {
@@ -327,7 +327,7 @@ void MediaWindow::executeFormatErrorBox( Window* pParent )
     aErrBox.Execute();
 }
 
-// -------------------------------------------------------------------------
+
 
 bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep, Size* pPreferredSizePixel )
 {
@@ -383,14 +383,14 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo
     return bRet;
 }
 
-// -------------------------------------------------------------------------
+
 
 uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL, const OUString& rReferer )
 {
     return priv::MediaWindowImpl::createPlayer( rURL, rReferer );
 }
 
-// -------------------------------------------------------------------------
+
 
 uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL,
                                                             const OUString& rReferer,
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 73b4bf4fd80f..43416d3e760a 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -40,22 +40,22 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace priv {
 
-// ----------------------
+
 // - MediaWindowControl -
-// ----------------------
+
 
 MediaWindowControl::MediaWindowControl( Window* pParent ) :
     MediaControl( pParent, MEDIACONTROLSTYLE_MULTILINE )
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 MediaWindowControl::~MediaWindowControl()
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowControl::update()
 {
@@ -65,29 +65,29 @@ void MediaWindowControl::update()
     setState( aItem );
 }
 
-// ---------------------------------------------------------------------
+
 
 void  MediaWindowControl::execute( const MediaItem& rItem )
 {
     static_cast< MediaWindowImpl* >( GetParent() )->executeMediaItem( rItem );
 }
 
-// --------------------
+
 // - MediaChildWindow -
-// --------------------
+
 
 MediaChildWindow::MediaChildWindow( Window* pParent ) :
     SystemChildWindow( pParent, WB_CLIPCHILDREN )
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 MediaChildWindow::~MediaChildWindow()
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
 {
@@ -98,7 +98,7 @@ void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
     GetParent()->MouseMove( aTransformedEvent );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -109,7 +109,7 @@ void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
     GetParent()->MouseButtonDown( aTransformedEvent );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -120,7 +120,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
     GetParent()->MouseButtonUp( aTransformedEvent );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
 {
@@ -128,7 +128,7 @@ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
     GetParent()->KeyInput( rKEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
 {
@@ -136,7 +136,7 @@ void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
     GetParent()->KeyUp( rKEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaChildWindow::Command( const CommandEvent& rCEvt )
 {
@@ -147,9 +147,9 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt )
     GetParent()->Command( aTransformedEvent );
 }
 
-// ----------------------
+
 // - MediaWindowImpl -
-// ----------------------
+
 
 MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) :
     Control( pParent ),
@@ -173,7 +173,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 MediaWindowImpl::~MediaWindowImpl()
 {
@@ -527,14 +527,14 @@ void MediaWindowImpl::onURLChanged()
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::setPosSize( const Rectangle& rRect )
 {
     SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::setPointer( const Pointer& rPointer )
 {
@@ -559,7 +559,7 @@ void MediaWindowImpl::setPointer( const Pointer& rPointer )
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::Resize()
 {
@@ -583,7 +583,7 @@ void MediaWindowImpl::Resize()
     maChildWindow.SetPosSizePixel( Point( 0, 0 ), aPlayerWindowSize );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::StateChanged( StateChangedType eType )
 {
@@ -612,7 +612,7 @@ void MediaWindowImpl::StateChanged( StateChangedType eType )
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::Paint( const Rectangle& )
 {
@@ -668,13 +668,13 @@ void MediaWindowImpl::Paint( const Rectangle& )
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::GetFocus()
 {
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::MouseMove( const MouseEvent& rMEvt )
 {
@@ -682,7 +682,7 @@ void MediaWindowImpl::MouseMove( const MouseEvent& rMEvt )
         mpMediaWindow->MouseMove( rMEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -690,7 +690,7 @@ void MediaWindowImpl::MouseButtonDown( const MouseEvent& rMEvt )
         mpMediaWindow->MouseButtonDown( rMEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -698,7 +698,7 @@ void MediaWindowImpl::MouseButtonUp( const MouseEvent& rMEvt )
         mpMediaWindow->MouseButtonUp( rMEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::KeyInput( const KeyEvent& rKEvt )
 {
@@ -706,7 +706,7 @@ void MediaWindowImpl::KeyInput( const KeyEvent& rKEvt )
         mpMediaWindow->KeyInput( rKEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::KeyUp( const KeyEvent& rKEvt )
 {
@@ -714,7 +714,7 @@ void MediaWindowImpl::KeyUp( const KeyEvent& rKEvt )
         mpMediaWindow->KeyUp( rKEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::Command( const CommandEvent& rCEvt )
 {
@@ -722,21 +722,21 @@ void MediaWindowImpl::Command( const CommandEvent& rCEvt )
         mpMediaWindow->Command( rCEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 sal_Int8 MediaWindowImpl::AcceptDrop( const AcceptDropEvent& rEvt )
 {
     return( mpMediaWindow ? mpMediaWindow->AcceptDrop( rEvt ) : 0 );
 }
 
-// ---------------------------------------------------------------------
+
 
 sal_Int8 MediaWindowImpl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
     return( mpMediaWindow ? mpMediaWindow->ExecuteDrop( rEvt ) : 0 );
 }
 
-// ---------------------------------------------------------------------
+
 
 void MediaWindowImpl::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
 {
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index b93720ffcd39..aef5be256316 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -48,9 +48,9 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace win {
 
-// ----------------
+
 // - FrameGrabber -
-// ----------------
+
 
 FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr )
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index 19419aee8c23..94e45af48950 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -29,9 +29,9 @@
 using namespace ::com::sun::star;
 
 namespace avmedia { namespace win {
-// ----------------
+
 // - Manager -
-// ----------------
+
 
 Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr )
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index b76d0914a0aa..7b396815fc20 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -76,9 +76,9 @@ bool isWindowsVistaOrHigher()
     return  osvi.dwMajorVersion >= 6;
 }
 
-// ----------------
+
 // - Player -
-// ----------------
+
 
 Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     Player_BASE(m_aMutex),
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index b42427e2172e..c39c00af671e 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -22,9 +22,9 @@
 
 using namespace ::com::sun::star;
 
-// -------------------
+
 // - factory methods -
-// -------------------
+
 
 static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
 {
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 4078efe153bd..691295074564 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -46,9 +46,9 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-// -----------------------------------------------------------------------------
+
 // class AccessibleDialogControlShape
-// -----------------------------------------------------------------------------
+
 
 AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj)
     :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
@@ -68,7 +68,7 @@ AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialo
     m_aBounds = GetBounds();
 }
 
-// -----------------------------------------------------------------------------
+
 
 AccessibleDialogControlShape::~AccessibleDialogControlShape()
 {
@@ -79,7 +79,7 @@ AccessibleDialogControlShape::~AccessibleDialogControlShape()
     m_pExternalLock = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool AccessibleDialogControlShape::IsFocused()
 {
@@ -94,7 +94,7 @@ bool AccessibleDialogControlShape::IsFocused()
     return bFocused;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool AccessibleDialogControlShape::IsSelected()
 {
@@ -103,7 +103,7 @@ bool AccessibleDialogControlShape::IsSelected()
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogControlShape::SetFocused( bool bFocused )
 {
@@ -119,7 +119,7 @@ void AccessibleDialogControlShape::SetFocused( bool bFocused )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogControlShape::SetSelected( bool bSelected )
 {
@@ -135,7 +135,7 @@ void AccessibleDialogControlShape::SetSelected( bool bSelected )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle AccessibleDialogControlShape::GetBounds()
 {
@@ -165,7 +165,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds()
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds )
 {
@@ -176,7 +176,7 @@ void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Window* AccessibleDialogControlShape::GetWindow() const
 {
@@ -191,7 +191,7 @@ Window* AccessibleDialogControlShape::GetWindow() const
     return pWindow;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName )
 {
@@ -215,7 +215,7 @@ OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* p
     return sReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -238,30 +238,30 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateS
     rStateSet.AddState( AccessibleStateType::RESIZABLE );
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException)
 {
     return GetBounds();
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogControlShape, AccessibleExtendedComponentHelper_BASE, AccessibleDialogControlShape_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogControlShape, AccessibleExtendedComponentHelper_BASE, AccessibleDialogControlShape_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogControlShape::disposing()
 {
@@ -275,9 +275,9 @@ void AccessibleDialogControlShape::disposing()
     m_xControlModel.clear();
 }
 
-// -----------------------------------------------------------------------------
+
 // XEventListener
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (RuntimeException)
 {
@@ -286,9 +286,9 @@ void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (
     m_xControlModel.clear();
 }
 
-// -----------------------------------------------------------------------------
+
 // XPropertyChangeListener
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEvent& rEvent ) throw (RuntimeException)
 {
@@ -345,7 +345,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (Runtime
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -357,7 +357,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_I
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent(  ) throw (RuntimeException)
 {
@@ -370,7 +370,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent(  ) t
     return xParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
@@ -402,7 +402,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent(  ) throw (Ru
     return nIndexInParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 AccessibleDialogControlShape::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -411,7 +411,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole(  ) throw (RuntimeExce
     return AccessibleRole::SHAPE;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogControlShape::getAccessibleDescription(  ) throw (RuntimeException)
 {
@@ -420,7 +420,7 @@ OUString AccessibleDialogControlShape::getAccessibleDescription(  ) throw (Runti
     return GetModelStringProperty( "HelpText" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogControlShape::getAccessibleName(  ) throw (RuntimeException)
 {
@@ -429,7 +429,7 @@ OUString AccessibleDialogControlShape::getAccessibleName(  ) throw (RuntimeExcep
     return GetModelStringProperty( "Name" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
@@ -440,7 +440,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleR
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet(  ) throw (RuntimeException)
 {
@@ -461,7 +461,7 @@ Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStat
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale AccessibleDialogControlShape::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -470,9 +470,9 @@ Locale AccessibleDialogControlShape::getLocale(  ) throw (IllegalAccessibleCompo
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
 {
@@ -481,14 +481,14 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( con
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogControlShape::grabFocus(  ) throw (RuntimeException)
 {
     // no focus for shapes
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 AccessibleDialogControlShape::getForeground(  ) throw (RuntimeException)
 {
@@ -514,7 +514,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground(  ) throw (RuntimeExceptio
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 AccessibleDialogControlShape::getBackground(  ) throw (RuntimeException)
 {
@@ -533,9 +533,9 @@ sal_Int32 AccessibleDialogControlShape::getBackground(  ) throw (RuntimeExceptio
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< awt::XFont > AccessibleDialogControlShape::getFont(  ) throw (RuntimeException)
 {
@@ -562,7 +562,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont(  ) throw (Runtime
     return xFont;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogControlShape::getTitledBorderText(  ) throw (RuntimeException)
 {
@@ -571,7 +571,7 @@ OUString AccessibleDialogControlShape::getTitledBorderText(  ) throw (RuntimeExc
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogControlShape::getToolTipText(  ) throw (RuntimeException)
 {
@@ -585,7 +585,7 @@ OUString AccessibleDialogControlShape::getToolTipText(  ) throw (RuntimeExceptio
     return sText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 } // namespace basctl
 
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index dc482853cbce..19240ee72602 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -50,9 +50,9 @@ using namespace ::comphelper;
 DBG_NAME( AccessibleDialogWindow )
 
 
-// -----------------------------------------------------------------------------
+
 // class ChildDescriptor
-// -----------------------------------------------------------------------------
+
 
 AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj )
     :pDlgEdObj( _pDlgEdObj )
@@ -60,13 +60,13 @@ AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 AccessibleDialogWindow::ChildDescriptor::~ChildDescriptor()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( const ChildDescriptor& rDesc )
     :pDlgEdObj( rDesc.pDlgEdObj )
@@ -74,7 +74,7 @@ AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( const ChildDescriptor&
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 AccessibleDialogWindow::ChildDescriptor& AccessibleDialogWindow::ChildDescriptor::operator=( const ChildDescriptor& rDesc )
 {
@@ -84,7 +84,7 @@ AccessibleDialogWindow::ChildDescriptor& AccessibleDialogWindow::ChildDescriptor
     return *this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool AccessibleDialogWindow::ChildDescriptor::operator==( const ChildDescriptor& rDesc )
 {
@@ -95,7 +95,7 @@ bool AccessibleDialogWindow::ChildDescriptor::operator==( const ChildDescriptor&
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor& rDesc ) const
 {
@@ -106,9 +106,9 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor&
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 // class AccessibleDialogWindow
-// -----------------------------------------------------------------------------
+
 
 AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWindow)
     : AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
@@ -143,7 +143,7 @@ AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWin
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 AccessibleDialogWindow::~AccessibleDialogWindow()
 {
@@ -161,7 +161,7 @@ AccessibleDialogWindow::~AccessibleDialogWindow()
     m_pExternalLock = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::UpdateFocused()
 {
@@ -177,7 +177,7 @@ void AccessibleDialogWindow::UpdateFocused()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::UpdateSelected()
 {
@@ -195,7 +195,7 @@ void AccessibleDialogWindow::UpdateSelected()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::UpdateBounds()
 {
@@ -211,7 +211,7 @@ void AccessibleDialogWindow::UpdateBounds()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc )
 {
@@ -255,7 +255,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc )
     return bVisible;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc )
 {
@@ -284,7 +284,7 @@ void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc )
 {
@@ -314,7 +314,7 @@ void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc )
 {
@@ -330,7 +330,7 @@ void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::UpdateChildren()
 {
@@ -343,7 +343,7 @@ void AccessibleDialogWindow::UpdateChildren()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::SortChildren()
 {
@@ -351,7 +351,7 @@ void AccessibleDialogWindow::SortChildren()
     ::std::sort( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclSimpleEvent*, pEvent )
 {
@@ -368,7 +368,7 @@ IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclSimpleEvent*, pEvent
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -464,7 +464,7 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -489,9 +489,9 @@ void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelp
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException)
 {
@@ -502,9 +502,9 @@ awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException)
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 // SfxListener
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
@@ -563,21 +563,21 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogWindow, AccessibleExtendedComponentHelper_BASE, AccessibleDialogWindow_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogWindow, AccessibleExtendedComponentHelper_BASE, AccessibleDialogWindow_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::disposing()
 {
@@ -641,7 +641,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeExcept
     return m_aAccessibleChildren.size();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -669,7 +669,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent(  ) throw (RuntimeException)
 {
@@ -686,7 +686,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent(  ) throw (
     return xParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent(  ) throw (RuntimeException)
 {
@@ -713,7 +713,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent(  ) throw (RuntimeE
     return nIndexInParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 AccessibleDialogWindow::getAccessibleRole(  ) throw (RuntimeException)
 {
@@ -722,7 +722,7 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole(  ) throw (RuntimeException)
     return AccessibleRole::PANEL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogWindow::getAccessibleDescription(  ) throw (RuntimeException)
 {
@@ -735,7 +735,7 @@ OUString AccessibleDialogWindow::getAccessibleDescription(  ) throw (RuntimeExce
     return sDescription;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogWindow::getAccessibleName(  ) throw (RuntimeException)
 {
@@ -748,7 +748,7 @@ OUString AccessibleDialogWindow::getAccessibleName(  ) throw (RuntimeException)
     return sName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
@@ -759,7 +759,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelatio
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet(  ) throw (RuntimeException)
 {
@@ -780,7 +780,7 @@ Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet(
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale AccessibleDialogWindow::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -789,9 +789,9 @@ Locale AccessibleDialogWindow::getLocale(  ) throw (IllegalAccessibleComponentSt
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
 {
@@ -820,7 +820,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::grabFocus(  ) throw (RuntimeException)
 {
@@ -830,7 +830,7 @@ void AccessibleDialogWindow::grabFocus(  ) throw (RuntimeException)
         m_pDialogWindow->GrabFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 AccessibleDialogWindow::getForeground(  ) throw (RuntimeException)
 {
@@ -855,7 +855,7 @@ sal_Int32 AccessibleDialogWindow::getForeground(  ) throw (RuntimeException)
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 AccessibleDialogWindow::getBackground(  ) throw (RuntimeException)
 {
@@ -873,9 +873,9 @@ sal_Int32 AccessibleDialogWindow::getBackground(  ) throw (RuntimeException)
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< awt::XFont > AccessibleDialogWindow::getFont(  ) throw (RuntimeException)
 {
@@ -901,7 +901,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont(  ) throw (RuntimeExcept
     return xFont;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogWindow::getTitledBorderText(  ) throw (RuntimeException)
 {
@@ -910,7 +910,7 @@ OUString AccessibleDialogWindow::getTitledBorderText(  ) throw (RuntimeException
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString AccessibleDialogWindow::getToolTipText(  ) throw (RuntimeException)
 {
@@ -923,9 +923,9 @@ OUString AccessibleDialogWindow::getToolTipText(  ) throw (RuntimeException)
     return sText;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleSelection
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -945,7 +945,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -960,7 +960,7 @@ sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildInde
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::clearAccessibleSelection()
     throw (RuntimeException, std::exception)
@@ -971,7 +971,7 @@ void AccessibleDialogWindow::clearAccessibleSelection()
         m_pDialogWindow->GetView().UnmarkAll();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::selectAllAccessibleChildren(  ) throw (RuntimeException)
 {
@@ -981,7 +981,7 @@ void AccessibleDialogWindow::selectAllAccessibleChildren(  ) throw (RuntimeExcep
         m_pDialogWindow->GetView().MarkAll();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
 {
@@ -998,7 +998,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount(  ) throw (Run
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -1021,7 +1021,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal
     return xChild;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -1042,7 +1042,7 @@ void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) th
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 } // namespace basctl
 
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index 855ad1ee3f6f..0335269819b0 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -42,9 +42,6 @@ OUString const sPropertyIconId("IconId");
 
 }
 
-
-//----------------------------------------------------------------------------
-
 Controller::Controller (Shell* pViewShell)
     :OPropertyContainer( m_aBHelper )
     ,SfxBaseController( pViewShell )
@@ -57,14 +54,10 @@ Controller::Controller (Shell* pViewShell)
     );
 }
 
-//----------------------------------------------------------------------------
-
 Controller::~Controller()
 { }
 
 // XInterface
-//----------------------------------------------------------------------------
-
 Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aReturn = SfxBaseController::queryInterface( rType );
@@ -74,24 +67,17 @@ Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeExcep
     return aReturn;
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL Controller::acquire() throw()
 {
     SfxBaseController::acquire();
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL Controller::release() throw()
 {
     SfxBaseController::release();
 }
 
-
 // XTypeProvider ( ::SfxBaseController )
-//----------------------------------------------------------------------------
-
 Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException)
 {
     Sequence< Type > aTypes = ::comphelper::concatSequences(
@@ -102,8 +88,6 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException)
     return aTypes;
 }
 
-//----------------------------------------------------------------------------
-
 Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException)
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -120,8 +104,6 @@ Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeExc
 }
 
 // XPropertySet
-//----------------------------------------------------------------------------
-
 Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException)
 {
     Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
@@ -129,16 +111,12 @@ Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() t
 }
 
 // OPropertySetHelper
-//----------------------------------------------------------------------------
-
 ::cppu::IPropertyArrayHelper& Controller::getInfoHelper()
 {
     return *getArrayHelper();
 }
 
 // OPropertyArrayUsageHelper
-//----------------------------------------------------------------------------
-
 ::cppu::IPropertyArrayHelper* Controller::createArrayHelper( ) const
 {
     Sequence< Property > aProps;
@@ -146,8 +124,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() t
     return new ::cppu::OPropertyArrayHelper( aProps );
 }
 
-//----------------------------------------------------------------------------
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 721ab895fd53..63c1db46d357 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -50,9 +50,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 
-
-//----------------------------------------------------------------------------
-
 extern "C" {
     SAL_DLLPUBLIC_EXPORT rtl_uString* basicide_choose_macro( void* pOnlyInDocument_AsXModel, sal_Bool bChooseOnly, rtl_uString* pMacroDesc )
     {
@@ -71,8 +68,6 @@ extern "C" {
     }
 }
 
-//----------------------------------------------------------------------------
-
 void Organize( sal_Int16 tabId )
 {
     EnsureIde();
@@ -86,8 +81,6 @@ void Organize( sal_Int16 tabId )
     OrganizeDialog(pParent, tabId, aDesc).Execute();
 }
 
-//----------------------------------------------------------------------------
-
 bool IsValidSbxName( const OUString& rName )
 {
     for ( sal_uInt16 nChar = 0; nChar < rName.getLength(); nChar++ )
@@ -110,8 +103,6 @@ static bool StringCompareLessThan( const OUString& rStr1, const OUString& rStr2
     return rStr1.compareToIgnoreAsciiCase( rStr2 ) < 0;
 }
 
-//----------------------------------------------------------------------------
-
 Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryContainer >& xModLibContainer, const Reference< script::XLibraryContainer >& xDlgLibContainer )
 {
     // create a sorted list of module library names
@@ -153,8 +144,6 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon
     return aSeqLibNames;
 }
 
-//----------------------------------------------------------------------------
-
 bool RenameModule (
     Window* pErrorParent,
     const ScriptDocument& rDocument,
@@ -212,9 +201,6 @@ bool RenameModule (
     return true;
 }
 
-
-//----------------------------------------------------------------------------
-
 namespace
 {
     struct MacroExecutionData
@@ -235,7 +221,6 @@ namespace
         DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData* );
     };
 
-
     IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData*, i_pData )
     {
         (void)pThis;
@@ -257,8 +242,6 @@ namespace
     }
 }
 
-//----------------------------------------------------------------------------
-
 OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, bool bChooseOnly, const OUString& rMacroDesc )
 {
     (void)rMacroDesc;
@@ -394,8 +377,6 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
     return aScriptURL;
 }
 
-//----------------------------------------------------------------------------
-
 Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName )
     throw(NoSuchElementException )
 {
@@ -443,8 +424,6 @@ Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUSt
     return aSeqMethods;
 }
 
-//----------------------------------------------------------------------------
-
 bool HasMethod (
     ScriptDocument const& rDocument,
     OUString const& rLibName,
@@ -482,7 +461,6 @@ bool HasMethod (
     return bHasMethod;
 }
 
-//----------------------------------------------------------------------------
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 651798d50196..a735a4bd9ab1 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -60,9 +60,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 
-
-//----------------------------------------------------------------------------
-
 extern "C" {
     SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void* pPtr )
     {
@@ -70,8 +67,6 @@ extern "C" {
     }
 }
 
-//----------------------------------------------------------------------------
-
 SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName )
 {
     SfxDispatcher* pDispatcher = GetDispatcher();
@@ -160,8 +155,6 @@ SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName )
     return pMethod;
 }
 
-//----------------------------------------------------------------------------
-
 bool RenameDialog (
     Window* pErrorParent,
     ScriptDocument const& rDocument,
@@ -226,8 +219,6 @@ bool RenameDialog (
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName )
 {
     if (Shell* pShell = GetShell())
@@ -242,8 +233,6 @@ bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, co
     return rDocument.removeDialog( rLibName, rDlgName );
 }
 
-//----------------------------------------------------------------------------
-
 StarBASIC* FindBasic( const SbxVariable* pVar )
 {
     SbxVariable const* pSbx = pVar;
@@ -252,8 +241,6 @@ StarBASIC* FindBasic( const SbxVariable* pVar )
     return (StarBASIC*)pSbx;
 }
 
-//----------------------------------------------------------------------------
-
 BasicManager* FindBasicManager( StarBASIC* pLib )
 {
     ScriptDocuments aDocuments( ScriptDocument::getAllScriptDocuments( ScriptDocument::AllWithApplication ) );
@@ -281,8 +268,6 @@ BasicManager* FindBasicManager( StarBASIC* pLib )
     return NULL;
 }
 
-//----------------------------------------------------------------------------
-
 void MarkDocumentModified( const ScriptDocument& rDocument )
 {
     // does not have to come from a document...
@@ -307,8 +292,6 @@ void MarkDocumentModified( const ScriptDocument& rDocument )
     }
 }
 
-//----------------------------------------------------------------------------
-
 void RunMethod( SbMethod* pMethod )
 {
     SbxValues aRes;
@@ -316,8 +299,6 @@ void RunMethod( SbMethod* pMethod )
     pMethod->Get( aRes );
 }
 
-//----------------------------------------------------------------------------
-
 void StopBasic()
 {
     StarBASIC::Stop();
@@ -335,8 +316,6 @@ void StopBasic()
     BasicStopped();
 }
 
-//----------------------------------------------------------------------------
-
 void BasicStopped(
     bool* pbAppWindowDisabled,
     bool* pbDispatcherLocked,
@@ -346,7 +325,6 @@ void BasicStopped(
 {
     // maybe there are some locks to be removed after an error
     // or an explicit cancelling of the basic...
-
     if ( pbAppWindowDisabled )
         *pbAppWindowDisabled = false;
     if ( pbDispatcherLocked )
@@ -358,7 +336,7 @@ void BasicStopped(
     if ( ppSWLockViewCount )
         *ppSWLockViewCount = 0;
 
-    // AppWait ?
+    // AppWait?
     if (Shell* pShell = GetShell())
     {
         sal_uInt16 nWait = 0;
@@ -381,8 +359,6 @@ void BasicStopped(
 
 }
 
-//----------------------------------------------------------------------------
-
 void InvalidateDebuggerSlots()
 {
     if (SfxBindings* pBindings = GetBindingsPtr())
@@ -406,8 +382,6 @@ void InvalidateDebuggerSlots()
     }
 }
 
-//----------------------------------------------------------------------------
-
 long HandleBasicError( StarBASIC* pBasic )
 {
     EnsureIde();
@@ -465,8 +439,6 @@ long HandleBasicError( StarBASIC* pBasic )
     return nRet;
 }
 
-//----------------------------------------------------------------------------
-
 SfxBindings* GetBindingsPtr()
 {
     SfxBindings* pBindings = NULL;
@@ -495,8 +467,6 @@ SfxBindings* GetBindingsPtr()
     return pBindings;
 }
 
-//----------------------------------------------------------------------------
-
 SfxDispatcher* GetDispatcher ()
 {
     if (Shell* pShell = GetShell())
@@ -505,8 +475,6 @@ SfxDispatcher* GetDispatcher ()
                 return pDispatcher;
     return 0;
 }
-
-//----------------------------------------------------------------------------
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 95ed06fa12e2..1037da1760a9 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "doceventnotifier.hxx"
 #include "scriptdocument.hxx"
 
@@ -36,10 +35,8 @@
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-//........................................................................
 namespace basctl
 {
-//........................................................................
 
     using ::com::sun::star::document::XDocumentEventBroadcaster;
     using ::com::sun::star::document::XDocumentEventListener;
@@ -55,9 +52,8 @@ namespace basctl
 
     namespace csslang = ::com::sun::star::lang;
 
-    //====================================================================
-    //= DocumentEventNotifier::Impl
-    //====================================================================
+    // DocumentEventNotifier::Impl
+
     typedef ::cppu::WeakComponentImplHelper1    <   XDocumentEventListener
                                                 >   DocumentEventNotifier_Impl_Base;
 
@@ -101,7 +97,6 @@ namespace basctl
         Reference< XModel >     m_xModel;
     };
 
-    //--------------------------------------------------------------------
     DocumentEventNotifier::Impl::Impl (DocumentEventListener& rListener, Reference<XModel> const& rxDocument) :
         DocumentEventNotifier_Impl_Base(m_aMutex),
         m_pListener(&rListener),
@@ -112,7 +107,6 @@ namespace basctl
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
     DocumentEventNotifier::Impl::~Impl ()
     {
         if ( !impl_isDisposed_nothrow() )
@@ -122,7 +116,6 @@ namespace basctl
         }
     }
 
-    //--------------------------------------------------------------------
     void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) throw (RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -176,7 +169,6 @@ namespace basctl
         }
     }
 
-    //--------------------------------------------------------------------
     void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -186,21 +178,18 @@ namespace basctl
             impl_dispose_nothrow();
     }
 
-    //--------------------------------------------------------------------
     void SAL_CALL DocumentEventNotifier::Impl::disposing()
     {
         impl_listenerAction_nothrow( RemoveListener );
         impl_dispose_nothrow();
     }
 
-    //--------------------------------------------------------------------
     void DocumentEventNotifier::Impl::impl_dispose_nothrow()
     {
         m_pListener = NULL;
         m_xModel.clear();
     }
 
-    //--------------------------------------------------------------------
     void DocumentEventNotifier::Impl::impl_listenerAction_nothrow( ListenerAction _eAction )
     {
         try
@@ -225,39 +214,31 @@ namespace basctl
         }
     }
 
-    //====================================================================
-    //= DocumentEventNotifier
-    //====================================================================
-    //--------------------------------------------------------------------
+    // DocumentEventNotifier
+
     DocumentEventNotifier::DocumentEventNotifier (DocumentEventListener& rListener, Reference<XModel> const& rxDocument) :
         m_pImpl(new Impl(rListener, rxDocument))
     { }
 
-    //--------------------------------------------------------------------
     DocumentEventNotifier::DocumentEventNotifier (DocumentEventListener& rListener) :
         m_pImpl(new Impl(rListener, Reference<XModel>()))
     { }
 
-    //--------------------------------------------------------------------
     DocumentEventNotifier::~DocumentEventNotifier()
     {
     }
 
-    //--------------------------------------------------------------------
     void DocumentEventNotifier::dispose()
     {
         m_pImpl->dispose();
     }
 
-    //====================================================================
-    //= DocumentEventListener
-    //====================================================================
+    // DocumentEventListener
+
     DocumentEventListener::~DocumentEventListener()
     {
     }
 
-//........................................................................
 } // namespace basctl
-//........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx
index 0060ca6f19e9..0553bbd191be 100644
--- a/basctl/source/basicide/docsignature.cxx
+++ b/basctl/source/basicide/docsignature.cxx
@@ -23,11 +23,8 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/signaturestate.hxx>
 
-//........................................................................
 namespace basctl
 {
-//........................................................................
-
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
@@ -35,9 +32,8 @@ namespace basctl
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::frame::XModel;
 
-    //====================================================================
-    //= DocumentSignature::Impl
-    //====================================================================
+    // DocumentSignature::Impl
+
     struct DocumentSignature::Impl
     {
         SfxObjectShell* pShell;
@@ -45,10 +41,8 @@ namespace basctl
         Impl () : pShell(0) { }
     };
 
-    //====================================================================
-    //= DocumentSignature
-    //====================================================================
-    //--------------------------------------------------------------------
+    // DocumentSignature
+
     DocumentSignature::DocumentSignature (ScriptDocument const& rDocument) :
         m_pImpl(new Impl)
     {
@@ -67,18 +61,15 @@ namespace basctl
         }
     }
 
-    //--------------------------------------------------------------------
     DocumentSignature::~DocumentSignature()
     {
     }
 
-    //--------------------------------------------------------------------
     bool DocumentSignature::supportsSignatures() const
     {
         return ( m_pImpl->pShell != NULL );
     }
 
-    //--------------------------------------------------------------------
     void DocumentSignature::signScriptingContent() const
     {
         OSL_PRECOND( supportsSignatures(), "DocumentSignature::signScriptingContent: signatures not supported by this document!" );
@@ -86,7 +77,6 @@ namespace basctl
             m_pImpl->pShell->SignScriptingContent();
     }
 
-    //--------------------------------------------------------------------
     sal_uInt16 DocumentSignature::getScriptingSignatureState() const
     {
         if ( m_pImpl->pShell )
@@ -94,8 +84,6 @@ namespace basctl
         return SIGNATURESTATE_NOSIGNATURES;
     }
 
-//........................................................................
 } // namespace basctl
-//........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index f281ecadd112..de65f8cb1a56 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -34,9 +34,7 @@
 
 #include <comphelper/stl_types.hxx>
 
-//........................................................................
 namespace basctl { namespace docs {
-//........................................................................
 
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::Reference;
@@ -59,9 +57,7 @@ namespace basctl { namespace docs {
 
     namespace FrameSearchFlag = ::com::sun::star::frame::FrameSearchFlag;
 
-    //====================================================================
-    //= DocumentEnumeration_Data
-    //====================================================================
+    // DocumentEnumeration_Data
     struct DocumentEnumeration_Data
     {
         Reference< com::sun::star::uno::XComponentContext > aContext;
@@ -74,24 +70,18 @@ namespace basctl { namespace docs {
         }
     };
 
-    //====================================================================
-    //= DocumentEnumeration
-    //====================================================================
-    //--------------------------------------------------------------------
+    // DocumentEnumeration
     DocumentEnumeration::DocumentEnumeration( Reference< com::sun::star::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter )
         :m_pData( new DocumentEnumeration_Data( _rContext, _pFilter ) )
     {
     }
 
-    //--------------------------------------------------------------------
     DocumentEnumeration::~DocumentEnumeration()
     {
     }
 
-    //--------------------------------------------------------------------
     namespace
     {
-        //................................................................
         void lcl_getDocumentControllers_nothrow( DocumentDescriptor& _io_rDocDesc )
         {
             OSL_PRECOND( _io_rDocDesc.xModel.is(), "lcl_getDocumentControllers_nothrow: illegal model!" );
@@ -118,7 +108,6 @@ namespace basctl { namespace docs {
             }
         }
 
-        //................................................................
         void lcl_getDocuments_nothrow( const Sequence< Reference< XFrame > >& _rFrames, Documents& _out_rDocuments,
             const IDocumentDescriptorFilter* _pFilter )
         {
@@ -170,7 +159,6 @@ namespace basctl { namespace docs {
         }
     }
 
-    //--------------------------------------------------------------------
     void DocumentEnumeration::getDocuments( Documents& _out_rDocuments ) const
     {
         _out_rDocuments.clear();
@@ -189,8 +177,6 @@ namespace basctl { namespace docs {
         }
     }
 
-//........................................................................
 } } // namespace basctl::docs
-//........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 475d182ec29f..ae356ed80632 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -74,7 +74,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::ui::dialogs;
 
-
 typedef ::cppu::WeakImplHelper1< task::XInteractionHandler > HandlerImpl_BASE;
 
 namespace
@@ -97,9 +96,7 @@ public:
     }
 };
 
-//----------------------------------------------------------------------------
-//  LibUserData
-//----------------------------------------------------------------------------
+// LibUserData
 class LibUserData
 {
 private:
@@ -112,10 +109,7 @@ public:
     const ScriptDocument& GetDocument() const { return m_aDocument; }
 };
 
-//----------------------------------------------------------------------------
 //  LibLBoxString
-//----------------------------------------------------------------------------
-
 class LibLBoxString : public SvLBoxString
 {
 public:
@@ -125,8 +119,6 @@ public:
     virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
 };
 
-//----------------------------------------------------------------------------
-
 void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
 {
     // Change text color if library is read only:
@@ -156,11 +148,7 @@ void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa
 
 } // namespace
 
-
-//----------------------------------------------------------------------------
 //  basctl::CheckBox
-//----------------------------------------------------------------------------
-
 CheckBox::CheckBox(Window* pParent, WinBits nStyle)
     : SvTabListBox(pParent, nStyle)
     , eMode(ObjectMode::Module)
@@ -181,8 +169,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCheckBox(Window *pParent, V
     return new CheckBox(pParent, nWinBits);
 }
 
-//----------------------------------------------------------------------------
-
 CheckBox::~CheckBox()
 {
     delete pCheckButton;
@@ -196,8 +182,6 @@ CheckBox::~CheckBox()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void CheckBox::Init()
 {
     pCheckButton = new SvLBoxButtonData(this);
@@ -210,8 +194,6 @@ void CheckBox::Init()
     SetHighlightRange();
 }
 
-//----------------------------------------------------------------------------
-
 void CheckBox::SetMode (ObjectMode::Mode e)
 {
     eMode = e;
@@ -222,15 +204,11 @@ void CheckBox::SetMode (ObjectMode::Mode e)
         EnableCheckButton( 0 );
 }
 
-//----------------------------------------------------------------------------
-
 SvTreeListEntry* CheckBox::DoInsertEntry( const OUString& rStr, sal_uLong nPos )
 {
     return SvTabListBox::InsertEntryToColumn( rStr, nPos, 0 );
 }
 
-//----------------------------------------------------------------------------
-
 SvTreeListEntry* CheckBox::FindEntry( const OUString& rName )
 {
     sal_uLong nCount = GetEntryCount();
@@ -244,8 +222,6 @@ SvTreeListEntry* CheckBox::FindEntry( const OUString& rName )
     return 0;
 }
 
-//----------------------------------------------------------------------------
-
 void CheckBox::CheckEntryPos( sal_uLong nPos )
 {
     if ( nPos < GetEntryCount() )
@@ -257,8 +233,6 @@ void CheckBox::CheckEntryPos( sal_uLong nPos )
     }
 }
 
-//----------------------------------------------------------------------------
-
 bool CheckBox::IsChecked( sal_uLong nPos ) const
 {
     if ( nPos < GetEntryCount() )
@@ -266,8 +240,6 @@ bool CheckBox::IsChecked( sal_uLong nPos ) const
     return false;
 }
 
-//----------------------------------------------------------------------------
-
 void CheckBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rTxt,
     const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind )
 {
@@ -286,8 +258,6 @@ void CheckBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rTxt,
     }
 }
 
-//----------------------------------------------------------------------------
-
 sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
 {
     if (eMode != ObjectMode::Module)
@@ -334,8 +304,6 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
 {
     bool bValid = rNewName.getLength() <= 30 && IsValidSbxName(rNewName);
@@ -382,10 +350,7 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam
     return bValid;
 }
 
-//----------------------------------------------------------------------------
 // NewObjectDialog
-//----------------------------------------------------------------------------
-
 IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
 {
     if (IsValidSbxName(m_pEdit->GetText()))
@@ -429,10 +394,7 @@ NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode,
         m_pOKButton->SetClickHdl(LINK(this, NewObjectDialog, OkButtonHandler));
 }
 
-//----------------------------------------------------------------------------
 // GotoLineDialog
-//----------------------------------------------------------------------------
-
 GotoLineDialog::GotoLineDialog(Window * pParent )
     : ModalDialog(pParent, "GotoLineDialog",
         "modules/BasicIDE/ui/gotolinedialog.ui")
@@ -457,11 +419,7 @@ IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
     return 0;
 }
 
-
-//----------------------------------------------------------------------------
 // ExportDialog
-//----------------------------------------------------------------------------
-
 IMPL_LINK_NOARG(ExportDialog, OkButtonHandler)
 {
     mbExportAsPackage = m_pExportAsPackageButton->IsChecked();
@@ -481,10 +439,7 @@ ExportDialog::ExportDialog(Window * pParent)
     m_pOKButton->SetClickHdl(LINK(this, ExportDialog, OkButtonHandler));
 }
 
-//----------------------------------------------------------------------------
-//  LibPage
-//----------------------------------------------------------------------------
-
+// LibPage
 LibPage::LibPage(Window * pParent)
     : TabPage(pParent, "LibPage",
         "modules/BasicIDE/ui/libpage.ui")
@@ -529,8 +484,6 @@ LibPage::LibPage(Window * pParent)
     CheckButtons();
 }
 
-//----------------------------------------------------------------------------
-
 LibPage::~LibPage()
 {
     sal_uInt16 nCount = m_pBasicsBox->GetEntryCount();
@@ -541,8 +494,6 @@ LibPage::~LibPage()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::CheckButtons()
 {
     SvTreeListEntry* pCur = m_pLibBox->GetCurEntry();
@@ -594,23 +545,15 @@ void LibPage::CheckButtons()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::ActivatePage()
 {
     SetCurLib();
 }
 
-//----------------------------------------------------------------------------
-
-
 void LibPage::DeactivatePage()
 {
 }
 
-//----------------------------------------------------------------------------
-
-
 IMPL_LINK_INLINE_START( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
 {
     if ( pBox->IsSelected( pBox->GetHdlEntry() ) )
@@ -619,8 +562,6 @@ IMPL_LINK_INLINE_START( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
 }
 IMPL_LINK_INLINE_END( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
 
-//----------------------------------------------------------------------------
-
 IMPL_LINK_INLINE_START( LibPage, BasicSelectHdl, ListBox *, pBox )
 {
     (void)pBox;
@@ -630,8 +571,6 @@ IMPL_LINK_INLINE_START( LibPage, BasicSelectHdl, ListBox *, pBox )
 }
 IMPL_LINK_INLINE_END( LibPage, BasicSelectHdl, ListBox *, pBox )
 
-//----------------------------------------------------------------------------
-
 IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
 {
     if (pButton == m_pEditButton)
@@ -722,8 +661,6 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
     return 0;
 }
 
-//----------------------------------------------------------------------------
-
 IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
 {
     long nRet = 0;
@@ -750,15 +687,11 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
 }
 IMPL_LINK_INLINE_END( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
 
-//----------------------------------------------------------------------------
-
 void LibPage::NewLib()
 {
     createLibImpl( static_cast<Window*>( this ), m_aCurDocument, m_pLibBox, NULL);
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::InsertLib()
 {
     Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -1119,8 +1052,6 @@ void LibPage::InsertLib()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::Export( void )
 {
     SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
@@ -1146,7 +1077,6 @@ void LibPage::Export( void )
             return;
     }
 
-
     ExportDialog aNewDlg(this);
     if (aNewDlg.Execute() == RET_OK)
     {
@@ -1178,10 +1108,7 @@ void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetUR
         xDlgLibContainerExport->exportLibrary( aOULibName, aTargetURL, Handler );
 }
 
-
-//===========================================================================
 // Implementation XCommandEnvironment
-
 typedef cppu::WeakImplHelper1< XCommandEnvironment > LibCommandEnvironmentHelper;
 
 class OLibCommandEnvironment : public LibCommandEnvironmentHelper
@@ -1213,8 +1140,6 @@ Reference< XProgressHandler > OLibCommandEnvironment::getProgressHandler()
     return xRet;
 }
 
-
-
 void LibPage::ExportAsPackage( const OUString& aLibName )
 {
     // file open dialog
@@ -1364,8 +1289,6 @@ void LibPage::ExportAsBasic( const OUString& aLibName )
     }
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::DeleteCurrent()
 {
     SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
@@ -1402,8 +1325,6 @@ void LibPage::DeleteCurrent()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::EndTabDialog( sal_uInt16 nRet )
 {
     DBG_ASSERT( pTabDlg, "TabDlg nicht gesetzt!" );
@@ -1411,8 +1332,6 @@ void LibPage::EndTabDialog( sal_uInt16 nRet )
         pTabDlg->EndDialog( nRet );
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::FillListBox()
 {
     InsertListBoxEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_USER );
@@ -1428,8 +1347,6 @@ void LibPage::FillListBox()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation )
 {
     OUString aEntryText( rDocument.getTitle( eLocation ) );
@@ -1437,8 +1354,6 @@ void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocati
     m_pBasicsBox->SetEntryData( nPos, new DocumentEntry(rDocument, eLocation) );
 }
 
-//----------------------------------------------------------------------------
-
 void LibPage::SetCurLib()
 {
     sal_uInt16 nSelPos = m_pBasicsBox->GetSelectEntryPos();
@@ -1477,8 +1392,6 @@ void LibPage::SetCurLib()
     }
 }
 
-//----------------------------------------------------------------------------
-
 SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos )
 {
     // check, if library is password protected
@@ -1514,8 +1427,6 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong
     return pNewEntry;
 }
 
-//----------------------------------------------------------------------------
-
 // Helper function
 void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                     CheckBox* pLibBox, TreeListBox* pBasicBox )
@@ -1624,9 +1535,6 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
         }
     }
 }
-
-//----------------------------------------------------------------------------
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index 320336093782..18eefab9af17 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -25,9 +25,6 @@
 namespace basctl
 {
 
-//-------------------
-// class TbxControls
-//-------------------
 class TbxControls : public SfxToolBoxControl
 {
 private:
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index ba1d2193c95d..46b9f2fa8183 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -26,7 +26,6 @@
 namespace basctl
 {
 
-//-----------------------------------------------------------------------------
 class SIDEModel : public SfxBaseModel,
                 public com::sun::star::lang::XServiceInfo
 {
diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index 99b8684bbbd3..dbef9d595db4 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -33,24 +33,14 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
-
-
-//----------------------------------------------------------------------------
-
 DlgEdTransferableImpl::DlgEdTransferableImpl( const Sequence< DataFlavor >& aSeqFlavors, const Sequence< Any >& aSeqData )
 {
     m_SeqFlavors = aSeqFlavors;
     m_SeqData = aSeqData;
 }
-
-//----------------------------------------------------------------------------
-
 DlgEdTransferableImpl::~DlgEdTransferableImpl()
 {
 }
-
-//----------------------------------------------------------------------------
-
 sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, const DataFlavor& rFlavor )
 {
     // compare mime content types
@@ -71,8 +61,6 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, c
 }
 
 // XTransferable
-//----------------------------------------------------------------------------
-
 Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException)
 {
     const SolarMutexGuard aGuard;
@@ -93,18 +81,12 @@ Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor )
 
     return aData;
 }
-
-//----------------------------------------------------------------------------
-
 Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors(  ) throw(RuntimeException)
 {
     const SolarMutexGuard aGuard;
 
     return m_SeqFlavors;
 }
-
-//----------------------------------------------------------------------------
-
 sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor ) throw(RuntimeException)
 {
     const SolarMutexGuard aGuard;
@@ -116,8 +98,6 @@ sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor
 }
 
 // XClipboardOwner
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw(RuntimeException)
 {
     const SolarMutexGuard aGuard;
@@ -125,8 +105,6 @@ void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard
     m_SeqFlavors = Sequence< DataFlavor >();
     m_SeqData = Sequence< Any >();
 }
-
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 85ec1bf6b092..f5f2c4137b99 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -27,8 +27,6 @@
 namespace basctl
 {
 
-//----------------------------------------------------------------------------
-
 IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
 {
     (void)pTimer;
@@ -40,8 +38,6 @@ IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
 }
 IMPL_LINK_INLINE_END( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
 
-//----------------------------------------------------------------------------
-
 void DlgEdFunc::ForceScroll( const Point& rPos )
 {
     aScrollTimer.Stop();
@@ -83,8 +79,6 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
     aScrollTimer.Start();
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdFunc::DlgEdFunc (DlgEditor& rParent_) :
     rParent(rParent_)
 {
@@ -92,36 +86,26 @@ DlgEdFunc::DlgEdFunc (DlgEditor& rParent_) :
     aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdFunc::~DlgEdFunc()
 {
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFunc::MouseButtonDown( const MouseEvent& )
 {
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFunc::MouseButtonUp( const MouseEvent& )
 {
     aScrollTimer.Stop();
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFunc::MouseMove( const MouseEvent& )
 {
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
 {
     bool bReturn = false;
@@ -349,23 +333,17 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
     return bReturn;
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdFuncInsert::DlgEdFuncInsert (DlgEditor& rParent_) :
     DlgEdFunc(rParent_)
 {
     rParent.GetView().SetCreateMode(true);
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdFuncInsert::~DlgEdFuncInsert()
 {
     rParent.GetView().SetEditMode( true );
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if( !rMEvt.IsLeft() )
@@ -405,8 +383,6 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
 {
     DlgEdFunc::MouseButtonUp( rMEvt );
@@ -439,8 +415,6 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
     }
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
 {
     SdrView& rView  = rParent.GetView();
@@ -461,22 +435,16 @@ bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdFuncSelect::DlgEdFuncSelect (DlgEditor& rParent_) :
     DlgEdFunc(rParent_),
     bMarkAction(false)
 {
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdFuncSelect::~DlgEdFuncSelect()
 {
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
 {
     // get view from parent
@@ -539,8 +507,6 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
 {
     DlgEdFunc::MouseButtonUp( rMEvt );
@@ -575,8 +541,6 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
 {
     SdrView& rView  = rParent.GetView();
@@ -600,8 +564,6 @@ bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx
index fbcc89c26309..ad871511cd30 100644
--- a/basctl/source/dlged/dlgedlist.cxx
+++ b/basctl/source/dlged/dlgedlist.cxx
@@ -23,88 +23,58 @@
 namespace basctl
 {
 
-//============================================================================
 // DlgEdPropListenerImpl
-//============================================================================
-
-//----------------------------------------------------------------------------
-
 DlgEdPropListenerImpl::DlgEdPropListenerImpl (DlgEdObj& rObj) :
     rDlgEdObj(rObj)
 {
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdPropListenerImpl::~DlgEdPropListenerImpl()
 {
 }
 
 // XEventListener
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdPropListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
 {
 }
 
 // XPropertyChangeListener
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdPropListenerImpl::propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException)
 {
     rDlgEdObj._propertyChange( evt );
 }
 
-//----------------------------------------------------------------------------
-
-//============================================================================
 // DlgEdEvtContListenerImpl
-//============================================================================
-
-//----------------------------------------------------------------------------
-
 DlgEdEvtContListenerImpl::DlgEdEvtContListenerImpl (DlgEdObj& rObj) :
     rDlgEdObj(rObj)
 {
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl()
 {
 }
 
 // XEventListener
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdEvtContListenerImpl::disposing( const  ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
 {
 }
 
 // XContainerListener
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException)
 {
     rDlgEdObj._elementInserted( Event );
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException)
 {
     rDlgEdObj._elementReplaced( Event );
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException)
 {
     rDlgEdObj._elementRemoved( Event );
 }
 
-//----------------------------------------------------------------------------
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 93527d1b9761..4c83b53e3eac 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -28,31 +28,23 @@ DBG_NAME(DlgEdModel)
 
 TYPEINIT1(DlgEdModel,SdrModel);
 
-//----------------------------------------------------------------------------
-
 DlgEdModel::DlgEdModel()
     :SdrModel(NULL, NULL)
 {
     DBG_CTOR(DlgEdModel,0);
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdModel::~DlgEdModel()
 {
     DBG_DTOR(DlgEdModel,0);
 }
 
-//----------------------------------------------------------------------------
-
 SdrPage* DlgEdModel::AllocPage(bool bMasterPage)
 {
     DBG_CHKTHIS(DlgEdModel, 0);
     return new DlgEdPage(*this, bMasterPage);
 }
 
-//----------------------------------------------------------------------------
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 35c41cf73072..379f6bc8956c 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "dlged.hxx"
 #include "dlgeddef.hxx"
 #include "dlgedlist.hxx"
@@ -61,8 +60,6 @@ DlgEditor& DlgEdObj::GetDialogEditor ()
         return pDlgEdForm->GetDlgEditor();
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdObj::DlgEdObj()
           :SdrUnoObj(OUString(), false)
           ,bIsListening(false)
@@ -71,8 +68,6 @@ DlgEdObj::DlgEdObj()
     DBG_CTOR(DlgEdObj, NULL);
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdObj::DlgEdObj(const OUString& rModelName,
                    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac)
           :SdrUnoObj(rModelName, rxSFac, false)
@@ -82,8 +77,6 @@ DlgEdObj::DlgEdObj(const OUString& rModelName,
     DBG_CTOR(DlgEdObj, NULL);
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdObj::~DlgEdObj()
 {
     DBG_DTOR(DlgEdObj, NULL);
@@ -92,19 +85,15 @@ DlgEdObj::~DlgEdObj()
         EndListening();
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::SetPage(SdrPage* _pNewPage)
 {
     // now set the page
     SdrUnoObj::SetPage(_pNewPage);
 }
 
-//----------------------------------------------------------------------------
-
 namespace
 {
-    /** returns the DlgEdForm which the given DlgEdObj belongs to
+    /* returns the DlgEdForm which the given DlgEdObj belongs to
         (which might in fact be the object itself)
 
         Failure to obtain the form will be reported with an assertion in the non-product
@@ -120,8 +109,6 @@ namespace
     }
 }
 
-//----------------------------------------------------------------------------
-
 uno::Reference< awt::XControl > DlgEdObj::GetControl() const
 {
     uno::Reference< awt::XControl > xControl;
@@ -133,8 +120,6 @@ uno::Reference< awt::XControl > DlgEdObj::GetControl() const
     return xControl;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdObj::TransformSdrToControlCoordinates(
     sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
     sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
@@ -190,8 +175,6 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdObj::TransformSdrToFormCoordinates(
     sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
     sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
@@ -239,8 +222,6 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdObj::TransformControlToSdrCoordinates(
     sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
     sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
@@ -301,8 +282,6 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdObj::TransformFormToSdrCoordinates(
     sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
     sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
@@ -352,8 +331,6 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
     return true;
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::SetRectFromProps()
 {
     // get control position and size from properties
@@ -378,8 +355,6 @@ void DlgEdObj::SetRectFromProps()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::SetPropsFromRect()
 {
     // get control position and size from rectangle
@@ -410,8 +385,6 @@ void DlgEdObj::SetPropsFromRect()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
 {
     DBG_ASSERT( pDlgEdForm, "DlgEdObj::PositionAndSizeChange: no form!" );
@@ -482,8 +455,6 @@ void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
     SetRectFromProps();
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdObj::NameChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException)
 {
     // get old name
@@ -530,8 +501,6 @@ void SAL_CALL DlgEdObj::NameChange( const  ::com::sun::star::beans::PropertyChan
     }
 }
 
-//----------------------------------------------------------------------------
-
 sal_Int32 DlgEdObj::GetStep() const
 {
     // get step property
@@ -544,8 +513,6 @@ sal_Int32 DlgEdObj::GetStep() const
     return nStep;
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::UpdateStep()
 {
     sal_Int32 nCurStep = GetDlgEdForm()->GetStep();
@@ -572,8 +539,6 @@ void DlgEdObj::UpdateStep()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException)
 {
     DlgEdForm* pForm = GetDlgEdForm();
@@ -669,8 +634,6 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (Ru
     }
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdObj::supportsService( OUString const & serviceName ) const
 {
     bool bSupports = false;
@@ -683,8 +646,6 @@ bool DlgEdObj::supportsService( OUString const & serviceName ) const
     return bSupports;
 }
 
-//----------------------------------------------------------------------------
-
 OUString DlgEdObj::GetDefaultName() const
 {
     sal_uInt16 nResId = 0;
@@ -790,8 +751,6 @@ OUString DlgEdObj::GetDefaultName() const
     return aDefaultName;
 }
 
-//----------------------------------------------------------------------------
-
 OUString DlgEdObj::GetUniqueName() const
 {
     OUString aUniqueName;
@@ -811,15 +770,11 @@ OUString DlgEdObj::GetUniqueName() const
     return aUniqueName;
 }
 
-//----------------------------------------------------------------------------
-
 sal_uInt32 DlgEdObj::GetObjInventor()   const
 {
     return DlgInventor;
 }
 
-//----------------------------------------------------------------------------
-
 sal_uInt16 DlgEdObj::GetObjIdentifier() const
 {
     if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ))
@@ -912,8 +867,6 @@ sal_uInt16 DlgEdObj::GetObjIdentifier() const
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::clonedFrom(const DlgEdObj* _pSource)
 {
     // set parent form
@@ -955,8 +908,6 @@ void DlgEdObj::clonedFrom(const DlgEdObj* _pSource)
     StartListening();
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdObj* DlgEdObj::Clone() const
 {
     DlgEdObj* pDlgEdObj = CloneHelper< DlgEdObj >();
@@ -967,8 +918,6 @@ DlgEdObj* DlgEdObj::Clone() const
     return pDlgEdObj;
 }
 
-//----------------------------------------------------------------------------
-
 SdrObject* DlgEdObj::getFullDragClone() const
 {
     // no need to really add the clone for dragging, it's a temporary
@@ -979,8 +928,6 @@ SdrObject* DlgEdObj::getFullDragClone() const
     return pObj;
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::NbcMove( const Size& rSize )
 {
     SdrUnoObj::NbcMove( rSize );
@@ -998,8 +945,6 @@ void DlgEdObj::NbcMove( const Size& rSize )
     GetDlgEdForm()->GetDlgEditor().SetDialogModelChanged(true);
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
 {
     SdrUnoObj::NbcResize( rRef, xFract, yFract );
@@ -1017,8 +962,6 @@ void DlgEdObj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti
     GetDlgEdForm()->GetDlgEditor().SetDialogModelChanged(true);
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
@@ -1029,8 +972,6 @@ bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     return bResult;
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::SetDefaults()
 {
     // set parent form
@@ -1114,8 +1055,6 @@ void DlgEdObj::SetDefaults()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::StartListening()
 {
     DBG_ASSERT(!isListening(), "DlgEdObj::StartListening: already listening!");
@@ -1152,8 +1091,6 @@ void DlgEdObj::StartListening()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::EndListening(bool bRemoveListener)
 {
     DBG_ASSERT(isListening(), "DlgEdObj::EndListening: not listening currently!");
@@ -1189,8 +1126,6 @@ void DlgEdObj::EndListening(bool bRemoveListener)
     }
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdObj::_propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException)
 {
     if (isListening())
@@ -1237,8 +1172,6 @@ void SAL_CALL DlgEdObj::_propertyChange( const  ::com::sun::star::beans::Propert
     }
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdObj::_elementInserted(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException)
 {
     if (isListening())
@@ -1248,8 +1181,6 @@ void SAL_CALL DlgEdObj::_elementInserted(const ::com::sun::star::container::Cont
     }
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdObj::_elementReplaced(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException)
 {
     if (isListening())
@@ -1259,8 +1190,6 @@ void SAL_CALL DlgEdObj::_elementReplaced(const ::com::sun::star::container::Cont
     }
 }
 
-//----------------------------------------------------------------------------
-
 void SAL_CALL DlgEdObj::_elementRemoved(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException)
 {
     if (isListening())
@@ -1270,8 +1199,6 @@ void SAL_CALL DlgEdObj::_elementRemoved(const ::com::sun::star::container::Conta
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdObj::SetLayer(SdrLayerID nLayer)
 {
     SdrLayerID nOldLayer = GetLayer();
@@ -1285,28 +1212,20 @@ void DlgEdObj::SetLayer(SdrLayerID nLayer)
     }
 }
 
-//----------------------------------------------------------------------------
-
 TYPEINIT1(DlgEdForm, DlgEdObj);
 DBG_NAME(DlgEdForm);
 
-//----------------------------------------------------------------------------
-
 DlgEdForm::DlgEdForm (DlgEditor& rDlgEditor_) :
     rDlgEditor(rDlgEditor_)
 {
     DBG_CTOR(DlgEdForm, NULL);
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdForm::~DlgEdForm()
 {
     DBG_DTOR(DlgEdForm, NULL);
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::SetRectFromProps()
 {
     // get form position and size from properties
@@ -1331,8 +1250,6 @@ void DlgEdForm::SetRectFromProps()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::SetPropsFromRect()
 {
     // get form position and size from rectangle
@@ -1363,22 +1280,16 @@ void DlgEdForm::SetPropsFromRect()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::AddChild( DlgEdObj* pDlgEdObj )
 {
     pChildren.push_back( pDlgEdObj );
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::RemoveChild( DlgEdObj* pDlgEdObj )
 {
     pChildren.erase( ::std::find( pChildren.begin() , pChildren.end() , pDlgEdObj ) );
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
 {
     DlgEditor& rEditor = GetDlgEditor();
@@ -1495,8 +1406,6 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
         (*aIter)->SetRectFromProps();
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::UpdateStep()
 {
     sal_uLong nObjCount;
@@ -1513,8 +1422,6 @@ void DlgEdForm::UpdateStep()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::UpdateTabIndices()
 {
     // stop listening with all children
@@ -1577,8 +1484,6 @@ void DlgEdForm::UpdateTabIndices()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::UpdateTabOrder()
 {
     // #110559#
@@ -1599,8 +1504,6 @@ void DlgEdForm::UpdateTabOrder()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::UpdateGroups()
 {
     // #110559#
@@ -1667,16 +1570,12 @@ void DlgEdForm::UpdateGroups()
     }
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::UpdateTabOrderAndGroups()
 {
     UpdateTabOrder();
     UpdateGroups();
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::NbcMove( const Size& rSize )
 {
     SdrUnoObj::NbcMove( rSize );
@@ -1699,8 +1598,6 @@ void DlgEdForm::NbcMove( const Size& rSize )
     GetDlgEditor().SetDialogModelChanged(true);
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
 {
     SdrUnoObj::NbcResize( rRef, xFract, yFract );
@@ -1723,8 +1620,6 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract
     GetDlgEditor().SetDialogModelChanged(true);
 }
 
-//----------------------------------------------------------------------------
-
 bool DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
@@ -1744,8 +1639,6 @@ bool DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     return bResult;
 }
 
-//----------------------------------------------------------------------------
-
 awt::DeviceInfo DlgEdForm::getDeviceInfo() const
 {
     awt::DeviceInfo aDeviceInfo;
@@ -1809,8 +1702,6 @@ bool DlgEdObj::MakeDataAware( const Reference< frame::XModel >& xModel )
     }
     return bRes;
 }
-//----------------------------------------------------------------------------
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx
index d315227f2183..c170032928dd 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -27,29 +27,23 @@ namespace basctl
 
 TYPEINIT1( DlgEdPage, SdrPage );
 
-//----------------------------------------------------------------------------
-
 DlgEdPage::DlgEdPage(DlgEdModel& rModel, bool bMasterPage)
     : SdrPage(rModel, bMasterPage)
     , pDlgEdForm(0)
 {
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdPage::~DlgEdPage()
 {
     Clear();
 }
 
-//----------------------------------------------------------------------------
 
 SdrPage* DlgEdPage::Clone() const
 {
     return new DlgEdPage( *this );
 }
 
-//----------------------------------------------------------------------------
 
 SdrObject* DlgEdPage::SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum)
 {
@@ -62,8 +56,6 @@ SdrObject* DlgEdPage::SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum
     return pObj;
 }
 
-//----------------------------------------------------------------------------
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index ee06f8ffda4b..c75fd1915a22 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -33,8 +33,6 @@ namespace basctl
 
 TYPEINIT1( DlgEdView, SdrView );
 
-//----------------------------------------------------------------------------
-
 DlgEdView::DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor) :
     SdrView(&rModel, &rOut),
     rDlgEditor(rEditor)
@@ -44,14 +42,10 @@ DlgEdView::DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor)
     SetBufferedOverlayAllowed(true);
 }
 
-//----------------------------------------------------------------------------
-
 DlgEdView::~DlgEdView()
 {
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdView::MarkListHasChanged()
 {
     SdrView::MarkListHasChanged();
@@ -61,8 +55,6 @@ void DlgEdView::MarkListHasChanged()
     rDlgEditor.UpdatePropertyBrowserDelayed();
 }
 
-//----------------------------------------------------------------------------
-
 void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin )
 {
     // visible area
@@ -131,8 +123,6 @@ void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin )
     }
 }
 
-//----------------------------------------------------------------------------
-
 SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt16 nTol)
 {
     DlgEdObj* pDlgEdObj = dynamic_cast< DlgEdObj* >(pRetval);
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 9f1f0a3f462e..eca619b3a698 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -39,12 +39,9 @@ class StarBASIC;
 
 namespace basctl
 {
-//----------------------------------------------------------------------------
 
 const sal_uLong BASICIDE_UI_FEATURE_SHOW_BROWSER = 0x00000001;
 
-//----------------------------------------------------------------------------
-
 class Layout;
 class ModulWindow;
 class ModulWindowLayout;
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index f1d0c2b2ba3a..707559c828c9 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -207,13 +207,13 @@ namespace
                                alphamask_accessorselector_type,
                                Masks>                                      alphamask_bitmap_type;
 
-        // -------------------------------------------------------
+
 
         typedef AccessorTraits< raw_accessor_type >                        raw_accessor_traits;
         typedef typename uInt32Converter<
             typename raw_accessor_type::value_type>::to                    to_uint32_functor;
 
-        // -------------------------------------------------------
+
 
         typedef typename raw_accessor_traits::xor_accessor                 raw_xor_accessor_type;
         typedef AccessorTraits<raw_xor_accessor_type>                      raw_xor_accessor_traits;
@@ -221,7 +221,7 @@ namespace
             raw_xor_accessor_type >::type                                  xor_accessor_type;
         typedef AccessorTraits<xor_accessor_type>                          xor_accessor_traits;
 
-        // -------------------------------------------------------
+
 
         typedef typename raw_accessor_traits::template masked_accessor<
             mask_rawaccessor_type,
@@ -235,7 +235,7 @@ namespace
         typedef typename accessor_selector::template wrap_accessor<
             raw_maskedxor_accessor_type >::type                            masked_xoraccessor_type;
 
-        // -------------------------------------------------------
+
 
         // ((iter,mask),mask) special case (e.g. for clipped
         // drawMaskedColor())
@@ -250,7 +250,7 @@ namespace
             composite_iterator_type,
             mask_iterator_type>                                            composite_composite_mask_iterator_type;
 
-        // -------------------------------------------------------
+
 
         typedef ConstantColorBlendSetterAccessorAdapter<
             dest_accessor_type,
@@ -263,7 +263,7 @@ namespace
             mask_iterator_type,
             Masks::clipmask_polarity>::type                                masked_colorblend_accessor_type;
 
-        // -------------------------------------------------------
+
 
         typedef ConstantColorBlendSetterAccessorAdapter<
             dest_accessor_type,
@@ -276,14 +276,14 @@ namespace
             mask_iterator_type,
             Masks::clipmask_polarity>::type                                masked_colorblend_generic_accessor_type;
 
-        // -------------------------------------------------------
+
 
         typedef JoinImageAccessorAdapter< dest_accessor_type,
                                           mask_rawaccessor_type >          joined_image_accessor_type;
         typedef JoinImageAccessorAdapter< GenericColorImageAccessor,
                                           GenericColorImageAccessor >      joined_generic_image_accessor_type;
 
-        // -------------------------------------------------------
+
 
         dest_iterator_type                      maBegin;
         typename accessor_traits::color_lookup  maColorLookup;
@@ -304,7 +304,7 @@ namespace
         raw_maskedmask_accessor_type            maRawMaskedMaskAccessor;
 
 
-        // -------------------------------------------------------
+
 
         BitmapRenderer( const basegfx::B2IBox&                     rBounds,
                         const basegfx::B2IVector&                  rBufferSize,
@@ -1609,7 +1609,7 @@ void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
         if( isSharedBuffer(rAlphaMask) )
         {
             // src == dest, copy rAlphaMask beforehand
-            // ---------------------------------------------------
+
 
             const basegfx::B2ITuple aSize( aSrcRange.getWidth(),
                                            aSrcRange.getHeight() );
@@ -1662,7 +1662,7 @@ void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
             if( isSharedBuffer(rAlphaMask) )
             {
                 // src == dest, copy rAlphaMask beforehand
-                // ---------------------------------------------------
+
 
                 const basegfx::B2ITuple aSize( aSrcRange.getWidth(),
                                                aSrcRange.getHeight() );
@@ -2002,7 +2002,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
 
     switch( nScanlineFormat )
     {
-        // ----------------------------------------------------------------------
+
         // one bit formats
 
         case FORMAT_ONE_BIT_MSB_GREY:
@@ -2028,7 +2028,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
                 bitsPerPixel[nScanlineFormat], rDamage );
 
 
-        // ----------------------------------------------------------------------
+
         // four bit formats
 
         case FORMAT_FOUR_BIT_MSB_GREY:
@@ -2054,7 +2054,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
                 bitsPerPixel[nScanlineFormat], rDamage );
 
 
-        // ----------------------------------------------------------------------
+
         // eight bit formats
 
         case FORMAT_EIGHT_BIT_GREY:
@@ -2069,7 +2069,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
                 bitsPerPixel[nScanlineFormat], rDamage );
 
 
-        // ----------------------------------------------------------------------
+
         // sixteen bit formats
 
         case FORMAT_SIXTEEN_BIT_LSB_TC_MASK:
@@ -2083,7 +2083,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
                 pFirstScanline, pMem, pPal, rDamage );
 
 
-        // ----------------------------------------------------------------------
+
         // twentyfour bit formats
         case FORMAT_TWENTYFOUR_BIT_TC_MASK:
             return createRenderer<PixelFormatTraits_BGR24,StdMasks>(
@@ -2091,7 +2091,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
                 pFirstScanline, pMem, pPal, rDamage );
 
 
-        // ----------------------------------------------------------------------
+
         // thirtytwo bit formats
 
         case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index d91e6efefbaf..775364127ec7 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -62,7 +62,7 @@ private:
         CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 0",
                                countPixel( rDevice, aCol ) == 0);
 
-        // --------------------------------------------------
+
 
         rDevice->clear(aBgCol);
         aPoly.clear();
@@ -94,7 +94,7 @@ private:
         CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 7",
                                countPixel( rDevice, aCol ) == 7);
 
-        // --------------------------------------------------
+
 
         rDevice->clear(aBgCol);
         aPoly.clear();
@@ -108,7 +108,7 @@ private:
         CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 6",
                                countPixel( rDevice, aCol ) == 6);
 
-        // --------------------------------------------------
+
 
         rDevice->clear(aBgCol);
         aPoly.clear();
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index efcf16c148d0..a08a1779ffdf 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -101,8 +101,6 @@ namespace basegfx
             }
         }
 
-        //---------------------------------------------------------------------------------------
-
         uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > > bezierSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly )
         {
             const sal_uInt32 nNumPolies( rPolyPoly.count() );
@@ -119,8 +117,6 @@ namespace basegfx
             return outputSequence;
         }
 
-        //---------------------------------------------------------------------------------------
-
         uno::Sequence< uno::Sequence< geometry::RealPoint2D > > pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly  )
         {
             const sal_uInt32 nNumPolies( rPolyPoly.count() );
@@ -137,8 +133,6 @@ namespace basegfx
             return outputSequence;
         }
 
-        //---------------------------------------------------------------------------------------
-
         uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolygon( const uno::Reference< rendering::XGraphicDevice >&  xGraphicDevice,
                                                                                 const ::basegfx::B2DPolygon&                        rPoly    )
         {
@@ -170,8 +164,6 @@ namespace basegfx
             return xRes;
         }
 
-        //---------------------------------------------------------------------------------------
-
         uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolyPolygon( const uno::Reference< rendering::XGraphicDevice >&  xGraphicDevice,
                                                                                     const ::basegfx::B2DPolyPolygon&                    rPolyPoly    )
         {
@@ -204,8 +196,6 @@ namespace basegfx
             return xRes;
         }
 
-        //---------------------------------------------------------------------------------------
-
         ::basegfx::B2DPolygon polygonFromPoint2DSequence( const uno::Sequence< geometry::RealPoint2D >& points )
         {
             const sal_Int32 nCurrSize( points.getLength() );
@@ -218,8 +208,6 @@ namespace basegfx
             return aPoly;
         }
 
-        //---------------------------------------------------------------------------------------
-
         ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence( const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points )
         {
             ::basegfx::B2DPolyPolygon aRes;
@@ -232,8 +220,6 @@ namespace basegfx
             return aRes;
         }
 
-        //---------------------------------------------------------------------------------------
-
         ::basegfx::B2DPolygon polygonFromBezier2DSequence( const uno::Sequence< geometry::RealBezierSegment2D >& curves )
         {
             const sal_Int32 nSize(curves.getLength());
@@ -266,8 +252,6 @@ namespace basegfx
             return aRetval;
         }
 
-        //---------------------------------------------------------------------------------------
-
         ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence( const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >& curves )
         {
             ::basegfx::B2DPolyPolygon aRes;
@@ -280,8 +264,6 @@ namespace basegfx
             return aRes;
         }
 
-        //---------------------------------------------------------------------------------------
-
         ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly )
         {
             ::basegfx::unotools::UnoPolyPolygon* pPolyImpl =
@@ -336,8 +318,6 @@ namespace basegfx
             }
         }
 
-        //---------------------------------------------------------------------------------------
-
         ::basegfx::B2DHomMatrix& homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix&        output,
                                                             const geometry::AffineMatrix2D& input )
         {
@@ -411,8 +391,6 @@ namespace basegfx
             return output;
         }
 
-        //---------------------------------------------------------------------------------------
-
         ::basegfx::B2DHomMatrix& homMatrixFromMatrix( ::basegfx::B2DHomMatrix&  output,
                                                       const geometry::Matrix2D& input )
         {
@@ -427,8 +405,6 @@ namespace basegfx
             return output;
         }
 
-        //---------------------------------------------------------------------------------------
-
         geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& rVec )
         {
             return geometry::RealSize2D( rVec.getX(),
diff --git a/basegfx/source/workbench/bezierclip.cxx b/basegfx/source/workbench/bezierclip.cxx
index 7d99dfafc032..2ba7302c7ca5 100644
--- a/basegfx/source/workbench/bezierclip.cxx
+++ b/basegfx/source/workbench/bezierclip.cxx
@@ -45,7 +45,7 @@
 
 
 
-// -----------------------------------------------------------------------------
+
 
 /* Implementation of the so-called 'Fat-Line Bezier Clipping Algorithm' by Sederberg et al.
  *
@@ -54,7 +54,7 @@
  * (9), 1990, pp. 538--549
  */
 
-// -----------------------------------------------------------------------------
+
 
 /* Misc helper
  * ===========
@@ -74,20 +74,20 @@ int fallFac( int n, int k )
     return res;
 }
 
-// -----------------------------------------------------------------------------
+
 
 int fac( int n )
 {
     return fallFac(n, n);
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* Bezier fat line clipping part
  * =============================
  */
 
-// -----------------------------------------------------------------------------
+
 
 void Impl_calcFatLine( FatLine& line, const Bezier& c )
 {
@@ -340,7 +340,7 @@ bool Impl_calcSafeParams_clip( double&          t1,
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Impl_deCasteljauAt( Bezier&        part1,
                          Bezier&        part2,
@@ -389,7 +389,7 @@ void Impl_deCasteljauAt( Bezier&        part1,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1, double t2_c1,
                                const Bezier& c2_part, const FatLine& bounds_c2 )
@@ -473,7 +473,7 @@ void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1,
     offset += 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void printResultWithFinalCurves( const Bezier& c1, const Bezier& c1_part,
                                  const Bezier& c2, const Bezier& c2_part,
@@ -548,7 +548,7 @@ void printResultWithFinalCurves( const Bezier& c1, const Bezier& c1_part,
     offset += 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** determine parameter ranges [0,t1) and (t2,1] on c1, where c1 is guaranteed to lie outside c2.
       Returns false, if the two curves don't even intersect.
@@ -628,13 +628,13 @@ bool Impl_calcClipRange( double&        t1,
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* Tangent intersection part
  * =========================
  */
 
-// -----------------------------------------------------------------------------
+
 
 void Impl_calcFocus( Bezier& res, const Bezier& c )
 {
@@ -761,7 +761,7 @@ void Impl_calcFocus( Bezier& res, const Bezier& c )
     res.p3.y = c.p3.y + 3*fRes[1]*(c.p3.x - c.p2.x);
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool Impl_calcSafeParams_focus( double&         t1,
                                 double&         t2,
@@ -900,7 +900,7 @@ bool Impl_calcSafeParams_focus( double&         t1,
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** Calc all values t_i on c1, for which safeRanges functor does not
     give a safe range on c1 and c2.
@@ -1144,7 +1144,7 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 struct ClipBezierFunctor
 {
@@ -1159,7 +1159,7 @@ struct ClipBezierFunctor
     }
 };
 
-// -----------------------------------------------------------------------------
+
 
 struct BezierTangencyFunctor
 {
@@ -1187,7 +1187,7 @@ struct BezierTangencyFunctor
     }
 };
 
-// -----------------------------------------------------------------------------
+
 
 /** Perform a bezier clip (curve against curve)
 
diff --git a/basegfx/source/workbench/convexhull.cxx b/basegfx/source/workbench/convexhull.cxx
index 579413e16ea1..aba5c1a94b69 100644
--- a/basegfx/source/workbench/convexhull.cxx
+++ b/basegfx/source/workbench/convexhull.cxx
@@ -23,7 +23,7 @@
 
 #include "bezierclip.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 /* Implements the theta function from Sedgewick: Algorithms in XXX, chapter 24 */
 template <class PointType> double theta( const PointType& p1, const PointType& p2 )
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index 5b0b24bf4d4c..8d190cb1d6c1 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -55,7 +55,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class b1drange
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx1d::b1drange);
 } // namespace basegfx1d
 
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index afa065c0ac57..ba59c5f01e99 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -1285,7 +1285,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class b2dvector
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dsvgdimpex);
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2drange);
@@ -1304,7 +1304,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::bcolor);
 } // namespace basegfx2d
 
 
-// -----------------------------------------------------------------------------
+
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index 96f0b5748ca4..7665cfcd2986 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -165,7 +165,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class b3dvector
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dhommatrix);
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dpoint);
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3drange);
@@ -174,7 +174,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dvector);
 } // namespace basegfx3d
 
 
-// -----------------------------------------------------------------------------
+
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx
index 7ff301755902..01ae9634f4ad 100644
--- a/basegfx/test/basegfxtools.cxx
+++ b/basegfx/test/basegfxtools.cxx
@@ -93,7 +93,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfxtools::KeyStopLerpTest);
 } // namespace basegfxtools
 
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index 9b8bf10254f4..f96c7eb0d52f 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -428,7 +428,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::boxclipper);
 } // namespace basegfx2d
 
diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx
index dc925409fea9..2f094e5bac4c 100644
--- a/basegfx/test/clipstate.cxx
+++ b/basegfx/test/clipstate.cxx
@@ -157,7 +157,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::clipstate);
 } // namespace basegfx2d
 
diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx
index b60b067b45f0..66c503a4383c 100644
--- a/basegfx/test/genericclipper.cxx
+++ b/basegfx/test/genericclipper.cxx
@@ -191,7 +191,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::genericclipper);
 } // namespace basegfx2d
 
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 9bb855e81ae6..ad45eaa76eab 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -25,9 +25,7 @@
 #include <basic/sbxfac.hxx>
 #include <basic/basicdllapi.h>
 
-//--------------------
 // class SbStdFactory
-//--------------------
 class BASIC_DLLPUBLIC SbStdFactory : public SbxFactory
 {
 public:
@@ -36,9 +34,7 @@ public:
     virtual SbxObject*  CreateObject( const OUString& rClassName );
 };
 
-//--------------------
 // class SbStdPicture
-//--------------------
 class BASIC_DLLPUBLIC SbStdPicture : public SbxObject
 {
 protected:
@@ -62,9 +58,7 @@ public:
     void    SetGraphic( const Graphic& rGrf ) { aGraphic = rGrf; }
 };
 
-//-----------------
 // class SbStdFont
-//-----------------
 class BASIC_DLLPUBLIC SbStdFont : public SbxObject
 {
 protected:
@@ -106,9 +100,7 @@ public:
     OUString GetFontName() const { return aName; }
 };
 
-//----------------------
 // class SbStdClipboard
-//----------------------
 class BASIC_DLLPUBLIC SbStdClipboard : public SbxObject
 {
 protected:
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 4aece49a21c5..0e483d698177 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -223,19 +223,19 @@ namespace basic
     //====================================================================
     //= ImplRepository
     //====================================================================
-    //--------------------------------------------------------------------
+
     ImplRepository::ImplRepository()
     {
     }
 
-    //--------------------------------------------------------------------
+
     ImplRepository& ImplRepository::Instance()
     {
         return *rtl_Instance< ImplRepository, CreateImplRepository, ::osl::MutexGuard, ::osl::GetGlobalMutex >::
             create( CreateImplRepository(), ::osl::GetGlobalMutex() );
     }
 
-    //--------------------------------------------------------------------
+
     BasicManager* ImplRepository::getDocumentBasicManager( const Reference< XModel >& _rxDocumentModel )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -255,7 +255,7 @@ namespace basic
         return pBasicManager;
     }
 
-    //--------------------------------------------------------------------
+
     BasicManager* ImplRepository::getApplicationBasicManager( bool _bCreate )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -267,7 +267,7 @@ namespace basic
         return pAppManager;
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::setApplicationBasicManager( BasicManager* _pBasicManager )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -278,7 +278,7 @@ namespace basic
         GetSbData()->pAppBasMgr = _pBasicManager;
     }
 
-    //--------------------------------------------------------------------
+
     BasicManager* ImplRepository::impl_createApplicationBasicManager()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -337,14 +337,14 @@ namespace basic
         return pBasicManager;
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::registerCreationListener( BasicManagerCreationListener& _rListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_aCreationListeners.push_back( &_rListener );
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::revokeCreationListener( BasicManagerCreationListener& _rListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -356,7 +356,7 @@ namespace basic
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::impl_notifyCreationListeners( const Reference< XModel >& _rxDocumentModel, BasicManager& _rManager )
     {
         for (   CreationListeners::const_iterator loop = m_aCreationListeners.begin();
@@ -368,7 +368,7 @@ namespace basic
         }
     }
 
-    //--------------------------------------------------------------------
+
     StarBASIC* ImplRepository::impl_getDefaultAppBasicLibrary()
     {
         BasicManager* pAppManager = getApplicationBasicManager( true );
@@ -378,7 +378,7 @@ namespace basic
         return pAppBasic;
     }
 
-    //--------------------------------------------------------------------
+
     BasicManagerPointer& ImplRepository::impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel )
     {
         DBG_ASSERT( _rxDocumentModel.is(), "ImplRepository::impl_getLocationForModel: invalid model!" );
@@ -387,7 +387,7 @@ namespace basic
         return location;
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::impl_initDocLibraryContainers_nothrow( const Reference< XPersistentLibraryContainer >& _rxBasicLibraries, const Reference< XPersistentLibraryContainer >& _rxDialogLibraries )
     {
         OSL_PRECOND( _rxBasicLibraries.is() && _rxDialogLibraries.is(),
@@ -413,7 +413,7 @@ namespace basic
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::impl_createManagerForModel( BasicManagerPointer& _out_rpBasicManager, const Reference< XModel >& _rxDocumentModel )
     {
         StarBASIC* pAppBasic = impl_getDefaultAppBasicLibrary();
@@ -502,7 +502,7 @@ namespace basic
 
     }
 
-    //--------------------------------------------------------------------
+
     bool ImplRepository::impl_getDocumentStorage_nothrow( const Reference< XModel >& _rxDocument, Reference< XStorage >& _out_rStorage )
     {
         _out_rStorage.clear();
@@ -519,7 +519,7 @@ namespace basic
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool ImplRepository::impl_getDocumentLibraryContainers_nothrow( const Reference< XModel >& _rxDocument,
         Reference< XPersistentLibraryContainer >& _out_rxBasicLibraries, Reference< XPersistentLibraryContainer >& _out_rxDialogLibraries )
     {
@@ -538,7 +538,7 @@ namespace basic
         return _out_rxBasicLibraries.is() && _out_rxDialogLibraries.is();
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::impl_removeFromRepository( BasicManagerStore::iterator _pos )
     {
         OSL_PRECOND( _pos != m_aStore.end(), "ImplRepository::impl_removeFromRepository: invalid position!" );
@@ -553,7 +553,7 @@ namespace basic
         BasicManagerCleaner::deleteBasicManager( pManager );
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::_disposing( const ::com::sun::star::lang::EventObject& _rSource )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -581,7 +581,7 @@ namespace basic
         OSL_ENSURE( bFound, "ImplRepository::_disposing: where does this come from?" );
     }
 
-    //--------------------------------------------------------------------
+
     void ImplRepository::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint )
     {
         const SfxSimpleHint* pSimpleHint = dynamic_cast< const SfxSimpleHint* >( &_rHint );
@@ -612,31 +612,31 @@ namespace basic
     //====================================================================
     //= BasicManagerRepository
     //====================================================================
-    //--------------------------------------------------------------------
+
     BasicManager* BasicManagerRepository::getDocumentBasicManager( const Reference< XModel >& _rxDocumentModel )
     {
         return ImplRepository::Instance().getDocumentBasicManager( _rxDocumentModel );
     }
 
-    //--------------------------------------------------------------------
+
     BasicManager* BasicManagerRepository::getApplicationBasicManager( bool _bCreate )
     {
         return ImplRepository::Instance().getApplicationBasicManager( _bCreate );
     }
 
-    //--------------------------------------------------------------------
+
     void BasicManagerRepository::resetApplicationBasicManager()
     {
         return ImplRepository::Instance().setApplicationBasicManager( NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void BasicManagerRepository::registerCreationListener( BasicManagerCreationListener& _rListener )
     {
         ImplRepository::Instance().registerCreationListener( _rListener );
     }
 
-    //--------------------------------------------------------------------
+
     void BasicManagerRepository::revokeCreationListener( BasicManagerCreationListener& _rListener )
     {
         ImplRepository::Instance().revokeCreationListener( _rListener );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 620deb98e740..c7c4bd48c189 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -104,7 +104,7 @@ DBG_NAME( BasicManager );
 StreamMode eStreamReadMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL;
 StreamMode eStorageReadMode = STREAM_READ | STREAM_SHARE_DENYWRITE;
 
-//----------------------------------------------------------------------------
+
 // BasicManager impl data
 struct BasicManagerImpl
 {
@@ -242,7 +242,7 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
 
 
 // XEventListener
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& Source )
     throw( uno::RuntimeException )
@@ -251,7 +251,7 @@ void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& S
 }
 
 // XContainerListener
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::ContainerEvent& Event )
     throw( uno::RuntimeException )
@@ -298,7 +298,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::ContainerEvent& Event )
     throw( uno::RuntimeException )
@@ -328,7 +328,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::ContainerEvent& Event )
     throw( uno::RuntimeException )
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index 8f870bb143d4..d9dfaa9a9dc7 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -48,7 +48,7 @@ uno::Reference< frame::XModuleManager2 > lclCreateModuleManager()
     return frame::ModuleManager::create(xContext);
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Implementation of an enumeration of all open documents of the same type.
  */
@@ -98,7 +98,7 @@ uno::Any SAL_CALL DocumentsEnumeration::nextElement() throw (container::NoSuchEl
     return uno::Any( *maModelIt++ );
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Locks or unlocks the controllers of the specified document model.
  */
@@ -116,7 +116,7 @@ void lclLockControllers( const uno::Reference< frame::XModel >& rxModel, sal_Boo
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Enables or disables the container windows of all controllers of the
     specified document model.
@@ -147,7 +147,7 @@ void lclEnableContainerWindows( const uno::Reference< frame::XModel >& rxModel,
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 typedef void (*ModifyDocumentFunc)( const uno::Reference< frame::XModel >&, sal_Bool );
 
@@ -168,7 +168,7 @@ void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Ref
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 struct CurrDirPool
 {
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index f7414782141b..9f00c8d6dbde 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -57,20 +57,20 @@ extern "C" int SAL_CALL SbCompare_UString_Property_Impl( const void *arg1, const
     return pArg1->compareTo( pArg2->Name );
 }
 
-//----------------------------------------------------------------------------
+
 
 SbPropertyValues::SbPropertyValues()
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 SbPropertyValues::~SbPropertyValues()
 {
     m_xInfo.clear();
 }
 
-//----------------------------------------------------------------------------
+
 
 Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException )
 {
@@ -83,7 +83,7 @@ Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw(
     return m_xInfo;
 }
 
-//-------------------------------------------------------------------------
+
 
 size_t SbPropertyValues::GetIndex_Impl( const OUString &rPropName ) const
 {
@@ -99,7 +99,7 @@ size_t SbPropertyValues::GetIndex_Impl( const OUString &rPropName ) const
     return it - m_aPropVals.begin();
 }
 
-//----------------------------------------------------------------------------
+
 
 void SbPropertyValues::setPropertyValue(
                     const OUString& aPropertyName,
@@ -115,7 +115,7 @@ void SbPropertyValues::setPropertyValue(
     rPropVal.Value = aValue;
 }
 
-//----------------------------------------------------------------------------
+
 
 Any SbPropertyValues::getPropertyValue(
                     const OUString& aPropertyName)
@@ -127,7 +127,7 @@ Any SbPropertyValues::getPropertyValue(
     return m_aPropVals[nIndex].Value;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SbPropertyValues::addPropertyChangeListener(
                     const OUString& aPropertyName,
@@ -137,7 +137,7 @@ void SbPropertyValues::addPropertyChangeListener(
     (void)aPropertyName;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SbPropertyValues::removePropertyChangeListener(
                     const OUString& aPropertyName,
@@ -147,7 +147,7 @@ void SbPropertyValues::removePropertyChangeListener(
     (void)aPropertyName;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SbPropertyValues::addVetoableChangeListener(
                     const OUString& aPropertyName,
@@ -157,7 +157,7 @@ void SbPropertyValues::addVetoableChangeListener(
     (void)aPropertyName;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SbPropertyValues::removeVetoableChangeListener(
                     const OUString& aPropertyName,
@@ -167,7 +167,7 @@ void SbPropertyValues::removeVetoableChangeListener(
     (void)aPropertyName;
 }
 
-//----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -177,7 +177,7 @@ Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com
     return aRet;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPropertyValues )
                      throw (::com::sun::star::beans::UnknownPropertyException,
@@ -234,7 +234,7 @@ sal_Bool PropertySetInfoImpl::hasPropertyByName(const OUString& Name) throw( Run
 }
 
 
-//----------------------------------------------------------------------------
+
 
 SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
 {
@@ -250,13 +250,13 @@ SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 SbPropertySetInfo::~SbPropertySetInfo()
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException )
 {
@@ -275,7 +275,7 @@ sal_Bool SbPropertySetInfo::hasPropertyByName(const OUString& Name)
     return aImpl.hasPropertyByName( Name );
 }
 
-//----------------------------------------------------------------------------
+
 
 void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index cbbe3ca50ea8..5d9a6f858f4b 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -91,7 +91,7 @@ private:
     bool            mbDisposed;
 };
 
-// ----------------------------------------------------------------------------
+
 
 DocBasicItem::DocBasicItem( StarBASIC& rDocBasic ) :
     mrDocBasic( rDocBasic ),
@@ -151,7 +151,7 @@ void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) thr
     stopListening();
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -1614,7 +1614,7 @@ void StarBASIC::SetErrorData( SbError nCode, sal_uInt16 nLine,
     aGlobals.nCol2 = nCol2;
 }
 
-//----------------------------------------------------------------
+
 // help class for access to string SubResource of a Resource.
 // Source: sfx2\source\doc\docfile.cxx (TLX)
 struct BasicStringList_Impl : private Resource
@@ -1629,7 +1629,7 @@ struct BasicStringList_Impl : private Resource
     sal_Bool IsErrorTextAvailable( void )
         { return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
 };
-//----------------------------------------------------------------
+
 
 void StarBASIC::MakeErrorText( SbError nId, const OUString& aMsg )
 {
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 88574041a4bd..8e8c2aac9af3 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4053,7 +4053,7 @@ Reference< XInterface > createAllListenerAdapter
 }
 
 
-//--------------------------------------------------------------------------------------------------
+
 // InvocationToAllListenerMapper
 InvocationToAllListenerMapper::InvocationToAllListenerMapper
     ( const Reference< XIdlClass >& ListenerType, const Reference< XAllListener >& AllListener, const Any& Helper )
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 9f74c798efb2..04ee05998844 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4525,7 +4525,7 @@ RTLFUNC(SavePicture)
 }
 
 
-//-----------------------------------------------------------------------------------------
+
 
 RTLFUNC(MsgBox)
 {
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 629470f3bc01..c0dc04f73b24 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -40,7 +40,7 @@
 #define METH_SETDATA            24
 #define METH_SETTEXT            25
 
-//------------------------------------------------------------------------------
+
 SbStdFactory::SbStdFactory()
 {
 }
@@ -55,7 +55,7 @@ SbxObject* SbStdFactory::CreateObject( const OUString& rClassName )
         return NULL;
 }
 
-//------------------------------------------------------------------------------
+
 
 
 
@@ -171,7 +171,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
@@ -300,7 +300,7 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 }
 
 
-//-----------------------------------------------------------------------------
+
 
 
 void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, sal_Bool )
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index 2331a23f6e25..6c3478b8435c 100644
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
@@ -24,7 +24,7 @@ namespace basic
 {
 //........................................................................
 
-    //--------------------------------------------------------------------
+
     extern void createRegistryInfo_SfxDialogLibraryContainer();
     extern void createRegistryInfo_SfxScriptLibraryContainer();
 
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index d3e713956a1e..a1d834d5c4a1 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -105,18 +105,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -194,7 +194,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index 7696f6184df7..6c78eb18be25 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -105,18 +105,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -195,7 +195,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index c5e837effe85..1848d3f8fbd2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -108,14 +108,14 @@ namespace CPPU_CURRENT_NAMESPACE
 
         type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(());
     };
-    //____________________________________________________________________
+
     RTTI::RTTI() SAL_THROW(())
 #ifndef ANDROID
         : m_hApp( dlopen( 0, RTLD_LAZY ) )
 #endif
     {
     }
-    //____________________________________________________________________
+
     RTTI::~RTTI() SAL_THROW(())
     {
 #ifndef ANDROID
@@ -123,7 +123,7 @@ namespace CPPU_CURRENT_NAMESPACE
 #endif
     }
 
-    //____________________________________________________________________
+
     type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
     {
         type_info * rtti;
@@ -220,7 +220,7 @@ namespace CPPU_CURRENT_NAMESPACE
         return rtti;
     }
 
-    //------------------------------------------------------------------
+
     static void deleteException( void * pExc )
     {
         __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 2e4e149cb6f0..89b92a64399a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -106,18 +106,18 @@ namespace CPPU_CURRENT_NAMESPACE
 
         type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(());
     };
-    //____________________________________________________________________
+
     RTTI::RTTI() SAL_THROW(())
         : m_hApp( dlopen( 0, RTLD_LAZY ) )
     {
     }
-    //____________________________________________________________________
+
     RTTI::~RTTI() SAL_THROW(())
     {
         dlclose( m_hApp );
     }
 
-    //____________________________________________________________________
+
     type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
     {
         type_info * rtti;
@@ -196,7 +196,7 @@ namespace CPPU_CURRENT_NAMESPACE
         return rtti;
     }
 
-    //------------------------------------------------------------------
+
     static void deleteException( void * pExc )
     {
         __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 7696f6184df7..6c78eb18be25 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -105,18 +105,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -195,7 +195,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index f9397a918b92..f5aeeec57462 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -102,7 +102,7 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
 #if defined(FREEBSD) && __FreeBSD_version < 702104
     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
@@ -111,13 +111,13 @@ RTTI::RTTI() SAL_THROW(())
 #endif
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -200,7 +200,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 extern "C" {
 static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
 {
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 2e4e149cb6f0..89b92a64399a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -106,18 +106,18 @@ namespace CPPU_CURRENT_NAMESPACE
 
         type_info * getRTTI(typelib_CompoundTypeDescription *) SAL_THROW(());
     };
-    //____________________________________________________________________
+
     RTTI::RTTI() SAL_THROW(())
         : m_hApp( dlopen( 0, RTLD_LAZY ) )
     {
     }
-    //____________________________________________________________________
+
     RTTI::~RTTI() SAL_THROW(())
     {
         dlclose( m_hApp );
     }
 
-    //____________________________________________________________________
+
     type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
     {
         type_info * rtti;
@@ -196,7 +196,7 @@ namespace CPPU_CURRENT_NAMESPACE
         return rtti;
     }
 
-    //------------------------------------------------------------------
+
     static void deleteException( void * pExc )
     {
         __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index bbc9b62da626..4c64443bb34c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -103,18 +103,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -193,7 +193,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index 7696f6184df7..6c78eb18be25 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -105,18 +105,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -195,7 +195,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index 7696f6184df7..6c78eb18be25 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -105,18 +105,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -195,7 +195,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index 7696f6184df7..6c78eb18be25 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -105,18 +105,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -195,7 +195,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index 7696f6184df7..6c78eb18be25 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -105,18 +105,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -195,7 +195,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 334297b4fe74..b014fe1726c9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -425,7 +425,7 @@ void * pRegReturn = &nRegReturn;
     }
 
 }
-//__________________________________________________________________________________________________
+
 
 int const codeSnippetSize = 56;
 unsigned char * codeSnippet(
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index e78c2407c443..b815b54a1607 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -104,18 +104,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -194,7 +194,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 2e1536899abd..68df95c5f519 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -104,7 +104,7 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
 #if defined(FREEBSD) && __FreeBSD_version < 702104
     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
@@ -113,13 +113,13 @@ RTTI::RTTI() SAL_THROW(())
 #endif
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -202,7 +202,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 extern "C" {
 static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
 {
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index 4a551895574b..965c53c0c3a8 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -176,18 +176,18 @@ public:
 
     std::type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     std::type_info * rtti;
@@ -271,7 +271,7 @@ std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SA
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
index 80ccc1eb10fb..6d75ba34a1a0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
@@ -104,18 +104,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -194,7 +194,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 4a551895574b..965c53c0c3a8 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -176,18 +176,18 @@ public:
 
     std::type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     std::type_info * rtti;
@@ -271,7 +271,7 @@ std::type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SA
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 9c0c937af520..69afe915d07f 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -106,18 +106,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -196,7 +196,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index af388d592d6a..0579ba1c37de 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -423,7 +423,7 @@ static void cpp_vtable_call()
     }
 
 }
-//__________________________________________________________________________________________________
+
 
 int const codeSnippetSize = 56;
 unsigned char * codeSnippet(
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index a869281433c8..f025b2816f5a 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -103,18 +103,18 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
     dlclose( m_hApp );
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -193,7 +193,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void deleteException( void * pExc )
 {
     __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 330f66881db7..d6ec5219f329 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -108,16 +108,16 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -185,7 +185,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 extern "C" {
 static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
 {
diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
index 330f66881db7..d6ec5219f329 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
@@ -108,16 +108,16 @@ public:
 
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 RTTI::RTTI() SAL_THROW(())
 {
 }
-//__________________________________________________________________________________________________
+
 RTTI::~RTTI() SAL_THROW(())
 {
 }
 
-//__________________________________________________________________________________________________
+
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
 {
     type_info * rtti;
@@ -185,7 +185,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     return rtti;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 extern "C" {
 static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
 {
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 2aecc3a03afc..6a411494010a 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -119,11 +119,11 @@ private:
     void * _m_data;
     char _m_d_name[1];
 };
-//__________________________________________________________________________________________________
+
 __type_info::~__type_info() throw ()
 {
 }
-//__________________________________________________________________________________________________
+
 type_info * RTTInfos::getRTTI( OUString const & rUNOname ) throw ()
 {
     // a must be
@@ -152,11 +152,11 @@ type_info * RTTInfos::getRTTI( OUString const & rUNOname ) throw ()
         return (type_info *)iFind->second;
     }
 }
-//__________________________________________________________________________________________________
+
 RTTInfos::RTTInfos() throw ()
 {
 }
-//__________________________________________________________________________________________________
+
 RTTInfos::~RTTInfos() throw ()
 {
 #if OSL_DEBUG_LEVEL > 1
@@ -212,7 +212,7 @@ inline void ObjectFunction::operator delete ( void * pMem )
     rtl_freeMemory( pMem );
 }
 
-//__________________________________________________________________________________________________
+
 ObjectFunction::ObjectFunction( typelib_TypeDescription * pTypeDescr, void * fpFunc ) throw ()
     : _pTypeDescr( pTypeDescr )
 {
@@ -230,7 +230,7 @@ ObjectFunction::ObjectFunction( typelib_TypeDescription * pTypeDescr, void * fpF
     *pCode++ = 0xe9;
     *(sal_Int32 *)pCode = ((unsigned char *)fpFunc) - pCode - sizeof(sal_Int32);
 }
-//__________________________________________________________________________________________________
+
 ObjectFunction::~ObjectFunction() throw ()
 {
     ::typelib_typedescription_release( _pTypeDescr );
@@ -312,7 +312,7 @@ struct RaiseInfo
     RaiseInfo( typelib_TypeDescription * pTypeDescr ) throw ();
     ~RaiseInfo() throw ();
 };
-//__________________________________________________________________________________________________
+
 RaiseInfo::RaiseInfo( typelib_TypeDescription * pTypeDescr ) throw ()
     : _n0( 0 )
     , _pDtor( new ObjectFunction( pTypeDescr, destruct ) )
@@ -346,7 +346,7 @@ RaiseInfo::RaiseInfo( typelib_TypeDescription * pTypeDescr ) throw ()
         ppTypes[nPos++] = new ExceptionType( (typelib_TypeDescription *)pCompTypeDescr );
     }
 }
-//__________________________________________________________________________________________________
+
 RaiseInfo::~RaiseInfo() throw ()
 {
     ExceptionType ** ppTypes = (ExceptionType **)((sal_Int32 *)_types + 1);
@@ -371,11 +371,11 @@ public:
     ExceptionInfos() throw ();
     ~ExceptionInfos() throw ();
 };
-//__________________________________________________________________________________________________
+
 ExceptionInfos::ExceptionInfos() throw ()
 {
 }
-//__________________________________________________________________________________________________
+
 ExceptionInfos::~ExceptionInfos() throw ()
 {
 #if OSL_DEBUG_LEVEL > 1
@@ -389,7 +389,7 @@ ExceptionInfos::~ExceptionInfos() throw ()
         delete (RaiseInfo *)iPos->second;
     }
 }
-//__________________________________________________________________________________________________
+
 void * ExceptionInfos::getRaiseInfo( typelib_TypeDescription * pTypeDescr ) throw ()
 {
     static ExceptionInfos * s_pInfos = 0;
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index 26b030059943..1cc914541e27 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -39,7 +39,7 @@ namespace
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL Mapping_acquire( uno_Mapping * mapping )
     SAL_THROW_EXTERN_C()
 {
@@ -47,7 +47,7 @@ void SAL_CALL Mapping_acquire( uno_Mapping * mapping )
     that->m_bridge->acquire();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL Mapping_release( uno_Mapping * mapping )
     SAL_THROW_EXTERN_C()
 {
@@ -55,7 +55,7 @@ void SAL_CALL Mapping_release( uno_Mapping * mapping )
     that->m_bridge->release();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL Mapping_map_to_uno(
     uno_Mapping * mapping, void ** ppOut,
     void * pIn, typelib_InterfaceTypeDescription * td )
@@ -113,7 +113,7 @@ void SAL_CALL Mapping_map_to_uno(
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL Mapping_map_to_java(
     uno_Mapping * mapping, void ** ppOut,
     void * pIn, typelib_InterfaceTypeDescription * td )
@@ -174,7 +174,7 @@ void SAL_CALL Mapping_map_to_java(
     }
 }
 
-//______________________________________________________________________________
+
 void SAL_CALL Bridge_free( uno_Mapping * mapping )
     SAL_THROW_EXTERN_C()
 {
@@ -189,7 +189,7 @@ void SAL_CALL Bridge_free( uno_Mapping * mapping )
 namespace jni_uno
 {
 
-//______________________________________________________________________________
+
 void Bridge::acquire() const SAL_THROW(())
 {
     if (1 == osl_atomic_increment( &m_ref ))
@@ -211,7 +211,7 @@ void Bridge::acquire() const SAL_THROW(())
     }
 }
 
-//______________________________________________________________________________
+
 void Bridge::release() const SAL_THROW(())
 {
     if (! osl_atomic_decrement( &m_ref ))
@@ -223,7 +223,7 @@ void Bridge::release() const SAL_THROW(())
     }
 }
 
-//______________________________________________________________________________
+
 Bridge::Bridge(
     uno_Environment * java_env, uno_ExtEnvironment * uno_env,
     bool registered_java2uno )
@@ -254,7 +254,7 @@ Bridge::Bridge(
     m_uno2java.m_bridge = this;
 }
 
-//______________________________________________________________________________
+
 Bridge::~Bridge() SAL_THROW(())
 {
     (*m_java_env->release)( m_java_env );
@@ -262,7 +262,7 @@ Bridge::~Bridge() SAL_THROW(())
 }
 
 
-//______________________________________________________________________________
+
 void JNI_context::java_exc_occurred() const
 {
     // !don't rely on JNI_info!
@@ -329,7 +329,7 @@ void JNI_context::java_exc_occurred() const
     throw BridgeRuntimeError( message + get_stack_trace( jo_exc.get() ) );
 }
 
-//______________________________________________________________________________
+
 void JNI_context::getClassForName(
     jclass * classClass, jmethodID * methodForName) const
 {
@@ -342,7 +342,7 @@ void JNI_context::getClassForName(
     *classClass = c;
 }
 
-//______________________________________________________________________________
+
 jclass JNI_context::findClass(
     char const * name, jclass classClass, jmethodID methodForName,
     bool inException) const
@@ -363,7 +363,7 @@ jclass JNI_context::findClass(
     return c;
 }
 
-//______________________________________________________________________________
+
 OUString JNI_context::get_stack_trace( jobject jo_exc ) const
 {
     JLocalAutoRef jo_JNI_proxy(
@@ -415,7 +415,7 @@ extern "C"
 namespace
 {
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL java_env_disposing( uno_Environment * java_env )
     SAL_THROW_EXTERN_C()
 {
@@ -431,7 +431,7 @@ void SAL_CALL java_env_disposing( uno_Environment * java_env )
 #define uno_initEnvironment java_uno_initEnvironment
 #endif
 
-//------------------------------------------------------------------------------
+
 SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
     SAL_THROW_EXTERN_C()
 {
@@ -449,7 +449,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_e
 #define uno_ext_getMapping java_uno_ext_getMapping
 #endif
 
-//------------------------------------------------------------------------------
+
 SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
     uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
     SAL_THROW_EXTERN_C()
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index 06063bd82c1b..8c3a5ec7b616 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -32,7 +32,7 @@ using namespace ::rtl;
 namespace jni_uno
 {
 
-//------------------------------------------------------------------------------
+
 inline rtl_mem * seq_allocate( sal_Int32 nElements, sal_Int32 nSize )
 {
     o3tl::heap_ptr< rtl_mem > seq(
@@ -43,7 +43,7 @@ inline rtl_mem * seq_allocate( sal_Int32 nElements, sal_Int32 nSize )
     return seq.release();
 }
 
-//______________________________________________________________________________
+
 namespace {
 
 void createDefaultUnoValue(
@@ -1158,7 +1158,7 @@ void Bridge::map_to_uno(
 
 //##############################################################################
 
-//______________________________________________________________________________
+
 void Bridge::map_to_java(
     JNI_context const & jni,
     jvalue * java_data, void const * uno_data,
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index f55ad4f6802a..ee9818a3afdd 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -40,7 +40,7 @@ using namespace ::rtl;
 namespace jni_uno
 {
 
-//______________________________________________________________________________
+
 JNI_type_info::JNI_type_info(
     JNI_context const & jni, typelib_TypeDescription * td )
     : m_td( td ),
@@ -57,7 +57,7 @@ JNI_type_info::JNI_type_info(
 }
 
 
-//______________________________________________________________________________
+
 void JNI_interface_type_info::destroy( JNIEnv * jni_env )
 {
     JNI_type_info::destruct( jni_env );
@@ -67,7 +67,7 @@ void JNI_interface_type_info::destroy( JNIEnv * jni_env )
     delete this;
 }
 
-//______________________________________________________________________________
+
 JNI_interface_type_info::JNI_interface_type_info(
     JNI_context const & jni, typelib_TypeDescription * td_ )
     : JNI_type_info( jni, td_ )
@@ -222,7 +222,7 @@ JNI_interface_type_info::JNI_interface_type_info(
 }
 
 
-//______________________________________________________________________________
+
 void JNI_compound_type_info::destroy( JNIEnv * jni_env )
 {
     JNI_type_info::destruct( jni_env );
@@ -230,7 +230,7 @@ void JNI_compound_type_info::destroy( JNIEnv * jni_env )
     delete this;
 }
 
-//______________________________________________________________________________
+
 JNI_compound_type_info::JNI_compound_type_info(
     JNI_context const & jni, typelib_TypeDescription * td_ )
     : JNI_type_info( jni, td_ ),
@@ -343,7 +343,7 @@ JNI_compound_type_info::JNI_compound_type_info(
 }
 
 
-//______________________________________________________________________________
+
 JNI_type_info const * JNI_info::create_type_info(
     JNI_context const & jni, typelib_TypeDescription * td ) const
 {
@@ -389,7 +389,7 @@ JNI_type_info const * JNI_info::create_type_info(
     return info;
 }
 
-//______________________________________________________________________________
+
 JNI_type_info const * JNI_info::get_type_info(
     JNI_context const & jni, typelib_TypeDescription * td ) const
 {
@@ -416,7 +416,7 @@ JNI_type_info const * JNI_info::get_type_info(
     return info;
 }
 
-//______________________________________________________________________________
+
 JNI_type_info const * JNI_info::get_type_info(
     JNI_context const & jni, typelib_TypeDescriptionReference * type ) const
 {
@@ -443,7 +443,7 @@ JNI_type_info const * JNI_info::get_type_info(
     return info;
 }
 
-//______________________________________________________________________________
+
 JNI_type_info const * JNI_info::get_type_info(
     JNI_context const & jni, OUString const & uno_name ) const
 {
@@ -474,7 +474,7 @@ JNI_type_info const * JNI_info::get_type_info(
     return info;
 }
 
-//______________________________________________________________________________
+
 JNI_info::JNI_info(
     JNIEnv * jni_env, jobject class_loader, jclass classClass,
     jmethodID methodForName )
@@ -859,7 +859,7 @@ JNI_info::JNI_info(
     }
 }
 
-//______________________________________________________________________________
+
 void JNI_info::destruct( JNIEnv * jni_env )
 {
     t_str2type::const_iterator iPos( m_type_map.begin() );
@@ -901,7 +901,7 @@ void JNI_info::destruct( JNIEnv * jni_env )
     jni_env->DeleteGlobalRef( m_class_Any );
 }
 
-//______________________________________________________________________________
+
 JNI_info const * JNI_info::get_jni_info(
     rtl::Reference< jvmaccess::UnoVirtualMachine > const & uno_vm )
 {
@@ -966,7 +966,7 @@ JNI_info const * JNI_info::get_jni_info(
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 SAL_JNI_EXPORT void
 JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1info_1holder_finalize__J(
     JNIEnv * jni_env, SAL_UNUSED_PARAMETER jobject, jlong jni_info_handle )
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index ffc90ce760a6..fb3068fcb04e 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -31,7 +31,7 @@ using namespace ::rtl;
 namespace jni_uno
 {
 
-//______________________________________________________________________________
+
 jobject Bridge::map_to_java(
     JNI_context const & jni,
     uno_Interface * pUnoI, JNI_interface_type_info const * info ) const
@@ -82,7 +82,7 @@ jobject Bridge::map_to_java(
 }
 
 
-//______________________________________________________________________________
+
 void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
 {
     if (typelib_TypeClass_EXCEPTION == uno_exc->pType->eTypeClass)
@@ -147,7 +147,7 @@ union largest
     uno_Any a;
 };
 
-//______________________________________________________________________________
+
 jobject Bridge::call_uno(
     JNI_context const & jni,
     uno_Interface * pUnoI, typelib_TypeDescription * member_td,
@@ -364,7 +364,7 @@ using namespace ::jni_uno;
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 SAL_JNI_EXPORT jobject
 JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
     JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle, jstring jo_method,
@@ -613,7 +613,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
     }
 }
 
-//------------------------------------------------------------------------------
+
 SAL_JNI_EXPORT void
 JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
     JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle )
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index beb4ac0b9e36..6c035643daf8 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -37,19 +37,19 @@ namespace
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
     SAL_THROW_EXTERN_C();
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C();
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C();
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UNO_proxy_dispatch(
     uno_Interface * pUnoI, typelib_TypeDescription const * member_td,
     void * uno_ret, void * uno_args[], uno_Any ** uno_exc )
@@ -60,7 +60,7 @@ void SAL_CALL UNO_proxy_dispatch(
 namespace jni_uno
 {
 
-//______________________________________________________________________________
+
 void Bridge::handle_java_exc(
     JNI_context const & jni,
     JLocalAutoRef const & jo_exc, uno_Any * uno_exc ) const
@@ -119,7 +119,7 @@ void Bridge::handle_java_exc(
             ->Message));
 }
 
-//______________________________________________________________________________
+
 void Bridge::call_java(
     jobject javaI, typelib_InterfaceTypeDescription * iface_td,
     sal_Int32 local_member_index, sal_Int32 function_pos_offset,
@@ -419,7 +419,7 @@ struct UNO_proxy : public uno_Interface
         JNI_interface_type_info const * info );
 };
 
-//______________________________________________________________________________
+
 inline UNO_proxy::UNO_proxy(
     JNI_context const & jni, Bridge const * bridge,
     jobject javaI, jstring jo_oid, OUString const & oid,
@@ -452,7 +452,7 @@ inline UNO_proxy::UNO_proxy(
     uno_Interface::pDispatcher = UNO_proxy_dispatch;
 }
 
-//______________________________________________________________________________
+
 inline void UNO_proxy::acquire() const
 {
     if (1 == osl_atomic_increment( &m_ref ))
@@ -468,7 +468,7 @@ inline void UNO_proxy::acquire() const
     }
 }
 
-//______________________________________________________________________________
+
 inline void UNO_proxy::release() const
 {
     if (0 == osl_atomic_decrement( &m_ref ))
@@ -480,7 +480,7 @@ inline void UNO_proxy::release() const
 }
 
 
-//______________________________________________________________________________
+
 uno_Interface * Bridge::map_to_uno(
     JNI_context const & jni,
     jobject javaI, JNI_interface_type_info const * info ) const
@@ -517,7 +517,7 @@ namespace
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
     SAL_THROW_EXTERN_C()
 {
@@ -555,7 +555,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
     delete that;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C()
 {
@@ -563,7 +563,7 @@ void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI )
     that->acquire();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C()
 {
@@ -571,7 +571,7 @@ void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI )
     that->release();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UNO_proxy_dispatch(
     uno_Interface * pUnoI, typelib_TypeDescription const * member_td,
     void * uno_ret, void * uno_args [], uno_Any ** uno_exc )
diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx
index 240b5f85ed51..06c510082e48 100644
--- a/bridges/test/java_uno/any/transport.cxx
+++ b/bridges/test/java_uno/any/transport.cxx
@@ -43,7 +43,7 @@ public:
     virtual Any SAL_CALL mapAny( Any const & any )
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 Any Transport::mapAny( Any const & any )
     throw (RuntimeException)
 {
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index 52f70bff08f9..19156ee494c8 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -65,7 +65,7 @@ void doPerformanceTest( const Reference < XPerformanceTest > & /* xBench */)
     printf( "not implemented\n" );
 //      sal_Int32 i,nLoop = 2000;
 //      sal_Int32 tStart, tEnd , tEnd2;
-//      //------------------------------------
+//
 //      // oneway calls
 //      i = nLoop;
 //      tStart = GetTickCount();
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 3af55ad44e47..6323ca42f7d4 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -1011,7 +1011,7 @@ namespace dxcanvas
             mpWindow->setPosSizePixel(0,0,maSize.getX(),maSize.getY());
 
             // resize back buffer, if necessary
-            // -------------------------------------------------------------
+
 
             // don't attempt to create anything if the
             // requested size is NULL.
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 193c6f3b6c58..a02455268467 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -337,7 +337,7 @@ namespace dxcanvas
 
 
             // Setup stroke pen
-            // ----------------
+
 
             Gdiplus::Pen aPen(
                 Gdiplus::Color(
@@ -657,7 +657,7 @@ namespace dxcanvas
     }
 
     // private helper
-    // --------------------------------------------------
+
 
     Gdiplus::CompositingMode CanvasHelper::calcCompositingMode( sal_Int8 nMode )
     {
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index c7f5d3a23b17..a59e10a71454 100644
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -62,7 +62,7 @@ namespace dxcanvas
                                  const rendering::Texture&                      texture )
         {
             // setup a linear gradient with given colors
-            // -----------------------------------------
+
 
             Gdiplus::LinearGradientBrush aBrush(
                 Gdiplus::PointF(0.0f,
@@ -250,7 +250,7 @@ namespace dxcanvas
 
 
                 // determine number of steps to use
-                // --------------------------------
+
 
                 // TODO(Q2): Unify step calculations with VCL canvas
                 int nColorSteps = 0;
@@ -288,7 +288,7 @@ namespace dxcanvas
 
 
                 // apply scaling (possibly anisotrophic) to inner polygon
-                // ------------------------------------------------------
+
 
                 // scale inner polygon according to aspect ratio: for
                 // wider-than-tall bounds (nAspectRatio > 1.0), the inner
@@ -540,7 +540,7 @@ namespace dxcanvas
         }
     }
 
-    // -------------------------------------------------------------
+
 
     uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas*                          /*pCanvas*/,
                                                                                          const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 60306f6f3988..9dc19fe8a140 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -218,7 +218,7 @@ CanvasFactory::~CanvasFactory()
 {
 }
 
-//------------------------------------------------------------------------------
+
 Reference<XInterface> create( Reference<XComponentContext> const & xContext )
 {
     return static_cast< ::cppu::OWeakObject * >(
@@ -263,7 +263,7 @@ Reference<XInterface> CanvasFactory::createInstanceWithContext(
         name, Sequence<Any>(), xContext );
 }
 
-//______________________________________________________________________________
+
 Reference<XInterface> CanvasFactory::use(
     OUString const & serviceName,
     Sequence<Any> const & args,
@@ -287,7 +287,7 @@ Reference<XInterface> CanvasFactory::use(
     }
 }
 
-//______________________________________________________________________________
+
 void CanvasFactory::checkConfigFlag( bool& r_bFlag,
                                      bool& r_CacheFlag,
                                      const OUString& nodeName ) const
@@ -306,7 +306,7 @@ void CanvasFactory::checkConfigFlag( bool& r_bFlag,
     }
 }
 
-//______________________________________________________________________________
+
 Reference<XInterface> CanvasFactory::lookupAndUse(
     OUString const & serviceName, Sequence<Any> const & args,
     Reference<XComponentContext> const & xContext ) const
@@ -465,7 +465,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
     return Reference<XInterface>();
 }
 
-//______________________________________________________________________________
+
 Reference<XInterface> CanvasFactory::createInstanceWithArgumentsAndContext(
     OUString const & preferredOne, Sequence<Any> const & args,
     Reference<XComponentContext> const & xContext ) throw (Exception)
@@ -480,7 +480,7 @@ Reference<XInterface> CanvasFactory::createInstanceWithArgumentsAndContext(
 }
 
 // XMultiServiceFactory
-//______________________________________________________________________________
+
 Reference<XInterface> CanvasFactory::createInstance( OUString const & name )
     throw (Exception)
 {
@@ -488,7 +488,7 @@ Reference<XInterface> CanvasFactory::createInstance( OUString const & name )
         name, Sequence<Any>(), m_xContext );
 }
 
-//______________________________________________________________________________
+
 Reference<XInterface> CanvasFactory::createInstanceWithArguments(
     OUString const & name, Sequence<Any> const & args ) throw (Exception)
 {
diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index 98339506642d..a70091b39d20 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -60,7 +60,7 @@ namespace vclcanvas
                          "CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" );
 
         // setup back buffer
-        // -----------------
+
 
         const ::Size aSize(
             static_cast<sal_Int32>( ::std::max( 1.0,
@@ -94,7 +94,7 @@ namespace vclcanvas
 
 
         // setup canvas helper
-        // -------------------
+
 
         // always render into back buffer, don't preserve state (it's
         // our private VDev, after all), have notion of alpha
@@ -106,7 +106,7 @@ namespace vclcanvas
 
 
         // setup sprite helper
-        // -------------------
+
 
         maSpriteHelper.init( rSpriteSize,
                              rOwningSpriteCanvas,
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 455a474aeebe..1a68d423e1b8 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -176,7 +176,7 @@ namespace vclcanvas
 
             // fill initial strip (extending two times the bound rect's
             // diagonal to the 'left'
-            // ------------------------------------------------------
+
 
             // calculate left edge, by moving left edge of the
             // gradient rect two times the bound rect's diagonal to
@@ -193,7 +193,7 @@ namespace vclcanvas
 
 
             // iteratively render all other strips
-            // -----------------------------------
+
 
             // ensure that nStepCount matches color stop parity, to
             // have a well-defined middle color e.g. for axial
@@ -245,7 +245,7 @@ namespace vclcanvas
 
             // fill final strip (extending two times the bound rect's
             // diagonal to the 'right'
-            // ------------------------------------------------------
+
 
             // copy right egde of polygon to left edge (and also
             // copy the closing point)
@@ -306,7 +306,7 @@ namespace vclcanvas
 
 
             // apply scaling (possibly anisotrophic) to inner polygon
-            // ------------------------------------------------------
+
 
             // scale inner polygon according to aspect ratio: for
             // wider-than-tall bounds (nAspectRatio > 1.0), the inner
@@ -552,7 +552,7 @@ namespace vclcanvas
             // mutex.
 
             // calc step size
-            // --------------
+
             int nColorSteps = 0;
             for( size_t i=0; i<rColors.size()-1; ++i )
                 nColorSteps += numColorSteps(rColors[i],rColors[i+1]);
@@ -575,7 +575,7 @@ namespace vclcanvas
             if( tools::isRectangle( rPoly ) )
             {
                 // use optimized output path
-                // -------------------------
+
 
                 // this distinction really looks like a
                 // micro-optimisation, but in fact greatly speeds up
@@ -960,7 +960,7 @@ namespace vclcanvas
                     if( bRectangularPolygon )
                     {
                         // use optimized output path
-                        // -------------------------
+
 
                         // this distinction really looks like a
                         // micro-optimisation, but in fact greatly speeds up
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 0dce58095324..d46ac3247861 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -169,7 +169,7 @@ namespace vclcanvas
 
 
         // VCL-Canvas related
-        //---------------------------------------------------------------------
+
 
         ::Point mapRealPoint2D( const geometry::RealPoint2D&    rPoint,
                                 const rendering::ViewState&     rViewState,
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index ae4a90d4e7c9..bbd2bd51239a 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -652,9 +652,9 @@ void DemoApp::Main()
         return;
     }
 
-    //-------------------------------------------------
+
     // create the global service-manager
-    //-------------------------------------------------
+
     uno::Reference< lang::XMultiServiceFactory > xFactory;
     try
     {
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index dd09bd7a3694..8fa152a4fcc4 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -1074,7 +1074,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
 
     long nYPos = m_nYTopPos;
 
-    //------
+
     bool bShow = rTypeController.shouldShow_XAxisTypeControl();
     long nXPos = m_pAxisTypeResourceGroup->getPosition().X();
     m_pAxisTypeResourceGroup->showControls( bShow );
@@ -1083,7 +1083,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
         m_pAxisTypeResourceGroup->setPosition( Point( nXPos, nYPos ) );
         nYPos += m_pAxisTypeResourceGroup->getHeight() + lcl_getDistance();
     }
-    //------
+
     bShow = rTypeController.shouldShow_3DLookControl();
     m_pDim3DLookResourceGroup->showControls( bShow );
     if(bShow)
@@ -1091,7 +1091,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
         m_pDim3DLookResourceGroup->setPosition( Point( nXPos, nYPos ) );
         nYPos += m_pDim3DLookResourceGroup->getHeight() + lcl_getDistance();
     }
-    //------
+
     bShow = rTypeController.shouldShow_StackingControl();
     m_pStackingResourceGroup->showControls( bShow, rTypeController.shouldShow_DeepStackingControl() );
     if(bShow)
@@ -1102,7 +1102,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
         m_pStackingResourceGroup->setPosition( Point( nStackingXPos, nYPos ) );
         nYPos += m_pStackingResourceGroup->getHeight() + lcl_getDistance();
     }
-    //------
+
     bShow = rTypeController.shouldShow_SplineControl();
     m_pSplineResourceGroup->showControls( bShow );
     if(bShow)
@@ -1110,7 +1110,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
         m_pSplineResourceGroup->setPosition( Point( nXPos, nYPos ) );
         nYPos += m_pSplineResourceGroup->getHeight() + lcl_getDistance();
     }
-    //------
+
     bShow = rTypeController.shouldShow_GeometryControl();
     m_pGeometryResourceGroup->showControls( bShow );
     if(bShow)
@@ -1118,7 +1118,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
         m_pGeometryResourceGroup->setPosition( Point( nXPos+17, nYPos ) );
         nYPos += m_pGeometryResourceGroup->getHeight() + lcl_getDistance();
     }
-    //------
+
     bShow = rTypeController.shouldShow_SortByXValuesResourceGroup();
     m_pSortByXValuesResourceGroup->showControls( bShow );
     if(bShow)
@@ -1126,7 +1126,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
         m_pSortByXValuesResourceGroup->setPosition( Point( nXPos, nYPos ) );
         nYPos += m_pSortByXValuesResourceGroup->getHeight() + lcl_getDistance();
     }
-    //------
+
     Size aPageSize( this->GetSizePixel() );
     Size aRemainingSize = Size( aPageSize.Width()-nXPos, aPageSize.Height()-nYPos );
     rTypeController.showExtraControls( this, Point( nXPos, nYPos ), aRemainingSize );
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index b8ceebf2386b..f52c435684f1 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -58,17 +58,17 @@
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 #include <com/sun/star/document/XUndoAction.hpp>
 
-//-------
+
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
-//-------
 
-//-------
+
+
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-//-------
+
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index f51dd49efe85..9b75609a020d 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1022,7 +1022,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                 lcl_insertMenuCommand( xPopupMenu, nUniqueId++, aFormatCommand );
 
                 //some commands for dataseries and points:
-                //-----
+
                 if( OBJECTTYPE_DATA_SERIES == eObjectType || OBJECTTYPE_DATA_POINT == eObjectType )
                 {
                     bool bIsPoint = ( OBJECTTYPE_DATA_POINT == eObjectType );
@@ -1179,7 +1179,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                 }
 
                 //some commands for axes: and grids
-                //-----
+
                 else if( OBJECTTYPE_AXIS  == eObjectType || OBJECTTYPE_GRID == eObjectType || OBJECTTYPE_SUBGRID == eObjectType )
                 {
                     Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( m_aSelection.getSelectedCID(), getModel() );
@@ -1247,7 +1247,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                     if( bHasLegend )
                         lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteLegend" );
                 }
-                //-----
+
 
                 xPopupMenu->insertSeparator( -1 );
                 lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DiagramType" );
diff --git a/chart2/source/glew/glew.cxx b/chart2/source/glew/glew.cxx
index d075b5248836..441f3ee2def1 100644
--- a/chart2/source/glew/glew.cxx
+++ b/chart2/source/glew/glew.cxx
@@ -4,24 +4,24 @@
 ** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
 ** Copyright (C) 2002, Lev Povalahev
 ** All rights reserved.
-** 
-** Redistribution and use in source and binary forms, with or without 
+**
+** Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are met:
-** 
-** * Redistributions of source code must retain the above copyright notice, 
+**
+** * Redistributions of source code must retain the above copyright notice,
 **   this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright notice, 
-**   this list of conditions and the following disclaimer in the documentation 
+** * Redistributions in binary form must reproduce the above copyright notice,
+**   this list of conditions and the following disclaimer in the documentation
 **   and/or other materials provided with the distribution.
-** * The name of the author may be used to endorse or promote products 
+** * The name of the author may be used to endorse or promote products
 **   derived from this software without specific prior written permission.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 ** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 ** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 ** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
@@ -102,7 +102,7 @@ void* NSGLGetProcAddress (const GLubyte *name)
 {
   static void* image = NULL;
   void* addr;
-  if (NULL == image) 
+  if (NULL == image)
   {
 #ifdef GLEW_REGAL
     image = dlopen("libRegal.dylib", RTLD_LAZY);
@@ -9469,7 +9469,7 @@ static GLboolean _glewInit_GL_WIN_swap_hint (GLEW_CONTEXT_ARG_DEF_INIT)
 /* ------------------------------------------------------------------------- */
 
 GLboolean GLEWAPIENTRY glewGetExtension (const char* name)
-{    
+{
   const GLubyte* start;
   const GLubyte* end;
   start = (const GLubyte*)glGetString(GL_EXTENSIONS);
@@ -9496,7 +9496,7 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
   dot = _glewStrCLen(s, '.');
   if (dot == 0)
     return GLEW_ERROR_NO_GL_VERSION;
-  
+
   major = s[dot-1]-'0';
   minor = s[dot+1]-'0';
 
@@ -9504,7 +9504,7 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
     minor = 0;
   if (major<0 || major>9)
     return GLEW_ERROR_NO_GL_VERSION;
-  
+
 
   if (major == 1 && minor == 0)
   {
@@ -9521,12 +9521,12 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
     CONST_CAST(GLEW_VERSION_3_2)   = GLEW_VERSION_3_3   == GL_TRUE || ( major == 3 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
     CONST_CAST(GLEW_VERSION_3_1)   = GLEW_VERSION_3_2   == GL_TRUE || ( major == 3 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
     CONST_CAST(GLEW_VERSION_3_0)   = GLEW_VERSION_3_1   == GL_TRUE || ( major == 3               ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_2_1)   = GLEW_VERSION_3_0   == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE;    
+    CONST_CAST(GLEW_VERSION_2_1)   = GLEW_VERSION_3_0   == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
     CONST_CAST(GLEW_VERSION_2_0)   = GLEW_VERSION_2_1   == GL_TRUE || ( major == 2               ) ? GL_TRUE : GL_FALSE;
     CONST_CAST(GLEW_VERSION_1_5)   = GLEW_VERSION_2_0   == GL_TRUE || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE;
     CONST_CAST(GLEW_VERSION_1_4)   = GLEW_VERSION_1_5   == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE;
     CONST_CAST(GLEW_VERSION_1_3)   = GLEW_VERSION_1_4   == GL_TRUE || ( major == 1 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_1_2_1) = GLEW_VERSION_1_3   == GL_TRUE                                 ? GL_TRUE : GL_FALSE; 
+    CONST_CAST(GLEW_VERSION_1_2_1) = GLEW_VERSION_1_3   == GL_TRUE                                 ? GL_TRUE : GL_FALSE;
     CONST_CAST(GLEW_VERSION_1_2)   = GLEW_VERSION_1_2_1 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
     CONST_CAST(GLEW_VERSION_1_1)   = GLEW_VERSION_1_2   == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
   }
@@ -12099,7 +12099,7 @@ static PFNWGLGETEXTENSIONSSTRINGARBPROC _wglewGetExtensionsStringARB = NULL;
 static PFNWGLGETEXTENSIONSSTRINGEXTPROC _wglewGetExtensionsStringEXT = NULL;
 
 GLboolean GLEWAPIENTRY wglewGetExtension (const char* name)
-{    
+{
   const GLubyte* start;
   const GLubyte* end;
   if (_wglewGetExtensionsStringARB == NULL)
@@ -13164,7 +13164,7 @@ static GLboolean _glewInit_GLX_SUN_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT)
 /* ------------------------------------------------------------------------ */
 
 GLboolean glxewGetExtension (const char* name)
-{    
+{
   const GLubyte* start;
   const GLubyte* end;
 
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 443101d3556e..66f3830ca9af 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -48,7 +48,7 @@ void DataPointProperties::AddPropertiesToVector(
     // DataPointProperties
 
     // Common
-    // ------
+
     rOutProperties.push_back(
         Property( "Color",
                   PROP_DATAPOINT_COLOR,
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 6db8a268f49d..9c7fd8e26452 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -203,7 +203,7 @@ void ColumnLineChartTypeTemplate::createChartTypes(
             nNumberOfColumns = nNumberOfSeries - nNumberOfLines;
 
         // Columns
-        // -------
+
         Reference< XChartType > xCT(
             xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ), uno::UNO_QUERY_THROW );
 
@@ -223,7 +223,7 @@ void ColumnLineChartTypeTemplate::createChartTypes(
         }
 
         // Lines
-        // -----
+
         xCT.set( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_LINE ), uno::UNO_QUERY_THROW );
         xCTCnt.set( rCoordSys[ 0 ], uno::UNO_QUERY_THROW );
         xCTCnt->addChartType( xCT );
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 877718ffdf22..ab47d1a0a134 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -342,7 +342,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     if( m_bDisposed || m_bInDispose )
         return; //behave as passive as possible, if disposed or closed already
 
-    //--------
+
     m_bClosed = sal_True;
 
     NegativeGuard< osl::Mutex > aNegativeGuard( m_aAccessMutex );
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 55a8c8d41bb2..332600ad5485 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -102,10 +102,10 @@ EquidistantTickFactory::EquidistantTickFactory(
             fMax = m_fScaledVisibleMax;
     }
 
-    //--
+
     m_fOuterMajorTickBorderMin = EquidistantTickFactory::getMinimumAtIncrement( fMin, m_rIncrement );
     m_fOuterMajorTickBorderMax = EquidistantTickFactory::getMaximumAtIncrement( fMax, m_rIncrement );
-    //--
+
 
     m_fOuterMajorTickBorderMin_Scaled = m_fOuterMajorTickBorderMin;
     m_fOuterMajorTickBorderMax_Scaled = m_fOuterMajorTickBorderMax;
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index da8fe4913743..db67c0140d38 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -124,7 +124,7 @@ ChartItemPool::ChartItemPool():
     ppPoolDefaults[SCHATTR_AXIS_LABEL_OVERLAP   - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_OVERLAP,false);
     ppPoolDefaults[SCHATTR_AXIS_LABEL_BREAK     - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_BREAK, false );
 
-    //--
+
     ppPoolDefaults[SCHATTR_SYMBOL_BRUSH         - SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH);
     ppPoolDefaults[SCHATTR_STOCK_VOLUME         - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,false);
     ppPoolDefaults[SCHATTR_STOCK_UPDOWN         - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,false);
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index cca91e5e9f2c..c8771d65d83d 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno;
 namespace climaker
 {
 
-//------------------------------------------------------------------------------
+
 static char const s_usingText [] =
 "\n"
 "using: climaker <switches> [registry-file-1 registry-file-2 ...]\n"
@@ -94,7 +94,7 @@ struct OptionInfo
 
 bool g_verbose = false;
 
-//------------------------------------------------------------------------------
+
 static const OptionInfo s_option_infos [] = {
     { RTL_CONSTASCII_STRINGPARAM("out"), 'O', true },
     { RTL_CONSTASCII_STRINGPARAM("types"), 'T', true },
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index 628547135df9..58f3c1172c76 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
 namespace climaker
 {
 System::String^ mapUnoPolymorphicName(System::String^ unoName);
-//------------------------------------------------------------------------------
+
 static inline ::System::String ^ to_cts_name(
     OUString const & uno_name )
 {
@@ -48,7 +48,7 @@ static inline ::System::String ^ to_cts_name(
     return ustring_to_String( buf.makeStringAndClear() );
 }
 
-//------------------------------------------------------------------------------
+
 static inline ::System::Object ^ to_cli_constant( Any const & value )
 {
     switch (value.getValueTypeClass())
@@ -95,7 +95,7 @@ static inline ::System::Object ^ to_cli_constant( Any const & value )
     }
 }
 
-//------------------------------------------------------------------------------
+
 static inline void emit_ldarg( Emit::ILGenerator ^ code, ::System::Int32 index )
 {
     switch (index)
@@ -275,7 +275,7 @@ System::String^ mapUnoPolymorphicName(System::String^ unoName)
 
 
 
-//______________________________________________________________________________
+
 Assembly ^ TypeEmitter::type_resolve(
     ::System::Object ^, ::System::ResolveEventArgs ^ args )
 {
@@ -310,7 +310,7 @@ Assembly ^ TypeEmitter::type_resolve(
     return nullptr;
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type(
     ::System::String ^ cts_name, bool throw_exc )
 {
@@ -358,7 +358,7 @@ Assembly ^ TypeEmitter::type_resolve(
     }
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type_Exception()
 {
     if (nullptr == m_type_Exception)
@@ -419,7 +419,7 @@ Assembly ^ TypeEmitter::type_resolve(
     return m_type_Exception;
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type_RuntimeException()
 {
     if (nullptr == m_type_RuntimeException)
@@ -473,7 +473,7 @@ Assembly ^ TypeEmitter::type_resolve(
     return m_type_RuntimeException;
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type(
     Reference< reflection::XConstantTypeDescription > const & xType )
 {
@@ -511,7 +511,7 @@ Assembly ^ TypeEmitter::type_resolve(
     return ret_type;
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type(
     Reference< reflection::XConstantsTypeDescription > const & xType )
 {
@@ -562,7 +562,7 @@ Assembly ^ TypeEmitter::type_resolve(
     return ret_type;
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type(
     Reference< reflection::XEnumTypeDescription > const & xType )
 {
@@ -621,7 +621,7 @@ Assembly ^ TypeEmitter::type_resolve(
     return ret_type;
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type(
     Reference< reflection::XCompoundTypeDescription > const & xType )
 {
@@ -696,7 +696,7 @@ Assembly ^ TypeEmitter::type_resolve(
     return ret_type;
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type(
     Reference< reflection::XInterfaceTypeDescription2 > const & xType )
 {
@@ -767,7 +767,7 @@ Assembly ^ TypeEmitter::type_resolve(
 }
 
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type(
     Reference< reflection::XServiceTypeDescription2 > const & xType )
 {
@@ -828,7 +828,7 @@ Assembly ^ TypeEmitter::type_resolve(
 
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::complete_iface_type( iface_entry ^ entry )
 {
     Emit::TypeBuilder ^ type_builder = entry->m_type_builder;
@@ -1575,7 +1575,7 @@ Assembly ^ TypeEmitter::type_resolve(
         if (attrBuilder != nullptr)
             method_builder->SetCustomAttribute(attrBuilder);
 
-        //-------------------------------------------------------------
+
         //define parameter attributes (paramarray), names etc.
         //The first parameter is the XComponentContext, which cannot be obtained
         //from reflection.
@@ -2062,7 +2062,7 @@ Emit::CustomAttributeBuilder^ TypeEmitter::get_exception_attribute(
 }
 
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_type(
     Reference< reflection::XTypeDescription > const & xType )
 {
@@ -2158,7 +2158,7 @@ Emit::CustomAttributeBuilder^ TypeEmitter::get_exception_attribute(
     }
 }
 
-//______________________________________________________________________________
+
 ::System::Type ^ TypeEmitter::get_complete_struct( ::System::String ^ sName)
 {
     struct_entry ^ pStruct = safe_cast< struct_entry ^>(
@@ -2213,7 +2213,7 @@ TypeEmitter::~TypeEmitter()
             safe_cast< singleton_entry ^ >( enumerator->Value ) );
     }
 }
-//______________________________________________________________________________
+
 TypeEmitter::TypeEmitter(
     ::System::Reflection::Emit::ModuleBuilder ^ module_builder,
     array< ::System::Reflection::Assembly^>^ extra_assemblies )
diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx
index 0a22d7bb5e63..583dbf30fd4d 100644
--- a/cli_ure/source/native/native_bootstrap.cxx
+++ b/cli_ure/source/native/native_bootstrap.cxx
@@ -352,7 +352,7 @@ public:
     bootstrap();
 };
 
-//______________________________________________________________________________
+
 ::unoidl::com::sun::star::uno::XComponentContext ^
 Bootstrap::defaultBootstrap_InitialComponentContext(
     ::System::String ^ ini_file,
@@ -390,7 +390,7 @@ Bootstrap::defaultBootstrap_InitialComponentContext(
         to_cli( xContext ) );
 }
 
-//______________________________________________________________________________
+
 ::unoidl::com::sun::star::uno::XComponentContext ^
 Bootstrap::defaultBootstrap_InitialComponentContext()
 {
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index 7a28582efcd5..8485317810e0 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -44,7 +44,7 @@ void SAL_CALL Mapping_acquire( uno_Mapping * mapping )
     Mapping const * that = static_cast< Mapping const * >( mapping );
      that->m_bridge->acquire();
 }
-//--------------------------------------------------------------------------------------------------
+
 void SAL_CALL Mapping_release( uno_Mapping * mapping )
     SAL_THROW_EXTERN_C()
 {
@@ -53,7 +53,7 @@ void SAL_CALL Mapping_release( uno_Mapping * mapping )
 }
 
 
-//--------------------------------------------------------------------------------------------------
+
 void SAL_CALL Mapping_cli2uno(
     uno_Mapping * mapping, void ** ppOut,
     void * pIn, typelib_InterfaceTypeDescription * td )
@@ -93,7 +93,7 @@ void SAL_CALL Mapping_cli2uno(
 #endif
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 void SAL_CALL Mapping_uno2cli(
     uno_Mapping * mapping, void ** ppOut,
     void * pIn, typelib_InterfaceTypeDescription * td )
@@ -153,7 +153,7 @@ void SAL_CALL Mapping_uno2cli(
     }
 }
 
-//__________________________________________________________________________________________________
+
 void SAL_CALL Bridge_free( uno_Mapping * mapping )
     SAL_THROW_EXTERN_C()
 {
@@ -167,7 +167,7 @@ void SAL_CALL Bridge_free( uno_Mapping * mapping )
 namespace cli_uno
 {
 
-//__________________________________________________________________________________________________
+
 /** ToDo
     I doubt that the case that the ref count raises from 0 to 1
     can occur.  uno_ext_getMapping returns an acquired mapping. Every time
@@ -195,7 +195,7 @@ void Bridge::acquire()  const SAL_THROW(())
         }
     }
 }
-//__________________________________________________________________________________________________
+
 void Bridge::release() const  SAL_THROW(())
 {
     if (! osl_atomic_decrement( &m_ref ))
@@ -206,7 +206,7 @@ void Bridge::release() const  SAL_THROW(())
             :  const_cast<Mapping*>(&m_uno2cli)  );
    }
 }
-//__________________________________________________________________________________________________
+
 Bridge::Bridge(
     uno_Environment * uno_cli_env, uno_ExtEnvironment * uno_env,
     bool registered_cli2uno )
@@ -232,7 +232,7 @@ Bridge::Bridge(
 
 }
 
-//__________________________________________________________________________________________________
+
 Bridge::~Bridge() SAL_THROW(())
 {
     //System::GC::Collect();
@@ -249,7 +249,7 @@ extern "C"
 
 namespace cli_uno
 {
-//--------------------------------------------------------------------------------------------------
+
 void SAL_CALL cli_env_disposing( uno_Environment * uno_cli_env )
     SAL_THROW_EXTERN_C()
 {
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 09bfe60931e8..092cdfc16efe 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -41,16 +41,16 @@ using namespace cli_uno;
 
 extern "C"
 {
-//------------------------------------------------------------------------------
+
 void SAL_CALL cli_proxy_free( uno_ExtEnvironment * env, void * proxy )
     SAL_THROW_EXTERN_C();
-//------------------------------------------------------------------------------
+
 void SAL_CALL cli_proxy_acquire( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C();
-//------------------------------------------------------------------------------
+
 void SAL_CALL cli_proxy_release( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C();
-//------------------------------------------------------------------------------
+
 void SAL_CALL cli_proxy_dispatch(
     uno_Interface * pUnoI, typelib_TypeDescription const * member_td,
     void * uno_ret, void * uno_args[], uno_Any ** uno_exc )
@@ -911,7 +911,7 @@ inline void CliProxy::acquire() const
 #endif
     }
 }
-//---------------------------------------------------------------------------
+
 inline void CliProxy::release() const
 {
     if (0 == osl_atomic_decrement( &m_ref ))
@@ -947,7 +947,7 @@ void SAL_CALL cli_proxy_acquire( uno_Interface * pUnoI )
     CliProxy const * cliProxy = static_cast< CliProxy const * >( pUnoI );
     cliProxy->acquire();
 }
-//-----------------------------------------------------------------------------
+
 extern "C"
 void SAL_CALL cli_proxy_release( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C()
@@ -956,7 +956,7 @@ void SAL_CALL cli_proxy_release( uno_Interface * pUnoI )
     cliProxy->release();
 }
 
-//------------------------------------------------------------------------------
+
 extern "C"
 
 void SAL_CALL cli_proxy_dispatch(
diff --git a/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx
index d3b440465de0..b04c11aeb8ad 100644
--- a/comphelper/source/container/container.cxx
+++ b/comphelper/source/container/container.cxx
@@ -38,7 +38,7 @@ IndexAccessIterator::IndexAccessIterator(::com::sun::star::uno::Reference< ::com
 
 IndexAccessIterator::~IndexAccessIterator() {}
 
-//------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> IndexAccessIterator::Next()
 {
     bool bCheckingStartingPoint = !m_xCurrentObject.is();
diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx
index 0c14bb3da529..d74b62fff802 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.cxx
@@ -32,14 +32,14 @@ namespace comphelper
     //=====================================================================
     //= OContainerListener
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OContainerListener::OContainerListener(::osl::Mutex& _rMutex)
         :m_pAdapter(NULL)
         ,m_rMutex(_rMutex)
     {
     }
 
-    //---------------------------------------------------------------------
+
     OContainerListener::~OContainerListener()
     {
         if (m_pAdapter)
@@ -49,27 +49,27 @@ namespace comphelper
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OContainerListener::_elementInserted( const ContainerEvent& /*_rEvent*/ ) throw(RuntimeException)
     {
     }
 
-    //---------------------------------------------------------------------
+
     void OContainerListener::_elementRemoved( const ContainerEvent& ) throw(RuntimeException)
     {
     }
 
-    //---------------------------------------------------------------------
+
     void OContainerListener::_elementReplaced( const ContainerEvent& /*_rEvent*/ ) throw(RuntimeException)
     {
     }
 
-    //---------------------------------------------------------------------
+
     void OContainerListener::_disposing(const EventObject& ) throw( RuntimeException)
     {
     }
 
-    //------------------------------------------------------------------
+
     void OContainerListener::setAdapter(OContainerListenerAdapter* pAdapter)
     {
         if (m_pAdapter)
@@ -90,7 +90,7 @@ namespace comphelper
     //=====================================================================
     //= OContainerListenerAdapter
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OContainerListenerAdapter::OContainerListenerAdapter(OContainerListener* _pListener,
             const  Reference< XContainer >& _rxContainer)
         :m_xContainer(_rxContainer)
@@ -112,12 +112,12 @@ namespace comphelper
         ::comphelper::decrement(m_refCount);
     }
 
-    //---------------------------------------------------------------------
+
     OContainerListenerAdapter::~OContainerListenerAdapter()
     {
     }
 
-    //------------------------------------------------------------------
+
     void OContainerListenerAdapter::dispose()
     {
         if (m_xContainer.is())
@@ -137,7 +137,7 @@ namespace comphelper
         }
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OContainerListenerAdapter::disposing( const  EventObject& _rSource) throw(RuntimeException)
     {
         if (m_pListener)
@@ -154,21 +154,21 @@ namespace comphelper
         m_pListener = NULL;
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException)
     {
         if (m_pListener && !locked())
             m_pListener->_elementInserted(_rEvent);
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException)
     {
         if (m_pListener && !locked())
             m_pListener->_elementRemoved(_rEvent);
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException)
     {
         if (m_pListener && !locked())
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index ebe4df1f28ea..c3c321c0835c 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1337,7 +1337,7 @@ namespace {
     }
 
 }
-// -----------------------------------------------------------------------------
+
 bool EmbeddedObjectContainer::StoreAsChildren(bool _bOasisFormat,bool _bCreateEmbedded,const uno::Reference < embed::XStorage >& _xStorage)
 {
     bool bResult = false;
@@ -1460,7 +1460,7 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool _bOasisFormat,bool _bCreateEm
     }
     return bResult;
 }
-// -----------------------------------------------------------------------------
+
 bool EmbeddedObjectContainer::StoreChildren(bool _bOasisFormat,bool _bObjectsOnly)
 {
     bool bResult = true;
@@ -1580,7 +1580,7 @@ bool EmbeddedObjectContainer::StoreChildren(bool _bOasisFormat,bool _bObjectsOnl
     }
     return bResult;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacementStream(
                                                                 sal_Int64 nViewAspect,
                                                                 const uno::Reference< embed::XEmbeddedObject >& xObj,
@@ -1607,7 +1607,7 @@ uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacemen
 
     return xInStream;
 }
-// -----------------------------------------------------------------------------
+
 bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::XStorage >& _xStorage,bool _bClearModifedFlag)
 {
     bool bError = false;
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index d2432d2e8cd6..40dc3f5f6dd8 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -132,7 +132,7 @@ namespace comphelper
     //====================================================================
     //= MapData helpers
     //====================================================================
-    //--------------------------------------------------------------------
+
     static void lcl_registerMapModificationListener( MapData& _mapData, IMapModificationListener& _listener )
     {
     #if OSL_DEBUG_LEVEL > 0
@@ -147,7 +147,7 @@ namespace comphelper
         _mapData.m_aModListeners.push_back( &_listener );
     }
 
-    //--------------------------------------------------------------------
+
     static void lcl_revokeMapModificationListener( MapData& _mapData, IMapModificationListener& _listener )
     {
         for (   MapListeners::iterator lookup = _mapData.m_aModListeners.begin();
@@ -164,7 +164,7 @@ namespace comphelper
         OSL_FAIL( "lcl_revokeMapModificationListener: the listener is not registered!" );
     }
 
-    //--------------------------------------------------------------------
+
     static void lcl_notifyMapDataListeners_nothrow( const MapData& _mapData )
     {
         for (   MapListeners::const_iterator loop = _mapData.m_aModListeners.begin();
@@ -342,14 +342,14 @@ namespace comphelper
     //====================================================================
     //= EnumerableMap
     //====================================================================
-    //--------------------------------------------------------------------
+
     EnumerableMap::EnumerableMap()
         :Map_IFace( m_aMutex )
         ,ComponentBase( Map_IFace::rBHelper )
     {
     }
 
-    //--------------------------------------------------------------------
+
     EnumerableMap::~EnumerableMap()
     {
         if ( !impl_isDisposed() )
@@ -359,7 +359,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this, ComponentMethodGuard::WithoutInit );
@@ -407,7 +407,7 @@ namespace comphelper
         setInitialized();
     }
 
-    //--------------------------------------------------------------------
+
     void EnumerableMap::impl_initValues_throw( const Sequence< Pair< Any, Any > >& _initialValues )
     {
         OSL_PRECOND( m_aData.m_pValues.get() && m_aData.m_pValues->empty(), "EnumerableMap::impl_initValues_throw: illegal call!" );
@@ -423,7 +423,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void EnumerableMap::impl_checkValue_throw( const Any& _value ) const
     {
         if ( !_value.hasValue() )
@@ -500,7 +500,7 @@ namespace comphelper
         impl_checkNaN_throw( _value, m_aData.m_aValueType );
     }
 
-    //--------------------------------------------------------------------
+
     void EnumerableMap::impl_checkNaN_throw( const Any& _keyOrValue, const Type& _keyOrValueType ) const
     {
         if  (   ( _keyOrValueType.getTypeClass() == TypeClass_DOUBLE )
@@ -518,7 +518,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void EnumerableMap::impl_checkKey_throw( const Any& _key ) const
     {
         if ( !_key.hasValue() )
@@ -529,7 +529,7 @@ namespace comphelper
         impl_checkNaN_throw( _key, m_aData.m_aKeyType );
     }
 
-    //--------------------------------------------------------------------
+
     void EnumerableMap::impl_checkMutable_throw() const
     {
         if ( !m_aData.m_bMutable )
@@ -538,42 +538,42 @@ namespace comphelper
                     *const_cast< EnumerableMap* >( this ) );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, _Isolated );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, _Isolated );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eBoth, _Isolated );
     }
 
-    //--------------------------------------------------------------------
+
     Type SAL_CALL EnumerableMap::getKeyType() throw (RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return m_aData.m_aKeyType;
     }
 
-    //--------------------------------------------------------------------
+
     Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return m_aData.m_aValueType;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL EnumerableMap::clear(  ) throw (NoSupportException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
@@ -584,7 +584,7 @@ namespace comphelper
         lcl_notifyMapDataListeners_nothrow( m_aData );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
@@ -594,7 +594,7 @@ namespace comphelper
         return ( pos != m_aData.m_pValues->end() );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
@@ -611,7 +611,7 @@ namespace comphelper
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
@@ -624,7 +624,7 @@ namespace comphelper
         return pos->second;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
@@ -650,7 +650,7 @@ namespace comphelper
         return previousValue;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
@@ -671,20 +671,20 @@ namespace comphelper
         return previousValue;
     }
 
-    //--------------------------------------------------------------------
+
     Type SAL_CALL EnumerableMap::getElementType() throw (RuntimeException)
     {
         return ::cppu::UnoType< Pair< Any, Any > >::get();
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL EnumerableMap::hasElements() throw (RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return m_aData.m_pValues->empty();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL EnumerableMap::getImplementationName(  ) throw (RuntimeException)
     {
         return getImplementationName_static();
@@ -695,19 +695,19 @@ namespace comphelper
         return cppu::supportsService(this, _serviceName);
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames(  ) throw (RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL EnumerableMap::getImplementationName_static(  )
     {
         return OUString( "org.openoffice.comp.comphelper.EnumerableMap" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames_static(  )
     {
         Sequence< OUString > aServiceNames(1);
@@ -715,7 +715,7 @@ namespace comphelper
         return aServiceNames;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL EnumerableMap::Create( SAL_UNUSED_PARAMETER const Reference< XComponentContext >& )
     {
         return *new EnumerableMap;
@@ -724,7 +724,7 @@ namespace comphelper
     //====================================================================
     //= MapEnumerator
     //====================================================================
-    //--------------------------------------------------------------------
+
     bool MapEnumerator::hasMoreElements()
     {
         if ( m_disposed )
@@ -732,7 +732,7 @@ namespace comphelper
         return m_mapPos != m_rMapData.m_pValues->end();
     }
 
-    //--------------------------------------------------------------------
+
     Any MapEnumerator::nextElement()
     {
         if ( m_disposed )
@@ -751,7 +751,7 @@ namespace comphelper
         return aNextElement;
     }
 
-    //--------------------------------------------------------------------
+
     void MapEnumerator::mapModified()
     {
         m_disposed = true;
@@ -760,14 +760,14 @@ namespace comphelper
     //====================================================================
     //= MapEnumeration - implementation
     //====================================================================
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL MapEnumeration::hasMoreElements(  ) throw (RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return m_aEnumerator.hasMoreElements();
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL MapEnumeration::nextElement(  ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index 168cac43e5b9..3eb7a0dc245b 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -28,7 +28,7 @@ namespace comphelper
 //==================================================================
 //= OEnumerationByName
 //==================================================================
-//------------------------------------------------------------------------------
+
 OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::XNameAccess>& _rxAccess)
     :m_aNames(_rxAccess->getElementNames())
     ,m_nPos(0)
@@ -38,7 +38,7 @@ OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::X
     impl_startDisposeListening();
 }
 
-//------------------------------------------------------------------------------
+
 OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::XNameAccess>& _rxAccess,
                                        const staruno::Sequence< OUString >&           _aNames  )
     :m_aNames(_aNames)
@@ -49,13 +49,13 @@ OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::X
     impl_startDisposeListening();
 }
 
-//------------------------------------------------------------------------------
+
 OEnumerationByName::~OEnumerationByName()
 {
     impl_stopDisposeListening();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  ) throw(staruno::RuntimeException)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -72,7 +72,7 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  ) throw(staruno::Runtime
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 staruno::Any SAL_CALL OEnumerationByName::nextElement(  )
         throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException)
 {
@@ -94,7 +94,7 @@ staruno::Any SAL_CALL OEnumerationByName::nextElement(  )
     return aRes;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OEnumerationByName::disposing(const starlang::EventObject& aEvent)
         throw(staruno::RuntimeException)
 {
@@ -104,7 +104,7 @@ void SAL_CALL OEnumerationByName::disposing(const starlang::EventObject& aEvent)
         m_xAccess.clear();
 }
 
-//------------------------------------------------------------------------------
+
 void OEnumerationByName::impl_startDisposeListening()
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -122,7 +122,7 @@ void OEnumerationByName::impl_startDisposeListening()
     --m_refCount;
 }
 
-//------------------------------------------------------------------------------
+
 void OEnumerationByName::impl_stopDisposeListening()
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -143,7 +143,7 @@ void OEnumerationByName::impl_stopDisposeListening()
 //==================================================================
 //= OEnumerationByIndex
 //==================================================================
-//------------------------------------------------------------------------------
+
 OEnumerationByIndex::OEnumerationByIndex(const staruno::Reference< starcontainer::XIndexAccess >& _rxAccess)
     :m_nPos(0)
     ,m_xAccess(_rxAccess)
@@ -152,13 +152,13 @@ OEnumerationByIndex::OEnumerationByIndex(const staruno::Reference< starcontainer
     impl_startDisposeListening();
 }
 
-//------------------------------------------------------------------------------
+
 OEnumerationByIndex::~OEnumerationByIndex()
 {
     impl_stopDisposeListening();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  ) throw(staruno::RuntimeException)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -175,7 +175,7 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  ) throw(staruno::Runtim
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 staruno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
         throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException)
 {
@@ -197,7 +197,7 @@ staruno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
     return aRes;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OEnumerationByIndex::disposing(const starlang::EventObject& aEvent)
         throw(staruno::RuntimeException)
 {
@@ -207,7 +207,7 @@ void SAL_CALL OEnumerationByIndex::disposing(const starlang::EventObject& aEvent
         m_xAccess.clear();
 }
 
-//------------------------------------------------------------------------------
+
 void OEnumerationByIndex::impl_startDisposeListening()
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -225,7 +225,7 @@ void OEnumerationByIndex::impl_startDisposeListening()
     --m_refCount;
 }
 
-//------------------------------------------------------------------------------
+
 void OEnumerationByIndex::impl_stopDisposeListening()
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -247,19 +247,19 @@ void OEnumerationByIndex::impl_stopDisposeListening()
 //= OAnyEnumeration
 //==================================================================
 
-//------------------------------------------------------------------------------
+
 OAnyEnumeration::OAnyEnumeration(const staruno::Sequence< staruno::Any >& lItems)
     :m_nPos(0)
     ,m_lItems(lItems)
 {
 }
 
-//------------------------------------------------------------------------------
+
 OAnyEnumeration::~OAnyEnumeration()
 {
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  ) throw(staruno::RuntimeException)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -267,7 +267,7 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  ) throw(staruno::RuntimeExc
     return (m_lItems.getLength() > m_nPos);
 }
 
-//------------------------------------------------------------------------------
+
 staruno::Any SAL_CALL OAnyEnumeration::nextElement(  )
         throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException)
 {
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 782eb92211bb..c6d531fbdddf 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -59,7 +59,7 @@ using namespace osl;
 namespace comphelper
 {
 
-//-----------------------------------------------------------------------------
+
 struct AttachedObject_Impl
 {
     Reference< XInterface >                 xTarget;
@@ -79,7 +79,7 @@ struct AttacherIndex_Impl
     bool    operator==( const AttacherIndex_Impl & ) const;
 };
 
-//-----------------------------------------------------------------------------
+
 class ImplEventAttacherManager
     : public WeakImplHelper2< XEventAttacherManager, XPersistObject >
 {
@@ -355,7 +355,7 @@ Reference< XEventAttacherManager > createEventAttacherManager( const Reference<
     return new ImplEventAttacherManager( xIntrospection, rxContext );
 }
 
-//-----------------------------------------------------------------------------
+
 ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospection > & rIntrospection,
                                                     const Reference< XComponentContext > xContext )
     : aScriptListeners( aLock )
@@ -383,7 +383,7 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect
     }
 }
 
-//-----------------------------------------------------------------------------
+
 ImplEventAttacherManager::~ImplEventAttacherManager()
 {
 }
@@ -400,7 +400,7 @@ Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exc
 }
 
 
-//-----------------------------------------------------------------------------
+
 ::std::deque<AttacherIndex_Impl>::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex ) SAL_THROW ( ( IllegalArgumentException ) )
 {
     if (_nIndex < 0)
@@ -448,7 +448,7 @@ public:
 
 }
 
-//-----------------------------------------------------------------------------
+
 // Methods of XEventAttacherManager
 void SAL_CALL ImplEventAttacherManager::registerScriptEvent
 (
@@ -496,7 +496,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ImplEventAttacherManager::registerScriptEvents
 (
     sal_Int32 nIndex,
@@ -520,7 +520,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents
     ::std::for_each(aList.begin(), aList.end(), AttachObject(*this, nIndex));
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
 (
     sal_Int32 nIndex,
@@ -559,7 +559,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
     ::std::for_each(aList.begin(), aList.end(), AttachObject(*this, nIndex));
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex )
     throw( IllegalArgumentException, RuntimeException )
 {
@@ -572,7 +572,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex )
     ::std::for_each(aList.begin(), aList.end(), AttachObject(*this, nIndex));
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex)
     throw( IllegalArgumentException, RuntimeException )
 {
@@ -587,7 +587,7 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex)
     aIndex.insert( aIndex.begin() + nIndex, aTmp );
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex)
     throw( IllegalArgumentException, RuntimeException )
 {
@@ -599,7 +599,7 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex)
     aIndex.erase( aIt );
 }
 
-//-----------------------------------------------------------------------------
+
 Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEvents(sal_Int32 nIndex)
     throw( IllegalArgumentException, RuntimeException )
 {
@@ -620,7 +620,7 @@ Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEv
     return aSeq;
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any & Helper)
     throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException )
 {
@@ -683,7 +683,7 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference< XInterface >& xObject)
     throw( IllegalArgumentException, RuntimeException )
 {
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx
index e5daf792d2b7..de24434b0a47 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -33,20 +33,20 @@ using namespace ::com::sun::star::view;
 //========================================================================
 //= OSelectionChangeListener
 //========================================================================
-//------------------------------------------------------------------------
+
 OSelectionChangeListener::~OSelectionChangeListener()
 {
     if (m_pAdapter)
         m_pAdapter->dispose();
 }
 
-//------------------------------------------------------------------
+
 void OSelectionChangeListener::_disposing(const EventObject&) throw( RuntimeException)
 {
     // nothing to do here
 }
 
-//------------------------------------------------------------------
+
 void OSelectionChangeListener::setAdapter(OSelectionChangeMultiplexer* pAdapter)
 {
     if (m_pAdapter)
@@ -67,7 +67,7 @@ void OSelectionChangeListener::setAdapter(OSelectionChangeMultiplexer* pAdapter)
 //========================================================================
 //= OSelectionChangeMultiplexer
 //========================================================================
-//------------------------------------------------------------------
+
 OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const  Reference< XSelectionSupplier>& _rxSet, bool _bAutoReleaseSet)
             :m_xSet(_rxSet)
             ,m_pListener(_pListener)
@@ -84,24 +84,24 @@ OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListene
     osl_atomic_decrement(&m_refCount);
 }
 
-//------------------------------------------------------------------
+
 OSelectionChangeMultiplexer::~OSelectionChangeMultiplexer()
 {
 }
 
-//------------------------------------------------------------------
+
 void OSelectionChangeMultiplexer::lock()
 {
     ++m_nLockCount;
 }
 
-//------------------------------------------------------------------
+
 void OSelectionChangeMultiplexer::unlock()
 {
     --m_nLockCount;
 }
 
-//------------------------------------------------------------------
+
 void OSelectionChangeMultiplexer::dispose()
 {
     if (m_bListening)
@@ -121,7 +121,7 @@ void OSelectionChangeMultiplexer::dispose()
 }
 
 // XEventListener
-//------------------------------------------------------------------
+
 void SAL_CALL OSelectionChangeMultiplexer::disposing( const  EventObject& _rSource) throw( RuntimeException)
 {
     if (m_pListener)
@@ -142,7 +142,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const  EventObject& _rSour
 }
 
 // XSelectionChangeListener
-//------------------------------------------------------------------
+
 void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const  EventObject& _rEvent ) throw( RuntimeException)
 {
     if (m_pListener && !locked())
diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx
index 2fdaf84f12a6..6774302b5afc 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.cxx
@@ -32,18 +32,18 @@ namespace comphelper
     //=====================================================================
     //= OCommonAccessibleComponent
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OCommonAccessibleComponent::OCommonAccessibleComponent( IMutex* _pExternalLock )
         :OAccessibleContextHelper( _pExternalLock )
     {
     }
 
-    //---------------------------------------------------------------------
+
     OCommonAccessibleComponent::~OCommonAccessibleComponent( )
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
@@ -54,7 +54,7 @@ namespace comphelper
             &&  ( _rPoint.Y < aBounds.Height );
     }
 
-    //--------------------------------------------------------------------
+
     Point SAL_CALL OCommonAccessibleComponent::getLocation(  ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
@@ -62,7 +62,7 @@ namespace comphelper
         return Point( aBounds.X, aBounds.Y );
     }
 
-    //--------------------------------------------------------------------
+
     Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen(  ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
@@ -82,7 +82,7 @@ namespace comphelper
         return aScreenLoc;
     }
 
-    //--------------------------------------------------------------------
+
     Size SAL_CALL OCommonAccessibleComponent::getSize(  ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
@@ -90,7 +90,7 @@ namespace comphelper
         return Size( aBounds.Width, aBounds.Height );
     }
 
-    //--------------------------------------------------------------------
+
     Rectangle SAL_CALL OCommonAccessibleComponent::getBounds(  ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
@@ -100,42 +100,42 @@ namespace comphelper
     //=====================================================================
     //= OAccessibleComponentHelper
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OAccessibleComponentHelper::OAccessibleComponentHelper( IMutex* _pExternalLock )
         :OCommonAccessibleComponent( _pExternalLock )
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleComponentHelper, OCommonAccessibleComponent, OAccessibleComponentHelper_Base )
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleComponentHelper, OCommonAccessibleComponent, OAccessibleComponentHelper_Base )
         // (order matters: the first is the class name, the second is the class doing the ref counting)
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::containsPoint( _rPoint );
     }
 
-    //--------------------------------------------------------------------
+
     Point SAL_CALL OAccessibleComponentHelper::getLocation(  ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::getLocation( );
     }
 
-    //--------------------------------------------------------------------
+
     Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen(  ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::getLocationOnScreen( );
     }
 
-    //--------------------------------------------------------------------
+
     Size SAL_CALL OAccessibleComponentHelper::getSize(  ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::getSize( );
     }
 
-    //--------------------------------------------------------------------
+
     Rectangle SAL_CALL OAccessibleComponentHelper::getBounds(  ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::getBounds( );
@@ -144,42 +144,42 @@ namespace comphelper
     //=====================================================================
     //= OAccessibleExtendedComponentHelper
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper( IMutex* _pExternalLock )
         :OCommonAccessibleComponent( _pExternalLock )
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleExtendedComponentHelper, OCommonAccessibleComponent, OAccessibleExtendedComponentHelper_Base )
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleExtendedComponentHelper, OCommonAccessibleComponent, OAccessibleExtendedComponentHelper_Base )
         // (order matters: the first is the class name, the second is the class doing the ref counting)
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::containsPoint( _rPoint );
     }
 
-    //--------------------------------------------------------------------
+
     Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation(  ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::getLocation( );
     }
 
-    //--------------------------------------------------------------------
+
     Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen(  ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::getLocationOnScreen( );
     }
 
-    //--------------------------------------------------------------------
+
     Size SAL_CALL OAccessibleExtendedComponentHelper::getSize(  ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::getSize( );
     }
 
-    //--------------------------------------------------------------------
+
     Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds(  ) throw (RuntimeException)
     {
         return OCommonAccessibleComponent::getBounds( );
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index f4d9df56bc86..d94cd43e1f51 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -69,7 +69,7 @@ namespace comphelper
         }
     };
 
-    //---------------------------------------------------------------------
+
     inline  void OContextHelper_Impl::setCreator( const Reference< XAccessible >& _rAcc )
     {
         m_aCreator = _rAcc;
@@ -78,7 +78,7 @@ namespace comphelper
     //=====================================================================
     //= OAccessibleContextHelper
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OAccessibleContextHelper::OAccessibleContextHelper( IMutex* _pExternalLock )
         :OAccessibleContextHelper_Base( GetMutex() )
         ,m_pImpl( NULL )
@@ -88,13 +88,13 @@ namespace comphelper
         m_pImpl->setExternalLock( _pExternalLock );
     }
 
-    //---------------------------------------------------------------------
+
     void OAccessibleContextHelper::forgetExternalLock()
     {
         m_pImpl->setExternalLock( NULL );
     }
 
-    //---------------------------------------------------------------------
+
     OAccessibleContextHelper::~OAccessibleContextHelper( )
     {
         forgetExternalLock();
@@ -107,13 +107,13 @@ namespace comphelper
         m_pImpl = NULL;
     }
 
-    //---------------------------------------------------------------------
+
     IMutex* OAccessibleContextHelper::getExternalLock( )
     {
         return m_pImpl->getExternalLock();
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextHelper::disposing()
     {
         // rhbz#1001768: de facto this class is locked by SolarMutex;
@@ -127,7 +127,7 @@ namespace comphelper
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
     {
         OMutexGuard aGuard( getExternalLock() );
@@ -150,7 +150,7 @@ namespace comphelper
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
     {
         OMutexGuard aGuard( getExternalLock() );
@@ -175,7 +175,7 @@ namespace comphelper
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextHelper::NotifyAccessibleEvent( const sal_Int16 _nEventId,
         const Any& _rOldValue, const Any& _rNewValue )
     {
@@ -195,20 +195,20 @@ namespace comphelper
         AccessibleEventNotifier::addEvent( m_pImpl->getClientId( ), aEvent );
     }
 
-    //---------------------------------------------------------------------
+
     bool OAccessibleContextHelper::isAlive() const
     {
         return !GetBroadcastHelper().bDisposed && !GetBroadcastHelper().bInDispose;
     }
 
-    //---------------------------------------------------------------------
+
     void OAccessibleContextHelper::ensureAlive() const SAL_THROW( ( DisposedException ) )
     {
         if( !isAlive() )
             throw DisposedException();
     }
 
-    //---------------------------------------------------------------------
+
     void OAccessibleContextHelper::ensureDisposed( )
     {
         if ( !GetBroadcastHelper().bDisposed )
@@ -219,19 +219,19 @@ namespace comphelper
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OAccessibleContextHelper::lateInit( const Reference< XAccessible >& _rxAccessible )
     {
         m_pImpl->setCreator( _rxAccessible );
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XAccessible > OAccessibleContextHelper::getAccessibleCreator( ) const
     {
         return m_pImpl->getCreator();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent(  ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
@@ -277,7 +277,7 @@ namespace comphelper
         return nRet;
     }
 
-    //---------------------------------------------------------------------
+
     Locale SAL_CALL OAccessibleContextHelper::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
     {
         // simply ask the parent
@@ -292,7 +292,7 @@ namespace comphelper
         return xParentContext->getLocale();
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XAccessibleContext > OAccessibleContextHelper::implGetParentContext() SAL_THROW( ( RuntimeException ) )
     {
         Reference< XAccessible > xParent = getAccessibleParent();
diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index be60fe3d9824..97187c3fb1c4 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.cxx
@@ -34,7 +34,7 @@ using namespace ::comphelper;
 //=====================================================================
 //= AccessibleEventNotifier
 //=====================================================================
-//---------------------------------------------------------------------
+
 namespace
 {
     typedef ::std::pair< AccessibleEventNotifier::TClientId,
@@ -148,7 +148,7 @@ namespace comphelper
 {
 //.........................................................................
 
-    //---------------------------------------------------------------------
+
     AccessibleEventNotifier::TClientId AccessibleEventNotifier::registerClient( )
     {
         ::osl::MutexGuard aGuard( lclMutex::get() );
@@ -171,7 +171,7 @@ namespace comphelper
         return nNewClientId;
     }
 
-    //---------------------------------------------------------------------
+
     void AccessibleEventNotifier::revokeClient( const TClientId _nClient )
     {
         ::osl::MutexGuard aGuard( lclMutex::get() );
@@ -187,7 +187,7 @@ namespace comphelper
         releaseId(_nClient);
     }
 
-    //---------------------------------------------------------------------
+
     void AccessibleEventNotifier::revokeClientNotifyDisposing( const TClientId _nClient,
             const Reference< XInterface >& _rxEventSource ) SAL_THROW( ( ) )
     {
@@ -222,7 +222,7 @@ namespace comphelper
         delete pListeners;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int32 AccessibleEventNotifier::addEventListener(
         const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener ) SAL_THROW( ( ) )
     {
@@ -239,7 +239,7 @@ namespace comphelper
         return aClientPos->second->getLength();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int32 AccessibleEventNotifier::removeEventListener(
         const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener ) SAL_THROW( ( ) )
     {
@@ -256,7 +256,7 @@ namespace comphelper
         return aClientPos->second->getLength();
     }
 
-    //---------------------------------------------------------------------
+
     void AccessibleEventNotifier::addEvent( const TClientId _nClient, const AccessibleEventObject& _rEvent ) SAL_THROW( ( ) )
     {
         Sequence< Reference< XInterface > > aListeners;
diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx
index 752b12fbeaeb..4aadb00f709c 100644
--- a/comphelper/source/misc/accessiblekeybindinghelper.cxx
+++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx
@@ -38,7 +38,7 @@ namespace comphelper
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OAccessibleKeyBindingHelper::OAccessibleKeyBindingHelper( const OAccessibleKeyBindingHelper& rHelper )
         : cppu::WeakImplHelper1<XAccessibleKeyBinding>( rHelper )
@@ -46,13 +46,13 @@ namespace comphelper
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OAccessibleKeyBindingHelper::~OAccessibleKeyBindingHelper()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void OAccessibleKeyBindingHelper::AddKeyBinding( const Sequence< awt::KeyStroke >& rKeyBinding ) throw (RuntimeException)
     {
@@ -61,7 +61,7 @@ namespace comphelper
         m_aKeyBindings.push_back( rKeyBinding );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void OAccessibleKeyBindingHelper::AddKeyBinding( const awt::KeyStroke& rKeyStroke ) throw (RuntimeException)
     {
@@ -72,9 +72,9 @@ namespace comphelper
         m_aKeyBindings.push_back( aSeq );
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleKeyBinding
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() throw (RuntimeException)
     {
@@ -83,7 +83,7 @@ namespace comphelper
         return m_aKeyBindings.size();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -95,7 +95,7 @@ namespace comphelper
         return m_aKeyBindings[nIndex];
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //..............................................................................
 }   // namespace comphelper
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx
index ed93e6888a57..7ddb80605bab 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -32,38 +32,38 @@ namespace comphelper
     //=====================================================================
     //= OCommonAccessibleSelection
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OCommonAccessibleSelection::OCommonAccessibleSelection( )
     {
     }
 
     OCommonAccessibleSelection::~OCommonAccessibleSelection() {}
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         implSelect( nChildIndex, sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         return( implIsSelected( nChildIndex ) );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection(  ) throw (RuntimeException)
     {
         implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_False );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
         implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
     {
         sal_Int32                       nRet = 0;
@@ -81,7 +81,7 @@ namespace comphelper
         return( nRet );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         Reference< XAccessible >        xRet;
@@ -99,7 +99,7 @@ namespace comphelper
         return( xRet );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         implSelect( nSelectedChildIndex, sal_False );
@@ -108,65 +108,65 @@ namespace comphelper
     //=====================================================================
     //= OAccessibleSelectionHelper
     //=====================================================================
-    //--------------------------------------------------------------------
+
     OAccessibleSelectionHelper::OAccessibleSelectionHelper( IMutex* _pExternalLock ) : OAccessibleComponentHelper(_pExternalLock)
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleSelectionHelper, OAccessibleComponentHelper, OAccessibleSelectionHelper_Base )
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleSelectionHelper, OAccessibleComponentHelper, OAccessibleSelectionHelper_Base )
     // (order matters: the first is the class name, the second is the class doing the ref counting)
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleContext > OAccessibleSelectionHelper::implGetAccessibleContext() throw ( RuntimeException )
     {
         return( this );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
         OCommonAccessibleSelection::selectAccessibleChild( nChildIndex );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
         return( OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ) );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection(  ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
         OCommonAccessibleSelection::clearAccessibleSelection();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
         OCommonAccessibleSelection::selectAllAccessibleChildren();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
         return( OCommonAccessibleSelection::getSelectedAccessibleChildCount() );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
         return( OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ) );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx
index d21d7ff3cc41..00a21a7fa1d0 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.cxx
@@ -48,13 +48,13 @@ namespace comphelper
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OCommonAccessibleText::~OCommonAccessibleText()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference < i18n::XBreakIterator > OCommonAccessibleText::implGetBreakIterator()
     {
@@ -67,7 +67,7 @@ namespace comphelper
         return m_xBreakIter;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference < i18n::XCharacterClassification > OCommonAccessibleText::implGetCharacterClassification()
     {
@@ -79,28 +79,28 @@ namespace comphelper
         return m_xCharClass;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     bool OCommonAccessibleText::implIsValidBoundary( i18n::Boundary& rBoundary, sal_Int32 nLength )
     {
         return ( rBoundary.startPos >= 0 ) && ( rBoundary.startPos < nLength ) && ( rBoundary.endPos >= 0 ) && ( rBoundary.endPos <= nLength );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     bool OCommonAccessibleText::implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength )
     {
         return ( nIndex >= 0 ) && ( nIndex < nLength );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     bool OCommonAccessibleText::implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength )
     {
         return ( nStartIndex >= 0 ) && ( nStartIndex <= nLength ) && ( nEndIndex >= 0 ) && ( nEndIndex <= nLength );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void OCommonAccessibleText::implGetGlyphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
@@ -131,7 +131,7 @@ namespace comphelper
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     bool OCommonAccessibleText::implGetWordBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
@@ -164,7 +164,7 @@ namespace comphelper
         return bWord;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void OCommonAccessibleText::implGetSentenceBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
@@ -187,7 +187,7 @@ namespace comphelper
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void OCommonAccessibleText::implGetParagraphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
@@ -213,7 +213,7 @@ namespace comphelper
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void OCommonAccessibleText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
@@ -232,7 +232,7 @@ namespace comphelper
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -244,14 +244,14 @@ namespace comphelper
         return sText[nIndex];
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 OCommonAccessibleText::getCharacterCount() throw (RuntimeException)
     {
         return implGetText().getLength();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException)
     {
@@ -272,7 +272,7 @@ namespace comphelper
         return sText;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 OCommonAccessibleText::getSelectionStart() throw (RuntimeException)
     {
@@ -284,7 +284,7 @@ namespace comphelper
         return nStartIndex;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 OCommonAccessibleText::getSelectionEnd() throw (RuntimeException)
     {
@@ -296,14 +296,14 @@ namespace comphelper
         return nEndIndex;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString OCommonAccessibleText::getText() throw (RuntimeException)
     {
         return implGetText();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -318,7 +318,7 @@ namespace comphelper
         return sText.copy( nMinIndex, nMaxIndex - nMinIndex );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
@@ -423,7 +423,7 @@ namespace comphelper
         return aResult;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
@@ -548,7 +548,7 @@ namespace comphelper
         return aResult;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
@@ -677,7 +677,7 @@ namespace comphelper
         return aResult;
     }
 
-    // -----------------------------------------------------------------------------
+
     bool OCommonAccessibleText::implInitTextChangedEvent(
         const OUString& rOldString,
         const OUString& rNewString,
@@ -777,21 +777,21 @@ namespace comphelper
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInterface
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleTextHelper, OAccessibleExtendedComponentHelper, OAccessibleTextHelper_Base )
 
-    // -----------------------------------------------------------------------------
+
     // XTypeProvider
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleTextHelper, OAccessibleExtendedComponentHelper, OAccessibleTextHelper_Base )
 
-    // -----------------------------------------------------------------------------
+
     // XAccessibleText
-    // -----------------------------------------------------------------------------
+
 
     sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -800,7 +800,7 @@ namespace comphelper
         return OCommonAccessibleText::getCharacter( nIndex );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException)
     {
@@ -809,7 +809,7 @@ namespace comphelper
         return OCommonAccessibleText::getCharacterCount();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException)
     {
@@ -818,7 +818,7 @@ namespace comphelper
         return OCommonAccessibleText::getSelectedText();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException)
     {
@@ -827,7 +827,7 @@ namespace comphelper
         return OCommonAccessibleText::getSelectionStart();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException)
     {
@@ -836,7 +836,7 @@ namespace comphelper
         return OCommonAccessibleText::getSelectionEnd();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString OAccessibleTextHelper::getText() throw (RuntimeException)
     {
@@ -845,7 +845,7 @@ namespace comphelper
         return OCommonAccessibleText::getText();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
@@ -854,7 +854,7 @@ namespace comphelper
         return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
@@ -863,7 +863,7 @@ namespace comphelper
         return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
@@ -872,7 +872,7 @@ namespace comphelper
         return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
@@ -881,7 +881,7 @@ namespace comphelper
         return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //..............................................................................
 }   // namespace comphelper
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index f189530365f0..47e33392701f 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -37,7 +37,7 @@ namespace comphelper
     //=========================================================================
     //= OWrappedAccessibleChildrenManager
     //=========================================================================
-    //--------------------------------------------------------------------
+
     struct RemoveEventListener
             : public ::std::unary_function< AccessibleMap::value_type, void >
     {
@@ -58,7 +58,7 @@ namespace comphelper
         }
     };
 
-    //--------------------------------------------------------------------
+
     struct DisposeMappedChild
             : public ::std::unary_function< AccessibleMap::value_type, void >
     {
@@ -72,32 +72,32 @@ namespace comphelper
         }
     };
 
-    //-------------------------------------------------------------------------
+
     OWrappedAccessibleChildrenManager::OWrappedAccessibleChildrenManager( const Reference< XComponentContext >& _rxContext )
         :m_xContext( _rxContext )
         ,m_bTransientChildren( true )
     {
     }
 
-    //-------------------------------------------------------------------------
+
     OWrappedAccessibleChildrenManager::~OWrappedAccessibleChildrenManager( )
     {
     }
 
-    //-------------------------------------------------------------------------
+
     void OWrappedAccessibleChildrenManager::setTransientChildren( bool _bSet )
     {
         m_bTransientChildren = _bSet;
     }
 
-    //-------------------------------------------------------------------------
+
     void OWrappedAccessibleChildrenManager::setOwningAccessible( const Reference< XAccessible >& _rxAcc )
     {
         OSL_ENSURE( !m_aOwningAccessible.get().is(), "OWrappedAccessibleChildrenManager::setOwningAccessible: to be called only once!" );
         m_aOwningAccessible = WeakReference< XAccessible >( _rxAcc );
     }
 
-    //-------------------------------------------------------------------------
+
     void OWrappedAccessibleChildrenManager::removeFromCache( const Reference< XAccessible >& _rxKey )
     {
         AccessibleMap::iterator aRemovedPos = m_aChildrenMap.find( _rxKey );
@@ -111,7 +111,7 @@ namespace comphelper
         }
     }
 
-    //-------------------------------------------------------------------------
+
     void OWrappedAccessibleChildrenManager::invalidateAll( )
     {
         // remove as event listener from the map elements
@@ -121,7 +121,7 @@ namespace comphelper
         m_aChildrenMap.swap( aMap );
     }
 
-    //-------------------------------------------------------------------------
+
     Reference< XAccessible > OWrappedAccessibleChildrenManager::getAccessibleWrapperFor(
         const Reference< XAccessible >& _rxKey, bool _bCreate )
     {
@@ -168,7 +168,7 @@ namespace comphelper
         return xValue;
     }
 
-    //-------------------------------------------------------------------------
+
     void OWrappedAccessibleChildrenManager::dispose()
     {
         // dispose our children
@@ -179,7 +179,7 @@ namespace comphelper
         m_aChildrenMap.swap( aMap );
     }
 
-    //--------------------------------------------------------------------
+
     void OWrappedAccessibleChildrenManager::implTranslateChildEventValue( const Any& _rInValue, Any& _rOutValue )
     {
         _rOutValue.clear();
@@ -188,7 +188,7 @@ namespace comphelper
             _rOutValue <<= getAccessibleWrapperFor( xChild, true );
     }
 
-    //-------------------------------------------------------------------------
+
     void OWrappedAccessibleChildrenManager::translateAccessibleEvent( const AccessibleEventObject& _rEvent, AccessibleEventObject& _rTranslatedEvent )
     {
         // just in case we can't translate some of the values:
@@ -242,7 +242,7 @@ namespace comphelper
         }
     }
 
-    //-------------------------------------------------------------------------
+
     void OWrappedAccessibleChildrenManager::handleChildNotification( const AccessibleEventObject& _rEvent )
     {
         if ( AccessibleEventId::INVALIDATE_ALL_CHILDREN == _rEvent.EventId )
@@ -258,7 +258,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         // this should come from one of the inner XAccessible's of our children
@@ -298,7 +298,7 @@ namespace comphelper
     //=========================================================================
     //= OAccessibleWrapper (implementation)
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OAccessibleWrapper::OAccessibleWrapper( const Reference< XComponentContext >& _rxContext,
             const Reference< XAccessible >& _rxInnerAccessible, const Reference< XAccessible >& _rxParentAccessible )
         :OAccessibleWrapper_Base( )
@@ -308,7 +308,7 @@ namespace comphelper
     {
     }
 
-    //--------------------------------------------------------------------
+
     OAccessibleWrapper::~OAccessibleWrapper( )
     {
         if ( !m_rBHelper.bDisposed )
@@ -318,11 +318,11 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleWrapper, OComponentProxyAggregation, OAccessibleWrapper_Base )
     IMPLEMENT_FORWARD_REFCOUNT( OAccessibleWrapper, OComponentProxyAggregation )
 
-    //--------------------------------------------------------------------
+
     Any OAccessibleWrapper::queryInterface( const Type& _rType ) throw (RuntimeException)
     {
         // #111089# instead of the inner XAccessible the proxy XAccessible must be returned
@@ -333,19 +333,19 @@ namespace comphelper
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleContext > OAccessibleWrapper::getContextNoCreate( ) const
     {
         return (Reference< XAccessibleContext >)m_aContext;
     }
 
-    //--------------------------------------------------------------------
+
     OAccessibleContextWrapper* OAccessibleWrapper::createAccessibleContext( const Reference< XAccessibleContext >& _rxInnerContext )
     {
         return new OAccessibleContextWrapper( getComponentContext(), _rxInnerContext, this, m_xParentAccessible );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext(  ) throw (RuntimeException)
     {
         // see if the context is still alive (we cache it)
@@ -368,7 +368,7 @@ namespace comphelper
     //=========================================================================
     //= OAccessibleWrapper (implementation)
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OAccessibleContextWrapperHelper::OAccessibleContextWrapperHelper(
                 const Reference< XComponentContext >& _rxContext,
                 ::cppu::OBroadcastHelper& _rBHelper,
@@ -393,7 +393,7 @@ namespace comphelper
         m_pChildMapper->setOwningAccessible( m_xOwningAccessible );
     }
 
-    //--------------------------------------------------------------------
+
     void OAccessibleContextWrapperHelper::aggregateProxy( oslInterlockedCount& _rRefCount, ::cppu::OWeakObject& _rDelegator )
     {
         Reference< XComponent > xInnerComponent( m_xInnerContext, UNO_QUERY );
@@ -411,7 +411,7 @@ namespace comphelper
         osl_atomic_decrement( &_rRefCount );
     }
 
-    //--------------------------------------------------------------------
+
     OAccessibleContextWrapperHelper::~OAccessibleContextWrapperHelper( )
     {
         OSL_ENSURE( m_rBHelper.bDisposed, "OAccessibleContextWrapperHelper::~OAccessibleContextWrapperHelper: you should ensure (in your dtor) that the object is disposed!" );
@@ -420,7 +420,7 @@ namespace comphelper
         m_pChildMapper = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType ) throw (RuntimeException)
     {
         Any aReturn = OComponentProxyAggregationHelper::queryInterface( _rType );
@@ -429,16 +429,16 @@ namespace comphelper
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleContextWrapperHelper, OComponentProxyAggregationHelper, OAccessibleContextWrapperHelper_Base )
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OAccessibleContextWrapperHelper::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleChildCount();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL OAccessibleContextWrapperHelper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         // get the child of the wrapped component
@@ -446,7 +446,7 @@ namespace comphelper
         return m_pChildMapper->getAccessibleWrapperFor( xInnerChild );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapperHelper::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleRelationSet();
@@ -454,7 +454,7 @@ namespace comphelper
             // to wrap them, too ....
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException)
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -492,7 +492,7 @@ namespace comphelper
         notifyTranslatedEvent( aTranslatedEvent );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextWrapperHelper::dispose() throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( m_rBHelper.rMutex );
@@ -510,7 +510,7 @@ namespace comphelper
         OComponentProxyAggregationHelper::dispose();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent )  throw (RuntimeException)
     {
         // simply disambiguate this
@@ -520,13 +520,13 @@ namespace comphelper
     //====================================================================
     //= OAccessibleContextWrapper
     //====================================================================
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleContextWrapper, OAccessibleContextWrapper_CBase, OAccessibleContextWrapperHelper )
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleContextWrapper, OAccessibleContextWrapper_CBase, OAccessibleContextWrapperHelper )
 
-    //--------------------------------------------------------------------
+
     OAccessibleContextWrapper::OAccessibleContextWrapper( const Reference< XComponentContext >& _rxContext,
             const Reference< XAccessibleContext >& _rxInnerAccessibleContext, const Reference< XAccessible >& _rxOwningAccessible,
             const Reference< XAccessible >& _rxParentAccessible )
@@ -537,79 +537,79 @@ namespace comphelper
         aggregateProxy( m_refCount, *this );
     }
 
-    //--------------------------------------------------------------------
+
     OAccessibleContextWrapper::~OAccessibleContextWrapper()
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         return OAccessibleContextWrapperHelper::getAccessibleChildCount();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         return OAccessibleContextWrapperHelper::getAccessibleChild( i );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent(  ) throw (RuntimeException)
     {
         return m_xParentAccessible;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleIndexInParent();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleRole();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleDescription();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleName();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
         return OAccessibleContextWrapperHelper::getAccessibleRelationSet();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleStateSet();
     }
 
-    //--------------------------------------------------------------------
+
     Locale SAL_CALL OAccessibleContextWrapper::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
     {
         return m_xInnerContext->getLocale();
     }
 
-    //--------------------------------------------------------------------
+
     void OAccessibleContextWrapper::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException)
     {
         if ( m_nNotifierClient )
             AccessibleEventNotifier::addEvent( m_nNotifierClient, _rEvent );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -618,7 +618,7 @@ namespace comphelper
         AccessibleEventNotifier::addEventListener( m_nNotifierClient, _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -633,7 +633,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextWrapper::disposing()  throw (RuntimeException)
     {
         AccessibleEventNotifier::TClientId nClientId( 0 );
@@ -659,7 +659,7 @@ namespace comphelper
             AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, *this );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleContextWrapper::dispose() throw( RuntimeException )
     {
         // simply disambiguate
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index b84853a27e25..c910f43e1e10 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -52,38 +52,38 @@ namespace comphelper
     //=====================================================================
     //= OAccessibleImplementationAccess
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OAccessibleImplementationAccess::OAccessibleImplementationAccess( )
         :m_pImpl( new OAccImpl_Impl )
     {
     }
 
-    //---------------------------------------------------------------------
+
     OAccessibleImplementationAccess::~OAccessibleImplementationAccess( )
     {
         delete m_pImpl;
         m_pImpl = NULL;
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XAccessible > OAccessibleImplementationAccess::implGetForeignControlledParent( ) const
     {
         return m_pImpl->m_xAccParent;
     }
 
-    //---------------------------------------------------------------------
+
     void OAccessibleImplementationAccess::setAccessibleParent( const Reference< XAccessible >& _rxAccParent )
     {
         m_pImpl->m_xAccParent = _rxAccParent;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int64 OAccessibleImplementationAccess::implGetForeignControlledStates( ) const
     {
         return m_pImpl->m_nForeignControlledStates;
     }
 
-    //---------------------------------------------------------------------
+
     void OAccessibleImplementationAccess::setStateBit( const sal_Int16 _nState, const sal_Bool _bSet )
     {
         OSL_ENSURE( _nState >= 0 && static_cast< sal_uInt16 >(_nState) < sizeof( sal_Int64 ) * 8, "OAccessibleImplementationAccess::setStateBit: no more bits (shutting down the universe now)!" );
@@ -98,14 +98,14 @@ namespace comphelper
 
     namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 
-    //---------------------------------------------------------------------
+
     const Sequence< sal_Int8 > OAccessibleImplementationAccess::getUnoTunnelImplementationId()
     {
         ::cppu::OImplementationId &rID = lcl_ImplId::get();
         return rID.getImplementationId();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw (RuntimeException)
     {
         sal_Int64 nReturn( 0 );
@@ -118,7 +118,7 @@ namespace comphelper
         return nReturn;
     }
 
-    //---------------------------------------------------------------------
+
     OAccessibleImplementationAccess* OAccessibleImplementationAccess::getImplementation( const Reference< XAccessibleContext >& _rxComponent )
     {
         OAccessibleImplementationAccess* pImplementation = NULL;
@@ -138,7 +138,7 @@ namespace comphelper
         return pImplementation;
     }
 
-    //---------------------------------------------------------------------
+
     bool OAccessibleImplementationAccess::setAccessibleParent(
             const Reference< XAccessibleContext >& _rxComponent, const Reference< XAccessible >& _rxNewParent )
     {
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index 30e805a791fc..9d1c1642002f 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -175,7 +175,7 @@ namespace comphelper
         }
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::std::auto_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
     {
 	SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx
index 12f646ca884d..5fa3028aba0c 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.cxx
@@ -52,7 +52,7 @@ inline void appendChar( OUStringBuffer & buf, sal_Unicode c )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void appendValue( OUStringBuffer & buf,
                   void const * val, typelib_TypeDescriptionReference * typeRef,
                   bool prependType )
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index 8b1d81a804d1..897a840b9841 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -36,24 +36,24 @@ namespace comphelper
     //====================================================================
     //= AnyEvent
     //====================================================================
-    //--------------------------------------------------------------------
+
     AnyEvent::AnyEvent()
         :m_refCount( 0 )
     {
     }
 
-    //--------------------------------------------------------------------
+
     AnyEvent::~AnyEvent()
     {
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL AnyEvent::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL AnyEvent::release()
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
@@ -132,18 +132,18 @@ namespace comphelper
     //====================================================================
     //= AsyncEventNotifier
     //====================================================================
-    //--------------------------------------------------------------------
+
     AsyncEventNotifier::AsyncEventNotifier(char const * name):
         Thread(name), m_pImpl(new EventNotifierImpl)
     {
     }
 
-    //--------------------------------------------------------------------
+
     AsyncEventNotifier::~AsyncEventNotifier()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void AsyncEventNotifier::removeEventsForProcessor( const ::rtl::Reference< IEventProcessor >& _xProcessor )
     {
         ::osl::MutexGuard aGuard( m_pImpl->aMutex );
@@ -156,7 +156,7 @@ namespace comphelper
         m_pImpl->m_aDeadProcessors.insert( _xProcessor );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL AsyncEventNotifier::terminate()
     {
         ::osl::MutexGuard aGuard( m_pImpl->aMutex );
@@ -168,7 +168,7 @@ namespace comphelper
         m_pImpl->aPendingActions.set();
     }
 
-    //--------------------------------------------------------------------
+
     void AsyncEventNotifier::addEvent( const AnyEventRef& _rEvent, const ::rtl::Reference< IEventProcessor >& _xProcessor )
     {
         ::osl::MutexGuard aGuard( m_pImpl->aMutex );
@@ -181,7 +181,7 @@ namespace comphelper
         m_pImpl->aPendingActions.set();
     }
 
-    //--------------------------------------------------------------------
+
     void AsyncEventNotifier::execute()
     {
         do
diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx
index 2e4699ef5710..4fff696dbd45 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -22,7 +22,7 @@
 
 #include <rtl/instance.hxx>
 
-//--------------------------------------------------------------------
+
 extern void createRegistryInfo_OPropertyBag();
 extern void createRegistryInfo_SequenceOutputStream();
 extern void createRegistryInfo_SequenceInputStream();
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index d5066fbbbf65..0d13cf26f87a 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -36,21 +36,21 @@ namespace comphelper
     //====================================================================
     //= ComponentBase
     //====================================================================
-    //--------------------------------------------------------------------
+
     void ComponentBase::impl_checkDisposed_throw() const
     {
         if ( m_rBHelper.bDisposed )
             throw DisposedException( OUString(), getComponent() );
     }
 
-    //--------------------------------------------------------------------
+
     void ComponentBase::impl_checkInitialized_throw() const
     {
         if ( !m_bInitialized )
             throw NotInitializedException( OUString(), getComponent() );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > ComponentBase::getComponent() const
     {
         return NULL;
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index a35a6779cb9d..4b1c44fcd045 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -54,12 +54,12 @@ namespace comphelper
         ~OModuleImpl();
     };
 
-    //-------------------------------------------------------------------------
+
     OModuleImpl::OModuleImpl()
     {
     }
 
-    //-------------------------------------------------------------------------
+
     OModuleImpl::~OModuleImpl()
     {
     }
@@ -67,7 +67,7 @@ namespace comphelper
     //=========================================================================
     //= OModule
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OModule::OModule()
         : m_nClients(0)
         , m_pImpl(new OModuleImpl)
@@ -79,7 +79,7 @@ namespace comphelper
         delete m_pImpl;
     }
 
-    //-------------------------------------------------------------------------
+
     void OModule::registerClient( OModule::ClientAccess )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -87,7 +87,7 @@ namespace comphelper
             onFirstClient();
     }
 
-    //-------------------------------------------------------------------------
+
     void OModule::revokeClient( OModule::ClientAccess )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -95,17 +95,17 @@ namespace comphelper
             onLastClient();
     }
 
-    //--------------------------------------------------------------------------
+
     void OModule::onFirstClient()
     {
     }
 
-    //--------------------------------------------------------------------------
+
     void OModule::onLastClient()
     {
     }
 
-    //--------------------------------------------------------------------------
+
     void OModule::registerImplementation( const ComponentDescription& _rComp )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -115,7 +115,7 @@ namespace comphelper
         m_pImpl->m_aRegisteredComponents.push_back( _rComp );
     }
 
-    //--------------------------------------------------------------------------
+
     void OModule::registerImplementation( const OUString& _rImplementationName, const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames,
         ::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation _pFactoryFunction )
     {
@@ -123,7 +123,7 @@ namespace comphelper
         registerImplementation( aComponent );
     }
 
-    //--------------------------------------------------------------------------
+
     void* OModule::getComponentFactory( const sal_Char* _pImplementationName )
     {
         Reference< XInterface > xFactory( getComponentFactory(
@@ -131,7 +131,7 @@ namespace comphelper
         return xFactory.get();
     }
 
-    //--------------------------------------------------------------------------
+
     Reference< XInterface > OModule::getComponentFactory( const OUString& _rImplementationName )
     {
         Reference< XInterface > xReturn;
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index 4cb1cb1c812f..837fd5de3e86 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -28,7 +28,7 @@
 
 namespace comphelper{
 
-//-----------------------------------------------
+
 css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                                                             const OUString&                                    sPackage,
                                                                                   sal_Int32                                           eMode   )
@@ -74,7 +74,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
     return xCFG;
 }
 
-//-----------------------------------------------
+
 css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG    ,
                                                    const OUString&                            sRelPath,
                                                    const OUString&                            sKey    )
@@ -97,7 +97,7 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs
     return xProps->getPropertyValue(sKey);
 }
 
-//-----------------------------------------------
+
 void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG    ,
                                            const OUString&                            sRelPath,
                                            const OUString&                            sKey    ,
@@ -121,7 +121,7 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::
     xProps->setPropertyValue(sKey, aValue);
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNodeExists(const css::uno::Reference< css::uno::XInterface > xCFG         ,
                                                                                        const OUString&                            sRelPathToSet,
                                                                                        const OUString&                            sSetNode     )
@@ -155,7 +155,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNode
     return xNode;
 }
 
-//-----------------------------------------------
+
 css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css::uno::XComponentContext >&    rxContext,
                                                  const OUString&                                       sPackage,
                                                  const OUString&                                       sRelPath,
@@ -166,7 +166,7 @@ css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css:
     return ConfigurationHelper::readRelativeKey(xCFG, sRelPath, sKey);
 }
 
-//-----------------------------------------------
+
 void ConfigurationHelper::writeDirectKey(const css::uno::Reference< css::uno::XComponentContext >&    rxContext,
                                          const OUString&                                       sPackage,
                                          const OUString&                                       sRelPath,
@@ -179,7 +179,7 @@ void ConfigurationHelper::writeDirectKey(const css::uno::Reference< css::uno::XC
     ConfigurationHelper::flush(xCFG);
 }
 
-//-----------------------------------------------
+
 void ConfigurationHelper::flush(const css::uno::Reference< css::uno::XInterface >& xCFG)
 {
     css::uno::Reference< css::util::XChangesBatch > xBatch(xCFG, css::uno::UNO_QUERY_THROW);
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index a436575fda7a..617455ee6cbf 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -71,7 +71,7 @@ namespace comphelper {
     //====================================================================
     //= DocumentInfo
     //====================================================================
-    //--------------------------------------------------------------------
+
     OUString DocumentInfo::getDocumentTitle( const Reference< XModel >& _rxDocument )
     {
         OUString sTitle;
diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index 5c588bbd1540..f9a97f064504 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
 namespace comphelper
 {
 
-// ----------------------------------------------------------
+
 OSimpleLogRing::OSimpleLogRing()
 : m_aMessages( SIMPLELOGRING_SIZE )
 , m_bInitialized( false )
@@ -40,12 +40,12 @@ OSimpleLogRing::OSimpleLogRing()
 {
 }
 
-// ----------------------------------------------------------
+
 OSimpleLogRing::~OSimpleLogRing()
 {
 }
 
-// ----------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static()
 {
     uno::Sequence< OUString > aResult( 1 );
@@ -53,32 +53,32 @@ uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_stat
     return aResult;
 }
 
-// ----------------------------------------------------------
+
 OUString SAL_CALL OSimpleLogRing::getImplementationName_static()
 {
     return OUString( "com.sun.star.comp.logging.SimpleLogRing" );
 }
 
-// ----------------------------------------------------------
+
 OUString SAL_CALL OSimpleLogRing::getSingletonName_static()
 {
     return OUString( "com.sun.star.logging.DocumentIOLogRing" );
 }
 
-// ----------------------------------------------------------
+
 OUString SAL_CALL OSimpleLogRing::getServiceName_static()
 {
     return OUString( "com.sun.star.logging.SimpleLogRing" );
 }
 
-// ----------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >& )
 {
     return static_cast< cppu::OWeakObject* >( new OSimpleLogRing );
 }
 
 // XSimpleLogRing
-// ----------------------------------------------------------
+
 void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -94,7 +94,7 @@ void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::
     m_bInitialized = true;
 }
 
-// ----------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -113,7 +113,7 @@ uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno:
 }
 
 // XInitialization
-// ----------------------------------------------------------
+
 void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx
index f16fc51d9b72..223d46893861 100644
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ b/comphelper/source/misc/ihwrapnofilter.cxx
@@ -29,7 +29,7 @@ namespace comphelper
 
     using namespace ::com::sun::star;
 
-    //----------------------------------------------------------------------------------------------------
+
     OIHWrapNoFilterDialog::OIHWrapNoFilterDialog( uno::Reference< task::XInteractionHandler > xInteraction )
         :m_xInter( xInteraction )
     {
@@ -39,7 +39,7 @@ namespace comphelper
     {
     }
 
-    //----------------------------------------------------------------------------------------------------
+
     uno::Sequence< OUString > SAL_CALL OIHWrapNoFilterDialog::impl_staticGetSupportedServiceNames()
     {
         uno::Sequence< OUString > aRet(1);
@@ -52,9 +52,9 @@ namespace comphelper
         return OUString("com.sun.star.comp.task.InteractionHandlerWrapper");
     }
 
-    //----------------------------------------------------------------------------------------------------
+
     // XInteractionHandler
-    //----------------------------------------------------------------------------------------------------
+
     void SAL_CALL OIHWrapNoFilterDialog::handle( const uno::Reference< task::XInteractionRequest >& xRequest)
             throw( com::sun::star::uno::RuntimeException )
     {
@@ -69,9 +69,9 @@ namespace comphelper
             m_xInter->handle( xRequest );
     }
 
-    //----------------------------------------------------------------------------------------------------
+
     // XInteractionHandler2
-    //----------------------------------------------------------------------------------------------------
+
     sal_Bool SAL_CALL OIHWrapNoFilterDialog::handleInteractionRequest( const uno::Reference< task::XInteractionRequest >& xRequest)
             throw( com::sun::star::uno::RuntimeException )
     {
@@ -89,9 +89,9 @@ namespace comphelper
         }
     }
 
-    //----------------------------------------------------------------------------------------------------
+
     // XInitialization
-    //----------------------------------------------------------------------------------------------------
+
     void SAL_CALL OIHWrapNoFilterDialog::initialize( const uno::Sequence< uno::Any >& )
         throw ( uno::Exception,
         uno::RuntimeException,
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index 8e648c2c1e0b..4563ac21f2f4 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
 // OInstanceLocker
 // ====================================================================
 
-// --------------------------------------------------------
+
 OInstanceLocker::OInstanceLocker( const uno::Reference< uno::XComponentContext >& xContext )
 : m_xContext( xContext )
 , m_pLockListener( NULL )
@@ -48,7 +48,7 @@ OInstanceLocker::OInstanceLocker( const uno::Reference< uno::XComponentContext >
 {
 }
 
-// --------------------------------------------------------
+
 OInstanceLocker::~OInstanceLocker()
 {
     if ( !m_bDisposed )
@@ -69,7 +69,7 @@ OInstanceLocker::~OInstanceLocker()
 }
 
 // XComponent
-// --------------------------------------------------------
+
 void SAL_CALL OInstanceLocker::dispose()
     throw (uno::RuntimeException)
 {
@@ -95,7 +95,7 @@ void SAL_CALL OInstanceLocker::dispose()
     m_bDisposed = true;
 }
 
-// --------------------------------------------------------
+
 void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw (uno::RuntimeException)
 {
@@ -109,7 +109,7 @@ void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEv
     m_pListenersContainer->addInterface( xListener );
 }
 
-// --------------------------------------------------------
+
 void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw (uno::RuntimeException)
 {
@@ -119,7 +119,7 @@ void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang::
 }
 
 // XInitialization
-// --------------------------------------------------------
+
 void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArguments )
     throw (uno::Exception, uno::RuntimeException)
 {
@@ -208,20 +208,20 @@ uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames()
 }
 
 // Static methods
-// --------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames_static()
 {
     const OUString aServiceName( "com.sun.star.embed.InstanceLocker" );
     return uno::Sequence< OUString >( &aServiceName, 1 );
 }
 
-// --------------------------------------------------------
+
 OUString SAL_CALL OInstanceLocker::getImplementationName_static()
 {
     return OUString( "com.sun.star.comp.embed.InstanceLocker" );
 }
 
-// --------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OInstanceLocker::Create(
                                 const uno::Reference< uno::XComponentContext >& rxContext )
 {
@@ -234,7 +234,7 @@ uno::Reference< uno::XInterface > SAL_CALL OInstanceLocker::Create(
 // OLockListener
 // ====================================================================
 
-// --------------------------------------------------------
+
 OLockListener::OLockListener( const uno::WeakReference< lang::XComponent >& xWrapper,
                     const uno::Reference< uno::XInterface >& xInstance,
                     sal_Int32 nMode,
@@ -248,12 +248,12 @@ OLockListener::OLockListener( const uno::WeakReference< lang::XComponent >& xWra
 {
 }
 
-// --------------------------------------------------------
+
 OLockListener::~OLockListener()
 {
 }
 
-// --------------------------------------------------------
+
 void OLockListener::Dispose()
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
@@ -293,7 +293,7 @@ void OLockListener::Dispose()
 }
 
 // XEventListener
-// --------------------------------------------------------
+
 void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent )
     throw (uno::RuntimeException)
 {
@@ -318,7 +318,7 @@ void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent )
 
 
 // XCloseListener
-// --------------------------------------------------------
+
 void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_Bool )
     throw (util::CloseVetoException, uno::RuntimeException)
 {
@@ -348,7 +348,7 @@ void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_
     }
 }
 
-// --------------------------------------------------------
+
 void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent )
     throw (uno::RuntimeException)
 {
@@ -379,7 +379,7 @@ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent )
 
 
 // XTerminateListener
-// --------------------------------------------------------
+
 void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent )
     throw (frame::TerminationVetoException, uno::RuntimeException)
 {
@@ -408,7 +408,7 @@ void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent )
     }
 }
 
-// --------------------------------------------------------
+
 void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent )
     throw (uno::RuntimeException)
 {
@@ -444,7 +444,7 @@ void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent
 
 
 // XInitialization
-// --------------------------------------------------------
+
 bool OLockListener::Init()
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx
index 916858317bab..30d7bdb33cd3 100644
--- a/comphelper/source/misc/interaction.cxx
+++ b/comphelper/source/misc/interaction.cxx
@@ -31,13 +31,13 @@ namespace comphelper
     //=========================================================================
     //= OInteractionPassword
     //=========================================================================
-    //--------------------------------------------------------------------
+
     void SAL_CALL OInteractionPassword::setPassword( const OUString& _Password ) throw (RuntimeException)
     {
         m_sPassword = _Password;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OInteractionPassword::getPassword(  ) throw (RuntimeException)
     {
         return m_sPassword;
@@ -46,13 +46,13 @@ namespace comphelper
     //=========================================================================
     //= OInteractionRequest
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OInteractionRequest::OInteractionRequest(const Any& _rRequestDescription)
         :m_aRequest(_rRequestDescription)
     {
     }
 
-    //-------------------------------------------------------------------------
+
     void OInteractionRequest::addContinuation(const Reference< XInteractionContinuation >& _rxContinuation)
     {
         OSL_ENSURE(_rxContinuation.is(), "OInteractionRequest::addContinuation: invalid argument!");
@@ -64,13 +64,13 @@ namespace comphelper
         }
     }
 
-    //-------------------------------------------------------------------------
+
     Any SAL_CALL OInteractionRequest::getRequest(  ) throw(RuntimeException)
     {
         return m_aRequest;
     }
 
-    //-------------------------------------------------------------------------
+
     Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations(  ) throw(RuntimeException)
     {
         return m_aContinuations;
diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx
index 8947b6003b6f..6368e5a7dc16 100644
--- a/comphelper/source/misc/listenernotification.cxx
+++ b/comphelper/source/misc/listenernotification.cxx
@@ -32,7 +32,7 @@ namespace comphelper
     //====================================================================
     //= OListenerContainer
     //====================================================================
-    //--------------------------------------------------------------------
+
     OListenerContainer::OListenerContainer( ::osl::Mutex& _rMutex )
         :m_aListeners( _rMutex )
     {
@@ -40,7 +40,7 @@ namespace comphelper
 
     OListenerContainer::~OListenerContainer() {}
 
-    //--------------------------------------------------------------------
+
     void OListenerContainer::impl_addListener( const Reference< XEventListener >& _rxListener )
     {
         OSL_PRECOND( _rxListener.is(), "OListenerContainer::impl_addListener: a NULL listener?!" );
@@ -48,7 +48,7 @@ namespace comphelper
             m_aListeners.addInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void OListenerContainer::impl_removeListener( const Reference< XEventListener >& _rxListener )
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -63,19 +63,19 @@ namespace comphelper
         m_aListeners.removeInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void OListenerContainer::disposing( const EventObject& _rEventSource )
     {
         m_aListeners.disposeAndClear( _rEventSource );
     }
 
-    //--------------------------------------------------------------------
+
     void OListenerContainer::clear()
     {
         m_aListeners.clear();
     }
 
-    //--------------------------------------------------------------------
+
     bool OListenerContainer::impl_notify( const EventObject& _rEvent ) SAL_THROW(( Exception ))
     {
         ::cppu::OInterfaceIteratorHelper aIter( m_aListeners );
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 98f38d878a9b..a4c1ceb46f32 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -76,7 +76,7 @@ namespace comphelper
     //====================================================================
     //= EventLogger_Impl - implementation
     //====================================================================
-    //--------------------------------------------------------------------
+
     void EventLogger_Impl::impl_createLogger_nothrow()
     {
         try
@@ -97,18 +97,18 @@ namespace comphelper
     //====================================================================
     //= EventLogger
     //====================================================================
-    //--------------------------------------------------------------------
+
     EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName )
         :m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     EventLogger::~EventLogger()
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool EventLogger::isLoggable( const sal_Int32 _nLogLevel ) const
     {
         if ( !m_pImpl->isValid() )
@@ -127,7 +127,7 @@ namespace comphelper
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         void    lcl_replaceParameter( OUString& _inout_Message, const OUString& _rPlaceHolder, const OUString& _rReplacement )
@@ -141,7 +141,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool EventLogger::impl_log( const sal_Int32 _nLogLevel,
         const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage,
         const OptionalString& _rArgument1, const OptionalString& _rArgument2,
@@ -222,7 +222,7 @@ namespace comphelper
         }
     };
 
-    //--------------------------------------------------------------------
+
     bool    lcl_loadBundle_nothrow( Reference< XComponentContext > const & _rContext, ResourceBasedEventLogger_Data& _rLoggerData )
     {
         if ( _rLoggerData.bBundleLoaded )
@@ -247,7 +247,7 @@ namespace comphelper
         return _rLoggerData.xBundle.is();
     }
 
-    //--------------------------------------------------------------------
+
     OUString lcl_loadString_nothrow( const Reference< XResourceBundle >& _rxBundle, const sal_Int32 _nMessageResID )
     {
         OSL_PRECOND( _rxBundle.is(), "lcl_loadString_nothrow: this will crash!" );
@@ -270,7 +270,7 @@ namespace comphelper
     //====================================================================
     //= ResourceBasedEventLogger
     //====================================================================
-    //--------------------------------------------------------------------
+
     ResourceBasedEventLogger::ResourceBasedEventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pResourceBundleBaseName,
         const sal_Char* _pAsciiLoggerName )
         :EventLogger( _rxContext, _pAsciiLoggerName )
@@ -279,7 +279,7 @@ namespace comphelper
         m_pData->sBundleBaseName = OUString::createFromAscii( _pResourceBundleBaseName );
     }
 
-    //--------------------------------------------------------------------
+
     OUString ResourceBasedEventLogger::impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const
     {
         OUString sMessage;
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index b734a8e2758c..6f25f001c1a9 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -33,7 +33,7 @@
 using namespace ::com::sun::star;
 using namespace comphelper;
 
-//-----------------------------------------------------------------------
+
 MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XComponentContext >& rxContext )
 : m_xContext( rxContext )
 {
@@ -41,7 +41,7 @@ MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XCo
         throw uno::RuntimeException();
 }
 
-//-----------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Sequence< sal_Int8 >& aClassID )
 {
     OUString aResult;
@@ -63,7 +63,7 @@ OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Seq
     return aResult;
 }
 
-//-----------------------------------------------------------------------
+
 sal_uInt8 GetDigit_Impl( sal_Char aChar )
 {
     if ( aChar >= '0' && aChar <= '9' )
@@ -76,7 +76,7 @@ sal_uInt8 GetDigit_Impl( sal_Char aChar )
         return 16;
 }
 
-//-----------------------------------------------------------------------
+
 uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentation( const OUString& aClassID )
 {
     sal_Int32 nLength = aClassID.getLength();
@@ -112,7 +112,7 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentat
     return uno::Sequence< sal_Int8 >();
 }
 
-//-----------------------------------------------------------------------
+
 uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurationByPath( const OUString& aPath )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -142,7 +142,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurati
     return xConfig;
 }
 
-//-----------------------------------------------------------------------
+
 uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetObjConfiguration()
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -154,7 +154,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetObjConfigur
     return m_xObjectConfig;
 }
 
-//-----------------------------------------------------------------------
+
 uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetVerbsConfiguration()
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -166,7 +166,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetVerbsConfig
     return m_xVerbsConfig;
 }
 
-//-----------------------------------------------------------------------
+
 uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeConfiguration()
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -178,7 +178,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
     return m_xMediaTypeConfig;
 }
 
-//-----------------------------------------------------------------------
+
 uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFactory()
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -191,7 +191,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto
     return m_xFilterFactory;
 }
 
-//-------------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const OUString& aFilterName )
 {
     OUString aDocServiceName;
@@ -217,7 +217,7 @@ OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const OUString& a
     return aDocServiceName;
 }
 
-//-------------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const OUString& aMediaType )
 {
     uno::Reference< container::XContainerQuery > xTypeCFG(
@@ -260,7 +260,7 @@ OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const OUString
     return OUString();
 }
 
-//-------------------------------------------------------------------------
+
 bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortcut,
                                                 embed::VerbDescriptor& aDescriptor )
 {
@@ -290,7 +290,7 @@ bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortcut,
     return bResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfigEntry(
                                             const uno::Sequence< sal_Int8 >& aClassID,
                                             const uno::Reference< container::XNameAccess >& xObjectProps )
@@ -339,7 +339,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi
     return aResult;
 }
 
-//-----------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetExplicitlyRegisteredObjClassID( const OUString& aMediaType )
 {
     OUString aStringClassID;
@@ -358,7 +358,7 @@ OUString MimeConfigurationHelper::GetExplicitlyRegisteredObjClassID( const OUStr
 
 }
 
-//-----------------------------------------------------------------------
+
 uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByStringClassID(
                                                                 const OUString& aStringClassID )
 {
@@ -393,7 +393,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByStri
     return aObjProps;
 }
 
-//-----------------------------------------------------------------------
+
 uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClassID(
                                                                 const uno::Sequence< sal_Int8 >& aClassID )
 {
@@ -425,7 +425,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClas
     return aObjProps;
 }
 
-//-----------------------------------------------------------------------
+
 uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMediaType( const OUString& aMediaType )
 {
     uno::Sequence< beans::NamedValue > aObject =
@@ -440,7 +440,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMedi
     return uno::Sequence< beans::NamedValue >();
 }
 
-//-----------------------------------------------------------------------
+
 uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByFilter( const OUString& aFilterName )
 {
     OUString aDocumentName = GetDocServiceNameFromFilter( aFilterName );
@@ -450,7 +450,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByFilt
     return uno::Sequence< beans::NamedValue >();
 }
 
-//-----------------------------------------------------------------------
+
 uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocumentName( const OUString& aDocName )
 {
     if ( !aDocName.isEmpty() )
@@ -483,13 +483,13 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
     return uno::Sequence< beans::NamedValue >();
 }
 
-//-----------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetFactoryNameByClassID( const uno::Sequence< sal_Int8 >& aClassID )
 {
     return GetFactoryNameByStringClassID( GetStringClassIDRepresentation( aClassID ) );
 }
 
-//-----------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const OUString& aStringClassID )
 {
     OUString aResult;
@@ -514,7 +514,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const OUString&
     return aResult;
 }
 
-//-----------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString& aDocName )
 {
     OUString aResult;
@@ -551,7 +551,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString&
 }
 
 
-//-----------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const OUString& aMediaType )
 {
     OUString aResult = GetFactoryNameByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) );
@@ -566,7 +566,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const OUString& aMe
     return aResult;
 }
 
-//-----------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
                                         uno::Sequence< beans::PropertyValue >& aMediaDescr,
                                         bool bIgnoreType )
@@ -711,7 +711,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 }
 #endif
 
-//-----------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUString& aServiceName, sal_Int32 nVersion )
 {
     OUString aResult;
@@ -762,7 +762,7 @@ OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUStrin
     return aResult;
 }
 
-//-------------------------------------------------------------------------
+
 OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const OUString& aImportFilterName )
 {
     OUString aExportFilterName;
@@ -828,7 +828,7 @@ OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const OUStrin
     return aExportFilterName;
 }
 
-//-------------------------------------------------------------------------
+
 // static
 uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter(
                                                         const uno::Reference< container::XContainerQuery >& xFilterQuery,
@@ -870,7 +870,7 @@ uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter(
 }
 
 
-//-------------------------------------------------------------------------
+
 bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >& aClassID1, const uno::Sequence< sal_Int8 >& aClassID2 )
 {
     if ( aClassID1.getLength() != aClassID2.getLength() )
@@ -883,7 +883,7 @@ bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >& aC
     return true;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
                                                 sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
                                                 sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 )
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index bf47f9a53b9a..2554e566dc3b 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -59,60 +59,60 @@ namespace comphelper
     //====================================================================
     //= NamedValueCollection
     //====================================================================
-    //--------------------------------------------------------------------
+
     NamedValueCollection::NamedValueCollection()
         :m_pImpl( new NamedValueCollection_Impl )
     {
     }
 
-    //--------------------------------------------------------------------
+
     NamedValueCollection::NamedValueCollection( const NamedValueCollection& _rCopySource )
         :m_pImpl( new NamedValueCollection_Impl )
     {
         *this = _rCopySource;
     }
 
-    //--------------------------------------------------------------------
+
     NamedValueCollection& NamedValueCollection::operator=( const NamedValueCollection& i_rCopySource )
     {
         m_pImpl->aValues = i_rCopySource.m_pImpl->aValues;
         return *this;
     }
 
-    //--------------------------------------------------------------------
+
     NamedValueCollection::NamedValueCollection( const Any& _rElements )
         :m_pImpl( new NamedValueCollection_Impl )
     {
         impl_assign( _rElements );
     }
 
-    //--------------------------------------------------------------------
+
     NamedValueCollection::NamedValueCollection( const Sequence< Any >& _rArguments )
         :m_pImpl( new NamedValueCollection_Impl )
     {
         impl_assign( _rArguments );
     }
 
-    //--------------------------------------------------------------------
+
     NamedValueCollection::NamedValueCollection( const Sequence< PropertyValue >& _rArguments )
         :m_pImpl( new NamedValueCollection_Impl )
     {
         impl_assign( _rArguments );
     }
 
-    //--------------------------------------------------------------------
+
     NamedValueCollection::NamedValueCollection( const Sequence< NamedValue >& _rArguments )
         :m_pImpl( new NamedValueCollection_Impl )
     {
         impl_assign( _rArguments );
     }
 
-    //--------------------------------------------------------------------
+
     NamedValueCollection::~NamedValueCollection()
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool NamedValueCollection::canExtractFrom( ::com::sun::star::uno::Any const & i_value )
     {
         Type const & aValueType = i_value.getValueType();
@@ -125,7 +125,7 @@ namespace comphelper
         return false;
     }
 
-   //--------------------------------------------------------------------
+
     NamedValueCollection& NamedValueCollection::merge( const NamedValueCollection& _rAdditionalValues, bool _bOverwriteExisting )
     {
         for (   NamedValueRepository::const_iterator namedValue = _rAdditionalValues.m_pImpl->aValues.begin();
@@ -140,19 +140,19 @@ namespace comphelper
         return *this;
     }
 
-    //--------------------------------------------------------------------
+
     size_t NamedValueCollection::size() const
     {
         return m_pImpl->aValues.size();
     }
 
-    //--------------------------------------------------------------------
+
     bool NamedValueCollection::empty() const
     {
         return m_pImpl->aValues.empty();
     }
 
-    //--------------------------------------------------------------------
+
     ::std::vector< OUString > NamedValueCollection::getNames() const
     {
         ::std::vector< OUString > aNames;
@@ -163,7 +163,7 @@ namespace comphelper
         return aNames;
     }
 
-    //--------------------------------------------------------------------
+
     void NamedValueCollection::impl_assign( const Any& i_rWrappedElements )
     {
         Sequence< NamedValue > aNamedValues;
@@ -183,7 +183,7 @@ namespace comphelper
             SAL_WARN_IF( i_rWrappedElements.hasValue(), "comphelper", "NamedValueCollection::impl_assign(Any): unsupported type!" );
     }
 
-    //--------------------------------------------------------------------
+
     void NamedValueCollection::impl_assign( const Sequence< Any >& _rArguments )
     {
         {
@@ -213,7 +213,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void NamedValueCollection::impl_assign( const Sequence< PropertyValue >& _rArguments )
     {
         {
@@ -227,7 +227,7 @@ namespace comphelper
             m_pImpl->aValues[ pArgument->Name ] = pArgument->Value;
     }
 
-    //--------------------------------------------------------------------
+
     void NamedValueCollection::impl_assign( const Sequence< NamedValue >& _rArguments )
     {
         {
@@ -241,7 +241,7 @@ namespace comphelper
             m_pImpl->aValues[ pArgument->Name ] = pArgument->Value;
     }
 
-    //--------------------------------------------------------------------
+
     bool NamedValueCollection::get_ensureType( const OUString& _rValueName, void* _pValueLocation, const Type& _rExpectedValueType ) const
     {
         NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName );
@@ -277,7 +277,7 @@ namespace comphelper
         class theEmptyDefault : public rtl::Static<Any, theEmptyDefault> {};
     }
 
-    //--------------------------------------------------------------------
+
     const Any& NamedValueCollection::impl_get( const OUString& _rValueName ) const
     {
         NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName );
@@ -287,14 +287,14 @@ namespace comphelper
         return theEmptyDefault::get();
     }
 
-    //--------------------------------------------------------------------
+
     bool NamedValueCollection::impl_has( const OUString& _rValueName ) const
     {
         NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName );
         return ( pos != m_pImpl->aValues.end() );
     }
 
-    //--------------------------------------------------------------------
+
     bool NamedValueCollection::impl_put( const OUString& _rValueName, const Any& _rValue )
     {
         bool bHas = impl_has( _rValueName );
@@ -302,7 +302,7 @@ namespace comphelper
         return bHas;
     }
 
-    //--------------------------------------------------------------------
+
     bool NamedValueCollection::impl_remove( const OUString& _rValueName )
     {
         NamedValueRepository::iterator pos = m_pImpl->aValues.find( _rValueName );
@@ -312,7 +312,7 @@ namespace comphelper
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         struct Value2PropertyValue : public ::std::unary_function< NamedValueRepository::value_type, PropertyValue >
@@ -333,7 +333,7 @@ namespace comphelper
         };
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 NamedValueCollection::operator >>= ( Sequence< PropertyValue >& _out_rValues ) const
     {
         _out_rValues.realloc( m_pImpl->aValues.size() );
@@ -341,7 +341,7 @@ namespace comphelper
         return _out_rValues.getLength();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 NamedValueCollection::operator >>= ( Sequence< NamedValue >& _out_rValues ) const
     {
         _out_rValues.realloc( m_pImpl->aValues.size() );
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index 50255eebb523..5044539c3cdd 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -27,7 +27,7 @@ namespace comphelper{
 
 static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed.";
 
-//-----------------------------------------------
+
 NumberedCollection::NumberedCollection()
     : ::cppu::BaseMutex ()
     , m_sUntitledPrefix ()
@@ -36,12 +36,12 @@ NumberedCollection::NumberedCollection()
 {
 }
 
-//-----------------------------------------------
+
 NumberedCollection::~NumberedCollection()
 {
 }
 
-//-----------------------------------------------
+
 void NumberedCollection::setOwner(const css::uno::Reference< css::uno::XInterface >& xOwner)
 {
     // SYNCHRONIZED ->
@@ -52,7 +52,7 @@ void NumberedCollection::setOwner(const css::uno::Reference< css::uno::XInterfac
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 void NumberedCollection::setUntitledPrefix(const OUString& sPrefix)
 {
     // SYNCHRONIZED ->
@@ -63,7 +63,7 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix)
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 ::sal_Int32 SAL_CALL NumberedCollection::leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent)
     throw (css::lang::IllegalArgumentException,
            css::uno::RuntimeException         )
@@ -100,7 +100,7 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix)
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
     throw (css::lang::IllegalArgumentException,
            css::uno::RuntimeException         )
@@ -139,7 +139,7 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent)
     throw (css::lang::IllegalArgumentException,
            css::uno::RuntimeException         )
@@ -163,7 +163,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 OUString SAL_CALL NumberedCollection::getUntitledPrefix()
     throw (css::uno::RuntimeException)
 {
@@ -175,7 +175,7 @@ OUString SAL_CALL NumberedCollection::getUntitledPrefix()
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 /** create an ordered list of all possible numbers ...
     e.g. {1,2,3,...,N} Max size of these list will be
     current size of component list + 1 .
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 569d492d1049..9920e4a7519a 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -32,7 +32,7 @@ namespace comphelper
 namespace starbeans = ::com::sun::star::beans;
 namespace starlang  = ::com::sun::star::lang;
 
-//------------------------------------------------------------------------------
+
 sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey)
 {
     sal_Int16 nReturn(starutil::NumberFormat::UNDEFINED);
@@ -52,7 +52,7 @@ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormatter>& xFormatter, sal_Int32 nKey)
 {
     OSL_ENSURE(xFormatter.is(), "getNumberFormatType : the formatter isn't valid !");
@@ -62,7 +62,7 @@ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormatte
     return getNumberFormatType(xFormats, nKey);
 }
 
-//------------------------------------------------------------------------------
+
 staruno::Any getNumberFormatDecimals(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey)
 {
     if (xFormats.is())
@@ -85,7 +85,7 @@ staruno::Any getNumberFormatDecimals(const staruno::Reference<starutil::XNumberF
 }
 
 
-//------------------------------------------------------------------------------
+
 sal_Int32 getStandardFormat(
         const staruno::Reference<starutil::XNumberFormatter>& xFormatter,
         sal_Int16 nType,
@@ -99,12 +99,12 @@ sal_Int32 getStandardFormat(
     return xTypes.is() ? xTypes->getStandardFormat(nType, _rLocale) : 0;
 }
 
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
 
-//------------------------------------------------------------------------------
+
 Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, const OUString& _rPropertyName )
 {
     Any aReturn;
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index 01b4e98ccf69..218a61ba3608 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.cxx
@@ -98,7 +98,7 @@ namespace comphelper
                 impl_getStringResourceKey( sal_Int32 _resourceId );
     };
 
-    //--------------------------------------------------------------------
+
     OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId )
     {
         OUStringBuffer key;
@@ -107,7 +107,7 @@ namespace comphelper
         return key.makeStringAndClear();
     }
 
-    //--------------------------------------------------------------------
+
     OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -128,7 +128,7 @@ namespace comphelper
         return sString;
     }
 
-    //--------------------------------------------------------------------
+
     bool ResourceBundle_Impl::hasString( sal_Int32 _resourceId ) const
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -149,7 +149,7 @@ namespace comphelper
         return has;
     }
 
-    //--------------------------------------------------------------------
+
     bool ResourceBundle_Impl::impl_loadBundle_nothrow()
     {
         if ( m_bAttemptedCreate )
@@ -187,7 +187,7 @@ namespace comphelper
     //====================================================================
     //= OfficeResourceBundle
     //====================================================================
-    //--------------------------------------------------------------------
+
     OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName )
         :m_pImpl( new ResourceBundle_Impl( _context, OUString::createFromAscii( _bundleBaseAsciiName ) ) )
     {
@@ -195,18 +195,18 @@ namespace comphelper
             throw NullPointerException();
     }
 
-    //--------------------------------------------------------------------
+
     OfficeResourceBundle::~OfficeResourceBundle()
     {
     }
 
-    //--------------------------------------------------------------------
+
     OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const
     {
         return m_pImpl->loadString( _resourceId );
     }
 
-    //--------------------------------------------------------------------
+
     bool OfficeResourceBundle::hasString( sal_Int32 _resourceId ) const
     {
         return m_pImpl->hasString( _resourceId );
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index aec471e511ee..7a02e234f81d 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
 namespace comphelper
 {
 
-// ----------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames_static()
 {
     uno::Sequence< OUString > aResult( 1 );
@@ -40,32 +40,32 @@ uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNam
     return aResult;
 }
 
-// ----------------------------------------------------------
+
 OUString SAL_CALL OOfficeRestartManager::getImplementationName_static()
 {
     return OUString( "com.sun.star.comp.task.OfficeRestartManager" );
 }
 
-// ----------------------------------------------------------
+
 OUString SAL_CALL OOfficeRestartManager::getSingletonName_static()
 {
     return OUString( "com.sun.star.task.OfficeRestartManager" );
 }
 
-// ----------------------------------------------------------
+
 OUString SAL_CALL OOfficeRestartManager::getServiceName_static()
 {
     return OUString( "com.sun.star.comp.task.OfficeRestartManager" );
 }
 
-// ----------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OOfficeRestartManager::Create( const uno::Reference< uno::XComponentContext >& rxContext )
 {
     return static_cast< cppu::OWeakObject* >( new OOfficeRestartManager( rxContext ) );
 }
 
 // XRestartManager
-// ----------------------------------------------------------
+
 void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task::XInteractionHandler >& /* xInteractionHandler */ )
     throw (uno::Exception, uno::RuntimeException)
 {
@@ -107,7 +107,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
     }
 }
 
-// ----------------------------------------------------------
+
 ::sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( ::sal_Bool bOfficeInitialized )
     throw (uno::Exception, uno::RuntimeException)
 {
@@ -120,7 +120,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
 }
 
 // XCallback
-// ----------------------------------------------------------
+
 void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
     throw ( uno::RuntimeException )
 {
@@ -163,7 +163,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
 }
 
 // XServiceInfo
-// ----------------------------------------------------------
+
 OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException)
 {
     return getImplementationName_static();
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index 86d0082fbb2f..3764ef1a38e2 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -36,13 +36,13 @@ namespace comphelper
     //=========================================================================
     //= OProxyAggregation
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OProxyAggregation::OProxyAggregation( const Reference< XComponentContext >& _rxContext )
         :m_xContext( _rxContext )
     {
     }
 
-    //-------------------------------------------------------------------------
+
     void OProxyAggregation::baseAggregateProxyFor( const Reference< XInterface >& _rxComponent, oslInterlockedCount& _rRefCount,
             ::cppu::OWeakObject& _rDelegator )
     {
@@ -68,13 +68,13 @@ namespace comphelper
         osl_atomic_decrement( &_rRefCount );
     }
 
-    //-------------------------------------------------------------------------
+
     Any SAL_CALL OProxyAggregation::queryAggregation( const Type& _rType ) throw (RuntimeException)
     {
         return m_xProxyAggregate.is() ? m_xProxyAggregate->queryAggregation( _rType ) : Any();
     }
 
-    //-------------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL OProxyAggregation::getTypes(  ) throw (RuntimeException)
     {
         Sequence< Type > aTypes;
@@ -86,7 +86,7 @@ namespace comphelper
         return aTypes;
     }
 
-    //-------------------------------------------------------------------------
+
     OProxyAggregation::~OProxyAggregation()
     {
         if ( m_xProxyAggregate.is() )
@@ -100,7 +100,7 @@ namespace comphelper
     //=========================================================================
     //= OComponentProxyAggregationHelper
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OComponentProxyAggregationHelper::OComponentProxyAggregationHelper( const Reference< XComponentContext >& _rxContext,
         ::cppu::OBroadcastHelper& _rBHelper )
         :OProxyAggregation( _rxContext )
@@ -109,7 +109,7 @@ namespace comphelper
         OSL_ENSURE( _rxContext.is(), "OComponentProxyAggregationHelper::OComponentProxyAggregationHelper: invalid arguments!" );
     }
 
-    //-------------------------------------------------------------------------
+
     void OComponentProxyAggregationHelper::componentAggregateProxyFor(
         const Reference< XComponent >& _rxComponent, oslInterlockedCount& _rRefCount,
         ::cppu::OWeakObject& _rDelegator )
@@ -129,7 +129,7 @@ namespace comphelper
         osl_atomic_decrement( &_rRefCount );
     }
 
-    //-------------------------------------------------------------------------
+
     Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType ) throw (RuntimeException)
     {
         Any aReturn( BASE::queryInterface( _rType ) );
@@ -138,10 +138,10 @@ namespace comphelper
         return aReturn;
     }
 
-    //-------------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OComponentProxyAggregationHelper, BASE, OProxyAggregation )
 
-    //-------------------------------------------------------------------------
+
     OComponentProxyAggregationHelper::~OComponentProxyAggregationHelper( )
     {
         OSL_ENSURE( m_rBHelper.bDisposed, "OComponentProxyAggregationHelper::~OComponentProxyAggregationHelper: you should dispose your derived class in the dtor, if necessary!" );
@@ -156,7 +156,7 @@ namespace comphelper
         m_xInner.clear();
     }
 
-    //-------------------------------------------------------------------------
+
     void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         if ( _rSource.Source == m_xInner )
@@ -168,7 +168,7 @@ namespace comphelper
         }
     }
 
-    //-------------------------------------------------------------------------
+
     void SAL_CALL OComponentProxyAggregationHelper::dispose() throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( m_rBHelper.rMutex );
@@ -188,7 +188,7 @@ namespace comphelper
     //=========================================================================
     //= OComponentProxyAggregation
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OComponentProxyAggregation::OComponentProxyAggregation( const Reference< XComponentContext >& _rxContext,
             const Reference< XComponent >& _rxComponent )
         :WeakComponentImplHelperBase( m_aMutex )
@@ -199,19 +199,19 @@ namespace comphelper
             componentAggregateProxyFor( _rxComponent, m_refCount, *this );
     }
 
-    //-------------------------------------------------------------------------
+
     OComponentProxyAggregation::~OComponentProxyAggregation()
     {
         implEnsureDisposeInDtor( );
     }
 
-    //-------------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OComponentProxyAggregation, WeakComponentImplHelperBase, OComponentProxyAggregationHelper )
 
-    //-------------------------------------------------------------------------
+
     IMPLEMENT_GET_IMPLEMENTATION_ID( OComponentProxyAggregation )
 
-    //-------------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes(  ) throw (RuntimeException)
     {
         Sequence< Type > aTypes( OComponentProxyAggregationHelper::getTypes() );
@@ -224,7 +224,7 @@ namespace comphelper
         return aTypes;
     }
 
-    //-------------------------------------------------------------------------
+
     void OComponentProxyAggregation::implEnsureDisposeInDtor( )
     {
         if ( !rBHelper.bDisposed )
@@ -234,7 +234,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         // Simply disambiguate---this is necessary for MSVC to distinguish
@@ -245,14 +245,14 @@ namespace comphelper
         OComponentProxyAggregationHelper::disposing( _rSource );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OComponentProxyAggregation::disposing()  throw (RuntimeException)
     {
         // call the dispose-functionality of the base, which will dispose our aggregated component
         OComponentProxyAggregationHelper::dispose();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OComponentProxyAggregation::dispose() throw( RuntimeException )
     {
         // simply disambiguate
diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx
index ea0cfe117f0d..440993abd075 100644
--- a/comphelper/source/misc/sequence.cxx
+++ b/comphelper/source/misc/sequence.cxx
@@ -19,20 +19,15 @@
 
 #include <comphelper/sequence.hxx>
 
-//.........................................................................
 namespace comphelper
 {
-//.........................................................................
-
-//------------------------------------------------------------------------------
 staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, bool _bOnlyFirst)
 {
     sal_Int32 nLength = _rList.getLength();
 
     if( _bOnlyFirst )
     {
-        //////////////////////////////////////////////////////////////////////
-        // An welcher Position finde ich den Wert?
+        // at which position do I find the value?
         sal_Int32 nPos = -1;
         const OUString* pTArray = _rList.getConstArray();
         for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
@@ -44,8 +39,7 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rLi
             }
         }
 
-        //////////////////////////////////////////////////////////////////////
-        // Sequence fuellen
+        // fill sequence
         if( nPos>-1 )
         {
             staruno::Sequence<sal_Int16> aRetSeq( 1 );
@@ -62,8 +56,7 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rLi
         staruno::Sequence<sal_Int16> aRetSeq( nLength );
         sal_Int16* pReturn = aRetSeq.getArray();
 
-        //////////////////////////////////////////////////////////////////////
-        // Wie oft kommt der Wert vor?
+        // how often does the value occur?
         const OUString* pTArray = _rList.getConstArray();
         for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
         {
@@ -80,6 +73,5 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rLi
     }
 }
 }   // namespace comphelper
-//.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index e3df3a9e9f78..1023dbea1490 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -32,7 +32,7 @@ SequenceAsHashMap::SequenceAsHashMap(const css::uno::Any& aSource)
     (*this) << aSource;
 }
 
-//-----------------------------------------------
+
 SequenceAsHashMap::SequenceAsHashMap(const css::uno::Sequence< css::uno::Any >& lSource)
 {
     (*this) << lSource;
@@ -80,7 +80,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Any& aSource)
             css::uno::Reference< css::uno::XInterface >());
 }
 
-//-----------------------------------------------
+
 void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lSource)
 {
     sal_Int32 c = lSource.getLength();
diff --git a/comphelper/source/misc/sharedmutex.cxx b/comphelper/source/misc/sharedmutex.cxx
index 094113a53fa4..49a051e229ad 100644
--- a/comphelper/source/misc/sharedmutex.cxx
+++ b/comphelper/source/misc/sharedmutex.cxx
@@ -28,20 +28,20 @@ namespace comphelper
     //========================================================================
     //= SharedMutex
     //========================================================================
-    //------------------------------------------------------------------------
+
     SharedMutex::SharedMutex()
         :m_pMutexImpl( new ::osl::Mutex )
     {
     }
 
-    //------------------------------------------------------------------------
+
     SharedMutex::SharedMutex( const SharedMutex& _rhs )
         :m_pMutexImpl()
     {
         *this = _rhs;
     }
 
-    //------------------------------------------------------------------------
+
     SharedMutex& SharedMutex::operator=( const SharedMutex& _rhs )
     {
         m_pMutexImpl = _rhs.m_pMutexImpl;
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 2a362ebd040c..0057cd93dbd5 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
 
 namespace comphelper {
 
-// ----------------------------------------------------------------------
+
 uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory(
                             const uno::Reference< uno::XComponentContext >& rxContext )
         throw ( uno::Exception )
@@ -60,7 +60,7 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory(
     return embed::StorageFactory::create( xContext );
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStorageFactory(
                             const uno::Reference< uno::XComponentContext >& rxContext )
         throw ( uno::Exception )
@@ -70,7 +70,7 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStora
     return embed::FileSystemStorageFactory::create(rxContext);
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > OStorageHelper::GetTemporaryStorage(
             const uno::Reference< uno::XComponentContext >& rxContext )
     throw ( uno::Exception )
@@ -83,7 +83,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetTemporaryStorage(
     return xTempStorage;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL(
             const OUString& aURL,
             sal_Int32 nStorageMode,
@@ -102,7 +102,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL(
     return xTempStorage;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2(
             const OUString& aURL,
             sal_Int32 nStorageMode,
@@ -135,7 +135,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2(
     return xTempStorage;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromInputStream(
             const uno::Reference < io::XInputStream >& xStream,
             const uno::Reference< uno::XComponentContext >& rxContext )
@@ -153,7 +153,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromInputStream(
     return xTempStorage;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromStream(
             const uno::Reference < io::XStream >& xStream,
             sal_Int32 nStorageMode,
@@ -172,7 +172,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromStream(
     return xTempStorage;
 }
 
-// ----------------------------------------------------------------------
+
 void OStorageHelper::CopyInputToOutput(
             const uno::Reference< io::XInputStream >& xInput,
             const uno::Reference< io::XOutputStream >& xOutput )
@@ -197,7 +197,7 @@ void OStorageHelper::CopyInputToOutput(
     while ( nRead == nConstBufferSize );
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
             const OUString& aURL,
             const uno::Reference< uno::XComponentContext >& context )
@@ -210,7 +210,7 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
     return xInputStream;
 }
 
-// ----------------------------------------------------------------------
+
 void OStorageHelper::SetCommonStorageEncryptionData(
             const uno::Reference< embed::XStorage >& xStorage,
             const uno::Sequence< beans::NamedValue >& aEncryptionData )
@@ -223,7 +223,7 @@ void OStorageHelper::SetCommonStorageEncryptionData(
     xEncrSet->setEncryptionData( aEncryptionData );
 }
 
-// ----------------------------------------------------------------------
+
 sal_Int32 OStorageHelper::GetXStorageFormat(
             const uno::Reference< embed::XStorage >& xStorage )
         throw ( uno::Exception )
@@ -280,7 +280,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
     return nResult;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL(
             const OUString& aFormat,
             const OUString& aURL,
@@ -312,7 +312,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL(
     return xTempStorage;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStream(
             const OUString& aFormat,
             const uno::Reference < io::XInputStream >& xStream,
@@ -343,7 +343,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStr
     return xTempStorage;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
             const OUString& aFormat,
             const uno::Reference < io::XStream >& xStream,
@@ -375,7 +375,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
     return xTempStorage;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const OUString& aPassword )
 {
     // TODO/LATER: Should not the method be part of DocPasswordHelper?
@@ -436,13 +436,13 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData(
     return aEncryptionData;
 }
 
-// ----------------------------------------------------------------------
+
 bool OStorageHelper::IsValidZipEntryFileName( const OUString& aName, bool bSlashAllowed )
 {
     return IsValidZipEntryFileName( aName.getStr(), aName.getLength(), bSlashAllowed );
 }
 
-// ----------------------------------------------------------------------
+
 bool OStorageHelper::IsValidZipEntryFileName(
     const sal_Unicode *pChar, sal_Int32 nLength, bool bSlashAllowed )
 {
@@ -470,7 +470,7 @@ bool OStorageHelper::IsValidZipEntryFileName(
     return true;
 }
 
-// ----------------------------------------------------------------------
+
 bool OStorageHelper::PathHasSegment( const OUString& aPath, const OUString& aSegment )
 {
     bool bResult = false;
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index ba5f936e7e25..949db6731787 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 
-//-------------------------------------------------------------------------
+
 bool operator ==(const DateTime& _rLeft, const DateTime& _rRight)
 {
     return ( _rLeft.NanoSeconds == _rRight.NanoSeconds) &&
@@ -53,7 +53,7 @@ bool operator ==(const DateTime& _rLeft, const DateTime& _rRight)
     ( _rLeft.Year == _rRight.Year) ;
 }
 
-//-------------------------------------------------------------------------
+
 bool operator ==(const Date& _rLeft, const Date& _rRight)
 {
     return ( _rLeft.Day == _rRight.Day) &&
@@ -61,7 +61,7 @@ bool operator ==(const Date& _rLeft, const Date& _rRight)
     ( _rLeft.Year == _rRight.Year) ;
 }
 
-//-------------------------------------------------------------------------
+
 bool operator ==(const Time& _rLeft, const Time& _rRight)
 {
     return ( _rLeft.NanoSeconds == _rRight.NanoSeconds) &&
@@ -70,7 +70,7 @@ bool operator ==(const Time& _rLeft, const Time& _rRight)
     ( _rLeft.Hours == _rRight.Hours) ;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 getINT64(const Any& _rAny)
 {
     sal_Int64 nReturn = 0;
@@ -78,7 +78,7 @@ sal_Int64 getINT64(const Any& _rAny)
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 getINT32(const Any& _rAny)
 {
     sal_Int32 nReturn = 0;
@@ -86,7 +86,7 @@ sal_Int32 getINT32(const Any& _rAny)
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 getINT16(const Any& _rAny)
 {
     sal_Int16 nReturn = 0;
@@ -94,7 +94,7 @@ sal_Int16 getINT16(const Any& _rAny)
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 double getDouble(const Any& _rAny)
 {
     double nReturn = 0.0;
@@ -102,7 +102,7 @@ double getDouble(const Any& _rAny)
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 float getFloat(const Any& _rAny)
 {
     float nReturn = 0.0;
@@ -110,7 +110,7 @@ float getFloat(const Any& _rAny)
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 OUString getString(const Any& _rAny)
 {
     OUString nReturn;
@@ -118,7 +118,7 @@ OUString getString(const Any& _rAny)
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 bool getBOOL(const Any& _rAny)
 {
     bool nReturn = false;
@@ -129,7 +129,7 @@ bool getBOOL(const Any& _rAny)
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException)
 {
     sal_Int32 nReturn = 0;
@@ -138,7 +138,7 @@ sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException)
     return nReturn;
 }
 
-//------------------------------------------------------------------------------
+
 FontDescriptor  getDefaultFont()
 {
     FontDescriptor aReturn;
@@ -148,7 +148,7 @@ FontDescriptor  getDefaultFont()
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
+
 bool isAssignableFrom(const Type& _rAssignable, const Type& _rFrom)
 {
     // getthe type lib descriptions
@@ -162,7 +162,7 @@ bool isAssignableFrom(const Type& _rAssignable, const Type& _rFrom)
     return typelib_typedescription_isAssignableFrom(pAssignable, pFrom);
 }
 
-//------------------------------------------------------------------
+
 template<class TYPE>
 bool tryCompare(const void* _pData, const Any& _rValue, bool& _bIdentical, TYPE& _rOut)
 {
@@ -171,7 +171,7 @@ bool tryCompare(const void* _pData, const Any& _rValue, bool& _bIdentical, TYPE&
     return bSuccess;
 }
 
-//------------------------------------------------------------------
+
 bool tryCompare(const void* _pData, const Any& _rValue, bool& _bIdentical, sal_Unicode& _rOut)
 {
     bool bSuccess = ( _rValue.getValueTypeClass() == TypeClass_CHAR );
@@ -181,7 +181,7 @@ bool tryCompare(const void* _pData, const Any& _rValue, bool& _bIdentical, sal_U
     return bSuccess;
 }
 
-//------------------------------------------------------------------
+
 bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue)
 {
     bool bRes = true;
@@ -421,13 +421,13 @@ bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue)
     return bRes;
 }
 
-//------------------------------------------------------------------------------
+
 bool compare(const Any& rLeft, const Any& rRight)
 {
     return compare_impl(rLeft.getValueType(), rLeft.getValue(), rRight);
 }
 
-//-------------------------------------------------------------------------
+
 bool    operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight)
 {
     return ( _rLeft.Name.equals( _rRight.Name ) ) &&
@@ -448,7 +448,7 @@ bool    operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight)
     ( _rLeft.Type == _rRight.Type ) ;
 }
 
-//-------------------------------------------------------------------------
+
 Type getSequenceElementType(const Type& _rSequenceType)
 {
     OSL_ENSURE(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE,
diff --git a/comphelper/source/misc/weakeventlistener.cxx b/comphelper/source/misc/weakeventlistener.cxx
index db176d4b643a..b3939ba1c4a3 100644
--- a/comphelper/source/misc/weakeventlistener.cxx
+++ b/comphelper/source/misc/weakeventlistener.cxx
@@ -32,7 +32,7 @@ namespace comphelper
     //=====================================================================
     //= OWeakListenerAdapter
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OWeakListenerAdapterBase::~OWeakListenerAdapterBase()
     {
     }
@@ -40,7 +40,7 @@ namespace comphelper
     //=====================================================================
     //= OWeakEventListenerAdapter
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OWeakEventListenerAdapter::OWeakEventListenerAdapter( Reference< XWeak > _rxListener, Reference< XComponent > _rxBroadcaster )
         :OWeakEventListenerAdapter_Base( _rxListener, _rxBroadcaster )
     {
@@ -63,7 +63,7 @@ namespace comphelper
         OSL_ENSURE( getListener().is(), "OWeakEventListenerAdapter::OWeakEventListenerAdapter: invalid listener (does not support the XEventListener interface)!" );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OWeakEventListenerAdapter::disposing( )
     {
         Reference< XComponent > xBroadcaster( getBroadcaster( ), UNO_QUERY );
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index fe724086670a..4fb1cc4c95ea 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -36,7 +36,7 @@
 #include <iterator>
 
 
-//--------------------------------------------------------------------------
+
 using namespace ::com::sun::star;
 
 void createRegistryInfo_OPropertyBag()
@@ -58,7 +58,7 @@ namespace comphelper
     //====================================================================
     //= OPropertyBag
     //====================================================================
-    //--------------------------------------------------------------------
+
     OPropertyBag::OPropertyBag()
         :OPropertyBag_PBase( GetBroadcastHelper(), this )
         ,::cppu::IEventNotificationHook()
@@ -69,16 +69,16 @@ namespace comphelper
     {
     }
 
-    //--------------------------------------------------------------------
+
     OPropertyBag::~OPropertyBag()
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OPropertyBag, OPropertyBag_Base, OPropertyBag_PBase )
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyBag, OPropertyBag_Base, OPropertyBag_PBase )
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > OPropertyBag::getSupportedServiceNames_static() throw( RuntimeException )
     {
         Sequence< OUString > aServices(1);
@@ -86,7 +86,7 @@ namespace comphelper
         return aServices;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
     {
         Sequence< Type > aTypes;
@@ -125,19 +125,19 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString OPropertyBag::getImplementationName_static() throw( RuntimeException )
     {
         return OUString( "com.sun.star.comp.comphelper.OPropertyBag" );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OPropertyBag::Create( SAL_UNUSED_PARAMETER const Reference< XComponentContext >& )
     {
         return *new OPropertyBag;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException)
     {
         return getImplementationName_static();
@@ -148,13 +148,13 @@ namespace comphelper
         return cppu::supportsService(this, rServiceName);
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames(  ) throw (RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyBag::fireEvents(
             sal_Int32 * /*pnHandles*/,
             sal_Int32 nCount,
@@ -189,7 +189,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL OPropertyBag::isModified()
         throw (RuntimeException)
     {
@@ -217,13 +217,13 @@ namespace comphelper
         m_NotifyListeners.removeInterface(xListener);
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo(  ) throw(RuntimeException)
     {
         return createPropertySetInfo( getInfoHelper() );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) throw (RuntimeException)
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
@@ -231,7 +231,7 @@ namespace comphelper
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException)
     {
         // This is a workaround for addProperty not being able to add default-void properties.
@@ -258,7 +258,7 @@ namespace comphelper
         setModified(sal_True);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
@@ -267,7 +267,7 @@ namespace comphelper
     }
 
 
-    //--------------------------------------------------------------------
+
     Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration(  ) throw (RuntimeException)
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
@@ -275,7 +275,7 @@ namespace comphelper
         return NULL;
     }
 
-    //--------------------------------------------------------------------
+
     Type SAL_CALL OPropertyBag::getElementType(  ) throw (RuntimeException)
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
@@ -283,7 +283,7 @@ namespace comphelper
         return Type();
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL OPropertyBag::hasElements(  ) throw (RuntimeException)
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
@@ -291,25 +291,25 @@ namespace comphelper
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBag::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         m_aDynamicProperties.getFastPropertyValue( _nHandle, _rValue );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL OPropertyBag::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException)
     {
         return m_aDynamicProperties.convertFastPropertyValue( _nHandle, _rValue, _rConvertedValue, _rOldValue );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
     {
         m_aDynamicProperties.setFastPropertyValue( nHandle, rValue );
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL OPropertyBag::getInfoHelper()
     {
         if ( !m_pArrayHelper.get() )
@@ -322,7 +322,7 @@ namespace comphelper
 
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 OPropertyBag::findFreeHandle() const
     {
         const sal_Int32 nPrime = 1009;
@@ -344,7 +344,7 @@ namespace comphelper
         return nCheck;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
         ::osl::ClearableMutexGuard g( m_aMutex );
@@ -367,7 +367,7 @@ namespace comphelper
         setModified(sal_True);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
     {
         ::osl::ClearableMutexGuard g( m_aMutex );
@@ -381,7 +381,7 @@ namespace comphelper
         setModified(sal_True);
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         struct ComparePropertyValueByName : public ::std::binary_function< PropertyValue, PropertyValue, bool >
@@ -410,7 +410,7 @@ namespace comphelper
         };
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -465,7 +465,7 @@ namespace comphelper
         return aPropertyValues;
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyBag::impl_setPropertyValues_throw( const Sequence< PropertyValue >& _rProps )
     {
         // sort (the XMultiPropertySet interface requires this)
@@ -543,14 +543,14 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_setPropertyValues_throw( _rProps );
     }
 
-    //--------------------------------------------------------------------
+
     PropertyState OPropertyBag::getPropertyStateByHandle( sal_Int32 _nHandle )
     {
         // for properties which do not support the MAYBEDEFAULT attribute, don't rely on the base class, but
@@ -570,7 +570,7 @@ namespace comphelper
         return OPropertyBag_PBase::getPropertyStateByHandle( _nHandle );
     }
 
-    //--------------------------------------------------------------------
+
     Any OPropertyBag::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     {
         Any aDefault;
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 664d2bfbbb5a..c4a66b68d4cb 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -42,7 +42,7 @@ namespace comphelper
 
     using namespace internal;
 
-    //------------------------------------------------------------------------------
+
     namespace
     {
         const Property* lcl_findPropertyByName( const Sequence< Property >& _rProps, const OUString& _rName )
@@ -61,7 +61,7 @@ namespace comphelper
 //= OPropertyArrayAggregationHelper
 //==================================================================
 
-//------------------------------------------------------------------------------
+
 OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
         const  Sequence< Property >& _rProperties, const  Sequence< Property >& _rAggProperties,
         IPropertyInfoService* _pInfoService, sal_Int32 _nFirstAggregateId )
@@ -147,7 +147,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
         m_aPropertyAccessors[ pMergedProps->Handle ].nPos = nMPLoop;
 }
 
-//------------------------------------------------------------------
+
 OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper::classifyProperty( const OUString& _rName )
 {
     PropertyOrigin eOrigin = UNKNOWN_PROPERTY;
@@ -166,7 +166,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper:
     return eOrigin;
 }
 
-//------------------------------------------------------------------
+
 Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) throw( UnknownPropertyException )
 {
     const Property* pProperty = findPropertyByName( _rPropertyName );
@@ -177,26 +177,26 @@ Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rP
     return *pProperty;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OPropertyArrayAggregationHelper::hasPropertyByName(const OUString& _rPropertyName)
 {
     return NULL != findPropertyByName( _rPropertyName );
 }
 
-//------------------------------------------------------------------------------
+
 const Property* OPropertyArrayAggregationHelper::findPropertyByName(const :: OUString& _rName ) const
 {
     return lcl_findPropertyByName( m_aProperties, _rName );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const OUString& _rPropertyName)
 {
     const Property* pProperty = findPropertyByName( _rPropertyName );
     return pProperty ? pProperty->Handle : -1;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle(
             OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle)
 {
@@ -213,7 +213,7 @@ sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle(
     return bRet;
 }
 
-//------------------------------------------------------------------------------
+
 bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandle, Property& _rProperty ) const
 {
     ConstPropertyAccessorMapIterator pos = m_aPropertyAccessors.find(_nHandle);
@@ -225,7 +225,7 @@ bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandle, P
     return false;
 }
 
-//------------------------------------------------------------------------------
+
 bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle(
             OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const
 {
@@ -246,14 +246,14 @@ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle(
 }
 
 
-//------------------------------------------------------------------------------
+
  ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> OPropertyArrayAggregationHelper::getProperties()
 {
     return m_aProperties;
 }
 
 
-//------------------------------------------------------------------------------
+
 sal_Int32 OPropertyArrayAggregationHelper::fillHandles(
         sal_Int32* _pHandles, const  ::com::sun::star::uno::Sequence< OUString >& _rPropNames )
 {
@@ -382,31 +382,31 @@ namespace internal
         sal_Int32 getCurrentlyForwardedProperty( ) const { return m_nCurrentlyForwarding; }
     };
 
-    //--------------------------------------------------------------------------
+
     PropertyForwarder::PropertyForwarder( OPropertySetAggregationHelper& _rAggregationHelper )
         :m_rAggregationHelper( _rAggregationHelper )
         ,m_nCurrentlyForwarding( -1 )
     {
     }
 
-    //--------------------------------------------------------------------------
+
     PropertyForwarder::~PropertyForwarder()
     {
     }
 
-    //--------------------------------------------------------------------------
+
     void PropertyForwarder::takeResponsibilityFor( sal_Int32 _nHandle )
     {
         m_aProperties.insert( _nHandle );
     }
 
-    //--------------------------------------------------------------------------
+
     bool PropertyForwarder::isResponsibleFor( sal_Int32 _nHandle )
     {
         return m_aProperties.find( _nHandle ) != m_aProperties.end();
     }
 
-    //--------------------------------------------------------------------------
+
     void PropertyForwarder::doForward( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception )
     {
         OSL_ENSURE( m_rAggregationHelper.m_xAggregateSet.is(), "PropertyForwarder::doForward: no property set!" );
@@ -439,7 +439,7 @@ namespace internal
 //= OPropertySetAggregationHelper
 //==================================================================
 
-//------------------------------------------------------------------------------
+
 OPropertySetAggregationHelper::OPropertySetAggregationHelper( ::cppu::OBroadcastHelper& rBHlp )
     :OPropertyStateHelper( rBHlp )
     ,m_bListening( false )
@@ -447,13 +447,13 @@ OPropertySetAggregationHelper::OPropertySetAggregationHelper( ::cppu::OBroadcast
     m_pForwarder = new PropertyForwarder( *this );
 }
 
-//------------------------------------------------------------------------------
+
 OPropertySetAggregationHelper::~OPropertySetAggregationHelper()
 {
     delete m_pForwarder;
 }
 
-//------------------------------------------------------------------------------
+
  ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const  ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException)
 {
      ::com::sun::star::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType);
@@ -468,7 +468,7 @@ OPropertySetAggregationHelper::~OPropertySetAggregationHelper()
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
+
 void OPropertySetAggregationHelper::disposing()
 {
     osl::MutexGuard aGuard(rBHelper.rMutex);
@@ -484,7 +484,7 @@ void OPropertySetAggregationHelper::disposing()
     OPropertyStateHelper::disposing();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::disposing(const  ::com::sun::star::lang::EventObject& _rSource) throw ( ::com::sun::star::uno::RuntimeException)
 {
     OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !");
@@ -492,7 +492,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const  ::com::sun::star::
         m_bListening = false;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const  ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& _rEvents) throw( ::com::sun::star::uno::RuntimeException)
 {
     OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::propertiesChange : have no aggregate !");
@@ -544,7 +544,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const  ::com::sun:
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const  ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::beans::PropertyVetoException,  ::com::sun::star::uno::RuntimeException)
 {
     OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::vetoableChange : have no aggregate !");
@@ -555,7 +555,7 @@ void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const  ::com::sun::s
     fire(&nHandle, &_rEvent.NewValue, &_rEvent.OldValue, 1, sal_True);
 }
 
-//------------------------------------------------------------------------------
+
 void OPropertySetAggregationHelper::setAggregation(const  ::com::sun::star::uno::Reference<  ::com::sun::star::uno::XInterface >& _rxDelegate)
         throw(  ::com::sun::star::lang::IllegalArgumentException )
 {
@@ -578,7 +578,7 @@ void OPropertySetAggregationHelper::setAggregation(const  ::com::sun::star::uno:
         throw  ::com::sun::star::lang::IllegalArgumentException();
 }
 
-//------------------------------------------------------------------------------
+
 void OPropertySetAggregationHelper::startListening()
 {
     osl::MutexGuard aGuard(rBHelper.rMutex);
@@ -594,7 +594,7 @@ void OPropertySetAggregationHelper::startListening()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName,
                                                                        const  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& _rxListener)
                                                                        throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
@@ -604,7 +604,7 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUS
         startListening();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName,
                                                                        const  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& _rxListener)
                                                                        throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
@@ -614,7 +614,7 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUS
         startListening();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const  ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames,
                                                                          const  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener>& _rxListener)
                                                                          throw( ::com::sun::star::uno::RuntimeException)
@@ -624,7 +624,7 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const
         startListening();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 OPropertySetAggregationHelper::getOriginalHandle(sal_Int32 nHandle) const
 {
     OPropertyArrayAggregationHelper& rPH = (OPropertyArrayAggregationHelper&)const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper();
@@ -633,7 +633,7 @@ sal_Int32 OPropertySetAggregationHelper::getOriginalHandle(sal_Int32 nHandle) co
     return nOriginalHandle;
 }
 
-//--------------------------------------------------------------------------
+
 OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) const
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper() );
@@ -642,7 +642,7 @@ OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) co
     return aProperty.Name;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const  ::com::sun::star::uno::Any& _rValue)
         throw(   ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::beans::PropertyVetoException,
                  ::com::sun::star::lang::IllegalArgumentException,  ::com::sun::star::lang::WrappedTargetException,
@@ -662,7 +662,7 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHa
         OPropertySetHelper::setFastPropertyValue(_nHandle, _rValue);
 }
 
-//------------------------------------------------------------------------------
+
 void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const
 {
     OPropertyArrayAggregationHelper& rPH = (OPropertyArrayAggregationHelper&)const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper();
@@ -684,7 +684,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
     }
 }
 
-//------------------------------------------------------------------------------
+
  ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle)
         throw(   ::com::sun::star::beans::UnknownPropertyException,
                  ::com::sun::star::lang::WrappedTargetException,
@@ -708,7 +708,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
     return aValue;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
         const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues )
     throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
@@ -895,7 +895,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
 }
 
 // XPropertyState
-//------------------------------------------------------------------------------
+
  ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName)
             throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
 {
@@ -920,7 +920,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
         return getPropertyStateByHandle(nHandle);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName)
         throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
 {
@@ -953,7 +953,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString
     }
 }
 
-//------------------------------------------------------------------------------
+
  ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName)
         throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
 {
@@ -976,7 +976,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString
         return getPropertyDefaultByHandle(nHandle);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException)
 {
     bool bModified = false;
@@ -997,7 +997,7 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any&
     return bModified;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception )
 {
     OSL_ENSURE( m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast: this is no forwarded property - did you use declareForwardedProperty for it?" );
@@ -1005,26 +1005,26 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( s
         m_pForwarder->doForward( _nHandle, _rValue );
 }
 
-//------------------------------------------------------------------------------
+
 void OPropertySetAggregationHelper::declareForwardedProperty( sal_Int32 _nHandle )
 {
     OSL_ENSURE( !m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::declareForwardedProperty: already declared!" );
     m_pForwarder->takeResponsibilityFor( _nHandle );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::forwardingPropertyValue( sal_Int32 )
 {
     // not interested in
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OPropertySetAggregationHelper::forwardedPropertyValue( sal_Int32, bool )
 {
     // not interested in
 }
 
-//------------------------------------------------------------------------------
+
 bool OPropertySetAggregationHelper::isCurrentlyForwardingProperty( sal_Int32 _nHandle ) const
 {
     return m_pForwarder->getCurrentlyForwardedProperty() == _nHandle;
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index 2eaec9af986c..872857a0d008 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -58,7 +58,7 @@ namespace comphelper
 
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
 
-//------------------------------------------------------------------
+
 void copyProperties(const Reference<XPropertySet>& _rxSource,
                     const Reference<XPropertySet>& _rxDest)
 {
@@ -129,7 +129,7 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
     }
 }
 
-//------------------------------------------------------------------
+
 bool hasProperty(const OUString& _rName, const Reference<XPropertySet>& _rxSet)
 {
     if (_rxSet.is())
@@ -140,7 +140,7 @@ bool hasProperty(const OUString& _rName, const Reference<XPropertySet>& _rxSet)
     return false;
 }
 
-//------------------------------------------------------------------
+
 void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName)
 {
     sal_Int32 nLen = _rProps.getLength();
@@ -158,7 +158,7 @@ void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName)
     }
 }
 
-//------------------------------------------------------------------
+
 void ModifyPropertyAttributes(Sequence<Property>& seqProps, const OUString& sPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib)
 {
     sal_Int32 nLen = seqProps.getLength();
@@ -176,7 +176,7 @@ void ModifyPropertyAttributes(Sequence<Property>& seqProps, const OUString& sPro
     }
 }
 
-//------------------------------------------------------------------
+
 bool tryPropertyValue(Any& _rConvertedValue, Any& _rOldValue, const Any& _rValueToSet, const Any& _rCurrentValue, const Type& _rExpectedType)
 {
     bool bModified(false);
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index 79225fc492e6..95471eab0925 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -58,7 +58,7 @@ namespace comphelper
     //====================================================================
     //= PropertyBag
     //====================================================================
-    //--------------------------------------------------------------------
+
     PropertyBag::PropertyBag()
         :m_pImpl( new PropertyBag_Impl )
     {
@@ -68,13 +68,13 @@ namespace comphelper
     {
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBag::setAllowEmptyPropertyName( bool i_isAllowed )
     {
         m_pImpl->m_bAllowEmptyPropertyName = i_isAllowed;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         void    lcl_checkForEmptyName( const bool _allowEmpty, const OUString& _name )
@@ -99,7 +99,7 @@ namespace comphelper
         }
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBag::addVoidProperty( const OUString& _rName, const Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes )
     {
         if ( _rType.getTypeClass() == TypeClass_VOID )
@@ -122,7 +122,7 @@ namespace comphelper
         m_pImpl->aDefaults.insert( MapInt2Any::value_type( _nHandle, Any() ) );
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBag::addProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Any& _rInitialValue )
     {
         // check type sanity
@@ -145,7 +145,7 @@ namespace comphelper
         m_pImpl->aDefaults.insert( MapInt2Any::value_type( _nHandle, _rInitialValue ) );
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBag::removeProperty( const OUString& _rName )
     {
         const Property& rProp = getProperty( _rName );
@@ -159,7 +159,7 @@ namespace comphelper
         m_pImpl->aDefaults.erase( nHandle );
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBag::getFastPropertyValue( sal_Int32 _nHandle, Any& _out_rValue ) const
     {
         if ( !hasPropertyByHandle( _nHandle ) )
@@ -168,7 +168,7 @@ namespace comphelper
         OPropertyContainerHelper::getFastPropertyValue( _out_rValue, _nHandle );
     }
 
-    //--------------------------------------------------------------------
+
     bool PropertyBag::convertFastPropertyValue( sal_Int32 _nHandle, const Any& _rNewValue, Any& _out_rConvertedValue, Any& _out_rCurrentValue ) const
     {
         if ( !hasPropertyByHandle( _nHandle ) )
@@ -178,7 +178,7 @@ namespace comphelper
             _out_rConvertedValue, _out_rCurrentValue, _nHandle, _rNewValue );
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBag::setFastPropertyValue( sal_Int32 _nHandle, const Any& _rValue )
     {
         if ( !hasPropertyByHandle( _nHandle ) )
@@ -187,7 +187,7 @@ namespace comphelper
         OPropertyContainerHelper::setFastPropertyValue( _nHandle, _rValue );
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBag::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _out_rValue ) const
     {
         if ( !hasPropertyByHandle( _nHandle ) )
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index 98e9439a687b..c8cc99004556 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -40,18 +40,18 @@ using namespace ::com::sun::star::beans;
 //==========================================================================
 //= OPropertyContainer
 //==========================================================================
-//--------------------------------------------------------------------------
+
 OPropertyContainer::OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper)
     :OPropertySetHelper(_rBHelper)
 {
 }
 
-// -------------------------------------------------------------------------
+
 OPropertyContainer::~OPropertyContainer()
 {
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException)
 {
     // just the types from our one and only base class
@@ -63,27 +63,27 @@ Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException
     return aTypes.getTypes();
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     OPropertySetHelper::setFastPropertyValue( nHandle, rValue );
 }
 
-//--------------------------------------------------------------------------
+
 sal_Bool OPropertyContainer::convertFastPropertyValue(
     Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException)
 {
     return OPropertyContainerHelper::convertFastPropertyValue( _rConvertedValue, _rOldValue, _nHandle, _rValue );
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainer::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
     throw (Exception, std::exception)
 {
     OPropertyContainerHelper::setFastPropertyValue( _nHandle, _rValue );
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainer::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
 {
     OPropertyContainerHelper::getFastPropertyValue( _rValue, _nHandle );
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 0a859ef2ff91..d0e783d7dc6f 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
-//--------------------------------------------------------------------------
+
 namespace
 {
     // comparing two property descriptions
@@ -64,18 +64,18 @@ namespace
 //==========================================================================
 //= OPropertyContainerHelper
 //==========================================================================
-//--------------------------------------------------------------------------
+
 OPropertyContainerHelper::OPropertyContainerHelper()
     :m_bUnused(false)
 {
 }
 
-// -------------------------------------------------------------------------
+
 OPropertyContainerHelper::~OPropertyContainerHelper()
 {
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainerHelper::registerProperty(const OUString& _rName, sal_Int32 _nHandle,
         sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType)
 {
@@ -94,7 +94,7 @@ void OPropertyContainerHelper::registerProperty(const OUString& _rName, sal_Int3
     implPushBackProperty(aNewProp);
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainerHelper::revokeProperty( sal_Int32 _nHandle )
 {
     PropertiesIterator aPos = searchHandle( _nHandle );
@@ -103,7 +103,7 @@ void OPropertyContainerHelper::revokeProperty( sal_Int32 _nHandle )
     m_aProperties.erase( aPos );
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainerHelper::registerMayBeVoidProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         Any* _pPointerToMember, const Type& _rExpectedType)
 {
@@ -125,7 +125,7 @@ void OPropertyContainerHelper::registerMayBeVoidProperty(const OUString& _rName,
 }
 
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainerHelper::registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         const Type& _rType, const void* _pInitialValue)
 {
@@ -146,13 +146,13 @@ void OPropertyContainerHelper::registerPropertyNoMember(const OUString& _rName,
     implPushBackProperty(aNewProp);
 }
 
-//--------------------------------------------------------------------------
+
 bool OPropertyContainerHelper::isRegisteredProperty( sal_Int32 _nHandle ) const
 {
     return const_cast< OPropertyContainerHelper* >( this )->searchHandle( _nHandle ) != m_aProperties.end();
 }
 
-//--------------------------------------------------------------------------
+
 bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) const
 {
     // TODO: the current structure is from a time where properties were
@@ -168,7 +168,7 @@ bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) co
     return pos != m_aProperties.end();
 }
 
-//--------------------------------------------------------------------------
+
 namespace
 {
     struct ComparePropertyHandles
@@ -180,7 +180,7 @@ namespace
     };
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainerHelper::implPushBackProperty(const PropertyDescription& _rProp)
 {
 #ifdef DBG_UTIL
@@ -201,7 +201,7 @@ void OPropertyContainerHelper::implPushBackProperty(const PropertyDescription& _
     m_aProperties.insert( pos, _rProp );
 }
 
-//--------------------------------------------------------------------------
+
 namespace
 {
     void lcl_throwIllegalPropertyValueTypeException( const PropertyDescription& _rProperty, const Any& _rValue )
@@ -219,7 +219,7 @@ namespace
     }
 }
 
-//--------------------------------------------------------------------------
+
 bool OPropertyContainerHelper::convertFastPropertyValue(
     Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) SAL_THROW( (IllegalArgumentException) )
 {
@@ -365,7 +365,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue(
     return bModified;
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue) SAL_THROW( (Exception) )
 {
     // get the property somebody is asking for
@@ -407,7 +407,7 @@ void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An
     }
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
 {
     // get the property somebody is asking for
@@ -436,7 +436,7 @@ void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHa
     }
 }
 
-//--------------------------------------------------------------------------
+
 OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHandle(sal_Int32 _nHandle)
 {
     PropertyDescription aHandlePropDesc;
@@ -455,7 +455,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan
     return aLowerBound;
 }
 
-//--------------------------------------------------------------------------
+
 const Property& OPropertyContainerHelper::getProperty( const OUString& _rName ) const
 {
     ConstPropertiesIterator pos = ::std::find_if(
@@ -469,7 +469,7 @@ const Property& OPropertyContainerHelper::getProperty( const OUString& _rName )
     return pos->aProperty;
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) const
 {
     Sequence< Property > aOwnProps(m_aProperties.size());
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index e93c6bb04199..ab7774887d00 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -48,13 +48,13 @@ namespace comphelper
     //=====================================================================
     //= OPropertyStateContainer
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OPropertyStateContainer::OPropertyStateContainer( ::cppu::OBroadcastHelper& _rBHelper )
         :OPropertyContainer( _rBHelper )
     {
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) throw (RuntimeException)
     {
         Any aReturn = OPropertyContainer::queryInterface( _rType );
@@ -63,10 +63,10 @@ namespace comphelper
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyStateContainer, OPropertyContainer, OPropertyStateContainer_TBase )
 
-    //--------------------------------------------------------------------
+
     sal_Int32 OPropertyStateContainer::getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) )
     {
         // look up the handle for the name
@@ -79,13 +79,13 @@ namespace comphelper
         return nHandle;
     }
 
-    //--------------------------------------------------------------------
+
     PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         return getPropertyStateByHandle( getHandleForName( _rPropertyName ) );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException)
     {
         sal_Int32 nProperties = _rPropertyNames.getLength();
@@ -138,13 +138,13 @@ namespace comphelper
         return aStates;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
         Any aDefault;
@@ -152,7 +152,7 @@ namespace comphelper
         return aDefault;
     }
 
-    //--------------------------------------------------------------------
+
     PropertyState OPropertyStateContainer::getPropertyStateByHandle( sal_Int32 _nHandle )
     {
         // simply compare the current and the default value
@@ -171,7 +171,7 @@ namespace comphelper
             return PropertyState_DIRECT_VALUE;
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyStateContainer::setPropertyToDefaultByHandle( sal_Int32 _nHandle )
     {
         Any aDefault;
diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index 08d27c6c8343..f04a4cc88097 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.cxx
@@ -32,20 +32,20 @@ using namespace ::com::sun::star::beans;
 //========================================================================
 //= OPropertyChangeListener
 //========================================================================
-//------------------------------------------------------------------------
+
 OPropertyChangeListener::~OPropertyChangeListener()
 {
     if (m_pAdapter)
         m_pAdapter->dispose();
 }
 
-//------------------------------------------------------------------
+
 void OPropertyChangeListener::_disposing(const EventObject&) throw( RuntimeException)
 {
     // nothing to do here
 }
 
-//------------------------------------------------------------------
+
 void OPropertyChangeListener::disposeAdapter()
 {
     if ( m_pAdapter )
@@ -55,7 +55,7 @@ void OPropertyChangeListener::disposeAdapter()
     OSL_ENSURE( !m_pAdapter, "OPropertyChangeListener::disposeAdapter: what did dispose do?" );
 }
 
-//------------------------------------------------------------------
+
 void OPropertyChangeListener::setAdapter(OPropertyChangeMultiplexer* pAdapter)
 {
     if (m_pAdapter)
@@ -76,7 +76,7 @@ void OPropertyChangeListener::setAdapter(OPropertyChangeMultiplexer* pAdapter)
 //========================================================================
 //= OPropertyChangeMultiplexer
 //========================================================================
-//------------------------------------------------------------------
+
 OPropertyChangeMultiplexer::OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const  Reference< XPropertySet>& _rxSet, bool _bAutoReleaseSet)
             :m_xSet(_rxSet)
             ,m_pListener(_pListener)
@@ -87,24 +87,24 @@ OPropertyChangeMultiplexer::OPropertyChangeMultiplexer(OPropertyChangeListener*
     m_pListener->setAdapter(this);
 }
 
-//------------------------------------------------------------------
+
 OPropertyChangeMultiplexer::~OPropertyChangeMultiplexer()
 {
 }
 
-//------------------------------------------------------------------
+
 void OPropertyChangeMultiplexer::lock()
 {
     ++m_nLockCount;
 }
 
-//------------------------------------------------------------------
+
 void OPropertyChangeMultiplexer::unlock()
 {
     --m_nLockCount;
 }
 
-//------------------------------------------------------------------
+
 void OPropertyChangeMultiplexer::dispose()
 {
     if (m_bListening)
@@ -126,7 +126,7 @@ void OPropertyChangeMultiplexer::dispose()
 }
 
 // XEventListener
-//------------------------------------------------------------------
+
 void SAL_CALL OPropertyChangeMultiplexer::disposing( const  EventObject& _rSource) throw( RuntimeException)
 {
     if (m_pListener)
@@ -147,14 +147,14 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const  EventObject& _rSourc
 }
 
 // XPropertyChangeListener
-//------------------------------------------------------------------
+
 void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const  PropertyChangeEvent& _rEvent ) throw( RuntimeException)
 {
     if (m_pListener && !locked())
         m_pListener->_propertyChanged(_rEvent);
 }
 
-//------------------------------------------------------------------
+
 void OPropertyChangeMultiplexer::addProperty(const OUString& _sPropertyName)
 {
     if (m_xSet.is())
diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index f2d0500af1eb..bafdf1c5b37f 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.cxx
@@ -43,7 +43,7 @@ namespace comphelper
     // OPropertyStateHelper
     //=====================================================================
 
-    //---------------------------------------------------------------------
+
     ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const  ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException)
     {
         ::com::sun::star::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType);
@@ -54,7 +54,7 @@ namespace comphelper
         return aReturn;
     }
 
-    //---------------------------------------------------------------------
+
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> OPropertyStateHelper::getTypes() throw( ::com::sun::star::uno::RuntimeException)
     {
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> aTypes(4);
@@ -75,14 +75,14 @@ namespace comphelper
 
     OPropertyStateHelper::~OPropertyStateHelper() {}
 
-    //---------------------------------------------------------------------
+
     void OPropertyStateHelper::firePropertyChange(sal_Int32 nHandle, const  ::com::sun::star::uno::Any& aNewValue, const  ::com::sun::star::uno::Any& aOldValue)
     {
         fire(&nHandle, &aNewValue, &aOldValue, 1, sal_False);
     }
 
     // XPropertyState
-    //---------------------------------------------------------------------
+
     ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
@@ -94,7 +94,7 @@ namespace comphelper
         return getPropertyStateByHandle(nHandle);
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
@@ -106,7 +106,7 @@ namespace comphelper
         setPropertyToDefaultByHandle(nHandle);
     }
 
-    //---------------------------------------------------------------------
+
     ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
@@ -118,7 +118,7 @@ namespace comphelper
         return getPropertyDefaultByHandle(nHandle);
     }
 
-    //---------------------------------------------------------------------
+
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const  ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
     {
         sal_Int32 nLen = _rPropertyNames.getLength();
@@ -148,7 +148,7 @@ namespace comphelper
         return aRet;
     }
 
-    //---------------------------------------------------------------------
+
     ::com::sun::star::beans::PropertyState OPropertyStateHelper::getPropertyStateByHandle( sal_Int32 _nHandle )
     {
         // simply compare the current and the default value
@@ -164,13 +164,13 @@ namespace comphelper
         return bEqual ? PropertyState_DEFAULT_VALUE : PropertyState_DIRECT_VALUE;
     }
 
-    //---------------------------------------------------------------------
+
     void OPropertyStateHelper::setPropertyToDefaultByHandle( sal_Int32 _nHandle )
     {
         setFastPropertyValue( _nHandle, getPropertyDefaultByHandle( _nHandle ) );
     }
 
-    //---------------------------------------------------------------------
+
     ::com::sun::star::uno::Any OPropertyStateHelper::getPropertyDefaultByHandle( sal_Int32 ) const
     {
         return  ::com::sun::star::uno::Any();
@@ -179,18 +179,18 @@ namespace comphelper
     //=====================================================================
     // OStatefulPropertySet
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OStatefulPropertySet::OStatefulPropertySet()
         :OPropertyStateHelper( GetBroadcastHelper() )
     {
     }
 
-    //---------------------------------------------------------------------
+
     OStatefulPropertySet::~OStatefulPropertySet()
     {
     }
 
-    //---------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException)
     {
         Sequence< Type > aOwnTypes( 2 );
@@ -205,14 +205,14 @@ namespace comphelper
 
     namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 
-    //---------------------------------------------------------------------
+
     Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException)
     {
         ::cppu::OImplementationId &rID = lcl_ImplId::get();
         return rID.getImplementationId();
     }
 
-    //---------------------------------------------------------------------
+
     Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) throw(RuntimeException)
     {
         Any aReturn = OWeakObject::queryInterface( _rType );
@@ -223,13 +223,13 @@ namespace comphelper
         return aReturn;
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OStatefulPropertySet::acquire() throw()
     {
         ::cppu::OWeakObject::acquire();
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OStatefulPropertySet::release() throw()
     {
         ::cppu::OWeakObject::release();
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx
index ff68422ff94b..a5adb0e94bca 100644
--- a/comphelper/source/streaming/basicio.cxx
+++ b/comphelper/source/streaming/basicio.cxx
@@ -24,7 +24,7 @@ namespace comphelper
 {
 //.........................................................................
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectOutputStream>& operator << (
         const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream,
         const starawt::FontDescriptor& _rFont)
@@ -49,7 +49,7 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (
 }
 
 // FontDescriptor
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectInputStream>& operator >> (
         const staruno::Reference<stario::XObjectInputStream>& _rxInStream,
         starawt::FontDescriptor& _rFont)
@@ -74,84 +74,84 @@ const staruno::Reference<stario::XObjectInputStream>& operator >> (
     return _rxInStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal)
 {
     _rVal = _rxInStream->readBoolean();
     return _rxInStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal)
 {
     _rxOutStream->writeBoolean(_bVal);
     return _rxOutStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& rStr)
 {
     rStr = _rxInStream->readUTF();
     return _rxInStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& rStr)
 {
     _rxOutStream->writeUTF(rStr);
     return _rxOutStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue)
 {
     _rValue = _rxInStream->readShort();
     return _rxInStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue)
 {
     _rxOutStream->writeShort(_nValue);
     return _rxOutStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue)
 {
     _rValue = _rxInStream->readShort();
     return _rxInStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue)
 {
     _rxOutStream->writeShort(_nValue);
     return _rxOutStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue)
 {
     _rValue = _rxInStream->readLong();
     return _rxInStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue)
 {
     _rxOutStream->writeLong(_nValue);
     return _rxOutStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int32& _rValue)
 {
     _rValue = _rxInStream->readLong();
     return _rxInStream;
 }
 
-//------------------------------------------------------------------------------
+
 const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue)
 {
     _rxOutStream->writeLong(_nValue);
diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 23764161a316..f49a9d653f1f 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.cxx
@@ -25,18 +25,18 @@ namespace comphelper
 {
     using namespace osl;
 
-//------------------------------------------------------------------
+
 OSLInputStreamWrapper::OSLInputStreamWrapper( File& _rFile )
     : m_pFile(&_rFile)
 {
 }
 
-//------------------------------------------------------------------
+
 OSLInputStreamWrapper::~OSLInputStreamWrapper()
 {
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
                 throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
@@ -62,7 +62,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8
     return sal::static_int_cast< sal_Int32 >(nRead);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     if (!m_pFile)
@@ -74,7 +74,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_I
     return readBytes(aData, nMaxBytesToRead);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -92,7 +92,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -122,7 +122,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte
         std::max(nAvailable, sal::static_int_cast< sal_uInt64 >(SAL_MAX_INT32)));
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException )
 {
     if (!m_pFile)
@@ -135,7 +135,7 @@ void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedExc
 
 /*************************************************************************/
 // stario::XOutputStream
-//------------------------------------------------------------------------------
+
 
 OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile):
     rFile(_rFile)
@@ -154,12 +154,12 @@ void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_In
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL OSLOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     rFile.close();
diff --git a/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx
index fdd62f3cfe34..3f0f49c3f284 100644
--- a/comphelper/source/streaming/seekableinput.cxx
+++ b/comphelper/source/streaming/seekableinput.cxx
@@ -31,7 +31,7 @@ namespace comphelper
 
 const sal_Int32 nConstBufferSize = 32000;
 
-//---------------------------------------------------------------------------
+
 void copyInputToOutput_Impl( const uno::Reference< io::XInputStream >& xIn,
                             const uno::Reference< io::XOutputStream >& xOut )
 {
@@ -52,7 +52,7 @@ void copyInputToOutput_Impl( const uno::Reference< io::XInputStream >& xIn,
     while ( nRead == nConstBufferSize );
 }
 
-//---------------------------------------------------------------------------
+
 OSeekableInputWrapper::OSeekableInputWrapper(
             const uno::Reference< io::XInputStream >& xInStream,
             const uno::Reference< uno::XComponentContext >& rxContext )
@@ -63,12 +63,12 @@ OSeekableInputWrapper::OSeekableInputWrapper(
         throw uno::RuntimeException();
 }
 
-//---------------------------------------------------------------------------
+
 OSeekableInputWrapper::~OSeekableInputWrapper()
 {
 }
 
-//---------------------------------------------------------------------------
+
 uno::Reference< io::XInputStream > OSeekableInputWrapper::CheckSeekableCanWrap(
                             const uno::Reference< io::XInputStream >& xInStream,
                             const uno::Reference< uno::XComponentContext >& rxContext )
@@ -84,7 +84,7 @@ uno::Reference< io::XInputStream > OSeekableInputWrapper::CheckSeekableCanWrap(
     return xNewStream;
 }
 
-//---------------------------------------------------------------------------
+
 void OSeekableInputWrapper::PrepareCopy_Impl()
 {
     if ( !m_xCopyInput.is() )
@@ -114,7 +114,7 @@ void OSeekableInputWrapper::PrepareCopy_Impl()
 }
 
 // XInputStream
-//---------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
     throw ( io::NotConnectedException,
             io::BufferSizeExceededException,
@@ -131,7 +131,7 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >&
     return m_xCopyInput->readBytes( aData, nBytesToRead );
 }
 
-//---------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
     throw ( io::NotConnectedException,
             io::BufferSizeExceededException,
@@ -148,7 +148,7 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8
     return m_xCopyInput->readSomeBytes( aData, nMaxBytesToRead );
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip )
     throw ( io::NotConnectedException,
             io::BufferSizeExceededException,
@@ -165,7 +165,7 @@ void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip )
     m_xCopyInput->skipBytes( nBytesToSkip );
 }
 
-//---------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OSeekableInputWrapper::available()
     throw ( io::NotConnectedException,
             io::IOException,
@@ -181,7 +181,7 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::available()
     return m_xCopyInput->available();
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL OSeekableInputWrapper::closeInput()
     throw ( io::NotConnectedException,
             io::IOException,
@@ -206,7 +206,7 @@ void SAL_CALL OSeekableInputWrapper::closeInput()
 
 
 // XSeekable
-//---------------------------------------------------------------------------
+
 void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location )
     throw ( lang::IllegalArgumentException,
             io::IOException,
@@ -222,7 +222,7 @@ void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location )
     m_xCopySeek->seek( location );
 }
 
-//---------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition()
     throw ( io::IOException,
             uno::RuntimeException )
@@ -237,7 +237,7 @@ sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition()
     return m_xCopySeek->getPosition();
 }
 
-//---------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OSeekableInputWrapper::getLength()
     throw ( io::IOException,
             uno::RuntimeException )
diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx
index f3395d191fef..fefc42b716fe 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.cxx
@@ -28,11 +28,11 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::osl;
 
-//---------------------------------------------------------------------------------------------
+
 // class SequenceInputStream
-//---------------------------------------------------------------------------------------------
 
-//------------------------------------------------------------------
+
+
 SequenceInputStream::SequenceInputStream(
     css::uno::Sequence<sal_Int8> const & rData)
 :   m_aData(rData)
@@ -41,7 +41,7 @@ SequenceInputStream::SequenceInputStream(
 }
 
 // checks if closed, returns available size, not mutex-protected
-//------------------------------------------------------------------
+
 inline sal_Int32 SequenceInputStream::avail()
 {
     if (m_nPos == -1)
@@ -51,7 +51,7 @@ inline sal_Int32 SequenceInputStream::avail()
 }
 
 // com::sun::star::io::XInputStream
-//------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead )
     throw(NotConnectedException, BufferSizeExceededException,
           IOException, RuntimeException)
@@ -73,7 +73,7 @@ sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence<sal_Int8>& aData, sa
     return nBytesToRead;
 }
 
-//------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead )
     throw(NotConnectedException, BufferSizeExceededException,
           IOException, RuntimeException)
@@ -82,7 +82,7 @@ sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence<sal_Int8>& aData
     return readBytes(aData, nMaxBytesToRead);
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip )
     throw(NotConnectedException, BufferSizeExceededException,
           IOException, RuntimeException)
@@ -100,7 +100,7 @@ void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip )
     m_nPos += nBytesToSkip;
 }
 
-//------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SequenceInputStream::available(  )
     throw(NotConnectedException, IOException, RuntimeException)
 {
@@ -109,7 +109,7 @@ sal_Int32 SAL_CALL SequenceInputStream::available(  )
     return avail();
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL SequenceInputStream::closeInput(  )
     throw(NotConnectedException, IOException, RuntimeException)
 {
@@ -136,7 +136,7 @@ sal_Int64 SAL_CALL SequenceInputStream::getLength(  ) throw (IOException, Runtim
     return m_aData.getLength();
 }
 
-//--------------------------------------------------------------------------
+
 OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double _nResizeFactor, sal_Int32 _nMinimumResize, sal_Int32 _nMaximumResize)
     :m_rSequence(_rSeq)
     ,m_nResizeFactor(_nResizeFactor)
@@ -156,7 +156,7 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double
         // this heuristic is as good as any other ... supply better parameters if you don't like it :)
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -207,7 +207,7 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rD
     m_nSize += _rData.getLength();
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL OSequenceOutputStream::flush(  ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -218,7 +218,7 @@ void SAL_CALL OSequenceOutputStream::flush(  ) throw(NotConnectedException, Buff
     m_rSequence.realloc(m_nSize);
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL OSequenceOutputStream::closeOutput(  ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx
index 0e60268c6c02..9cd2d01287c3 100644
--- a/comphelper/source/streaming/streamsection.cxx
+++ b/comphelper/source/streaming/streamsection.cxx
@@ -23,7 +23,7 @@
 namespace comphelper
 {
 
-//-------------------------------------------------------------------------
+
 OStreamSection::OStreamSection(const staruno::Reference< stario::XDataInputStream >& _rxInput)
     :m_xMarkStream(_rxInput, ::com::sun::star::uno::UNO_QUERY)
     ,m_xInStream(_rxInput)
@@ -38,7 +38,7 @@ OStreamSection::OStreamSection(const staruno::Reference< stario::XDataInputStrea
     }
 }
 
-//-------------------------------------------------------------------------
+
 OStreamSection::OStreamSection(const staruno::Reference< stario::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength)
     :m_xMarkStream(_rxOutput, ::com::sun::star::uno::UNO_QUERY)
     ,m_xOutStream(_rxOutput)
@@ -59,7 +59,7 @@ OStreamSection::OStreamSection(const staruno::Reference< stario::XDataOutputStre
     }
 }
 
-//-------------------------------------------------------------------------
+
 OStreamSection::~OStreamSection()
 {
     try
@@ -91,7 +91,7 @@ OStreamSection::~OStreamSection()
     {
     }
 }
-// -----------------------------------------------------------------------------
+
 
 }   // namespace comphelper
 
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index a595f25f15a9..85e625cb85c2 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star;
 
 namespace comphelper {
 
-// -----------------------------------
+
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
@@ -46,7 +46,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::Read
     return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, xContext );
 }
 
-// -----------------------------------
+
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadContentTypeSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
@@ -54,7 +54,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::Read
     return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, xContext );
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::WriteRelationsInfoSequence( const uno::Reference< io::XOutputStream >& xOutStream, const uno::Sequence< uno::Sequence< beans::StringPair > >& aSequence, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
@@ -115,7 +115,7 @@ void SAL_CALL OFOPXMLHelper::WriteRelationsInfoSequence( const uno::Reference< i
     xWriter->endDocument();
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOutputStream >& xOutStream, const uno::Sequence< beans::StringPair >& aDefaultsSequence, const uno::Sequence< beans::StringPair >& aOverridesSequence, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
@@ -178,7 +178,7 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu
 
 // ==================================================================================
 
-// -----------------------------------
+
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
@@ -199,7 +199,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::Read
     return pHelper->GetParsingResult();
 }
 
-// -----------------------------------
+
 OFOPXMLHelper::OFOPXMLHelper( sal_uInt16 nFormat )
 : m_nFormat( nFormat )
 , m_aRelListElement( "Relationships" )
@@ -217,12 +217,12 @@ OFOPXMLHelper::OFOPXMLHelper( sal_uInt16 nFormat )
 {
 }
 
-// -----------------------------------
+
 OFOPXMLHelper::~OFOPXMLHelper()
 {
 }
 
-// -----------------------------------
+
 uno::Sequence< uno::Sequence< beans::StringPair > > OFOPXMLHelper::GetParsingResult()
 {
     if ( m_aElementsSeq.getLength() )
@@ -231,19 +231,19 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OFOPXMLHelper::GetParsingRes
     return m_aResultSeq;
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::startDocument()
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::endDocument()
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
@@ -391,7 +391,7 @@ void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Ref
         throw xml::sax::SAXException(); // TODO: no other elements expected!
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName )
     throw( xml::sax::SAXException, uno::RuntimeException )
 {
@@ -408,25 +408,25 @@ void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName )
     }
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::characters( const OUString& /*aChars*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL OFOPXMLHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
index fff3e093d59b..081f18e8dc77 100644
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
@@ -28,24 +28,24 @@ using namespace ::com::sun::star::uno;
 BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val) : m_aValue(_val)
 {
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int64 SAL_CALL BlobHelper::length(  ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return m_aValue.getLength();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     if ( sal_Int32(pos + _length) > m_aValue.getLength() )
         throw ::com::sun::star::sdbc::SQLException();
     return ::com::sun::star::uno::Sequence< ::sal_Int8 >(m_aValue.getConstArray() + sal_Int32(pos),_length);
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream(  ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return new ::comphelper::SequenceInputStream(m_aValue);
 }
-// -----------------------------------------------------------------------------
+
 
 // The "return" after a call to throwFeatureNotImplementedException()
 // (which always throws) will be detected as unreachable when doing
@@ -58,7 +58,7 @@ SAL_WNOUNREACHABLE_CODE_PUSH
     ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this );
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this );
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index ef33afc7143e..6222ddbbacc0 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -50,10 +50,10 @@ namespace connectivity
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::java;
     using namespace dbtools;
-    //------------------------------------------------------------------------------
+
     const sal_Unicode CHAR_PLACE = '_';
     const sal_Unicode CHAR_WILD  = '%';
-    // -------------------------------------------------------------------------
+
     sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape)
     {
         int    pos=0;
@@ -111,7 +111,7 @@ namespace connectivity
         }
         return ( *pStr == 0 ) && ( *pWild == 0 );
     }
-    //------------------------------------------------------------------
+
 #if HAVE_FEATURE_JAVA
     ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const Reference<XComponentContext >& _rxContext)
     {
@@ -154,7 +154,7 @@ namespace connectivity
 
         return aRet;
     }
-    //------------------------------------------------------------------------------
+
     sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName )
     {
         sal_Bool bRet = sal_False;
@@ -179,7 +179,7 @@ namespace connectivity
 #include <ctype.h>
 namespace dbtools
 {
-//------------------------------------------------------------------
+
 sal_Bool isCharOk(sal_Unicode c,const OUString& _rSpecials)
 {
 
@@ -187,7 +187,7 @@ sal_Bool isCharOk(sal_Unicode c,const OUString& _rSpecials)
           c == '_' || _rSpecials.indexOf(c) != -1);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool isValidSQLName(const OUString& rName,const OUString& _rSpecials)
 {
     // Test for correct naming (in SQL sense)
@@ -215,7 +215,7 @@ sal_Bool isValidSQLName(const OUString& rName,const OUString& _rSpecials)
 
     return sal_True;
 }
-//------------------------------------------------------------------
+
 // Creates a new name if necessary
 OUString convertName2SQLName(const OUString& rName,const OUString& _rSpecials)
 {
@@ -237,7 +237,7 @@ OUString convertName2SQLName(const OUString& rName,const OUString& _rSpecials)
 
     return aNewName;
 }
-//------------------------------------------------------------------------------
+
 OUString quoteName(const OUString& _rQuote, const OUString& _rName)
 {
     OUString sName = _rName;
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 19b38fa308b2..f607209f8d61 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -31,18 +31,18 @@
 #include <string.h>
 
 using namespace connectivity;
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace ::com::sun::star::reflection;
-// --------------------------------------------------------------------------------
+
 OConnectionWrapper::OConnectionWrapper()
 {
 
 }
-// -----------------------------------------------------------------------------
+
 void OConnectionWrapper::setDelegation(Reference< XAggregation >& _rxProxyConnection,oslInterlockedCount& _rRefCount)
 {
     OSL_ENSURE(_rxProxyConnection.is(),"OConnectionWrapper: Connection must be valid!");
@@ -64,7 +64,7 @@ void OConnectionWrapper::setDelegation(Reference< XAggregation >& _rxProxyConnec
     }
     osl_atomic_decrement( &_rRefCount );
 }
-// -----------------------------------------------------------------------------
+
 void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnection
                                        ,const Reference< XComponentContext>& _rxContext
                                        ,oslInterlockedCount& _rRefCount)
@@ -91,12 +91,12 @@ void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnect
     }
     osl_atomic_decrement( &_rRefCount );
 }
-// -----------------------------------------------------------------------------
+
 void OConnectionWrapper::disposing()
 {
 m_xConnection.clear();
 }
-//-----------------------------------------------------------------------------
+
 OConnectionWrapper::~OConnectionWrapper()
 {
     if (m_xProxyConnection.is())
@@ -104,13 +104,13 @@ OConnectionWrapper::~OConnectionWrapper()
 }
 
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnectionWrapper::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" );
 }
 
-// --------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     // first collect the services which are supported by our aggregate
@@ -131,19 +131,19 @@ OUString SAL_CALL OConnectionWrapper::getImplementationName(  ) throw (::com::su
     return aSupported;
 }
 
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException)
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-// --------------------------------------------------------------------------------
+
 Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType ) throw (RuntimeException)
 {
     Any aReturn = OConnection_BASE::queryInterface(_rType);
     return aReturn.hasValue() ? aReturn : (m_xProxyConnection.is() ? m_xProxyConnection->queryAggregation(_rType) : aReturn);
 }
-// --------------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OConnectionWrapper::getTypes(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -151,7 +151,7 @@ Sequence< Type > SAL_CALL OConnectionWrapper::getTypes(  ) throw (::com::sun::st
         m_xTypeProvider->getTypes()
     );
 }
-// -----------------------------------------------------------------------------
+
 // com::sun::star::lang::XUnoTunnel
 sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
 {
@@ -163,7 +163,7 @@ sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >&
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -178,7 +178,7 @@ Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelImplementationId()
     }
     return pId->getImplementationId();
 }
-// -----------------------------------------------------------------------------
+
 namespace
 {
     class TPropertyValueLessFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,::com::sun::star::beans::PropertyValue,bool>
@@ -194,7 +194,7 @@ namespace
 
 }
 
-// -----------------------------------------------------------------------------
+
 // creates a unique id out of the url and sequence of properties
 void OConnectionWrapper::createUniqueId( const OUString& _rURL
                     ,Sequence< PropertyValue >& _rInfo
@@ -250,7 +250,7 @@ void OConnectionWrapper::createUniqueId( const OUString& _rURL
     // we have to destroy the digest
     rtl_digest_destroy(aDigest);
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 8ccf9d050fdc..0bcc9509133f 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::uno;
-// -----------------------------------------------------------------------------
+
 OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, sal_Bool bQuote,
                                               const Reference< XTypeConverter >&  _rxTypeConverter)
 {
@@ -209,7 +209,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, sal_Bo
         aRet.appendAscii(" NULL ");
     return aRet.makeStringAndClear();
 }
-// -----------------------------------------------------------------------------
+
 Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xSupplier)
 {
     OSL_ENSURE(xSupplier.is(), "getNULLDate : the formatter doesn't implement a supplier !");
@@ -229,7 +229,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS
 
     return getStandardDate();
 }
-// -----------------------------------------------------------------------------
+
 void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
                                 const Reference<XNumberFormatter>& xFormatter,
                                 const Date& rNullDate,
@@ -303,7 +303,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
                                 const Date& rNullDate,
                                 const double& rValue,
@@ -349,7 +349,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
     }
 }
 
-//------------------------------------------------------------------------------
+
 double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const Date& i_relativeToNullDate )
 {
     try
@@ -396,7 +396,7 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D
         return 0.0;
     }
 }
-//------------------------------------------------------------------------------
+
 OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn,
                                            const Reference<XNumberFormatter>& _xFormatter,
                                            const ::com::sun::star::lang::Locale& _rLocale,
@@ -432,7 +432,7 @@ OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xC
     return DBTypeConversion::getFormattedValue(Reference< XColumn > (_xColumn, UNO_QUERY), _xFormatter, _rNullDate, nKey, nKeyType);
 }
 
-//------------------------------------------------------------------------------
+
 OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
                                    const Reference<XNumberFormatter>& xFormatter,
                                    const Date& rNullDate,
@@ -502,6 +502,6 @@ OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
     }
     return aString;
 }
-//------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index bf70fbac5714..7804ad9f6fab 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -86,11 +86,11 @@ namespace
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 DriversConfigImpl::DriversConfigImpl()
 {
 }
-// -----------------------------------------------------------------------------
+
 void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rxORB) const
 {
     if ( m_aDrivers.empty() )
@@ -120,24 +120,24 @@ void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rx
         } // if ( m_aInstalled.isValid() )
     }
 }
-// -----------------------------------------------------------------------------
+
 DriversConfig::DriversConfig(const uno::Reference< uno::XComponentContext >& _rxORB)
 :m_xORB(_rxORB)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 DriversConfig::~DriversConfig()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 DriversConfig::DriversConfig( const DriversConfig& _rhs )
 {
     *this = _rhs;
 }
 
-// -----------------------------------------------------------------------------
+
 DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
 {
     if ( this != &_rhs )
@@ -147,7 +147,7 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
     return *this;
 }
 
-// -----------------------------------------------------------------------------
+
 OUString DriversConfig::getDriverFactoryName(const OUString& _sURL) const
 {
     const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
@@ -167,7 +167,7 @@ OUString DriversConfig::getDriverFactoryName(const OUString& _sURL) const
 
     return sRet;
 }
-// -----------------------------------------------------------------------------
+
 OUString DriversConfig::getDriverTypeDisplayName(const OUString& _sURL) const
 {
     const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
@@ -187,22 +187,22 @@ OUString DriversConfig::getDriverTypeDisplayName(const OUString& _sURL) const
 
     return sRet;
 }
-// -----------------------------------------------------------------------------
+
 const ::comphelper::NamedValueCollection& DriversConfig::getProperties(const OUString& _sURL) const
 {
     return impl_get(_sURL,1);
 }
-// -----------------------------------------------------------------------------
+
 const ::comphelper::NamedValueCollection& DriversConfig::getFeatures(const OUString& _sURL) const
 {
     return impl_get(_sURL,0);
 }
-// -----------------------------------------------------------------------------
+
 const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const OUString& _sURL) const
 {
     return impl_get(_sURL,2);
 }
-// -----------------------------------------------------------------------------
+
 const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const OUString& _sURL,sal_Int32 _nProps) const
 {
     const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
@@ -237,7 +237,7 @@ const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const OUString
     }
     return *pRet;
 }
-// -----------------------------------------------------------------------------
+
 uno::Sequence< OUString > DriversConfig::getURLs() const
 {
     const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index b580d377f013..162531ceb710 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -44,14 +44,14 @@
 using namespace connectivity;
 using namespace dbtools;
 using namespace cppu;
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet()
     :ODatabaseMetaDataResultSet_BASE(m_aMutex)
     ,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
@@ -64,7 +64,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet()
     construct();
 }
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet( MetaDataResultSetType _eType )
     :ODatabaseMetaDataResultSet_BASE(m_aMutex)
     ,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
@@ -79,11 +79,11 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet( MetaDataResultSetType _e
     setType(_eType);
 }
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
 {
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::construct()
 {
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),           PROPERTY_ID_FETCHSIZE,          0,&m_nFetchSize,        ::getCppuType(static_cast<sal_Int32*>(0)));
@@ -91,7 +91,7 @@ void ODatabaseMetaDataResultSet::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),      PROPERTY_ID_FETCHDIRECTION,     0,  &m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,   PropertyAttribute::READONLY,&m_nResultSetConcurrency,                ::getCppuType(static_cast<sal_Int32*>(0)));
 }
-// -----------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType)
 {
     switch( _eType )
@@ -118,7 +118,7 @@ void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType)
             OSL_FAIL("Wrong type!");
     }
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -130,23 +130,23 @@ m_xMetaData.clear();
     m_aRows.clear();
     m_aRowsIter = m_aRows.end();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw()
 {
     ODatabaseMetaDataResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
 {
     ODatabaseMetaDataResultSet_BASE::release();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -155,14 +155,14 @@ Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(Runtime
 
     return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
 }
-// -----------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setRows(const ORows& _rRows)
 {
     m_aRows = _rRows;
     m_bBOF = sal_True;
     m_bEOF = m_aRows.empty();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -184,78 +184,78 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum
     assert(false);
     return 0; // Never reached
 }
-// -----------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
 {
     if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
         ::dbtools::throwInvalidIndexException(*this);
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -268,69 +268,69 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData
 
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex).makeAny();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
 
-// -------------------------------------------------------------------------
+
 
 
 ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 
 ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
     return m_bEOF;
 }
-// -------------------------------------------------------------------------
+
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
@@ -339,7 +339,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, Ru
     ::dbtools::throwFunctionSequenceException(*this);
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
@@ -348,17 +348,17 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, Run
 
 SAL_WNOUNREACHABLE_CODE_POP
 
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeException)
 {
@@ -369,7 +369,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeE
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
@@ -378,26 +378,26 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, Runt
     ::dbtools::throwFunctionSequenceException(*this);
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
@@ -406,12 +406,12 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, R
 
 SAL_WNOUNREACHABLE_CODE_POP
 
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     return m_aStatement.get();
 }
-// -------------------------------------------------------------------------
+
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
@@ -420,13 +420,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException,
     ::dbtools::throwFunctionSequenceException(*this);
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionSequenceException(*this);
@@ -435,13 +435,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException,
 
 SAL_WNOUNREACHABLE_CODE_POP
 
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
     return m_bBOF;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, RuntimeException)
 {
@@ -470,7 +470,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, Runti
     }
     return bSuccess;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -483,65 +483,65 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, Ru
 
     return (*m_aRowsIter)[m_nColPos]->getValue().isNull();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* ODatabaseMetaDataResultSet::createArrayHelper( ) const
 {
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper()
 {
     return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setProceduresMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setProceduresMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setCatalogsMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setCatalogsMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setSchemasMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setSchemasMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setColumnPrivilegesMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setColumnPrivilegesMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setColumnsMap()
 {
 
@@ -549,7 +549,7 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
     pMetaData->setColumnsMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setTablesMap()
 {
 
@@ -557,102 +557,102 @@ void ODatabaseMetaDataResultSet::setTablesMap()
     pMetaData->setTablesMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setProcedureColumnsMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setProcedureColumnsMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setPrimaryKeysMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setPrimaryKeysMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setIndexInfoMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setIndexInfoMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setTablePrivilegesMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setCrossReferenceMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setCrossReferenceMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setVersionColumnsMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setVersionColumnsMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setBestRowIdentifierMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setBestRowIdentifierMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setTypeInfoMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setTypeInfoMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setUDTsMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setUDTsMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setTableTypes()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setTableTypes();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setExportedKeysMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setExportedKeysMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setImportedKeysMap()
 {
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setImportedKeysMap();
     m_xMetaData = pMetaData;
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecorator& ORowSetValueDecorator::operator=(const ORowSetValue& _aValue)
 {
     m_aValue = _aValue;
     return *this;
 }
-// -----------------------------------------------------------------------------
+
 const ORowSetValue& ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -668,89 +668,89 @@ const ORowSetValue& ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex)
         return *(*m_aRowsIter)[columnIndex];
     return m_aEmptyValue;
 }
-// -----------------------------------------------------------------------------
+
 /// return an empty ORowSetValueDecorator
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getEmptyValue()
 {
     static ORowSetValueDecoratorRef aEmptyValueRef = new ORowSetValueDecorator();
     return aEmptyValueRef;
 }
-// -----------------------------------------------------------------------------
+
 /// return an ORowSetValueDecorator with 0 as value
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::get0Value()
 {
     static ORowSetValueDecoratorRef a0ValueRef = new ORowSetValueDecorator((sal_Int32)0);
     return a0ValueRef;
 }
-// -----------------------------------------------------------------------------
+
 /// return an ORowSetValueDecorator with 1 as value
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::get1Value()
 {
     static ORowSetValueDecoratorRef a1ValueRef = new ORowSetValueDecorator((sal_Int32)1);
     return a1ValueRef;
 }
-// -----------------------------------------------------------------------------
+
 /// return an ORowSetValueDecorator with ColumnSearch::BASIC as value
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(ColumnSearch::BASIC);
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("SELECT"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("INSERT"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("DELETE"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("UPDATE"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("CREATE"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("READ"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("ALTER"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("DROP"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue()
 {
     static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("'"));
     return aValueRef;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException)
 {
     if ( _aArguments.getLength() == 2 )
@@ -847,20 +847,20 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
     }
 }
 // XServiceInfo
-    // --------------------------------------------------------------------------------
-    //------------------------------------------------------------------------------
+
+
     OUString ODatabaseMetaDataResultSet::getImplementationName_Static(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
     }
-    //------------------------------------------------------------------------------
+
     Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSNS( 1 );
         aSNS[0] = "com.sun.star.sdbc.ResultSet";
         return aSNS;
     }
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
@@ -870,12 +870,12 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
     {
         return cppu::supportsService(this, _rServiceName);
     }
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
-    // -------------------------------------------------------------------------
+
     namespace connectivity
     {
         Reference< XInterface >  SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& ) throw( Exception )
@@ -884,7 +884,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
         }
     }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     cppu::ImplementationEntry entries[] = {
@@ -908,7 +908,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
 extern "C"
 {
 
-//---------------------------------------------------------------------------------------
+
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbtools_component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey)
 {
     return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 5e99163f635c..646a80c9a32c 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -108,7 +108,7 @@ namespace {
     }
 }
 
-// -----------------------------------------------------------------------------
+
 #ifdef DBG_UTIL
 
 #include <vector>
@@ -190,7 +190,7 @@ namespace tracing
 #define TRACE_FREE( type )
 #endif
 
-// -----------------------------------------------------------------------------
+
 void ORowSetValue::setTypeKind(sal_Int32 _eType)
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::setTypeKind" );
@@ -272,7 +272,7 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType)
     m_eTypeKind = _eType;
 }
 
-// -----------------------------------------------------------------------------
+
 void ORowSetValue::free()
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::free" );
@@ -341,7 +341,7 @@ void ORowSetValue::free()
         m_bNull = true;
     }
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH)
 {
     if(&_rRH == this)
@@ -495,7 +495,7 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const Date& _rRH)
 {
@@ -514,7 +514,7 @@ ORowSetValue& ORowSetValue::operator=(const Date& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 ORowSetValue& ORowSetValue::operator=(const Time& _rRH)
 {
     if(m_eTypeKind != DataType::TIME)
@@ -532,7 +532,7 @@ ORowSetValue& ORowSetValue::operator=(const Time& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 ORowSetValue& ORowSetValue::operator=(const DateTime& _rRH)
 {
     if(m_eTypeKind != DataType::TIMESTAMP)
@@ -549,7 +549,7 @@ ORowSetValue& ORowSetValue::operator=(const DateTime& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const OUString& _rRH)
 {
@@ -565,7 +565,7 @@ ORowSetValue& ORowSetValue::operator=(const OUString& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const double& _rRH)
 {
@@ -578,7 +578,7 @@ ORowSetValue& ORowSetValue::operator=(const double& _rRH)
 
     return *this;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue& ORowSetValue::operator=(const float& _rRH)
 {
     if(m_eTypeKind != DataType::FLOAT)
@@ -590,7 +590,7 @@ ORowSetValue& ORowSetValue::operator=(const float& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const sal_Int8& _rRH)
 {
@@ -603,7 +603,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int8& _rRH)
     m_bSigned = true;
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const sal_uInt8& _rRH)
 {
@@ -616,7 +616,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt8& _rRH)
     m_bSigned = false;
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const sal_Int16& _rRH)
 {
@@ -630,7 +630,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int16& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const sal_uInt16& _rRH)
 {
@@ -644,7 +644,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt16& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const sal_Int32& _rRH)
 {
@@ -659,7 +659,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int32& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const sal_uInt32& _rRH)
 {
@@ -674,7 +674,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt32& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 ORowSetValue& ORowSetValue::operator=(const bool _rRH)
 {
@@ -687,7 +687,7 @@ ORowSetValue& ORowSetValue::operator=(const bool _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 ORowSetValue& ORowSetValue::operator=(const sal_Int64& _rRH)
 {
     if ( DataType::BIGINT != m_eTypeKind)
@@ -700,7 +700,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int64& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 ORowSetValue& ORowSetValue::operator=(const sal_uInt64& _rRH)
 {
     if ( DataType::BIGINT != m_eTypeKind)
@@ -713,7 +713,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt64& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 ORowSetValue& ORowSetValue::operator=(const Sequence<sal_Int8>& _rRH)
 {
     if (!isStorageCompatible(DataType::LONGVARBINARY,m_eTypeKind))
@@ -732,7 +732,7 @@ ORowSetValue& ORowSetValue::operator=(const Sequence<sal_Int8>& _rRH)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 ORowSetValue& ORowSetValue::operator=(const Any& _rAny)
 {
     if (!isStorageCompatible(DataType::OBJECT,m_eTypeKind))
@@ -751,26 +751,26 @@ ORowSetValue& ORowSetValue::operator=(const Any& _rAny)
 
     return *this;
 }
-// -------------------------------------------------------------------------
+
 
 bool operator==(const Date& _rLH,const Date& _rRH)
 {
     return _rLH.Day == _rRH.Day && _rLH.Month == _rRH.Month && _rLH.Year == _rRH.Year;
 }
-// -------------------------------------------------------------------------
+
 
 bool operator==(const Time& _rLH,const Time& _rRH)
 {
     return _rLH.Minutes == _rRH.Minutes && _rLH.Hours == _rRH.Hours && _rLH.Seconds == _rRH.Seconds && _rLH.NanoSeconds == _rRH.NanoSeconds;
 }
-// -------------------------------------------------------------------------
+
 
 bool operator==(const DateTime& _rLH,const DateTime& _rRH)
 {
     return _rLH.Day == _rRH.Day && _rLH.Month == _rRH.Month && _rLH.Year == _rRH.Year &&
         _rLH.Minutes == _rRH.Minutes && _rLH.Hours == _rRH.Hours && _rLH.Seconds == _rRH.Seconds && _rLH.NanoSeconds == _rRH.NanoSeconds;
 }
-// -------------------------------------------------------------------------
+
 
 bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
 {
@@ -881,7 +881,7 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 Any ORowSetValue::makeAny() const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::makeAny" );
@@ -975,7 +975,7 @@ Any ORowSetValue::makeAny() const
     }
     return rValue;
 }
-// -------------------------------------------------------------------------
+
 OUString ORowSetValue::getString( ) const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getString" );
@@ -1063,7 +1063,7 @@ OUString ORowSetValue::getString( ) const
     }
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 bool ORowSetValue::getBool()    const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getBool" );
@@ -1137,7 +1137,7 @@ bool ORowSetValue::getBool()    const
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 ORowSetValue::getInt8()    const
 {
@@ -1211,7 +1211,7 @@ sal_Int8 ORowSetValue::getInt8()    const
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_uInt8 ORowSetValue::getUInt8()    const
 {
@@ -1283,7 +1283,7 @@ sal_uInt8 ORowSetValue::getUInt8()    const
     return nRet;
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Int16 ORowSetValue::getInt16()  const
 {
@@ -1357,7 +1357,7 @@ sal_Int16 ORowSetValue::getInt16()  const
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_uInt16 ORowSetValue::getUInt16()  const
 {
@@ -1428,7 +1428,7 @@ sal_uInt16 ORowSetValue::getUInt16()  const
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 ORowSetValue::getInt32()  const
 {
@@ -1502,7 +1502,7 @@ sal_Int32 ORowSetValue::getInt32()  const
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_uInt32 ORowSetValue::getUInt32()  const
 {
@@ -1575,7 +1575,7 @@ sal_uInt32 ORowSetValue::getUInt32()  const
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 ORowSetValue::getLong()   const
 {
@@ -1649,7 +1649,7 @@ sal_Int64 ORowSetValue::getLong()   const
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_uInt64 ORowSetValue::getULong()   const
 {
@@ -1723,7 +1723,7 @@ sal_uInt64 ORowSetValue::getULong()   const
     return nRet;
 }
 
-// -------------------------------------------------------------------------
+
 float ORowSetValue::getFloat()  const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getFloat" );
@@ -1800,7 +1800,7 @@ float ORowSetValue::getFloat()  const
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 double ORowSetValue::getDouble()    const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getDouble" );
@@ -1879,7 +1879,7 @@ double ORowSetValue::getDouble()    const
     }
     return nRet;
 }
-// -----------------------------------------------------------------------------
+
 Sequence<sal_Int8>  ORowSetValue::getSequence() const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getSequence" );
@@ -1952,7 +1952,7 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
     return aSeq;
 
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::util::Date ORowSetValue::getDate() const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getDate" );
@@ -2011,7 +2011,7 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
     }
     return aValue;
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::util::Time ORowSetValue::getTime()        const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getTime" );
@@ -2056,7 +2056,7 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
     }
     return aValue;
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::util::DateTime ORowSetValue::getDateTime()    const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getDateTime" );
@@ -2109,7 +2109,7 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
     }
     return aValue;
 }
-// -----------------------------------------------------------------------------
+
 void ORowSetValue::setSigned(bool _bMod)
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::setSigned" );
@@ -2163,7 +2163,7 @@ void ORowSetValue::setSigned(bool _bMod)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 namespace detail
 {
     class SAL_NO_VTABLE IValueSource
@@ -2258,21 +2258,21 @@ namespace detail
     };
 }
 
-// -----------------------------------------------------------------------------
+
 void ORowSetValue::fill( const sal_Int32 _nType, const Reference< XColumn >& _rxColumn )
 {
     detail::ColumnValue aColumnValue( _rxColumn );
     impl_fill( _nType, true, aColumnValue );
 }
 
-// -----------------------------------------------------------------------------
+
 void ORowSetValue::fill( sal_Int32 _nPos, sal_Int32 _nType, bool  _bNullable, const Reference< XRow>& _xRow )
 {
     detail::RowValue aRowValue( _xRow, _nPos );
     impl_fill( _nType, _bNullable, aRowValue );
 }
 
-// -----------------------------------------------------------------------------
+
 void ORowSetValue::fill(sal_Int32 _nPos,
                      sal_Int32 _nType,
                      const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow)
@@ -2281,7 +2281,7 @@ void ORowSetValue::fill(sal_Int32 _nPos,
     fill(_nPos,_nType,true,_xRow);
 }
 
-// -----------------------------------------------------------------------------
+
 void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const detail::IValueSource& _rValueSource )
 
 {
@@ -2370,7 +2370,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det
         setNull();
     setTypeKind(_nType);
 }
-// -----------------------------------------------------------------------------
+
 void ORowSetValue::fill(const Any& _rValue)
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::fill (3)" );
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 57150ad7a49a..0ea7c652ddc1 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -39,12 +39,12 @@ namespace connectivity
         xConnection = aArgs.getUnpackedValueOrDefault("ActiveConnection",xConnection);
         m_xConnection = xConnection;
     }
-    //------------------------------------------------------------------------------
+
     OUString ParameterSubstitution::getImplementationName_Static(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.helper.ParameterSubstitution");
     }
-    //------------------------------------------------------------------------------
+
     OUString SAL_CALL ParameterSubstitution::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
@@ -54,12 +54,12 @@ namespace connectivity
     {
         return cppu::supportsService(this, _rServiceName);
     }
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
-    //------------------------------------------------------------------
+
     Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSNS( 1 );
@@ -67,12 +67,12 @@ namespace connectivity
         return aSNS;
     }
 
-    //------------------------------------------------------------------
+
     Reference< XInterface >  ParameterSubstitution::create(const Reference< XComponentContext >& _xContext)
     {
         return *(new ParameterSubstitution(_xContext));
     }
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
     {
         OUString sRet = _sText;
@@ -99,17 +99,17 @@ namespace connectivity
         }
         return sRet;
     }
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (::com::sun::star::uno::RuntimeException)
     {
         return _sText;
     }
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
     {
         throw container::NoSuchElementException();
     }
-    //------------------------------------------------------------------
+
 
 
 // ==================================
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 527fd6f6b584..7705e5caaff0 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -68,13 +68,13 @@ OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent
     ,m_pTable(NULL)
 {
 }
-// -----------------------------------------------------------------------------
+
 OColumnsHelper::~OColumnsHelper()
 {
     delete m_pImpl;
     m_pImpl = NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName)
 {
@@ -153,7 +153,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName)
     return xRet;
 }
 
-// -------------------------------------------------------------------------
+
 void OColumnsHelper::impl_refresh() throw(RuntimeException)
 {
     if ( m_pTable )
@@ -162,12 +162,12 @@ void OColumnsHelper::impl_refresh() throw(RuntimeException)
         m_pTable->refreshColumns();
     }
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OColumnsHelper::createDescriptor()
 {
     return new OColumn(sal_True);
 }
-// -----------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OColumnsHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -190,7 +190,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const OUString& _rForName, const
     }
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
@@ -212,7 +212,7 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index dd1a60cf9bad..94e7d431b47b 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -31,13 +31,13 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::beans;
 using namespace ::osl;
 
-//------------------------------------------------------------------------------
+
 OMetaConnection::OMetaConnection()
     : OMetaConnection_BASE(m_aMutex)
     , m_nTextEncoding(RTL_TEXTENCODING_MS_1252)
 {
 }
-//------------------------------------------------------------------------------
+
 void OMetaConnection::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -62,7 +62,7 @@ sal_Int64 SAL_CALL OMetaConnection::getSomething( const ::com::sun::star::uno::S
         ? reinterpret_cast< sal_Int64 >( this )
         : (sal_Int64)0;
 }
-// -----------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OMetaConnection::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -77,13 +77,13 @@ Sequence< sal_Int8 > OMetaConnection::getUnoTunnelImplementationId()
     }
     return pId->getImplementationId();
 }
-// -----------------------------------------------------------------------------
+
 ::dbtools::OPropertyMap& OMetaConnection::getPropMap()
 {
     static ::dbtools::OPropertyMap s_aPropertyNameMap;
     return s_aPropertyNameMap;
 }
-// -----------------------------------------------------------------------------
+
 void OMetaConnection::throwGenericSQLException( sal_uInt16 _nErrorResourceId,const Reference< XInterface>& _xContext )
 {
     OUString sErrorMessage;
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index db0b796b621d..c63667eee210 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -62,25 +62,25 @@ ODatabaseMetaDataBase::ODatabaseMetaDataBase(const Reference< XConnection >& _rx
     }
     osl_atomic_decrement( &m_refCount );
 }
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataBase::~ODatabaseMetaDataBase()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo(  ) throw (RuntimeException)
 {
     return m_aConnectionInfo;
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ ) throw(RuntimeException)
 {
     // cut off all references to the connection
 m_xConnection.clear();
 m_xListenerHelper.clear();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -167,39 +167,39 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
     pResult->setRows(m_aTypeInfoRows);
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getExportedKeys(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getImportedKeys(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getPrimaryKeys(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getIndexInfo(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/,
         sal_Bool /*unique*/, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, sal_Int32 /*scope*/,
         sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCrossReference(
         const Any& /*primaryCatalog*/, const OUString& /*primarySchema*/,
         const OUString& /*primaryTable*/, const Any& /*foreignCatalog*/,
@@ -207,119 +207,119 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCrossReference(
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection(  ) throw(SQLException, RuntimeException)
 {
     return m_xConnection;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedureColumns(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
         const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedures(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
         const OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getVersionColumns(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas(  ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getColumnPrivileges(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/,
         const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTablePrivileges(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs(  ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs );
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_supportsCatalogsInTableDefinitions,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_supportsSchemasInTableDefinitions,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_supportsCatalogsInDataManipulation,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_supportsSchemasInDataManipulation,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_supportsAlterTableWithAddColumn,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_supportsAlterTableWithDropColumn,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_MaxStatements,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_MaxTablesInSelect,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return callImplMethod(m_storesMixedCaseQuotedIdentifiers,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index b63dd4699dca..d10516773574 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex(sal_True)
                  , m_pTable(_pTable)
 {
@@ -39,7 +39,7 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex
     ::std::vector< OUString> aVector;
     m_pColumns  = new OIndexColumns(this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 OIndexHelper::OIndexHelper( OTableHelper* _pTable,
                 const OUString& _Name,
                 const OUString& _Catalog,
@@ -56,7 +56,7 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable,
     construct();
     refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 
 void OIndexHelper::refreshColumns()
 {
@@ -95,6 +95,6 @@ void OIndexHelper::refreshColumns()
     else
         m_pColumns  = new OIndexColumns(this,m_aMutex,aVector);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 93a395acc53c..025e13123ad1 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 OIndexColumns::OIndexColumns(   OIndexHelper* _pIndex,
                         ::osl::Mutex& _rMutex,
                         const ::std::vector< OUString> &_rVector)
@@ -43,7 +43,7 @@ OIndexColumns::OIndexColumns(   OIndexHelper* _pIndex,
             ,m_pIndex(_pIndex)
 {
 }
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
 {
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
@@ -104,16 +104,16 @@ sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OIndexColumns::createDescriptor()
 {
     return new OIndexColumn(sal_True);
 }
-// -------------------------------------------------------------------------
+
 void OIndexColumns::impl_refresh() throw(RuntimeException)
 {
     m_pIndex->refreshColumns();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 41e8652cbd9a..165c2fd93688 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace cppu;
 
-// -----------------------------------------------------------------------------
+
 OIndexesHelper::OIndexesHelper(OTableHelper* _pTable,
                  ::osl::Mutex& _rMutex,
              const ::std::vector< OUString> &_rVector
@@ -46,7 +46,7 @@ OIndexesHelper::OIndexesHelper(OTableHelper* _pTable,
     ,m_pTable(_pTable)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName)
 {
@@ -109,17 +109,17 @@ sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void OIndexesHelper::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshIndexes();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OIndexesHelper::createDescriptor()
 {
     return new OIndexHelper(m_pTable);
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -207,7 +207,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const
 
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
@@ -243,7 +243,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index b09b5fee1b40..4b984bf2198d 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -30,13 +30,13 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::OKey(sal_True)
     ,m_pTable(_pTable)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 OTableKeyHelper::OTableKeyHelper(   OTableHelper* _pTable
             ,const OUString& _Name
             ,const sdbcx::TKeyProperties& _rProps
@@ -46,7 +46,7 @@ OTableKeyHelper::OTableKeyHelper(   OTableHelper* _pTable
     construct();
     refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 void OTableKeyHelper::refreshColumns()
 {
     if ( !m_pTable )
@@ -102,6 +102,6 @@ void OTableKeyHelper::refreshColumns()
     else
         m_pColumns  = new OKeyColumnsHelper(this,m_aMutex,aVector);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 9325b080fee5..73ab71ce7eb0 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 OKeyColumnsHelper::OKeyColumnsHelper(   OTableKeyHelper* _pKey,
                 ::osl::Mutex& _rMutex,
                 const ::std::vector< OUString> &_rVector)
@@ -44,7 +44,7 @@ OKeyColumnsHelper::OKeyColumnsHelper(   OTableKeyHelper* _pKey,
             ,m_pKey(_pKey)
 {
 }
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName)
 {
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
@@ -123,17 +123,17 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OKeyColumnsHelper::createDescriptor()
 {
     return new OKeyColumn(isCaseSensitive());
 }
-// -------------------------------------------------------------------------
+
 void OKeyColumnsHelper::impl_refresh() throw(::com::sun::star::uno::RuntimeException)
 {
     m_pKey->refreshColumns();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 7466d5b3513d..6e83e7be05c3 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -50,7 +50,7 @@ OKeysHelper::OKeysHelper(   OTableHelper* _pTable,
     ,m_pTable(_pTable)
 {
 }
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
 {
     sdbcx::ObjectType xRet = NULL;
@@ -69,17 +69,17 @@ sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void OKeysHelper::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshKeys();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OKeysHelper::createDescriptor()
 {
     return new OTableKeyHelper(m_pTable);
 }
-// -----------------------------------------------------------------------------
+
 /** returns the keyrule string for the primary key
 */
 OUString getKeyRuleString(sal_Bool _bUpdate,sal_Int32 _nKeyRule)
@@ -107,7 +107,7 @@ OUString getKeyRuleString(sal_Bool _bUpdate,sal_Int32 _nKeyRule)
         sRet = OUString::createFromAscii(pKeyRule);
     return sRet;
 }
-// -------------------------------------------------------------------------
+
 void OKeysHelper::cloneDescriptorColumns( const sdbcx::ObjectType& _rSourceDescriptor, const sdbcx::ObjectType& _rDestDescriptor )
 {
     Reference< XColumnsSupplier > xColSupp( _rSourceDescriptor, UNO_QUERY_THROW );
@@ -123,7 +123,7 @@ void OKeysHelper::cloneDescriptorColumns( const sdbcx::ObjectType& _rSourceDescr
         xDestAppend->appendByDescriptor( xColProp );
     }
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -254,12 +254,12 @@ sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Re
 
     return createObject( sNewName );
 }
-// -----------------------------------------------------------------------------
+
 OUString OKeysHelper::getDropForeignKey() const
 {
     return OUString(" DROP CONSTRAINT ");
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OKeysHelper::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
@@ -304,8 +304,8 @@ void OKeysHelper::dropObject(sal_Int32 _nPos,const OUString _sElementName)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 } // namespace connectivity
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index c26a61eec22f..6906e57d5c10 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -20,14 +20,14 @@
 #include "TPrivilegesResultSet.hxx"
 
 using namespace connectivity;
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-//------------------------------------------------------------------------------
+
 OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& _rxMeta
                                            , const Any& catalog
                                            , const OUString& schemaPattern
@@ -81,7 +81,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
     }
     osl_atomic_decrement( &m_refCount );
 }
-//------------------------------------------------------------------------------
+
 const ORowSetValue& OResultSetPrivileges::getValue(sal_Int32 columnIndex)
 {
     switch(columnIndex)
@@ -106,14 +106,14 @@ const ORowSetValue& OResultSetPrivileges::getValue(sal_Int32 columnIndex)
     }
     return ODatabaseMetaDataResultSet::getValue(columnIndex);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSetPrivileges::disposing(void)
 {
     ODatabaseMetaDataResultSet::disposing();
 m_xTables.clear();
 m_xRow.clear();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetPrivileges::next(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -138,6 +138,6 @@ sal_Bool SAL_CALL OResultSetPrivileges::next(  ) throw(SQLException, RuntimeExce
     }
     return bReturn;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index f7808c67f6e7..b5925246556a 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -22,7 +22,7 @@
 #include "sal/log.hxx"
 
 using namespace connectivity;
-// -----------------------------------------------------------------------------
+
 OSkipDeletedSet::OSkipDeletedSet(IResultSetHelper* _pHelper)
     : m_pHelper(_pHelper)
     ,m_bDeletedVisible(false)
@@ -30,13 +30,13 @@ OSkipDeletedSet::OSkipDeletedSet(IResultSetHelper* _pHelper)
     SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::OSkipDeletedSet" );
     m_aBookmarksPositions.reserve(256);
 }
-// -----------------------------------------------------------------------------
+
 OSkipDeletedSet::~OSkipDeletedSet()
 {
     m_aBookmarksPositions.clear();
     //m_aBookmarks.clear();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData)
 {
     SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::skipDeleted" );
@@ -161,7 +161,7 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio
 
     return bDataFound;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,sal_Bool _bRetrieveData)
 {
     SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::moveAbsolute" );
@@ -224,14 +224,14 @@ sal_Bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,sal_Bool _bRetrieveData)
     }
     return bDataFound;
 }
-// -----------------------------------------------------------------------------
+
 void OSkipDeletedSet::clear()
 {
     SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::clear" );
     ::std::vector<sal_Int32>().swap(m_aBookmarksPositions);
     //TInt2IntMap().swap(m_aBookmarks);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const
 {
     SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::getMappedPosition" );
@@ -244,7 +244,7 @@ sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const
     OSL_FAIL("Why!");
     return -1;
 }
-// -----------------------------------------------------------------------------
+
 void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos)
 {
     SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::insertNewPosition" );
@@ -253,7 +253,7 @@ void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos)
     //OSL_ENSURE(::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos");
     m_aBookmarksPositions.push_back(_nPos);
 }
-// -----------------------------------------------------------------------------
+
 void OSkipDeletedSet::deletePosition(sal_Int32 _nBookmark)
 {
     SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::deletePosition" );
@@ -270,6 +270,6 @@ void OSkipDeletedSet::deletePosition(sal_Int32 _nBookmark)
     //m_aBookmarksPositions.erase(m_aBookmarksPositions.begin() + aFind->second-1);
     //m_aBookmarks.erase(_nPos);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index a9d5bc5028b7..28ee408e4d9f 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -24,7 +24,7 @@
 #include <o3tl/compat_functional.hxx>
 
 using namespace connectivity;
-//------------------------------------------------------------------
+
 /// binary_function Functor object for class OSortIndex::TIntValuePairVector::value_type returntype is bool
 struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::value_type,OSortIndex::TIntValuePairVector::value_type,bool>
 {
@@ -76,7 +76,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
     }
 };
 
-// -----------------------------------------------------------------------------
+
 ::rtl::Reference<OKeySet> OSortIndex::CreateKeySet()
 {
     Freeze();
@@ -90,7 +90,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
     pKeySet->setFrozen();
     return pKeySet;
 }
-// -----------------------------------------------------------------------------
+
 OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType,
                         const ::std::vector<TAscendingOrder>& _aAscending)
     :m_aKeyType(_aKeyType)
@@ -98,11 +98,11 @@ OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType,
     ,m_bFrozen(sal_False)
 {
 }
-//------------------------------------------------------------------
+
 OSortIndex::~OSortIndex()
 {
 }
-//------------------------------------------------------------------
+
 void OSortIndex::AddKeyValue(OKeyValue * pKeyValue)
 {
     OSL_ENSURE(pKeyValue,"Can not be null here!");
@@ -116,7 +116,7 @@ void OSortIndex::AddKeyValue(OKeyValue * pKeyValue)
 }
 
 
-//------------------------------------------------------------------
+
 void OSortIndex::Freeze()
 {
     OSL_ENSURE(! m_bFrozen,"OSortIndex::Freeze: already frozen!");
@@ -135,20 +135,20 @@ void OSortIndex::Freeze()
     m_bFrozen = sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 OKeyValue::OKeyValue(sal_Int32 nVal)
 : m_nValue(nVal)
 {
 }
-// -----------------------------------------------------------------------------
+
 OKeyValue::~OKeyValue()
 {
 }
-// -----------------------------------------------------------------------------
+
 OKeyValue* OKeyValue::createKeyValue(sal_Int32 _nVal)
 {
     return new OKeyValue(_nVal);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index e7e4da0ec9fe..c186b67c4946 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -147,7 +147,7 @@ OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
     ,m_pImpl(new OTableHelperImpl(_xConnection))
 {
 }
-// -------------------------------------------------------------------------
+
 OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
                             const Reference< XConnection >& _xConnection,
                             sal_Bool _bCase,
@@ -166,11 +166,11 @@ OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
                         ,m_pImpl(new OTableHelperImpl(_xConnection))
 {
 }
-// -----------------------------------------------------------------------------
+
 OTableHelper::~OTableHelper()
 {
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OTableHelper::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -187,7 +187,7 @@ void SAL_CALL OTableHelper::disposing()
 
 }
 
-// -------------------------------------------------------------------------
+
 namespace
 {
     /** collects ColumnDesc's from a resultset produced by XDatabaseMetaData::getColumns
@@ -259,7 +259,7 @@ namespace
     }
 }
 
-// -------------------------------------------------------------------------
+
 void OTableHelper::refreshColumns()
 {
     TStringVector aVector;
@@ -305,7 +305,7 @@ void OTableHelper::refreshColumns()
     else
         m_pColumns  = createColumns(aVector);
 }
-// -----------------------------------------------------------------------------
+
 const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) const
 {
     const ColumnDesc* pRet = NULL;
@@ -320,7 +320,7 @@ const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) con
     } // for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
     return pRet;
 }
-// -------------------------------------------------------------------------
+
 void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames)
 {
     Any aCatalog;
@@ -356,7 +356,7 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames)
     } // if ( xResult.is() && xResult->next() )
     ::comphelper::disposeComponent(xResult);
 }
-// -------------------------------------------------------------------------
+
 void OTableHelper::refreshForeignKeys(TStringVector& _rNames)
 {
     Any aCatalog;
@@ -419,7 +419,7 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames)
         ::comphelper::disposeComponent(xResult);
     }
 }
-// -------------------------------------------------------------------------
+
 void OTableHelper::refreshKeys()
 {
     m_pImpl->m_aKeys.clear();
@@ -439,7 +439,7 @@ void OTableHelper::refreshKeys()
     else*/
 
 }
-// -------------------------------------------------------------------------
+
 void OTableHelper::refreshIndexes()
 {
     TStringVector aVector;
@@ -480,7 +480,7 @@ void OTableHelper::refreshIndexes()
     else
         m_pIndexes  = createIndexes(aVector);
 }
-// -----------------------------------------------------------------------------
+
 OUString OTableHelper::getRenameStart() const
 {
     OUString sSql("RENAME ");
@@ -491,7 +491,7 @@ OUString OTableHelper::getRenameStart() const
 
     return sSql;
 }
-// -------------------------------------------------------------------------
+
 // XRename
 void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
@@ -537,12 +537,12 @@ void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException
     else
         ::dbtools::qualifiedNameComponents(getMetaData(),newName,m_CatalogName,m_SchemaName,m_Name,::dbtools::eInTableDefinitions);
 }
-// -----------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData> OTableHelper::getMetaData() const
 {
     return m_pImpl->m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -559,24 +559,24 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference
         alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor);
 }
 
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OTableHelper::getName() throw(RuntimeException)
 {
     OUString sComposedName;
     sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_False,::dbtools::eInDataManipulation);
     return sComposedName;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OTableHelper::acquire() throw()
 {
     OTable_TYPEDEF::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OTableHelper::release() throw()
 {
     OTable_TYPEDEF::release();
 }
-// -----------------------------------------------------------------------------
+
 sdbcx::TKeyProperties OTableHelper::getKeyProperties(const OUString& _sName) const
 {
     sdbcx::TKeyProperties pKeyProps;
@@ -593,41 +593,41 @@ sdbcx::TKeyProperties OTableHelper::getKeyProperties(const OUString& _sName) con
 
     return pKeyProps;
 }
-// -----------------------------------------------------------------------------
+
 void OTableHelper::addKey(const OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties)
 {
     m_pImpl->m_aKeys.insert(TKeyMap::value_type(_sName,_aKeyProperties));
 }
-// -----------------------------------------------------------------------------
+
 OUString OTableHelper::getTypeCreatePattern() const
 {
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XConnection> OTableHelper::getConnection() const
 {
     return m_pImpl->m_xConnection;
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::sdb::tools::XTableRename>      OTableHelper::getRenameService() const
 {
     return m_pImpl->m_xRename;
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::sdb::tools::XTableAlteration>  OTableHelper::getAlterService() const
 {
     return m_pImpl->m_xAlter;
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::sdb::tools::XKeyAlteration>  OTableHelper::getKeyService() const
 {
     return m_pImpl->m_xKeyAlter;
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::sdb::tools::XIndexAlteration>  OTableHelper::getIndexService() const
 {
     return m_pImpl->m_xIndexAlter;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 05e6a448122a..8a45b8b99dd7 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -42,7 +42,7 @@ namespace dbtools
     //=====================================================================
     //= OAutoConnectionDisposer
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OAutoConnectionDisposer::OAutoConnectionDisposer(const Reference< XRowSet >& _rxRowSet, const Reference< XConnection >& _rxConnection)
         :m_xRowSet( _rxRowSet )
         ,m_bRSListening( sal_False )
@@ -66,7 +66,7 @@ namespace dbtools
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OAutoConnectionDisposer::startPropertyListening( const Reference< XPropertySet >& _rxRowSet )
     {
         try
@@ -80,7 +80,7 @@ namespace dbtools
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OAutoConnectionDisposer::stopPropertyListening( const Reference< XPropertySet >& _rxEventSource )
     {
         // prevent deletion of ourself while we're herein
@@ -101,7 +101,7 @@ namespace dbtools
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OAutoConnectionDisposer::startRowSetListening()
     {
         OSL_ENSURE( !m_bRSListening, "OAutoConnectionDisposer::startRowSetListening: already listening!" );
@@ -117,7 +117,7 @@ namespace dbtools
         m_bRSListening = sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void OAutoConnectionDisposer::stopRowSetListening()
     {
         OSL_ENSURE( m_bRSListening, "OAutoConnectionDisposer::stopRowSetListening: not listening!" );
@@ -132,7 +132,7 @@ namespace dbtools
         m_bRSListening = sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException)
     {
         if ( _rEvent.PropertyName.equals( getActiveConnectionPropertyName() ) )
@@ -184,7 +184,7 @@ namespace dbtools
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         // the rowset is beeing disposed, and nobody has set a new ActiveConnection in the meantime
@@ -196,7 +196,7 @@ namespace dbtools
         if ( isPropertyListening() )
             stopPropertyListening( Reference< XPropertySet >( _rSource.Source, UNO_QUERY ) );
     }
-    //---------------------------------------------------------------------
+
     void OAutoConnectionDisposer::clearConnection()
     {
         try
@@ -212,22 +212,22 @@ namespace dbtools
             OSL_FAIL("OAutoConnectionDisposer::clearConnection: caught an exception!");
         }
     }
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAutoConnectionDisposer::cursorMoved( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException)
     {
     }
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAutoConnectionDisposer::rowChanged( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException)
     {
     }
-    //---------------------------------------------------------------------
+
     void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException)
     {
         stopRowSetListening();
         clearConnection();
 
     }
-    //---------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace dbtools
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index 04c9aec71b10..9dd38289dc04 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -30,12 +30,12 @@ namespace dbtools
     //=========================================================================
     //= OCharsetMap
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OCharsetMap::OCharsetMap()
     {
     }
 
-    //-------------------------------------------------------------------------
+
     void OCharsetMap::lateConstruct()
     {
         const rtl_TextEncoding eFirstEncoding = RTL_TEXTENCODING_DONTKNOW;
@@ -69,7 +69,7 @@ namespace dbtools
         OSL_ENSURE( find( RTL_TEXTENCODING_BIG5_HKSCS ) != end(), "OCharsetMap::lateConstruct: missing compatibility encoding Big5-HKSCS!" );
     }
 
-    //-------------------------------------------------------------------------
+
     sal_Bool OCharsetMap::approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const
     {
         sal_Bool bIsMimeEncoding = 0 != ( _rInfo.Flags & RTL_TEXTENCODING_INFO_MIME );
@@ -79,26 +79,26 @@ namespace dbtools
         return bIsMimeEncoding;
     }
 
-    //-------------------------------------------------------------------------
+
     OCharsetMap::~OCharsetMap()
     {
     }
 
-    //-------------------------------------------------------------------------
+
     OCharsetMap::CharsetIterator OCharsetMap::begin() const
     {
         ensureConstructed( );
         return CharsetIterator(this, m_aEncodings.begin() );
     }
 
-    //-------------------------------------------------------------------------
+
     OCharsetMap::CharsetIterator    OCharsetMap::find(const rtl_TextEncoding _eEncoding) const
     {
         ensureConstructed( );
         return CharsetIterator( this, m_aEncodings.find( _eEncoding ) );
     }
 
-    //-------------------------------------------------------------------------
+
     OCharsetMap::CharsetIterator    OCharsetMap::find(const OUString& _rIanaName, const IANA&) const
     {
         ensureConstructed( );
@@ -120,7 +120,7 @@ namespace dbtools
         return find( eEncoding );
     }
 
-    //-------------------------------------------------------------------------
+
     OCharsetMap::CharsetIterator OCharsetMap::end() const
     {
         ensureConstructed( );
@@ -131,14 +131,14 @@ namespace dbtools
     //=========================================================================
     //= CharsetIteratorDerefHelper
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     CharsetIteratorDerefHelper::CharsetIteratorDerefHelper( const CharsetIteratorDerefHelper& _rSource )
         :m_eEncoding( _rSource.m_eEncoding )
         ,m_aIanaName( _rSource.m_aIanaName )
     {
     }
 
-    //-------------------------------------------------------------------------
+
     CharsetIteratorDerefHelper:: CharsetIteratorDerefHelper(const rtl_TextEncoding _eEncoding, const OUString& _rIanaName )
         :m_eEncoding( _eEncoding )
         ,m_aIanaName( _rIanaName )
@@ -148,7 +148,7 @@ namespace dbtools
     //=========================================================================
     //= OCharsetMap::CharsetIterator
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     OCharsetMap::CharsetIterator::CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator _aPos )
         :m_pContainer( _pContainer )
         ,m_aPos( _aPos )
@@ -156,19 +156,19 @@ namespace dbtools
         OSL_ENSURE( m_pContainer, "OCharsetMap::CharsetIterator::CharsetIterator : invalid container!" );
     }
 
-    //-------------------------------------------------------------------------
+
     OCharsetMap::CharsetIterator::CharsetIterator(const CharsetIterator& _rSource)
         :m_pContainer( _rSource.m_pContainer )
         ,m_aPos( _rSource.m_aPos )
     {
     }
 
-    //-------------------------------------------------------------------------
+
     OCharsetMap::CharsetIterator::~CharsetIterator()
     {
     }
 
-    //-------------------------------------------------------------------------
+
     CharsetIteratorDerefHelper OCharsetMap::CharsetIterator::operator*() const
     {
         OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(), "OCharsetMap::CharsetIterator::operator*: invalid position!");
@@ -186,7 +186,7 @@ namespace dbtools
         return CharsetIteratorDerefHelper( eEncoding, sIanaName );
     }
 
-    //-------------------------------------------------------------------------
+
     const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator++()
     {
         OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(), "OCharsetMap::CharsetIterator::operator++ : invalid position!" );
@@ -195,7 +195,7 @@ namespace dbtools
         return *this;
     }
 
-    //-------------------------------------------------------------------------
+
     const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator--()
     {
         OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.begin(), "OCharsetMap::CharsetIterator::operator-- : invalid position!" );
@@ -204,7 +204,7 @@ namespace dbtools
         return *this;
     }
 
-    //-------------------------------------------------------------------------
+
     bool operator==(const OCharsetMap::CharsetIterator& lhs, const OCharsetMap::CharsetIterator& rhs)
     {
         return ( lhs.m_pContainer == rhs.m_pContainer ) && ( lhs.m_aPos == rhs.m_aPos );
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index d6e48315806b..579c0e2a2087 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -60,13 +60,13 @@ namespace dbtools
     using namespace ::com::sun::star::beans;
 
 
-    //------------------------------------------------------------------------------
+
     ::com::sun::star::util::Date DBTypeConversion::getStandardDate()
     {
         static ::com::sun::star::util::Date STANDARD_DB_DATE(1,1,1900);
         return STANDARD_DB_DATE;
     }
-    //------------------------------------------------------------------------------
+
     OUString DBTypeConversion::toDateString(const utl::Date& rDate)
     {
         sal_Char s[11];
@@ -79,7 +79,7 @@ namespace dbtools
         s[10] = 0;
         return OUString::createFromAscii(s);
     }
-    //------------------------------------------------------------------
+
     OUString DBTypeConversion::toTimeStringS(const utl::Time& rTime)
     {
         std::ostringstream ostr;
@@ -90,7 +90,7 @@ namespace dbtools
              << setw(2) << rTime.Seconds;
         return OUString::createFromAscii(ostr.str().c_str());
     }
-    //------------------------------------------------------------------
+
     OUString DBTypeConversion::toTimeString(const utl::Time& rTime)
     {
         std::ostringstream ostr;
@@ -102,7 +102,7 @@ namespace dbtools
              << setw(9) << rTime.NanoSeconds;
         return OUString::createFromAscii(ostr.str().c_str());
     }
-    //------------------------------------------------------------------
+
     OUString DBTypeConversion::toDateTimeString(const utl::DateTime& _rDateTime)
     {
         utl::Date aDate(_rDateTime.Day,_rDateTime.Month,_rDateTime.Year);
@@ -113,7 +113,7 @@ namespace dbtools
         aTemp.append( toTimeString(aTime) );
         return  aTemp.makeStringAndClear();
     }
-    //------------------------------------------------------------------------------
+
     utl::Date DBTypeConversion::toDate(sal_Int32 _nVal)
     {
         utl::Date aReturn;
@@ -123,7 +123,7 @@ namespace dbtools
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------
+
     utl::Time DBTypeConversion::toTime(sal_Int64 _nVal)
     {
         utl::Time aReturn;
@@ -148,11 +148,11 @@ namespace dbtools
                nHour * (minInHour * secInMin * nanoSecInSec);
     }
 
-    //------------------------------------------------------------------------------
+
     static const sal_Int32 aDaysInMonth[12] = {   31, 28, 31, 30, 31, 30,
                                             31, 31, 30, 31, 30, 31 };
 
-    //------------------------------------------------------------------------------
+
     static sal_Bool implIsLeapYear(sal_Int32 _nYear)
     {
         return  (   (   ((_nYear % 4) == 0)
@@ -163,7 +163,7 @@ namespace dbtools
                 ;
     }
 
-    //------------------------------------------------------------------------------
+
     static sal_Int32 implDaysInMonth(sal_Int32 _nMonth, sal_Int32 _nYear)
     {
         OSL_ENSURE(_nMonth > 0 && _nMonth < 13,"Month as invalid value!");
@@ -178,7 +178,7 @@ namespace dbtools
         }
     }
 
-    //------------------------------------------------------------------------------
+
     static sal_Int32 implRelativeToAbsoluteNull(const utl::Date& _rDate)
     {
         sal_Int32 nDays = 0;
@@ -195,7 +195,7 @@ namespace dbtools
         nDays += _rDate.Day;
         return nDays;
     }
-    //------------------------------------------------------------------------------
+
     static void implBuildFromRelative( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_Int16& rYear)
     {
         sal_Int32   nTempDays;
@@ -236,25 +236,25 @@ namespace dbtools
         }
         rDay = (sal_uInt16)nTempDays;
     }
-    //------------------------------------------------------------------------------
+
     sal_Int32 DBTypeConversion::toDays(const utl::Date& _rVal, const utl::Date& _rNullDate)
     {
         return implRelativeToAbsoluteNull(_rVal) - implRelativeToAbsoluteNull(_rNullDate);
     }
 
-    //------------------------------------------------------------------------------
+
     double DBTypeConversion::toDouble(const utl::Date& rVal, const utl::Date& _rNullDate)
     {
         return (double)toDays(rVal, _rNullDate);
     }
 
-    //------------------------------------------------------------------------------
+
     double DBTypeConversion::toDouble(const utl::Time& rVal)
     {
         return (double)getNsFromTime(rVal) / fNanoSecondsPerDay;
     }
 
-    //------------------------------------------------------------------------------
+
     double DBTypeConversion::toDouble(const utl::DateTime& _rVal, const utl::Date& _rNullDate)
     {
         sal_Int64   nTime     = toDays(utl::Date(_rVal.Day, _rVal.Month, _rVal.Year), _rNullDate);
@@ -267,7 +267,7 @@ namespace dbtools
 
         return ((double)nTime) + toDouble(aTimePart);
     }
-    // -------------------------------------------------------------------------
+
     static void addDays(sal_Int32 nDays, utl::Date& _rDate)
     {
         sal_Int32   nTempDays = implRelativeToAbsoluteNull( _rDate );
@@ -288,7 +288,7 @@ namespace dbtools
         else
             implBuildFromRelative( nTempDays, _rDate.Day, _rDate.Month, _rDate.Year );
     }
-    // -----------------------------------------------------------------------
+
     static void subDays( sal_Int32 nDays, utl::Date& _rDate )
     {
         sal_Int32   nTempDays = implRelativeToAbsoluteNull( _rDate );
@@ -309,7 +309,7 @@ namespace dbtools
         else
             implBuildFromRelative( nTempDays, _rDate.Day, _rDate.Month, _rDate.Year );
     }
-    // -------------------------------------------------------------------------
+
     utl::Date DBTypeConversion::toDate(double dVal, const utl::Date& _rNullDate)
     {
         utl::Date aRet = _rNullDate;
@@ -322,7 +322,7 @@ namespace dbtools
 
         return aRet;
     }
-    // -------------------------------------------------------------------------
+
     utl::Time DBTypeConversion::toTime(double dVal, short nDigits)
     {
         sal_Int32 nDays     = (sal_Int32)dVal;
@@ -370,7 +370,7 @@ namespace dbtools
         }
         return xRet;
     }
-    //------------------------------------------------------------------------------
+
     utl::DateTime DBTypeConversion::toDateTime(double dVal, const utl::Date& _rNullDate)
     {
         utl::Date aDate = toDate(dVal, _rNullDate);
@@ -394,7 +394,7 @@ namespace dbtools
 
         return xRet;
     }
-    //------------------------------------------------------------------------------
+
     utl::Date DBTypeConversion::toDate(const OUString& _sSQLString)
     {
         // get the token out of a string
@@ -415,7 +415,7 @@ namespace dbtools
         return utl::Date(nDay,nMonth,nYear);
     }
 
-    //-----------------------------------------------------------------------------
+
     utl::DateTime DBTypeConversion::toDateTime(const OUString& _sSQLString)
     {
         //@see http://java.sun.com/j2se/1.4.2/docs/api/java/sql/Timestamp.html#valueOf(java.lang.String)
@@ -439,7 +439,7 @@ namespace dbtools
                         aDate.Day, aDate.Month, aDate.Year, false);
     }
 
-    //-----------------------------------------------------------------------------
+
     utl::Time DBTypeConversion::toTime(const OUString& _sSQLString)
     {
         utl::Time aTime;
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 9e8dc91e7819..931c2cc45562 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -42,34 +42,34 @@ namespace dbtools
 //==============================================================================
 //= SQLExceptionInfo - encapsulating the type info of an SQLException-derived class
 //==============================================================================
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::SQLExceptionInfo()
     :m_eType(UNDEFINED)
 {
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdbc::SQLException& _rError)
 {
     m_aContent <<= _rError;
     implDetermineType();
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdbc::SQLWarning& _rError)
 {
     m_aContent <<= _rError;
     implDetermineType();
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdb::SQLContext& _rError)
 {
     m_aContent <<= _rError;
     implDetermineType();
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::SQLExceptionInfo( const OUString& _rSimpleErrorMessage )
 {
     SQLException aError;
@@ -78,14 +78,14 @@ SQLExceptionInfo::SQLExceptionInfo( const OUString& _rSimpleErrorMessage )
     implDetermineType();
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::SQLExceptionInfo(const SQLExceptionInfo& _rCopySource)
     :m_aContent(_rCopySource.m_aContent)
     ,m_eType(_rCopySource.m_eType)
 {
 }
 
-//------------------------------------------------------------------------------
+
 const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLException& _rError)
 {
     m_aContent <<= _rError;
@@ -93,7 +93,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc
     return *this;
 }
 
-//------------------------------------------------------------------------------
+
 const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLWarning& _rError)
 {
     m_aContent <<= _rError;
@@ -101,7 +101,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc
     return *this;
 }
 
-//------------------------------------------------------------------------------
+
 const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLContext& _rError)
 {
     m_aContent <<= _rError;
@@ -109,7 +109,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb:
     return *this;
 }
 
-//------------------------------------------------------------------------------
+
 const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLErrorEvent& _rErrorEvent)
 {
     m_aContent = _rErrorEvent.Reason;
@@ -117,7 +117,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb:
     return *this;
 }
 
-//------------------------------------------------------------------------------
+
 const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::uno::Any& _rCaughtSQLException)
 {
     m_aContent = _rCaughtSQLException;
@@ -125,7 +125,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::uno:
     return *this;
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError)
 {
     const staruno::Type& aSQLExceptionType = ::getCppuType(static_cast< ::com::sun::star::sdbc::SQLException*>(0));
@@ -137,7 +137,7 @@ SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError)
     implDetermineType();
 }
 
-//------------------------------------------------------------------------------
+
 void SQLExceptionInfo::implDetermineType()
 {
     const Type& aSQLExceptionType = ::getCppuType( static_cast< SQLException* >( 0 ) );
@@ -157,7 +157,7 @@ void SQLExceptionInfo::implDetermineType()
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SQLExceptionInfo::isKindOf(TYPE _eType) const
 {
     switch (_eType)
@@ -174,28 +174,28 @@ sal_Bool SQLExceptionInfo::isKindOf(TYPE _eType) const
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::operator const ::com::sun::star::sdbc::SQLException*() const
 {
     OSL_ENSURE(isKindOf(SQL_EXCEPTION), "SQLExceptionInfo::operator SQLException* : invalid call !");
     return reinterpret_cast<const ::com::sun::star::sdbc::SQLException*>(m_aContent.getValue());
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::operator const ::com::sun::star::sdbc::SQLWarning*() const
 {
     OSL_ENSURE(isKindOf(SQL_WARNING), "SQLExceptionInfo::operator SQLException* : invalid call !");
     return reinterpret_cast<const ::com::sun::star::sdbc::SQLWarning*>(m_aContent.getValue());
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionInfo::operator const ::com::sun::star::sdb::SQLContext*() const
 {
     OSL_ENSURE(isKindOf(SQL_CONTEXT), "SQLExceptionInfo::operator SQLException* : invalid call !");
     return reinterpret_cast<const ::com::sun::star::sdb::SQLContext*>(m_aContent.getValue());
 }
 
-//------------------------------------------------------------------------------
+
 void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const OUString& _rSQLState, const sal_Int32 _nErrorCode )
 {
     SQLException aException;
@@ -208,7 +208,7 @@ void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const OUString&
     m_eType = SQL_EXCEPTION;
 }
 
-//------------------------------------------------------------------------------
+
 void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, const OUString& _rSQLState, const sal_Int32 _nErrorCode )
 {
     // create the to-be-appended exception
@@ -254,7 +254,7 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, cons
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SQLExceptionInfo::doThrow()
 {
     if ( m_aContent.getValueTypeClass() == TypeClass_EXCEPTION )
@@ -266,7 +266,7 @@ void SQLExceptionInfo::doThrow()
 //= SQLExceptionIteratorHelper
 //==============================================================================
 
-//------------------------------------------------------------------------------
+
 SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const SQLExceptionInfo& _rChainStart )
     :m_pCurrent( NULL )
     ,m_eCurrentType( SQLExceptionInfo::UNDEFINED )
@@ -278,14 +278,14 @@ SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const SQLExceptionInfo&
     }
 }
 
-//------------------------------------------------------------------------------
+
 SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const ::com::sun::star::sdbc::SQLException& _rChainStart )
     :m_pCurrent( &_rChainStart )
     ,m_eCurrentType( SQLExceptionInfo::SQL_EXCEPTION )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void SQLExceptionIteratorHelper::current( SQLExceptionInfo& _out_rInfo ) const
 {
     switch ( m_eCurrentType )
@@ -308,7 +308,7 @@ void SQLExceptionIteratorHelper::current( SQLExceptionInfo& _out_rInfo ) const
     }
 }
 
-//------------------------------------------------------------------------------
+
 const ::com::sun::star::sdbc::SQLException* SQLExceptionIteratorHelper::next()
 {
     OSL_ENSURE( hasMoreElements(), "SQLExceptionIteratorHelper::next : invalid call (please use hasMoreElements)!" );
@@ -351,14 +351,14 @@ const ::com::sun::star::sdbc::SQLException* SQLExceptionIteratorHelper::next()
     return pReturn;
 }
 
-//------------------------------------------------------------------------------
+
 void SQLExceptionIteratorHelper::next( SQLExceptionInfo& _out_rInfo )
 {
     current( _out_rInfo );
     next();
 }
 
-//------------------------------------------------------------
+
 void throwFunctionSequenceException(const Reference< XInterface >& _Context, const Any& _Next)  throw ( ::com::sun::star::sdbc::SQLException )
 {
     ::connectivity::SharedResources aResources;
@@ -370,7 +370,7 @@ void throwFunctionSequenceException(const Reference< XInterface >& _Context, con
         _Next
     );
 }
-// -----------------------------------------------------------------------------
+
 void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context,
         const ::com::sun::star::uno::Any& _Next)  throw ( ::com::sun::star::sdbc::SQLException )
 {
@@ -383,7 +383,7 @@ void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::s
         _Next
     );
 }
-// -----------------------------------------------------------------------------
+
 void throwFunctionNotSupportedException( const OUString& _rFunctionName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
         const ::com::sun::star::uno::Any& _rNextException ) throw ( ::com::sun::star::sdbc::SQLException )
 {
@@ -400,21 +400,21 @@ void throwFunctionNotSupportedException( const OUString& _rFunctionName, const :
         _rNextException
     );
 }
-// -----------------------------------------------------------------------------
+
 void throwGenericSQLException(const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource)
     throw (::com::sun::star::sdbc::SQLException)
 {
     throwGenericSQLException(_rMsg, _rxSource, Any());
 }
 
-// -----------------------------------------------------------------------------
+
 void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException)
     throw (SQLException)
 {
     throw SQLException( _rMsg, _rxSource, getStandardSQLState( SQL_GENERAL_ERROR ), 0, _rNextException);
 }
 
-// -----------------------------------------------------------------------------
+
 void throwFeatureNotImplementedException( const OUString& _rFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
     throw (SQLException)
 {
@@ -442,7 +442,7 @@ void throwInvalidColumnException( const OUString& _rColumnName, const Reference<
                                 "$columnname$",_rColumnName) );
     throwSQLException( sErrorMessage, SQL_COLUMN_NOT_FOUND, _rxContext );
 }
-// -----------------------------------------------------------------------------
+
 void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState,
         const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException)
 {
@@ -455,7 +455,7 @@ void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState,
     );
 }
 
-// -----------------------------------------------------------------------------
+
 void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState,
         const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode,
         const Any* _pNextException ) throw (SQLException)
@@ -463,7 +463,7 @@ void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState,
     throwSQLException( _rMessage, getStandardSQLState( _eSQLState ), _rxContext, _nErrorCode, _pNextException );
 }
 
-// -----------------------------------------------------------------------------
+
 OUString getStandardSQLState( StandardSQLState _eState )
 {
     switch ( _eState )
@@ -495,7 +495,7 @@ OUString getStandardSQLState( StandardSQLState _eState )
     throw RuntimeException();
 }
 
-// -----------------------------------------------------------------------------
+
 //.........................................................................
 }   // namespace dbtools
 //.........................................................................
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 86527aa6ea98..dad2ceb77424 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -94,7 +94,7 @@ namespace dbtools
         }
     };
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         //................................................................
@@ -183,26 +183,26 @@ namespace dbtools
     //====================================================================
     //= DatabaseMetaData
     //====================================================================
-    //--------------------------------------------------------------------
+
     DatabaseMetaData::DatabaseMetaData()
         :m_pImpl( new DatabaseMetaData_Impl )
     {
     }
 
-    //--------------------------------------------------------------------
+
     DatabaseMetaData::DatabaseMetaData( const Reference< XConnection >& _connection )
         :m_pImpl( new DatabaseMetaData_Impl )
     {
         lcl_construct( *m_pImpl, _connection );
     }
 
-    //--------------------------------------------------------------------
+
     DatabaseMetaData::DatabaseMetaData( const DatabaseMetaData& _copyFrom )
         :m_pImpl( new DatabaseMetaData_Impl( *_copyFrom.m_pImpl ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     DatabaseMetaData& DatabaseMetaData::operator=( const DatabaseMetaData& _copyFrom )
     {
         if ( this == &_copyFrom )
@@ -212,18 +212,18 @@ namespace dbtools
         return *this;
     }
 
-    //--------------------------------------------------------------------
+
     DatabaseMetaData::~DatabaseMetaData()
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::isConnected() const
     {
         return m_pImpl->xConnection.is();
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::supportsSubqueriesInFrom() const
     {
         lcl_checkConnected( *m_pImpl );
@@ -243,7 +243,7 @@ namespace dbtools
         return supportsSubQueries;
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::supportsPrimaryKeys() const
     {
         lcl_checkConnected( *m_pImpl );
@@ -264,19 +264,19 @@ namespace dbtools
         return doesSupportPrimaryKeys;
     }
 
-    //--------------------------------------------------------------------
+
     const OUString&  DatabaseMetaData::getIdentifierQuoteString() const
     {
         return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedIdentifierQuoteString, &XDatabaseMetaData::getIdentifierQuoteString );
     }
 
-    //--------------------------------------------------------------------
+
     const OUString&  DatabaseMetaData::getCatalogSeparator() const
     {
         return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedCatalogSeparator, &XDatabaseMetaData::getCatalogSeparator );
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::restrictIdentifiersToSQL92() const
     {
         lcl_checkConnected( *m_pImpl );
@@ -288,7 +288,7 @@ namespace dbtools
         return restrict;
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::generateASBeforeCorrelationName() const
     {
         bool doGenerate( true );
@@ -297,7 +297,7 @@ namespace dbtools
             OSL_VERIFY( setting >>= doGenerate );
         return doGenerate;
     }
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::shouldEscapeDateTime() const
     {
         bool doGenerate( true );
@@ -306,7 +306,7 @@ namespace dbtools
             OSL_VERIFY( setting >>= doGenerate );
         return doGenerate;
     }
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::isAutoIncrementPrimaryKey() const
     {
         bool is( true );
@@ -315,7 +315,7 @@ namespace dbtools
             OSL_VERIFY( setting >>= is );
         return is;
     }
-    //--------------------------------------------------------------------
+
     sal_Int32 DatabaseMetaData::getBooleanComparisonMode() const
     {
         sal_Int32 mode( BooleanComparisonMode::EQUAL_INTEGER );
@@ -324,7 +324,7 @@ namespace dbtools
             OSL_VERIFY( setting >>= mode );
         return mode;
     }
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::supportsRelations() const
     {
         lcl_checkConnected( *m_pImpl );
@@ -353,7 +353,7 @@ namespace dbtools
         return bSupport;
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::supportsColumnAliasInOrderBy() const
     {
         bool doGenerate( true );
@@ -363,7 +363,7 @@ namespace dbtools
         return doGenerate;
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::supportsUserAdministration( const Reference<XComponentContext>& _rContext ) const
     {
         lcl_checkConnected( *m_pImpl  );
@@ -392,7 +392,7 @@ namespace dbtools
         return isSupported;
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::displayEmptyTableFolders() const
     {
         bool doDisplay( true );
@@ -414,7 +414,7 @@ namespace dbtools
 #endif
         return doDisplay;
     }
-    //--------------------------------------------------------------------
+
     bool DatabaseMetaData::supportsThreads() const
     {
         bool bSupported( true );
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 7f73de093a97..65f103961826 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -202,7 +202,7 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons
     return aSql.makeStringAndClear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const OUString& _sCreatePattern)
 {
@@ -266,7 +266,7 @@ namespace
         return sSql;
     }
 }
-// -----------------------------------------------------------------------------
+
 OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection)
 {
     Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
@@ -372,7 +372,7 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
     return aSql.makeStringAndClear();
 
 }
-// -----------------------------------------------------------------------------
+
 OUString createSqlCreateTableStatement(  const Reference< XPropertySet >& descriptor,
                                                 const Reference< XConnection>& _xConnection,
                                                 ISQLStatementHelper* _pHelper,
@@ -507,7 +507,7 @@ namespace
 
         return xProp;
     }
-    //------------------------------------------------------------------
+
     Reference< XModel> lcl_getXModel(const Reference< XInterface>& _xIface)
     {
         Reference< XInterface > xParent = _xIface;
@@ -521,7 +521,7 @@ namespace
         return xModel;
     }
 }
-// -----------------------------------------------------------------------------
+
 Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable,
                                           const Reference<XConnection>& _xConnection,
                                           const OUString& _rName,
@@ -573,7 +573,7 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
     return xProp;
 }
 
-// -----------------------------------------------------------------------------
+
 bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection, const sal_Char* _pAsciiSettingName )
 {
     bool bValue( false );
@@ -596,7 +596,7 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection,
     }
     return bValue;
 }
-// -------------------------------------------------------------------------
+
 bool getDataSourceSetting( const Reference< XInterface >& _xChild, const OUString& _sAsciiSettingsName,
     Any& /* [out] */ _rSettingsValue )
 {
@@ -621,14 +621,14 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const OUStrin
     }
     return bIsPresent;
 }
-// -------------------------------------------------------------------------
+
 bool getDataSourceSetting( const Reference< XInterface >& _rxDataSource, const sal_Char* _pAsciiSettingsName,
     Any& /* [out] */ _rSettingsValue )
 {
     OUString sAsciiSettingsName = OUString::createFromAscii(_pAsciiSettingsName);
     return getDataSourceSetting( _rxDataSource, sAsciiSettingsName,_rSettingsValue );
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const OUString& _sProperty,sal_Bool _bDefault)
 {
     sal_Bool bEnabled = _bDefault;
@@ -652,7 +652,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const O
     }
     return bEnabled;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XTablesSupplier> getDataDefinitionByURLAndConnection(
             const OUString& _rsUrl,
             const Reference< XConnection>& _xConnection,
@@ -677,7 +677,7 @@ Reference< XTablesSupplier> getDataDefinitionByURLAndConnection(
     return xTablesSup;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
                              const OUString& _sCatalog,
                              const OUString& _sSchema,
@@ -817,7 +817,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
     }
     return nPrivileges;
 }
-// -----------------------------------------------------------------------------
+
 // we need some more information about the column
 void collectColumnInformation(const Reference< XConnection>& _xConnection,
                               const OUString& _sComposedName,
@@ -851,7 +851,7 @@ void collectColumnInformation(const Reference< XConnection>& _xConnection,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Reference< XConnection >& _rxActualConnection )
 {
     bool bIsEmbedded = false;
@@ -893,7 +893,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc
     }
     return bIsEmbedded;
 }
-// -----------------------------------------------------------------------------
+
 namespace
 {
     OUString lcl_getEncodingName( rtl_TextEncoding _eEncoding )
@@ -910,7 +910,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OString& _rDest, rtl_TextEncoding _eEncoding ) SAL_THROW((com::sun::star::sdbc::SQLException))
 {
     if ( !rtl_convertUStringToString( &_rDest.pData, _rSource.getStr(), _rSource.getLength(),
@@ -939,7 +939,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr
     return _rDest.getLength();
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSource, OString&  _rDest,
    sal_Int32 _nMaxLen, rtl_TextEncoding _eEncoding ) SAL_THROW((SQLException))
 {
@@ -969,19 +969,19 @@ OUString lcl_getReportEngines()
     static OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines");
     return s_sNodeName;
 }
-// -----------------------------------------------------------------------------
+
 OUString lcl_getDefaultReportEngine()
 {
     static OUString s_sNodeName("DefaultReportEngine");
     return s_sNodeName;
 }
-// -----------------------------------------------------------------------------
+
 OUString lcl_getReportEngineNames()
 {
     static OUString s_sNodeName("ReportEngineNames");
     return s_sNodeName;
 }
-// -----------------------------------------------------------------------------
+
 OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& _rxORB)
 {
     ::utl::OConfigurationTreeRoot aReportEngines = ::utl::OConfigurationTreeRoot::createWithComponentContext(
@@ -1013,7 +1013,7 @@ OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >&
         return OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 //.........................................................................
 }   // namespace dbtools
 //.........................................................................
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index e8a4a2ddd4a4..3612ef8a3940 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -41,14 +41,14 @@ namespace dbtools
     //====================================================================
     //= FilterManager
     //====================================================================
-    //--------------------------------------------------------------------
+
     FilterManager::FilterManager( )
         :m_aFilterComponents( FC_COMPONENT_COUNT )
         ,m_bApplyPublicFilter( true )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void FilterManager::initialize( const Reference< XPropertySet >& _rxComponentAggregate )
     {
         m_xComponentAggregate = _rxComponentAggregate;
@@ -58,19 +58,19 @@ namespace dbtools
             m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_APPLYFILTER), makeAny( (sal_Bool)sal_True ) );
     }
 
-    //--------------------------------------------------------------------
+
     void FilterManager::dispose( )
     {
         m_xComponentAggregate.clear();
     }
 
-    //--------------------------------------------------------------------
+
     const OUString& FilterManager::getFilterComponent( FilterComponent _eWhich ) const
     {
         return m_aFilterComponents[ _eWhich ];
     }
 
-    //--------------------------------------------------------------------
+
     void FilterManager::setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent )
     {
         m_aFilterComponents[ _eWhich ]  = _rComponent;
@@ -85,7 +85,7 @@ namespace dbtools
         }
     }
 
-    //--------------------------------------------------------------------
+
     void FilterManager::setApplyPublicFilter( sal_Bool _bApply )
     {
         if ( m_bApplyPublicFilter == _bApply )
@@ -106,7 +106,7 @@ namespace dbtools
         }
     }
 
-    //--------------------------------------------------------------------
+
     void FilterManager::appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const
     {
         if ( !io_appendTo.isEmpty() )
@@ -121,7 +121,7 @@ namespace dbtools
         io_appendTo.appendAscii( " )" );
     }
 
-    //--------------------------------------------------------------------
+
     bool FilterManager::isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const
     {
         sal_Int32 nOnlyNonEmpty = -1;
@@ -152,7 +152,7 @@ namespace dbtools
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     OUString FilterManager::getComposedFilter( ) const
     {
         OUStringBuffer aComposedFilter;
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 5c89a7117a7f..393414095f80 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -94,7 +94,7 @@ namespace dbtools
         }
     };
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         //................................................................
@@ -214,7 +214,7 @@ namespace dbtools
     //====================================================================
     //= FormattedColumnValue
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormattedColumnValue::FormattedColumnValue( const Reference< XComponentContext >& _rxContext,
             const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& i_rColumn )
         :m_pData( new FormattedColumnValue_Data )
@@ -222,7 +222,7 @@ namespace dbtools
         lcl_initColumnDataValue_nothrow( _rxContext, *m_pData, _rxRowSet, i_rColumn );
     }
 
-    //--------------------------------------------------------------------
+
     FormattedColumnValue::FormattedColumnValue( const Reference< XNumberFormatter >& i_rNumberFormatter,
             const Reference< XPropertySet >& _rxColumn )
         :m_pData( new FormattedColumnValue_Data )
@@ -230,49 +230,49 @@ namespace dbtools
         lcl_initColumnDataValue_nothrow( *m_pData, i_rNumberFormatter, _rxColumn );
     }
 
-    //--------------------------------------------------------------------
+
     void FormattedColumnValue::clear()
     {
         lcl_clear_nothrow( *m_pData );
     }
 
-    //--------------------------------------------------------------------
+
     FormattedColumnValue::~FormattedColumnValue()
     {
         clear();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 FormattedColumnValue::getFormatKey() const
     {
         return m_pData->m_nFormatKey;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 FormattedColumnValue::getFieldType() const
     {
         return m_pData->m_nFieldType;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 FormattedColumnValue::getKeyType() const
     {
         return m_pData->m_nKeyType;
     }
 
-    //--------------------------------------------------------------------
+
     const Reference< XColumn >& FormattedColumnValue::getColumn() const
     {
         return m_pData->m_xColumn;
     }
 
-    //--------------------------------------------------------------------
+
     const Reference< XColumnUpdate >& FormattedColumnValue::getColumnUpdate() const
     {
         return m_pData->m_xColumnUpdate;
     }
 
-    //--------------------------------------------------------------------
+
     bool FormattedColumnValue::setFormattedValue( const OUString& _rFormattedStringValue ) const
     {
         OSL_PRECOND( m_pData->m_xColumnUpdate.is(), "FormattedColumnValue::setFormattedValue: no column!" );
@@ -299,7 +299,7 @@ namespace dbtools
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     OUString FormattedColumnValue::getFormattedValue() const
     {
         OSL_PRECOND( m_pData->m_xColumn.is(), "FormattedColumnValue::setFormattedValue: no column!" );
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 9ecb37275a9c..48becea7eaba 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -62,7 +62,7 @@ namespace dbtools
     //====================================================================
     //= ParameterManager
     //====================================================================
-    //--------------------------------------------------------------------
+
     ParameterManager::ParameterManager( ::osl::Mutex& _rMutex, const Reference< XComponentContext >& _rxContext )
         :m_rMutex             ( _rMutex )
         ,m_aParameterListeners( _rMutex )
@@ -74,7 +74,7 @@ namespace dbtools
         OSL_ENSURE( m_xContext.is(), "ParameterManager::ParameterManager: no service factory!" );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::initialize( const Reference< XPropertySet >& _rxComponent, const Reference< XAggregation >& _rxComponentAggregate )
     {
         OSL_ENSURE( !m_xComponent.get().is(), "ParameterManager::initialize: already initialized!" );
@@ -88,7 +88,7 @@ namespace dbtools
             return;
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::dispose( )
     {
         clearAllParameterInformation();
@@ -100,7 +100,7 @@ namespace dbtools
         m_xAggregatedRowSet.clear();
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::clearAllParameterInformation()
     {
        m_xInnerParamColumns.clear();
@@ -118,12 +118,12 @@ namespace dbtools
         m_bUpToDate = false;
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::disposing( const EventObject& /*_rDisposingEvent*/ )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setAllParametersNull() SAL_THROW( ( SQLException, RuntimeException ) )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::setAllParametersNull: not initialized, or already disposed!" );
@@ -134,7 +134,7 @@ namespace dbtools
             m_xInnerParamUpdate->setNull( i, DataType::VARCHAR );
     }
 
-    //--------------------------------------------------------------------
+
     bool ParameterManager::initializeComposerByComponent( const Reference< XPropertySet >& _rxComponent )
     {
         OSL_PRECOND( _rxComponent.is(), "ParameterManager::initializeComposerByComponent: invalid !" );
@@ -164,7 +164,7 @@ namespace dbtools
         return m_xInnerParamColumns.is();
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::collectInnerParameters( bool _bSecondRun )
     {
         OSL_PRECOND( m_xInnerParamColumns.is(), "ParameterManager::collectInnerParameters: missing some internal data!" );
@@ -219,7 +219,7 @@ namespace dbtools
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString ParameterManager::createFilterConditionFromColumnLink(
         const OUString& _rMasterColumn, const OUString& _rDetailLink, OUString& _rNewParamName )
     {
@@ -241,7 +241,7 @@ namespace dbtools
         return sFilter += _rNewParamName;
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::classifyLinks( const Reference< XNameAccess >& _rxParentColumns,
         const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents ) SAL_THROW(( Exception ))
     {
@@ -334,7 +334,7 @@ namespace dbtools
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::analyzeFieldLinks( FilterManager& _rFilterManager, bool& /* [out] */ _rColumnsInLinkDetails )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::analyzeFieldLinks: not initialized, or already disposed!" );
@@ -408,7 +408,7 @@ namespace dbtools
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::createOuterParameters()
     {
         OSL_PRECOND( !m_pOuterParameters.is(), "ParameterManager::createOuterParameters: outer parameters not initialized!" );
@@ -481,7 +481,7 @@ namespace dbtools
 #endif
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::updateParameterInfo( FilterManager& _rFilterManager )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::updateParameterInfo: not initialized, or already disposed!" );
@@ -535,7 +535,7 @@ namespace dbtools
         m_bUpToDate = true;
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::fillLinkedParameters( const Reference< XNameAccess >& _rxParentColumns )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::fillLinkedParameters: not initialized, or already disposed!" );
@@ -621,7 +621,7 @@ namespace dbtools
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ParameterManager::completeParameters( const Reference< XInteractionHandler >& _rxCompletionHandler, const Reference< XConnection > _rxConnection )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::completeParameters: not initialized, or already disposed!" );
@@ -684,7 +684,7 @@ namespace dbtools
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool ParameterManager::consultParameterListeners( ::osl::ResettableMutexGuard& _rClearForNotifies )
     {
         bool bCanceled = false;
@@ -707,7 +707,7 @@ namespace dbtools
         return !bCanceled;
     }
 
-    //--------------------------------------------------------------------
+
     bool ParameterManager::fillParameterValues( const Reference< XInteractionHandler >& _rxCompletionHandler, ::osl::ResettableMutexGuard& _rClearForNotifies )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::fillParameterValues: not initialized, or already disposed!" );
@@ -733,7 +733,7 @@ namespace dbtools
         return consultParameterListeners( _rClearForNotifies );
     }
 
-    //--------------------------------------------------------------------
+
     bool ParameterManager::getConnection( Reference< XConnection >& /* [out] */ _rxConnection )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::getConnection: not initialized, or already disposed!" );
@@ -755,7 +755,7 @@ namespace dbtools
         return _rxConnection.is();
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::cacheConnectionInfo() SAL_THROW(( ))
     {
         try
@@ -777,7 +777,7 @@ namespace dbtools
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ParameterManager::getColumns( Reference< XNameAccess >& /* [out] */ _rxColumns, bool _bFromComposer ) SAL_THROW(( Exception ))
     {
         _rxColumns.clear();
@@ -794,7 +794,7 @@ namespace dbtools
         return _rxColumns.is();
     }
 
-    //--------------------------------------------------------------------
+
     bool ParameterManager::getParentColumns( Reference< XNameAccess >& /* [out] */ _out_rxParentColumns, bool _bFromComposer )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::getParentColumns: not initialized, or already disposed!" );
@@ -834,20 +834,20 @@ namespace dbtools
         return _out_rxParentColumns.is();
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::addParameterListener( const Reference< XDatabaseParameterListener >& _rxListener )
     {
         if ( _rxListener.is() )
             m_aParameterListeners.addInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::removeParameterListener( const Reference< XDatabaseParameterListener >& _rxListener )
     {
         m_aParameterListeners.removeInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::resetParameterValues( ) SAL_THROW(())
     {
         OSL_PRECOND( isAlive(), "ParameterManager::resetParameterValues: not initialized, or already disposed!" );
@@ -933,7 +933,7 @@ namespace dbtools
 
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::externalParameterVisited( sal_Int32 _nIndex )
     {
         if ( m_aParametersVisited.size() < (size_t)_nIndex )
@@ -953,139 +953,139 @@ namespace dbtools
         m_xInnerParamUpdate->method; \
         externalParameterVisited( _nIndex ) \
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setNull( sal_Int32 _nIndex, sal_Int32 sqlType )
     {
         VISIT_PARAMETER( setNull( _nIndex, sqlType ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setObjectNull( sal_Int32 _nIndex, sal_Int32 sqlType, const OUString& typeName )
     {
         VISIT_PARAMETER( setObjectNull( _nIndex, sqlType, typeName ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setBoolean( sal_Int32 _nIndex, sal_Bool x )
     {
         VISIT_PARAMETER( setBoolean( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setByte( sal_Int32 _nIndex, sal_Int8 x )
     {
         VISIT_PARAMETER( setByte( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setShort( sal_Int32 _nIndex, sal_Int16 x )
     {
         VISIT_PARAMETER( setShort( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setInt( sal_Int32 _nIndex, sal_Int32 x )
     {
         VISIT_PARAMETER( setInt( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setLong( sal_Int32 _nIndex, sal_Int64 x )
     {
         VISIT_PARAMETER( setLong( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setFloat( sal_Int32 _nIndex, float x )
     {
         VISIT_PARAMETER( setFloat( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setDouble( sal_Int32 _nIndex, double x )
     {
         VISIT_PARAMETER( setDouble( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setString( sal_Int32 _nIndex, const OUString& x )
     {
         VISIT_PARAMETER( setString( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setBytes( sal_Int32 _nIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x )
     {
         VISIT_PARAMETER( setBytes( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setDate( sal_Int32 _nIndex, const ::com::sun::star::util::Date& x )
     {
         VISIT_PARAMETER( setDate( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setTime( sal_Int32 _nIndex, const ::com::sun::star::util::Time& x )
     {
         VISIT_PARAMETER( setTime( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setTimestamp( sal_Int32 _nIndex, const ::com::sun::star::util::DateTime& x )
     {
         VISIT_PARAMETER( setTimestamp( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setBinaryStream( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length )
     {
         VISIT_PARAMETER( setBinaryStream( _nIndex, x, length ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setCharacterStream( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length )
     {
         VISIT_PARAMETER( setCharacterStream( _nIndex, x, length ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setObject( sal_Int32 _nIndex, const ::com::sun::star::uno::Any& x )
     {
         VISIT_PARAMETER( setObject( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setObjectWithInfo( sal_Int32 _nIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale )
     {
         VISIT_PARAMETER( setObjectWithInfo( _nIndex, x, targetSqlType, scale ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setRef( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef>& x )
     {
         VISIT_PARAMETER( setRef( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setBlob( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>& x )
     {
         VISIT_PARAMETER( setBlob( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setClob( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob>& x )
     {
         VISIT_PARAMETER( setClob( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::setArray( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray>& x )
     {
         VISIT_PARAMETER( setArray( _nIndex, x ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterManager::clearParameters( )
     {
         if ( m_xInnerParamUpdate.is() )
@@ -1095,7 +1095,7 @@ namespace dbtools
     //====================================================================
     //= OParameterContinuation
     //====================================================================
-    //--------------------------------------------------------------------
+
     void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException )
     {
         m_aValues = _rValues;
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index f928945c5811..f8289fe5de2a 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -65,7 +65,7 @@ namespace param
     //====================================================================
     //= ParameterWrapper
     //====================================================================
-    //--------------------------------------------------------------------
+
     ParameterWrapper::ParameterWrapper( const Reference< XPropertySet >& _rxColumn )
         :PropertyBase( m_aBHelper )
         ,m_xDelegator( _rxColumn )
@@ -76,7 +76,7 @@ namespace param
             throw RuntimeException();
     }
 
-    //--------------------------------------------------------------------
+
     ParameterWrapper::ParameterWrapper( const Reference< XPropertySet >& _rxColumn,
             const Reference< XParameters >& _rxAllParameters, const ::std::vector< sal_Int32 >& _rIndexes )
         :PropertyBase( m_aBHelper )
@@ -92,15 +92,15 @@ namespace param
         OSL_ENSURE( !m_aIndexes.empty(), "ParameterWrapper::ParameterWrapper: sure about the indexes?" );
     }
 
-    //--------------------------------------------------------------------
+
     ParameterWrapper::~ParameterWrapper()
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( ParameterWrapper, UnoBase, PropertyBase )
 
-    //--------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL ParameterWrapper::getTypes(   ) throw(RuntimeException)
     {
         Sequence< Type > aTypes( 4 );
@@ -111,10 +111,10 @@ namespace param
         return aTypes;
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_GET_IMPLEMENTATION_ID( ParameterWrapper )
 
-    //--------------------------------------------------------------------
+
     OUString ParameterWrapper::impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const
     {
         Reference< XPropertySetInfo >  xInfo = const_cast<ParameterWrapper*>( this )->getPropertySetInfo();
@@ -130,13 +130,13 @@ namespace param
         return OUString();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo() throw( RuntimeException )
     {
         return createPropertySetInfo( getInfoHelper() );
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& ParameterWrapper::getInfoHelper()
     {
         if ( !m_pInfoHelper.get() )
@@ -164,7 +164,7 @@ namespace param
         return *m_pInfoHelper;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool ParameterWrapper::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw( IllegalArgumentException )
     {
         OSL_ENSURE( PROPERTY_ID_VALUE == nHandle, "ParameterWrapper::convertFastPropertyValue: the only non-readonly prop should be our PROPERTY_VALUE!" );
@@ -176,7 +176,7 @@ namespace param
         return sal_True;    // assume "modified" ...
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception )
     {
         if ( nHandle == PROPERTY_ID_VALUE )
@@ -218,7 +218,7 @@ namespace param
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterWrapper::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
     {
         if ( nHandle == PROPERTY_ID_VALUE )
@@ -232,7 +232,7 @@ namespace param
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ParameterWrapper::dispose()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -249,13 +249,13 @@ namespace param
     //====================================================================
     //= ParameterWrapperContainer
     //====================================================================
-    //--------------------------------------------------------------------
+
     ParameterWrapperContainer::ParameterWrapperContainer()
         :ParameterWrapperContainer_Base( m_aMutex )
     {
     }
 
-    //--------------------------------------------------------------------
+
     ParameterWrapperContainer::ParameterWrapperContainer( const Reference< XSingleSelectQueryAnalyzer >& _rxComposer )
         :ParameterWrapperContainer_Base( m_aMutex )
     {
@@ -269,12 +269,12 @@ namespace param
         }
     }
 
-    //--------------------------------------------------------------------
+
     ParameterWrapperContainer::~ParameterWrapperContainer()
     {
     }
 
-    //--------------------------------------------------------------------
+
     Type SAL_CALL ParameterWrapperContainer::getElementType() throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -282,7 +282,7 @@ namespace param
         return ::getCppuType( static_cast< Reference< XPropertySet >* >( NULL ) );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL ParameterWrapperContainer::hasElements() throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -290,7 +290,7 @@ namespace param
         return !m_aParameters.empty();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL ParameterWrapperContainer::getCount() throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -298,7 +298,7 @@ namespace param
         return m_aParameters.size();
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -310,7 +310,7 @@ namespace param
         return makeAny( Reference< XPropertySet >( m_aParameters[ _nIndex ].get() ) );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XEnumeration > ParameterWrapperContainer::createEnumeration() throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -319,14 +319,14 @@ namespace param
         return new ::comphelper::OEnumerationByIndex( static_cast< XIndexAccess* >( this ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ParameterWrapperContainer::impl_checkDisposed_throw()
     {
         if ( rBHelper.bDisposed )
             throw DisposedException( OUString(), *this );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ParameterWrapperContainer::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 79cc2697c64b..74e00aefb966 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -61,7 +61,7 @@ namespace dbtools
     using ::connectivity::OSQLParseNode;
 
     //=====================================================================
-    //---------------------------------------------------------------------
+
     static sal_Unicode lcl_getSeparatorChar( const OUString& _rSeparator, sal_Unicode _nFallback )
     {
         OSL_ENSURE( !_rSeparator.isEmpty(), "::lcl_getSeparatorChar: invalid separator string!" );
@@ -75,7 +75,7 @@ namespace dbtools
     //=====================================================================
     //= OPredicateInputController
     //=====================================================================
-    //---------------------------------------------------------------------
+
     sal_Bool OPredicateInputController::getSeparatorChars( const Locale& _rLocale, sal_Unicode& _rDecSep, sal_Unicode& _rThdSep ) const
     {
         _rDecSep = '.';
@@ -98,7 +98,7 @@ namespace dbtools
         return sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     OPredicateInputController::OPredicateInputController(
         const Reference< XComponentContext >& rxContext, const Reference< XConnection >& _rxConnection, const IParseContext* _pParseContext )
         : m_xConnection( _rxConnection )
@@ -134,7 +134,7 @@ namespace dbtools
         }
     }
 
-    //---------------------------------------------------------------------
+
     OSQLParseNode* OPredicateInputController::implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const Reference< XPropertySet > & _rxField) const
     {
         OSQLParseNode* pReturn = const_cast< OSQLParser& >( m_aParser ).predicateTree( _rErrorMessage, _rStatement, m_xFormatter, _rxField );
@@ -244,7 +244,7 @@ namespace dbtools
         return pReturn;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OPredicateInputController::normalizePredicateString(
         OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField, OUString* _pErrorMessage ) const
     {
@@ -282,7 +282,7 @@ namespace dbtools
         return bSuccess;
     }
 
-    //---------------------------------------------------------------------
+
     OUString OPredicateInputController::getPredicateValue(
         const OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField,
         sal_Bool _bForStatementUse, OUString* _pErrorMessage ) const
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 30df7cb335ae..863e962f7545 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -100,7 +100,7 @@ namespace dbtools
                 if(aIter->second)
                     rtl_uString_release(aIter->second);
         }
-        // ------------------------------------------------------------------------------
+
         OUString OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const
         {
             OUString sRet;
@@ -111,7 +111,7 @@ namespace dbtools
                 sRet = aIter->second;
             return sRet;
         }
-        // ------------------------------------------------------------------------------
+
         OUString OPropertyMap::fillValue(sal_Int32 _nIndex)
         {
             rtl_uString* pStr = NULL;
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index de58dae08b47..c9db24fa3199 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -97,7 +97,7 @@ namespace connectivity
     //====================================================================
     //= SQLError_Impl - implementation
     //====================================================================
-    //--------------------------------------------------------------------
+
     SQLError_Impl::SQLError_Impl( const Reference<XComponentContext> & _rxContext )
         :m_aContext( _rxContext )
         ,m_pResources( )
@@ -105,19 +105,19 @@ namespace connectivity
     {
     }
 
-    //--------------------------------------------------------------------
+
     SQLError_Impl::~SQLError_Impl()
     {
     }
 
-    //--------------------------------------------------------------------
+
     const OUString& SQLError_Impl::getMessagePrefix()
     {
         static const OUString s_sMessagePrefix( "[OOoBase]" );
         return s_sMessagePrefix;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         //................................................................
@@ -145,7 +145,7 @@ namespace connectivity
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString SQLError_Impl::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
         OUString sErrorMessage( impl_getErrorMessage( _eCondition ) );
@@ -157,19 +157,19 @@ namespace connectivity
         return sErrorMessage;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SQLError_Impl::getSQLState( const ErrorCondition _eCondition )
     {
         return impl_getSQLState( _eCondition );
     }
 
-    //--------------------------------------------------------------------
+
     ErrorCode SQLError_Impl::getErrorCode( const ErrorCondition _eCondition )
     {
         return 0 - ::sal::static_int_cast< ErrorCode, ErrorCondition >( _eCondition );
     }
 
-    //--------------------------------------------------------------------
+
     void SQLError_Impl::raiseException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
         raiseTypedException(
@@ -182,7 +182,7 @@ namespace connectivity
         );
     }
 
-    //--------------------------------------------------------------------
+
     void SQLError_Impl::raiseException( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
         raiseTypedException(
@@ -195,7 +195,7 @@ namespace connectivity
         );
     }
 
-    //--------------------------------------------------------------------
+
     void SQLError_Impl::raiseTypedException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const Type& _rExceptionType, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
@@ -213,14 +213,14 @@ namespace connectivity
         ::cppu::throwException( aException );
     }
 
-    //--------------------------------------------------------------------
+
     SQLException SQLError_Impl::getSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
         return impl_buildSQLException( _eCondition, _rxContext, _rParamValue1, _rParamValue2, _rParamValue3 );
     }
 
-    //--------------------------------------------------------------------
+
     SQLException SQLError_Impl::impl_buildSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
@@ -233,7 +233,7 @@ namespace connectivity
         );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SQLError_Impl::impl_getErrorMessage( const ErrorCondition& _eCondition )
     {
         OUStringBuffer aMessage;
@@ -248,7 +248,7 @@ namespace connectivity
         return aMessage.makeStringAndClear();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SQLError_Impl::impl_getSQLState( const ErrorCondition& _eCondition )
     {
         OUString sState;
@@ -266,7 +266,7 @@ namespace connectivity
         return sState;
     }
 
-    //--------------------------------------------------------------------
+
     bool SQLError_Impl::impl_initResources()
     {
         if ( m_pResources.get() )
@@ -284,55 +284,55 @@ namespace connectivity
     //====================================================================
     //= SQLError
     //====================================================================
-    //--------------------------------------------------------------------
+
     SQLError::SQLError( const Reference<XComponentContext> & _rxContext )
         :m_pImpl( new SQLError_Impl( _rxContext ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     SQLError::~SQLError()
     {
     }
 
-    //--------------------------------------------------------------------
+
     const OUString& SQLError::getMessagePrefix()
     {
         return SQLError_Impl::getMessagePrefix();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SQLError::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const
     {
         return m_pImpl->getErrorMessage( _eCondition, _rParamValue1, _rParamValue2, _rParamValue3 );
     }
 
-    //--------------------------------------------------------------------
+
     ErrorCode SQLError::getErrorCode( const ErrorCondition _eCondition )
     {
         return SQLError_Impl::getErrorCode( _eCondition );
     }
 
-    //--------------------------------------------------------------------
+
     void SQLError::raiseException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const
     {
         m_pImpl->raiseException( _eCondition, _rxContext, _rParamValue1, _rParamValue2, _rParamValue3 );
     }
 
-    //--------------------------------------------------------------------
+
     void SQLError::raiseException( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const
     {
         m_pImpl->raiseException( _eCondition, _rParamValue1, _rParamValue2, _rParamValue3 );
     }
 
-    //--------------------------------------------------------------------
+
     void SQLError::raiseTypedException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const Type& _rExceptionType, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const
     {
         m_pImpl->raiseTypedException( _eCondition, _rxContext, _rExceptionType, _rParamValue1, _rParamValue2, _rParamValue3 );
     }
 
-    //--------------------------------------------------------------------
+
     SQLException SQLError::getSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const
     {
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index f80bc1e03b02..a00356280ef2 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -82,10 +82,10 @@ namespace dbtools
         }
     };
 
-    //--------------------------------------------------------------------
+
     namespace
     {
-        //----------------------------------------------------------------
+
         void    lcl_resetComposer( StatementComposer_Data& _rData )
         {
             if ( _rData.bDisposeComposer && _rData.xComposer.is() )
@@ -103,7 +103,7 @@ namespace dbtools
             _rData.xComposer.clear();
         }
 
-        //----------------------------------------------------------------
+
         bool    lcl_ensureUpToDateComposer_nothrow( StatementComposer_Data& _rData )
         {
             if ( !_rData.bComposerDirty )
@@ -236,7 +236,7 @@ namespace dbtools
     //====================================================================
     //= StatementComposer
     //====================================================================
-    //--------------------------------------------------------------------
+
     StatementComposer::StatementComposer( const Reference< XConnection >& _rxConnection,
         const OUString&  _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing )
         :m_pData( new StatementComposer_Data( _rxConnection ) )
@@ -247,40 +247,40 @@ namespace dbtools
         m_pData->bEscapeProcessing = _bEscapeProcessing;
     }
 
-    //--------------------------------------------------------------------
+
     StatementComposer::~StatementComposer()
     {
         lcl_resetComposer( *m_pData );
     }
 
-    //--------------------------------------------------------------------
+
     void StatementComposer::setDisposeComposer( bool _bDoDispose )
     {
         m_pData->bDisposeComposer = _bDoDispose;
     }
 
-    //--------------------------------------------------------------------
+
     void StatementComposer::setFilter( const OUString& _rFilter )
     {
         m_pData->sFilter = _rFilter;
         m_pData->bComposerDirty = true;
     }
 
-    //--------------------------------------------------------------------
+
     void StatementComposer::setOrder( const OUString& _rOrder )
     {
         m_pData->sOrder = _rOrder;
         m_pData->bComposerDirty = true;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XSingleSelectQueryComposer > StatementComposer::getComposer()
     {
         lcl_ensureUpToDateComposer_nothrow( *m_pData );
         return m_pData->xComposer;
     }
 
-    //--------------------------------------------------------------------
+
     OUString StatementComposer::getQuery()
     {
         if ( lcl_ensureUpToDateComposer_nothrow( *m_pData ) )
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index 44b7a69de9e8..0681bcb11040 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -35,7 +35,7 @@ namespace dbtools
     //====================================================================
     //= WarningsContainer
     //====================================================================
-    //--------------------------------------------------------------------
+
     static void lcl_concatWarnings( Any& _rChainLeft, const Any& _rChainRight )
     {
         if ( !_rChainLeft.hasValue() )
@@ -58,30 +58,30 @@ namespace dbtools
         }
     }
 
-    //--------------------------------------------------------------------
+
     WarningsContainer::~WarningsContainer()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void WarningsContainer::appendWarning(const SQLException& _rWarning)
     {
         lcl_concatWarnings( m_aOwnWarnings, makeAny( _rWarning ) );
     }
 
-    //--------------------------------------------------------------------
+
     void WarningsContainer::appendWarning( const SQLContext& _rContext )
     {
         lcl_concatWarnings( m_aOwnWarnings, makeAny( _rContext ));
     }
 
-    //--------------------------------------------------------------------
+
     void WarningsContainer::appendWarning(const SQLWarning& _rWarning)
     {
         lcl_concatWarnings( m_aOwnWarnings, makeAny( _rWarning ) );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL WarningsContainer::getWarnings(  ) const
     {
         Any aAllWarnings;
@@ -94,7 +94,7 @@ namespace dbtools
         return aAllWarnings;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL WarningsContainer::clearWarnings(  )
     {
         if ( m_xExternalWarnings.is() )
@@ -102,7 +102,7 @@ namespace dbtools
         m_aOwnWarnings.clear();
     }
 
-    //--------------------------------------------------------------------
+
     void WarningsContainer::appendWarning( const OUString& _rWarning, const sal_Char* _pAsciiSQLState, const Reference< XInterface >& _rxContext )
     {
         appendWarning( SQLWarning( _rWarning, _rxContext, OUString::createFromAscii( _pAsciiSQLState ), 0, Any() ) );
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 476106b7606d..869b95e6e5ba 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -50,7 +50,7 @@ void SAL_CALL OPoolTimer::onShot()
 }
 namespace
 {
-    //--------------------------------------------------------------------
+
     static const OUString& getTimeoutNodeName()
     {
         static OUString s_sNodeName( "Timeout" );
@@ -61,7 +61,7 @@ namespace
 //==========================================================================
 //= OConnectionPool
 //==========================================================================
-//--------------------------------------------------------------------------
+
 OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
                                  const Reference< XInterface >& _xDriverNode,
                                  const Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory)
@@ -86,12 +86,12 @@ OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
     m_xInvalidator = new OPoolTimer(this,::salhelper::TTimeValue(m_nTimeOut,0));
     m_xInvalidator->start();
 }
-// -----------------------------------------------------------------------------
+
 OConnectionPool::~OConnectionPool()
 {
     clear(sal_False);
 }
-// -----------------------------------------------------------------------------
+
 struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::value_type,void>
                                     ,::std::unary_function<TActiveConnectionMap::value_type,void>
 {
@@ -104,7 +104,7 @@ struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::v
     {
         OSL_ENSURE(m_pConnectionPool,"No connection pool!");
     }
-    // -----------------------------------------------------------------------------
+
     void dispose(const Reference<XInterface>& _xComponent)
     {
         Reference< XComponent >  xComponent(_xComponent, UNO_QUERY);
@@ -116,18 +116,18 @@ struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::v
                 xComponent->dispose();
         }
     }
-    // -----------------------------------------------------------------------------
+
     void operator()(const TPooledConnections::value_type& _aValue)
     {
         dispose(_aValue);
     }
-    // -----------------------------------------------------------------------------
+
     void operator()(const TActiveConnectionMap::value_type& _aValue)
     {
         dispose(_aValue.first);
     }
 };
-// -----------------------------------------------------------------------------
+
 struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type,void>
 {
     OConnectionPool* m_pConnectionPool;
@@ -142,7 +142,7 @@ struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type
         ::std::for_each(_aValue.second.aConnections.begin(),_aValue.second.aConnections.end(),TRemoveEventListenerFunctor(m_pConnectionPool,sal_True));
     }
 };
-// -----------------------------------------------------------------------------
+
 void OConnectionPool::clear(sal_Bool _bDispose)
 {
     MutexGuard aGuard(m_aMutex);
@@ -166,7 +166,7 @@ void OConnectionPool::clear(sal_Bool _bDispose)
 m_xDriverNode.clear();
 m_xDriver.clear();
 }
-//--------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -187,7 +187,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const
 
     return xConnection;
 }
-//--------------------------------------------------------------------------
+
 void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException)
 {
     Reference<XConnection> xConnection(Source.Source,UNO_QUERY);
@@ -208,7 +208,7 @@ void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObj
     m_xDriverNode.clear();
     }
 }
-// -----------------------------------------------------------------------------
+
 Reference< XConnection> OConnectionPool::createNewConnection(const OUString& _rURL,const Sequence< PropertyValue >& _rInfo)
 {
     // create new pooled conenction
@@ -241,7 +241,7 @@ Reference< XConnection> OConnectionPool::createNewConnection(const OUString& _rU
 
     return xConnection;
 }
-// -----------------------------------------------------------------------------
+
 void OConnectionPool::invalidatePooledConnections()
 {
     MutexGuard aGuard(m_aMutex);
@@ -276,7 +276,7 @@ void OConnectionPool::invalidatePooledConnections()
     if(!m_aPool.empty())
         m_xInvalidator->start();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::iterator& _rIter)
 {
     Reference<XConnection> xConnection;
@@ -299,7 +299,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite
     }
     return xConnection;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(getTimeoutNodeName() == evt.PropertyName)
@@ -308,7 +308,7 @@ void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt )
         calculateTimeOuts();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OConnectionPool::calculateTimeOuts()
 {
     sal_Int32 nTimeOutCorrection = 10;
@@ -318,6 +318,6 @@ void OConnectionPool::calculateTimeOuts()
     m_nTimeOut      = m_nALiveCount / nTimeOutCorrection;
     m_nALiveCount   = m_nALiveCount / m_nTimeOut;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index e9cd16616293..98ec50cc2da3 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -26,19 +26,19 @@
 #include <comphelper/sequence.hxx>
 
 using namespace connectivity;
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
-// --------------------------------------------------------------------------------
+
 OConnectionWeakWrapper::OConnectionWeakWrapper(Reference< XAggregation >& _xConnection)
     : OConnectionWeakWrapper_BASE(m_aMutex)
 {
     setDelegation(_xConnection,m_refCount);
     OSL_ENSURE(m_xConnection.is(),"OConnectionWeakWrapper: Connection must be valid!");
 }
-//-----------------------------------------------------------------------------
+
 OConnectionWeakWrapper::~OConnectionWeakWrapper()
 {
     if ( !OConnectionWeakWrapper_BASE::rBHelper.bDisposed )
@@ -48,10 +48,10 @@ OConnectionWeakWrapper::~OConnectionWeakWrapper()
     }
 }
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OConnectionWeakWrapper, "com.sun.star.sdbc.drivers.OConnectionWeakWrapper", "com.sun.star.sdbc.Connection")
 
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -60,7 +60,7 @@ Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement(  ) thr
 
     return m_xConnection->createStatement();
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -69,7 +69,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatemen
 
     return m_xConnection->prepareStatement(sql);
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -78,7 +78,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( co
 
     return m_xConnection->prepareCall(sql);
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -87,7 +87,7 @@ OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw
 
     return m_xConnection->nativeSQL(sql);
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -95,7 +95,7 @@ void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw
 
     m_xConnection->setAutoCommit(autoCommit);
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -104,7 +104,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit(  ) throw(SQLException,
 
     return m_xConnection->getAutoCommit();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnectionWeakWrapper::commit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -113,7 +113,7 @@ void SAL_CALL OConnectionWeakWrapper::commit(  ) throw(SQLException, RuntimeExce
 
     m_xConnection->commit();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnectionWeakWrapper::rollback(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -122,14 +122,14 @@ void SAL_CALL OConnectionWeakWrapper::rollback(  ) throw(SQLException, RuntimeEx
 
     m_xConnection->rollback();
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnectionWeakWrapper::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_xConnection->isClosed();
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -138,7 +138,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData(  )
 
     return m_xConnection->getMetaData();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -147,7 +147,7 @@ void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQL
 
     m_xConnection->setReadOnly(readOnly);
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -156,7 +156,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly(  ) throw(SQLException, Run
 
     return m_xConnection->isReadOnly();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -165,7 +165,7 @@ void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) thro
 
     m_xConnection->setCatalog(catalog);
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnectionWeakWrapper::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -174,7 +174,7 @@ OUString SAL_CALL OConnectionWeakWrapper::getCatalog(  ) throw(SQLException, Run
 
     return m_xConnection->getCatalog();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -183,7 +183,7 @@ void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level )
 
     m_xConnection->setTransactionIsolation(level);
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -192,7 +192,7 @@ sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation(  ) throw(SQL
 
     return m_xConnection->getTransactionIsolation();
 }
-// --------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -201,7 +201,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWr
 
     return m_xConnection->getTypeMap();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -210,7 +210,7 @@ void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::s
 
     m_xConnection->setTypeMap(typeMap);
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL OConnectionWeakWrapper::close(  ) throw(SQLException, RuntimeException)
 {
@@ -221,7 +221,7 @@ void SAL_CALL OConnectionWeakWrapper::close(  ) throw(SQLException, RuntimeExcep
     }
     dispose();
 }
-//------------------------------------------------------------------------------
+
 void OConnectionWeakWrapper::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -229,7 +229,7 @@ void OConnectionWeakWrapper::disposing()
     OConnectionWeakWrapper_BASE::disposing();
     OConnectionWrapper::disposing();
 }
-// -----------------------------------------------------------------------------
+
 // com::sun::star::lang::XUnoTunnel
 #ifdef N_DEBUG
 IMPLEMENT_FORWARD_XINTERFACE2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper)
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index f039de4934dd..3c3ba05db709 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -33,7 +33,7 @@ namespace connectivity
     //====================================================================
     //= ODriverWrapper
     //====================================================================
-    //--------------------------------------------------------------------
+
     ODriverWrapper::ODriverWrapper( Reference< XAggregation >& _rxAggregateDriver, OConnectionPool* _pPool )
         :m_pConnectionPool(_pPool)
     {
@@ -60,7 +60,7 @@ namespace connectivity
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     ODriverWrapper::~ODriverWrapper()
     {
         if (m_xDriverAggregate.is())
@@ -71,14 +71,14 @@ namespace connectivity
         m_pConnectionPool = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL ODriverWrapper::queryInterface( const Type& _rType ) throw (RuntimeException)
     {
         Any aReturn = ODriverWrapper_BASE::queryInterface(_rType);
         return aReturn.hasValue() ? aReturn : (m_xDriverAggregate.is() ? m_xDriverAggregate->queryAggregation(_rType) : aReturn);
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         Reference< XConnection > xConnection;
@@ -91,13 +91,13 @@ namespace connectivity
         return xConnection;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException)
     {
         return m_xDriver.is() && m_xDriver->acceptsURL(url);
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         Sequence< DriverPropertyInfo > aInfo;
@@ -106,13 +106,13 @@ namespace connectivity
         return aInfo;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL ODriverWrapper::getMajorVersion(  ) throw (RuntimeException)
     {
         return m_xDriver.is() ? m_xDriver->getMajorVersion() : 0;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL ODriverWrapper::getMinorVersion(  ) throw (RuntimeException)
     {
         return m_xDriver.is() ? m_xDriver->getMinorVersion() : 0;
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 03eb49e15294..30aa321560db 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -42,38 +42,38 @@ using namespace ::com::sun::star::reflection;
 using namespace ::osl;
 using namespace connectivity;
 
-//--------------------------------------------------------------------
+
 static const OUString& getConnectionPoolNodeName()
 {
     static OUString s_sNodeName(  "org.openoffice.Office.DataAccess/ConnectionPool" );
     return s_sNodeName;
 }
-//--------------------------------------------------------------------
+
 static const OUString& getEnablePoolingNodeName()
 {
     static OUString s_sNodeName(  "EnablePooling" );
     return s_sNodeName;
 }
-//--------------------------------------------------------------------
+
 static const OUString& getDriverNameNodeName()
 {
     static OUString s_sNodeName(  "DriverName" );
     return s_sNodeName;
 }
-// -----------------------------------------------------------------------------
+
 static const OUString& getDriverSettingsNodeName()
 {
     static OUString s_sNodeName(  "DriverSettings" );
     return s_sNodeName;
 }
-//--------------------------------------------------------------------------
+
 static const OUString& getEnableNodeName()
 {
     static OUString s_sNodeName(  "Enable" );
     return s_sNodeName;
 }
 
-//--------------------------------------------------------------------
+
 OPoolCollection::OPoolCollection(const Reference< XComponentContext >& _rxContext)
     :m_xContext(_rxContext)
 {
@@ -95,17 +95,17 @@ OPoolCollection::OPoolCollection(const Reference< XComponentContext >& _rxContex
     }
     osl_atomic_decrement( &m_refCount );
 }
-// -----------------------------------------------------------------------------
+
 OPoolCollection::~OPoolCollection()
 {
     clearConnectionPools(sal_False);
 }
-// -----------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException)
 {
     return getConnectionWithInfo(_rURL,Sequence< PropertyValue >());
 }
-// -----------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -125,19 +125,19 @@ Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const
 
     return xConnection;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPoolCollection::setLoginTimeout( sal_Int32 seconds ) throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     m_xManager->setLoginTimeout(seconds);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout(  ) throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     return m_xManager->getLoginTimeout();
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OPoolCollection::getImplementationName(  ) throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -149,7 +149,7 @@ sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceNam
     return cppu::supportsService(this, _rServiceName);
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
@@ -161,20 +161,20 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference
     return static_cast<XDriverManager*>(new OPoolCollection(comphelper::getComponentContext(_rxFactory)));
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OPoolCollection::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString("com.sun.star.sdbc.OConnectionPool");
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static(  ) throw(RuntimeException)
 {
     Sequence< OUString > aSupported(1);
     aSupported[0] = "com.sun.star.sdbc.ConnectionPool";
     return aSupported;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) throw(RuntimeException)
 {
     // returns the original driver when no connection pooling is enabled else it returns the proxy
@@ -216,7 +216,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _
 
     return xDriver;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OPoolCollection::isDriverPoolingEnabled(const OUString& _sDriverImplName,
                                                  Reference< XInterface >& _rxDriverNode)
 {
@@ -244,7 +244,7 @@ sal_Bool OPoolCollection::isDriverPoolingEnabled(const OUString& _sDriverImplNam
     }
     return bEnabled;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OPoolCollection::isPoolingEnabled()
 {
     // the config node where all pooling relevant info are stored under
@@ -256,14 +256,14 @@ sal_Bool OPoolCollection::isPoolingEnabled()
         getNodeValue(getEnablePoolingNodeName(),xConnectionPoolRoot) >>= bEnabled;
     return bEnabled;
 }
-// -----------------------------------------------------------------------------
+
 Reference<XInterface> OPoolCollection::getConfigPoolRoot()
 {
     if(!m_xConfigNode.is())
         m_xConfigNode = createWithServiceFactory(getConnectionPoolNodeName());
     return m_xConfigNode;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OPoolCollection::isPoolingEnabledByUrl(const OUString& _sUrl,
                                                 Reference< XDriver >& _rxDriver,
                                                 OUString& _rsImplName,
@@ -285,7 +285,7 @@ sal_Bool OPoolCollection::isPoolingEnabledByUrl(const OUString& _sUrl,
     }
     return bEnabled;
 }
-// -----------------------------------------------------------------------------
+
 void OPoolCollection::clearConnectionPools(sal_Bool _bDispose)
 {
     OConnectionPools::const_iterator aIter = m_aPools.begin();
@@ -298,7 +298,7 @@ void OPoolCollection::clearConnectionPools(sal_Bool _bDispose)
         m_aPools.erase(sKeyValue);
     }
 }
-// -----------------------------------------------------------------------------
+
 OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName,
                                                     const Reference< XDriver >& _xDriver,
                                                     const Reference< XInterface >& _xDriverNode)
@@ -322,14 +322,14 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName,
 
     return pRet;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString& _rPath) const
 {
     return createWithProvider(
         com::sun::star::configuration::theDefaultProvider::get(m_xContext),
         _rPath);
 }
-//------------------------------------------------------------------------
+
 Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider,
                             const OUString& _rPath) const
 {
@@ -348,7 +348,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
         "::createWithProvider: could not create the node access!");
     return xInterface;
 }
-// -----------------------------------------------------------------------------
+
 Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) const throw()
 {
     Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY);
@@ -380,7 +380,7 @@ Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Ref
     }
     return xNode;
 }
-// -----------------------------------------------------------------------------
+
 Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) throw()
 {
     Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY);
@@ -405,16 +405,16 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterf
     }
     return aReturn;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPoolCollection::queryTermination( const EventObject& /*Event*/ ) throw (::com::sun::star::frame::TerminationVetoException, RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPoolCollection::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException)
 {
     clearDesktop();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPoolCollection::disposing( const EventObject& Source ) throw (RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -442,7 +442,7 @@ void SAL_CALL OPoolCollection::disposing( const EventObject& Source ) throw (Run
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -495,7 +495,7 @@ void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::Pr
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OPoolCollection::clearDesktop()
 {
     clearConnectionPools(sal_True);
@@ -503,7 +503,7 @@ void OPoolCollection::clearDesktop()
         m_xDesktop->removeTerminateListener(this);
 m_xDesktop.clear();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index a50d6da70ffc..93469c7a481f 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -42,7 +42,7 @@ OPooledConnection::OPooledConnection(const Reference< XConnection >& _xConnectio
 {
 
 }
-// -----------------------------------------------------------------------------
+
 // OComponentHelper
 void SAL_CALL OPooledConnection::disposing(void)
 {
@@ -52,13 +52,13 @@ void SAL_CALL OPooledConnection::disposing(void)
 m_xComponent.clear();
     ::comphelper::disposeComponent(m_xRealConnection);
 }
-// -----------------------------------------------------------------------------
+
 // XEventListener
 void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) throw (RuntimeException)
 {
 m_xComponent.clear();
 }
-// -----------------------------------------------------------------------------
+
 //XPooledConnection
 Reference< XConnection > OPooledConnection::getConnection()  throw(SQLException, RuntimeException)
 {
@@ -72,6 +72,6 @@ Reference< XConnection > OPooledConnection::getConnection()  throw(SQLException,
     }
     return Reference< XConnection >(m_xComponent,UNO_QUERY);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 3d3d657d272a..880190ee9b96 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -33,7 +33,7 @@ using namespace connectivity;
 extern "C"
 {
 
-//---------------------------------------------------------------------------------------
+
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 882b1d57bdbd..1823251f88e9 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -42,108 +42,108 @@ OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInf
 {
     m_Command.put_CommandType(adCmdStoredProc);
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPreparedStatement::queryInterface(rType);
     return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< XRow*>(this));
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeException)
 {
     return m_aValue.isNull();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return (sal_Int64)m_aValue.getCurrency().int64;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getObject", *this );
     return Any();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
  ::com::sun::star::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
  ::com::sun::star::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
@@ -155,7 +155,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex
         pParam->put_Direction(adParamOutput);
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
     ADOParameter* pParam = NULL;
@@ -167,7 +167,7 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet
         pParam->put_NumericScale((sal_Int8)scale);
     }
 }
-// -------------------------------------------------------------------------
+
 
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
@@ -175,51 +175,51 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::get
     ::dbtools::throwFeatureNotImplementedException( "XRow::getBinaryStream", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getCharacterStream", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getArray", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getClob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getBlob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getRef", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 void SAL_CALL OCallableStatement::acquire() throw()
 {
     OPreparedStatement::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCallableStatement::release() throw()
 {
     OPreparedStatement::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index 01e4aee0640d..0e25ab6d20fa 100644
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -27,23 +27,23 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity;
 using namespace connectivity::ado;
-// -------------------------------------------------------------------------
+
 OCatalog::OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
                 ,m_aCatalog(_pCatalog)
                 ,m_pConnection(_pCon)
 {
 }
-// -----------------------------------------------------------------------------
+
 OCatalog::~OCatalog()
 {
     if(m_aCatalog.IsValid())
         m_aCatalog.putref_ActiveConnection(NULL);
     m_aCatalog.clear();
 }
-// -----------------------------------------------------------------------------
+
 void OCatalog::refreshTables()
 {
     TStringVector aVector;
@@ -72,7 +72,7 @@ void OCatalog::refreshTables()
     else
         m_pTables = new OTables(this,m_aMutex,aVector,aTables,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshViews()
 {
     TStringVector aVector;
@@ -85,7 +85,7 @@ void OCatalog::refreshViews()
     else
         m_pViews = new OViews(this,m_aMutex,aVector,aViews,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshGroups()
 {
     TStringVector aVector;
@@ -98,7 +98,7 @@ void OCatalog::refreshGroups()
     else
         m_pGroups = new OGroups(this,m_aMutex,aVector,aGroups,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshUsers()
 {
     TStringVector aVector;
@@ -111,7 +111,7 @@ void OCatalog::refreshUsers()
     else
         m_pUsers = new OUsers(this,m_aMutex,aVector,aUsers,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
author	Release Engineers <releng@openoffice.org>	2009-07-20 22:54:23 +0000
committer	Release Engineers <releng@openoffice.org>	2009-07-20 22:54:23 +0000
commit	38ab8a5ee995f10d952b4adbb3245fcf6c1260ea (patch)
tree	c21cbf2612b74b7ac5a76c6811cdd05f39836310
parent	83817cc577d6f22b7f1a9155319437b2ecab60db (diff)